| Message ID | 20240408155330.522792-12-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | buildsys: Start shrinking qemu-user build process | expand |
On 4/8/24 05:53, Paolo Bonzini wrote: > Since the virtio memory device stubs are needed exactly when the > Kconfig symbol is not enabled, they can be placed in hw/virtio/ and > conditionalized on CONFIG_VIRTIO_MD. > > Signed-off-by: Paolo Bonzini<pbonzini@redhat.com> > --- > stubs/virtio-md-pci.c => hw/virtio/virtio-md-stubs.c | 0 > hw/virtio/meson.build | 3 ++- > stubs/meson.build | 1 - > 3 files changed, 2 insertions(+), 2 deletions(-) > rename stubs/virtio-md-pci.c => hw/virtio/virtio-md-stubs.c (100%) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/stubs/virtio-md-pci.c b/hw/virtio/virtio-md-stubs.c similarity index 100% rename from stubs/virtio-md-pci.c rename to hw/virtio/virtio-md-stubs.c diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index d7f18c96e60..2a086f7904b 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -80,7 +80,8 @@ virtio_pci_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-pmem-pci.c' virtio_pci_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu-pci.c')) virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem-pci.c')) virtio_pci_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-dev-pci.c')) -virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MD', if_true: files('virtio-md-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MD', if_true: files('virtio-md-pci.c'), + if_false: files('virtio-md-stubs.c')) specific_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) diff --git a/stubs/meson.build b/stubs/meson.build index 45616afbfaa..60e32d363fa 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -57,7 +57,6 @@ if have_system stub_ss.add(files('fw_cfg.c')) stub_ss.add(files('semihost.c')) stub_ss.add(files('xen-hw-stub.c')) - stub_ss.add(files('virtio-md-pci.c')) else stub_ss.add(files('qdev.c')) endif
Since the virtio memory device stubs are needed exactly when the Kconfig symbol is not enabled, they can be placed in hw/virtio/ and conditionalized on CONFIG_VIRTIO_MD. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- stubs/virtio-md-pci.c => hw/virtio/virtio-md-stubs.c | 0 hw/virtio/meson.build | 3 ++- stubs/meson.build | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) rename stubs/virtio-md-pci.c => hw/virtio/virtio-md-stubs.c (100%)