[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 11/18] hw/virtio: move stubs out of stubs/
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 11/18] hw/virtio: move stubs out of stubs/ |
Date: |
Mon, 8 Apr 2024 17:53:23 +0200 |
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%)
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
--
2.44.0
- Re: [PATCH v2 05/18] yank: only build if needed, (continued)
- [PATCH v2 08/18] hw: Include minimal source set in user emulation build, Paolo Bonzini, 2024/04/08
- [PATCH v2 07/18] hw/core: Move system emulation files to system_ss, Paolo Bonzini, 2024/04/08
- [PATCH v2 09/18] stubs: remove obsolete stubs, Paolo Bonzini, 2024/04/08
- [PATCH v2 10/18] hw/usb: move stubs out of stubs/, Paolo Bonzini, 2024/04/08
- [PATCH v2 06/18] util/qemu-config: Extract QMP commands to qemu-config-qmp.c, Paolo Bonzini, 2024/04/08
- [PATCH v2 11/18] hw/virtio: move stubs out of stubs/,
Paolo Bonzini <=
- [PATCH v2 12/18] semihosting: move stubs out of stubs/, Paolo Bonzini, 2024/04/08
- [PATCH v2 13/18] ramfb: move stubs out of stubs/, Paolo Bonzini, 2024/04/08
- [PATCH v2 14/18] memory-device: move stubs out of stubs/, Paolo Bonzini, 2024/04/08
- [PATCH v2 15/18] colo: move stubs out of stubs/, Paolo Bonzini, 2024/04/08