Le 17/05/2021 à 14:32, Xie Yongji a écrit : > The symbol address_space_memory are already declared in > include/exec/address-spaces.h. So let's add this header file > and remove the redundant declaration in include/hw/virtio/vhost-vdpa.h. > > Signed-off-by: Xie Yongji <xieyon...@bytedance.com> > Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > hw/virtio/vhost-vdpa.c | 1 + > include/hw/virtio/vhost-vdpa.h | 1 - > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c > index 8f2fb9f10b2a..ee51863d280b 100644 > --- a/hw/virtio/vhost-vdpa.c > +++ b/hw/virtio/vhost-vdpa.c > @@ -18,6 +18,7 @@ > #include "hw/virtio/vhost-backend.h" > #include "hw/virtio/virtio-net.h" > #include "hw/virtio/vhost-vdpa.h" > +#include "exec/address-spaces.h" > #include "qemu/main-loop.h" > #include "cpu.h" > #include "trace.h" > diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h > index 28ca65018ed7..ae9ee7adb2d0 100644 > --- a/include/hw/virtio/vhost-vdpa.h > +++ b/include/hw/virtio/vhost-vdpa.h > @@ -21,5 +21,4 @@ typedef struct vhost_vdpa { > struct vhost_dev *dev; > } VhostVDPA; > > -extern AddressSpace address_space_memory; > #endif >
Applied to my trivial-patches branch. Thanks, Laurent