diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-13 16:58:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-13 16:58:44 +0100 |
| commit | 20c1df5476e1e9b5d3f5b94f9f3ce01d21f14c46 (patch) | |
| tree | fadb1ea5e817287cd872b18ea0e597ece952dc00 /hw | |
| parent | 5c65b1f135ff09d24827fa3a17e56a4f8a032cd5 (diff) | |
| parent | 631009e775a91018a62e2670b4473e99916f858f (diff) | |
| download | qemu-20c1df5476e1e9b5d3f5b94f9f3ce01d21f14c46.zip qemu-20c1df5476e1e9b5d3f5b94f9f3ce01d21f14c46.tar.gz qemu-20c1df5476e1e9b5d3f5b94f9f3ce01d21f14c46.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20200713-pull-request' into staging
bugfixes for audio, usb, ui and docs.
# gpg: Signature made Mon 13 Jul 2020 15:10:35 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/fixes-20200713-pull-request:
usb: fix usb-host build on windows.
ui: fix vc_chr_write call in text_console_do_init
docs/qdev-device-use: Clean up the sentences related to -usbdevice
ossaudio: fix out of bounds write
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/usb/host-libusb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index ad7ed8f..c474551 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -907,7 +907,7 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd) goto fail; } } else { -#if LIBUSB_API_VERSION >= 0x01000107 +#if LIBUSB_API_VERSION >= 0x01000107 && !defined(CONFIG_WIN32) trace_usb_host_open_hostfd(hostfd); rc = libusb_wrap_sys_device(ctx, hostfd, &s->dh); @@ -1107,7 +1107,7 @@ static void usb_host_realize(USBDevice *udev, Error **errp) QTAILQ_INIT(&s->isorings); s->hostfd = -1; -#if LIBUSB_API_VERSION >= 0x01000107 +#if LIBUSB_API_VERSION >= 0x01000107 && !defined(CONFIG_WIN32) if (s->hostdevice) { int fd; s->needs_autoscan = false; |