|
 |
9bac43 |
From ca6e32bce33eab1000eba5629e28832430896cbd Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
Date: Mon, 9 Oct 2017 12:32:37 +0200
|
|
|
9bac43 |
Subject: [PATCH 18/34] usb: drop HOST_USB
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
Message-id: <1507552368-9245-2-git-send-email-thuth@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 77016
|
|
|
9bac43 |
O-Subject: [RHEL-7.5 qemu-kvm-ma PATCH 01/12] usb: drop HOST_USB
|
|
|
9bac43 |
Bugzilla: 1492033
|
|
|
9bac43 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
Nowdays we use libusb for usb-host, so we don't have different code
|
|
|
9bac43 |
for linux vs. bsd any more. So there is little reason to have the
|
|
|
9bac43 |
HOST_USB variable, we can just write things directly into the Makefile
|
|
|
9bac43 |
and avoid a pointless indirection.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9bac43 |
Reviewed-by: Fam Zheng <famz@redhat.com>
|
|
|
9bac43 |
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
Message-id: 20170908111217.21985-2-kraxel@redhat.com
|
|
|
9bac43 |
(cherry picked from commit 4e5ee5b21c84fe3023a64b5cc2e12a52ab0597c1)
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
Conflicts:
|
|
|
9bac43 |
configure (simple conflict in the context of the removed hunk)
|
|
|
9bac43 |
---
|
|
|
9bac43 |
configure | 7 -------
|
|
|
9bac43 |
hw/usb/Makefile.objs | 6 +++++-
|
|
|
9bac43 |
2 files changed, 5 insertions(+), 8 deletions(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/configure b/configure
|
|
|
9bac43 |
index 5cb65d0..457b2ff 100755
|
|
|
9bac43 |
--- a/configure
|
|
|
9bac43 |
+++ b/configure
|
|
|
9bac43 |
@@ -5968,13 +5968,6 @@ if test "$live_block_ops" = "yes" ; then
|
|
|
9bac43 |
echo "CONFIG_LIVE_BLOCK_OPS=y" >> $config_host_mak
|
|
|
9bac43 |
fi
|
|
|
9bac43 |
|
|
|
9bac43 |
-# USB host support
|
|
|
9bac43 |
-if test "$libusb" = "yes"; then
|
|
|
9bac43 |
- echo "HOST_USB=libusb legacy" >> $config_host_mak
|
|
|
9bac43 |
-else
|
|
|
9bac43 |
- echo "HOST_USB=stub" >> $config_host_mak
|
|
|
9bac43 |
-fi
|
|
|
9bac43 |
-
|
|
|
9bac43 |
# TPM passthrough support?
|
|
|
9bac43 |
if test "$tpm" = "yes"; then
|
|
|
9bac43 |
echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak
|
|
|
9bac43 |
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
|
|
|
9bac43 |
index 97f1c456..a43ebbc 100644
|
|
|
9bac43 |
--- a/hw/usb/Makefile.objs
|
|
|
9bac43 |
+++ b/hw/usb/Makefile.objs
|
|
|
9bac43 |
@@ -38,7 +38,11 @@ endif
|
|
|
9bac43 |
common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o
|
|
|
9bac43 |
|
|
|
9bac43 |
# usb pass-through
|
|
|
9bac43 |
-common-obj-y += $(patsubst %,host-%.o,$(HOST_USB))
|
|
|
9bac43 |
+ifeq ($(CONFIG_LIBUSB),y)
|
|
|
9bac43 |
+common-obj-y += host-libusb.o host-legacy.o
|
|
|
9bac43 |
+else
|
|
|
9bac43 |
+common-obj-y += host-stub.o
|
|
|
9bac43 |
+endif
|
|
|
9bac43 |
|
|
|
9bac43 |
ifeq ($(CONFIG_USB_LIBUSB),y)
|
|
|
9bac43 |
common-obj-$(CONFIG_XEN) += xen-usb.o
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|