8c721a87ae
- Remove deprecated patch "work-around-SA_RESTART-race" (boo#982208) - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.6 * Patches dropped: 0002-XXX-work-around-SA_RESTART-race-wit.patch 0003-qemu-0.9.0.cvs-binfmt.patch 0004-qemu-cvs-alsa_bitfield.patch 0005-qemu-cvs-alsa_ioctl.patch 0006-qemu-cvs-alsa_mmap.patch 0007-qemu-cvs-gettimeofday.patch 0008-qemu-cvs-ioctl_debug.patch 0009-qemu-cvs-ioctl_nodirection.patch 0010-block-vmdk-Support-creation-of-SCSI.patch 0011-linux-user-add-binfmt-wrapper-for-a.patch 0012-PPC-KVM-Disable-mmu-notifier-check.patch 0013-linux-user-fix-segfault-deadlock.patch 0014-linux-user-binfmt-support-host-bina.patch 0015-linux-user-Ignore-broken-loop-ioctl.patch 0016-linux-user-lock-tcg.patch 0017-linux-user-Run-multi-threaded-code-.patch 0018-linux-user-lock-tb-flushing-too.patch 0019-linux-user-Fake-proc-cpuinfo.patch 0020-linux-user-implement-FS_IOC_GETFLAG.patch 0021-linux-user-implement-FS_IOC_SETFLAG.patch 0022-linux-user-XXX-disable-fiemap.patch 0023-slirp-nooutgoing.patch 0024-vnc-password-file-and-incoming-conn.patch 0025-linux-user-add-more-blk-ioctls.patch 0026-linux-user-use-target_ulong.patch 0027-block-Add-support-for-DictZip-enabl.patch 0028-block-Add-tar-container-format.patch OBS-URL: https://build.opensuse.org/request/show/408549 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=305
29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
From 49ca2dd08ac9edce6d828328069d1092f3a63b50 Mon Sep 17 00:00:00 2001
|
|
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Fri, 10 Jun 2016 07:12:15 -0600
|
|
Subject: [PATCH] usb: Fix conditions that xen-usb.c is used
|
|
|
|
When non-x86 arch targets are built on x86 we have a mismatched
|
|
between what is built in support of xen. xen-usb.c is conditioned
|
|
upon CONFIG_USB_LIBUSB and CONFIG_XEN_BACKEND, but it relies on
|
|
an external reference that is instead controlled by CONFIG_XEN.
|
|
Add a dependency on CONFIG_XEN as well.
|
|
[BR: FATE#316612]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/usb/Makefile.objs | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
|
|
index 98b5c9d..2db2fa1 100644
|
|
--- a/hw/usb/Makefile.objs
|
|
+++ b/hw/usb/Makefile.objs
|
|
@@ -39,6 +39,6 @@ common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o
|
|
# usb pass-through
|
|
common-obj-y += $(patsubst %,host-%.o,$(HOST_USB))
|
|
|
|
-ifeq ($(CONFIG_USB_LIBUSB),y)
|
|
+ifeq ($(CONFIG_XEN)$(CONFIG_USB_LIBUSB),yy)
|
|
common-obj-$(CONFIG_XEN_BACKEND) += xen-usb.o
|
|
endif
|