[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 0/3] Usb 20170929 patches
From: |
Gerd Hoffmann |
Subject: |
Re: [Qemu-devel] [PULL 0/3] Usb 20170929 patches |
Date: |
Wed, 04 Oct 2017 11:50:39 +0200 |
Hi,
>
> Ah, deja vu. I think you've now run into the problem that I had with
> my
> patch, too - see:
>
> https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg01875.html
> https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg02082.html
>
> I think this is a race condition when building with "make -j" in
> parallel. Just add a line like this and you should be fine:
>
> common-obj-$(CONFIG_ALL) += host-stub.o
I'd guess when compiling this unconditionally we better move it over to
stubs.
cheers,
Gerd
diff --git a/hw/usb/host-stub.c b/stubs/usb-host.c
similarity index 100%
rename from hw/usb/host-stub.c
rename to stubs/usb-host.c
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 0e6d54b21f..c2f46ac540 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -44,8 +44,6 @@ redirect.o-libs = $(USB_REDIR_LIBS)
# usb pass-through
ifeq ($(CONFIG_USB_LIBUSB)$(CONFIG_USB),yy)
common-obj-y += host-libusb.o host-legacy.o
-else
-common-obj-y += host-stub.o
endif
host-libusb.o-cflags := $(LIBUSB_CFLAGS)
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index c7594796c3..edccdc5f1e 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -41,3 +41,4 @@ stub-obj-y += vmgenid.o
stub-obj-y += xen-common.o
stub-obj-y += xen-hvm.o
stub-obj-y += pci-host-piix.o
+stub-obj-y += usb-host.o