diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-04-08 17:53:23 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-04-18 11:17:27 +0200 |
| commit | f2604d8508a12a2060e854283fa076c9f09d1d10 (patch) | |
| tree | 8dfa4f6dc76d421dec74c11a05791e4404ca3e54 | |
| parent | 89857312f3245e589b161eb535261bae7b7fcce2 (diff) | |
| download | qemu-f2604d8508a12a2060e854283fa076c9f09d1d10.zip qemu-f2604d8508a12a2060e854283fa076c9f09d1d10.tar.gz qemu-f2604d8508a12a2060e854283fa076c9f09d1d10.tar.bz2 | |
hw/virtio: move stubs out of stubs/
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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20240408155330.522792-12-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/virtio/meson.build | 2 | ||||
| -rw-r--r-- | hw/virtio/virtio-md-stubs.c (renamed from stubs/virtio-md-pci.c) | 0 | ||||
| -rw-r--r-- | stubs/meson.build | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index d7f18c9..621fc65 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -87,6 +87,8 @@ specific_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) system_ss.add_all(when: 'CONFIG_VIRTIO', if_true: system_virtio_ss) system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vhost-stub.c')) system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('virtio-stub.c')) +system_ss.add(when: 'CONFIG_VIRTIO_MD', if_false: files('virtio-md-stubs.c')) + system_ss.add(files('virtio-hmp-cmds.c')) specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: specific_virtio_ss) diff --git a/stubs/virtio-md-pci.c b/hw/virtio/virtio-md-stubs.c index ce5bba0..ce5bba0 100644 --- a/stubs/virtio-md-pci.c +++ b/hw/virtio/virtio-md-stubs.c diff --git a/stubs/meson.build b/stubs/meson.build index 45616af..60e32d3 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 |