| Message ID | 20201105124353.3680057-3-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/virtio: Allow to disable legacy VIRTIO | expand |
On 05/11/20 13:43, Philippe Mathieu-Daudé wrote: > VirtIO devices shouldn't be arch-specific. Some device have to > use PAGE_SIZE definition or access to CPUState. Keep building > them as arch-specific objects. Move all we can to libcommon.fa. > > Suggested-by: Stefan Hajnoczi <stefanha@gmail.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/9pfs/meson.build | 2 +- > hw/block/dataplane/meson.build | 2 +- > hw/block/meson.build | 2 +- > hw/char/meson.build | 2 +- > hw/net/meson.build | 2 +- > hw/scsi/meson.build | 2 +- > hw/virtio/meson.build | 15 +++++++++------ > 7 files changed, 15 insertions(+), 12 deletions(-) > > diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build > index cc094262122..ac964be15ce 100644 > --- a/hw/9pfs/meson.build > +++ b/hw/9pfs/meson.build > @@ -17,4 +17,4 @@ > fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c')) > softmmu_ss.add_all(when: 'CONFIG_9PFS', if_true: fs_ss) > > -specific_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device.c')) > +softmmu_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device.c')) > diff --git a/hw/block/dataplane/meson.build b/hw/block/dataplane/meson.build > index 12c6a264f10..e2f3721ce24 100644 > --- a/hw/block/dataplane/meson.build > +++ b/hw/block/dataplane/meson.build > @@ -1,2 +1,2 @@ > -specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) > +softmmu_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) > specific_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c')) > diff --git a/hw/block/meson.build b/hw/block/meson.build > index 602ca6c8541..497592c33ac 100644 > --- a/hw/block/meson.build > +++ b/hw/block/meson.build > @@ -15,7 +15,7 @@ > softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('tc58128.c')) > softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c')) > > -specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) > +softmmu_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) > specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk.c')) > > subdir('dataplane') > diff --git a/hw/char/meson.build b/hw/char/meson.build > index 196ac91fa29..7496594ea07 100644 > --- a/hw/char/meson.build > +++ b/hw/char/meson.build > @@ -37,5 +37,5 @@ > > specific_ss.add(when: 'CONFIG_HTIF', if_true: files('riscv_htif.c')) > specific_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('terminal3270.c')) > -specific_ss.add(when: 'CONFIG_VIRTIO', if_true: files('virtio-serial-bus.c')) > +softmmu_ss.add(when: 'CONFIG_VIRTIO', if_true: files('virtio-serial-bus.c')) > specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_vty.c')) > diff --git a/hw/net/meson.build b/hw/net/meson.build > index 4a7051b54a0..c795af23eee 100644 > --- a/hw/net/meson.build > +++ b/hw/net/meson.build > @@ -43,7 +43,7 @@ > specific_ss.add(when: 'CONFIG_XILINX_ETHLITE', if_true: files('xilinx_ethlite.c')) > > softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('net_rx_pkt.c')) > -specific_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c')) > +softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c')) > > softmmu_ss.add(when: ['CONFIG_VIRTIO_NET', 'CONFIG_VHOST_NET'], if_true: files('vhost_net.c'), if_false: files('vhost_net-stub.c')) > softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost_net-stub.c')) > diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build > index 923a34f344c..fdf27156f6a 100644 > --- a/hw/scsi/meson.build > +++ b/hw/scsi/meson.build > @@ -19,7 +19,7 @@ > virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c')) > virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-common.c', 'vhost-scsi.c')) > virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-scsi-common.c', 'vhost-user-scsi.c')) > -specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) > +softmmu_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) > > specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c')) > > diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build > index 95415913a9a..40df99f1a48 100644 > --- a/hw/virtio/meson.build > +++ b/hw/virtio/meson.build > @@ -9,12 +9,15 @@ > > softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c')) > > +virtio_arch_ss = ss.source_set() > +virtio_arch_ss.add(files('virtio.c')) > +virtio_arch_ss.add(when: 'CONFIG_VIRTIO_LEGACY', if_true: files('virtio-legacy.c')) > +virtio_arch_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c')) > +virtio_arch_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-vdpa.c')) > +virtio_arch_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c')) > + > virtio_ss = ss.source_set() > -virtio_ss.add(files('virtio.c')) > -virtio_ss.add(when: 'CONFIG_VIRTIO_LEGACY', if_true: files('virtio-legacy.c')) > virtio_ss.add(when: 'CONFIG_VHOST', if_true: files('vhost.c', 'vhost-backend.c')) > -virtio_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c')) > -virtio_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-vdpa.c')) > virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloon.c')) > virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-crypto.c')) > virtio_ss.add(when: ['CONFIG_VIRTIO_CRYPTO', 'CONFIG_VIRTIO_PCI'], if_true: files('virtio-crypto-pci.c')) > @@ -24,7 +27,6 @@ > virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock.c', 'vhost-vsock-common.c')) > virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock.c', 'vhost-vsock-common.c')) > virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng.c')) > -virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c')) > virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem.c')) > > virtio_pci_ss = ss.source_set() > @@ -49,4 +51,5 @@ > > virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) > > -specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: virtio_ss) > +softmmu_ss.add_all(when: 'CONFIG_VIRTIO', if_true: virtio_ss) > +specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: virtio_arch_ss) > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
On Thu, 5 Nov 2020 13:43:52 +0100 Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > VirtIO devices shouldn't be arch-specific. Some device have to > use PAGE_SIZE definition or access to CPUState. Keep building > them as arch-specific objects. Move all we can to libcommon.fa. > This patch breaks build: $ ./configure && make ... [890/2578] Compiling C object libcommon.fa.p/hw_virtio_virtio-mem.c.o FAILED: libcommon.fa.p/hw_virtio_virtio-mem.c.o cc -Ilibcommon.fa.p -I. -I.. -I../slirp -I../slirp/src -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/SDL2 -I/usr/include/pixman-1 -I/usr/include/libpng16 -I/usr/include/capstone -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -fdiagnostics-color=auto -pipe -Wall -Winvalid-pch -Werror -std=gnu99 -O2 -g -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -m64 -mcx16 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-declaration -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -isystem /var/tmp/qemu/linux-headers -isystem linux-headers -iquote /var/tmp/qemu/tcg/i386 -iquote . -iquote /var/tmp/qemu -iquote /var/tmp/qemu/accel/tcg -iquote /var/tmp/qemu/include -iquote /var/tmp/qemu/disas/libvixl -pthread -fPIC -D_REENTRANT -Wno-undef -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DNCURSES_WIDECHAR -MD -MQ libcommon.fa.p/hw_virtio_virtio-mem.c.o -MF libcommon.fa.p/hw_virtio_virtio-mem.c.o.d -o libcommon.fa.p/hw_virtio_virtio-mem.c.o -c ../hw/virtio/virtio-mem.c In file included from ../hw/virtio/virtio-mem.c:28: /var/tmp/qemu/include/exec/ram_addr.h:23:10: fatal error: cpu.h: No such file or directory 23 | #include "cpu.h" | ^~~~~~~ compilation terminated. Unless I'm missing something legacy devices require to be built according to the target because of the endianess. > Suggested-by: Stefan Hajnoczi <stefanha@gmail.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/9pfs/meson.build | 2 +- > hw/block/dataplane/meson.build | 2 +- > hw/block/meson.build | 2 +- > hw/char/meson.build | 2 +- > hw/net/meson.build | 2 +- > hw/scsi/meson.build | 2 +- > hw/virtio/meson.build | 15 +++++++++------ > 7 files changed, 15 insertions(+), 12 deletions(-) > > diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build > index cc094262122..ac964be15ce 100644 > --- a/hw/9pfs/meson.build > +++ b/hw/9pfs/meson.build > @@ -17,4 +17,4 @@ > fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c')) > softmmu_ss.add_all(when: 'CONFIG_9PFS', if_true: fs_ss) > > -specific_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device.c')) > +softmmu_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device.c')) > diff --git a/hw/block/dataplane/meson.build b/hw/block/dataplane/meson.build > index 12c6a264f10..e2f3721ce24 100644 > --- a/hw/block/dataplane/meson.build > +++ b/hw/block/dataplane/meson.build > @@ -1,2 +1,2 @@ > -specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) > +softmmu_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) > specific_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c')) > diff --git a/hw/block/meson.build b/hw/block/meson.build > index 602ca6c8541..497592c33ac 100644 > --- a/hw/block/meson.build > +++ b/hw/block/meson.build > @@ -15,7 +15,7 @@ > softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('tc58128.c')) > softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c')) > > -specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) > +softmmu_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) > specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk.c')) > > subdir('dataplane') > diff --git a/hw/char/meson.build b/hw/char/meson.build > index 196ac91fa29..7496594ea07 100644 > --- a/hw/char/meson.build > +++ b/hw/char/meson.build > @@ -37,5 +37,5 @@ > > specific_ss.add(when: 'CONFIG_HTIF', if_true: files('riscv_htif.c')) > specific_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('terminal3270.c')) > -specific_ss.add(when: 'CONFIG_VIRTIO', if_true: files('virtio-serial-bus.c')) > +softmmu_ss.add(when: 'CONFIG_VIRTIO', if_true: files('virtio-serial-bus.c')) > specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_vty.c')) > diff --git a/hw/net/meson.build b/hw/net/meson.build > index 4a7051b54a0..c795af23eee 100644 > --- a/hw/net/meson.build > +++ b/hw/net/meson.build > @@ -43,7 +43,7 @@ > specific_ss.add(when: 'CONFIG_XILINX_ETHLITE', if_true: files('xilinx_ethlite.c')) > > softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('net_rx_pkt.c')) > -specific_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c')) > +softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c')) > > softmmu_ss.add(when: ['CONFIG_VIRTIO_NET', 'CONFIG_VHOST_NET'], if_true: files('vhost_net.c'), if_false: files('vhost_net-stub.c')) > softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost_net-stub.c')) > diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build > index 923a34f344c..fdf27156f6a 100644 > --- a/hw/scsi/meson.build > +++ b/hw/scsi/meson.build > @@ -19,7 +19,7 @@ > virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c')) > virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-common.c', 'vhost-scsi.c')) > virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-scsi-common.c', 'vhost-user-scsi.c')) > -specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) > +softmmu_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) > > specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c')) > > diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build > index 95415913a9a..40df99f1a48 100644 > --- a/hw/virtio/meson.build > +++ b/hw/virtio/meson.build > @@ -9,12 +9,15 @@ > > softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c')) > > +virtio_arch_ss = ss.source_set() > +virtio_arch_ss.add(files('virtio.c')) > +virtio_arch_ss.add(when: 'CONFIG_VIRTIO_LEGACY', if_true: files('virtio-legacy.c')) > +virtio_arch_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c')) > +virtio_arch_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-vdpa.c')) > +virtio_arch_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c')) > + > virtio_ss = ss.source_set() > -virtio_ss.add(files('virtio.c')) > -virtio_ss.add(when: 'CONFIG_VIRTIO_LEGACY', if_true: files('virtio-legacy.c')) > virtio_ss.add(when: 'CONFIG_VHOST', if_true: files('vhost.c', 'vhost-backend.c')) > -virtio_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c')) > -virtio_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-vdpa.c')) > virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloon.c')) > virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-crypto.c')) > virtio_ss.add(when: ['CONFIG_VIRTIO_CRYPTO', 'CONFIG_VIRTIO_PCI'], if_true: files('virtio-crypto-pci.c')) > @@ -24,7 +27,6 @@ > virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock.c', 'vhost-vsock-common.c')) > virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock.c', 'vhost-vsock-common.c')) > virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng.c')) > -virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c')) > virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem.c')) > > virtio_pci_ss = ss.source_set() > @@ -49,4 +51,5 @@ > > virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) > > -specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: virtio_ss) > +softmmu_ss.add_all(when: 'CONFIG_VIRTIO', if_true: virtio_ss) > +specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: virtio_arch_ss)
diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build index cc094262122..ac964be15ce 100644 --- a/hw/9pfs/meson.build +++ b/hw/9pfs/meson.build @@ -17,4 +17,4 @@ fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c')) softmmu_ss.add_all(when: 'CONFIG_9PFS', if_true: fs_ss) -specific_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device.c')) diff --git a/hw/block/dataplane/meson.build b/hw/block/dataplane/meson.build index 12c6a264f10..e2f3721ce24 100644 --- a/hw/block/dataplane/meson.build +++ b/hw/block/dataplane/meson.build @@ -1,2 +1,2 @@ -specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) specific_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c')) diff --git a/hw/block/meson.build b/hw/block/meson.build index 602ca6c8541..497592c33ac 100644 --- a/hw/block/meson.build +++ b/hw/block/meson.build @@ -15,7 +15,7 @@ softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('tc58128.c')) softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c')) -specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk.c')) subdir('dataplane') diff --git a/hw/char/meson.build b/hw/char/meson.build index 196ac91fa29..7496594ea07 100644 --- a/hw/char/meson.build +++ b/hw/char/meson.build @@ -37,5 +37,5 @@ specific_ss.add(when: 'CONFIG_HTIF', if_true: files('riscv_htif.c')) specific_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('terminal3270.c')) -specific_ss.add(when: 'CONFIG_VIRTIO', if_true: files('virtio-serial-bus.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO', if_true: files('virtio-serial-bus.c')) specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_vty.c')) diff --git a/hw/net/meson.build b/hw/net/meson.build index 4a7051b54a0..c795af23eee 100644 --- a/hw/net/meson.build +++ b/hw/net/meson.build @@ -43,7 +43,7 @@ specific_ss.add(when: 'CONFIG_XILINX_ETHLITE', if_true: files('xilinx_ethlite.c')) softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('net_rx_pkt.c')) -specific_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c')) softmmu_ss.add(when: ['CONFIG_VIRTIO_NET', 'CONFIG_VHOST_NET'], if_true: files('vhost_net.c'), if_false: files('vhost_net-stub.c')) softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost_net-stub.c')) diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build index 923a34f344c..fdf27156f6a 100644 --- a/hw/scsi/meson.build +++ b/hw/scsi/meson.build @@ -19,7 +19,7 @@ virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c')) virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-common.c', 'vhost-scsi.c')) virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-scsi-common.c', 'vhost-user-scsi.c')) -specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) +softmmu_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c')) diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 95415913a9a..40df99f1a48 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -9,12 +9,15 @@ softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c')) +virtio_arch_ss = ss.source_set() +virtio_arch_ss.add(files('virtio.c')) +virtio_arch_ss.add(when: 'CONFIG_VIRTIO_LEGACY', if_true: files('virtio-legacy.c')) +virtio_arch_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c')) +virtio_arch_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-vdpa.c')) +virtio_arch_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c')) + virtio_ss = ss.source_set() -virtio_ss.add(files('virtio.c')) -virtio_ss.add(when: 'CONFIG_VIRTIO_LEGACY', if_true: files('virtio-legacy.c')) virtio_ss.add(when: 'CONFIG_VHOST', if_true: files('vhost.c', 'vhost-backend.c')) -virtio_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c')) -virtio_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-vdpa.c')) virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloon.c')) virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-crypto.c')) virtio_ss.add(when: ['CONFIG_VIRTIO_CRYPTO', 'CONFIG_VIRTIO_PCI'], if_true: files('virtio-crypto-pci.c')) @@ -24,7 +27,6 @@ virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock.c', 'vhost-vsock-common.c')) virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock.c', 'vhost-vsock-common.c')) virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng.c')) -virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c')) virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem.c')) virtio_pci_ss = ss.source_set() @@ -49,4 +51,5 @@ virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) -specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: virtio_ss) +softmmu_ss.add_all(when: 'CONFIG_VIRTIO', if_true: virtio_ss) +specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: virtio_arch_ss)
VirtIO devices shouldn't be arch-specific. Some device have to use PAGE_SIZE definition or access to CPUState. Keep building them as arch-specific objects. Move all we can to libcommon.fa. Suggested-by: Stefan Hajnoczi <stefanha@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/9pfs/meson.build | 2 +- hw/block/dataplane/meson.build | 2 +- hw/block/meson.build | 2 +- hw/char/meson.build | 2 +- hw/net/meson.build | 2 +- hw/scsi/meson.build | 2 +- hw/virtio/meson.build | 15 +++++++++------ 7 files changed, 15 insertions(+), 12 deletions(-)