Skip to content

Commit

Permalink
usb: drop HOST_USB
Browse files Browse the repository at this point in the history
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
  • Loading branch information
kraxel committed Sep 13, 2017
1 parent 104ebc5 commit 4e5ee5b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
7 changes: 0 additions & 7 deletions configure
Expand Up @@ -5967,13 +5967,6 @@ if test "$live_block_migration" = "yes" ; then
echo "CONFIG_LIVE_BLOCK_MIGRATION=y" >> $config_host_mak
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?
if test "$tpm" = "yes"; then
echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak
Expand Down
6 changes: 5 additions & 1 deletion hw/usb/Makefile.objs
Expand Up @@ -38,7 +38,11 @@ endif
common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o

# 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)
common-obj-$(CONFIG_XEN) += xen-usb.o
Expand Down

0 comments on commit 4e5ee5b

Please sign in to comment.