hw/usb: Disable 'usb-host' device when no USB is available in the target

[Qemu-devel] [PATCH] hw/usb: Disable 'usb-host' device when no USB is available in the target

Thomas Huth posted 1 patch 6 years, 7 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1504856852-12425-1-git-send-email-thuth@redhat.com

Test checkpatch passed

Test docker passed

Test s390x passed

hw/usb/Makefile.objs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] hw/usb: Disable 'usb-host' device when no USB is available in the target

Posted by Thomas Huth 6 years, 7 months ago

The 'usb-host' device currently also shows up in the "-device help"
list of all targets that do not support USB. That's ugly and kind of
confusing for the users. We should only provide this device if both,
the host and the target support USB.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/usb/Makefile.objs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 97f1c456..323d448 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -38,7 +38,9 @@ endif
 common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o
 
 # usb pass-through
-common-obj-y += $(patsubst %,host-%.o,$(HOST_USB))
+common-obj-$(CONFIG_USB) += $(patsubst %,host-%.o,$(HOST_USB))
+common-obj-$(call lnot,$(CONFIG_USB)) += host-stub.o
+common-obj-$(CONFIG_ALL) += host-stub.o
 
 ifeq ($(CONFIG_USB_LIBUSB),y)
 common-obj-$(CONFIG_XEN) += xen-usb.o
-- 
1.8.3.1