david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: drop HOST_USB

Browse Source 
Nowdays we use libusb for usb-host, so we don't have different code
for linux vs. bsd any more.  So there is little reason to have the
HOST_USB variable, we can just write things directly into the Makefile
and avoid a pointless indirection.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 20170908111217.21985-2-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2017-09-08 13:12:16 +02:00
parent 104ebc5f2c
commit 4e5ee5b21c
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -5967,13 +5967,6 @@ if test "$live_block_migration" = "yes" ; then
echo "CONFIG_LIVE_BLOCK_MIGRATION=y" >> $config_host_mak echo "CONFIG_LIVE_BLOCK_MIGRATION=y" >> $config_host_mak
fi fi
# USB host support
if test "$libusb" = "yes"; then
echo "HOST_USB=libusb legacy" >> $config_host_mak
else
echo "HOST_USB=stub" >> $config_host_mak
fi
# TPM passthrough support? # TPM passthrough support?
if test "$tpm" = "yes"; then if test "$tpm" = "yes"; then
echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak

6
hw/usb/Makefile.objs
View File

@ -38,7 +38,11 @@ endif
common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o
# usb pass-through # usb pass-through
common-obj-y += $(patsubst %,host-%.o,$(HOST_USB)) ifeq ($(CONFIG_LIBUSB),y)
common-obj-y += host-libusb.o host-legacy.o
else
common-obj-y += host-stub.o
endif
ifeq ($(CONFIG_USB_LIBUSB),y) ifeq ($(CONFIG_USB_LIBUSB),y)
common-obj-$(CONFIG_XEN) += xen-usb.o common-obj-$(CONFIG_XEN) += xen-usb.o