[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 10/18] hw/usb: move stubs out of stubs/
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 10/18] hw/usb: move stubs out of stubs/ |
Date: |
Mon, 8 Apr 2024 17:53:22 +0200 |
Since the USB stubs are needed exactly when the Kconfig symbols are not
enabled, they can be placed in hw/usb/ and conditionalized on CONFIG_USB.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
stubs/usb-dev-stub.c => hw/usb/bus-stub.c | 0
hw/usb/meson.build | 2 +-
stubs/meson.build | 1 -
3 files changed, 1 insertion(+), 2 deletions(-)
rename stubs/usb-dev-stub.c => hw/usb/bus-stub.c (100%)
diff --git a/stubs/usb-dev-stub.c b/hw/usb/bus-stub.c
similarity index 100%
rename from stubs/usb-dev-stub.c
rename to hw/usb/bus-stub.c
diff --git a/hw/usb/meson.build b/hw/usb/meson.build
index aac3bb35f27..23f7f7acb50 100644
--- a/hw/usb/meson.build
+++ b/hw/usb/meson.build
@@ -9,7 +9,7 @@ system_ss.add(when: 'CONFIG_USB', if_true: files(
'desc-msos.c',
'libhw.c',
'pcap.c',
-))
+), if_false: files('bus-stub.c'))
# usb host adapters
system_ss.add(when: 'CONFIG_USB_UHCI', if_true: files('hcd-uhci.c'))
diff --git a/stubs/meson.build b/stubs/meson.build
index aa7120f7110..45616afbfaa 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -56,7 +56,6 @@ endif
if have_system
stub_ss.add(files('fw_cfg.c'))
stub_ss.add(files('semihost.c'))
- stub_ss.add(files('usb-dev-stub.c'))
stub_ss.add(files('xen-hw-stub.c'))
stub_ss.add(files('virtio-md-pci.c'))
else
--
2.44.0
- Re: [PATCH v2 02/18] tests: only build plugins if TCG is enabled, (continued)
- [PATCH v2 05/18] yank: only build if needed, Paolo Bonzini, 2024/04/08
- [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 <=
- [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, 2024/04/08
- [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