diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-09 13:16:05 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-09 13:16:05 +0000 |
| commit | dd4d2578215cd380f40a38028a9904e15b135ef3 (patch) | |
| tree | 084f584ccd58f3e4599c54e4772ebef8ad311283 | |
| parent | b64842dee42d6b24d51283e4722140b73be1e222 (diff) | |
| parent | dbb5fb8d3519130559b10fa4e1395e4486c633f8 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-fixes-20170309-1' into staging
2.9 bugfixes for ohci and qxl
# gpg: Signature made Thu 09 Mar 2017 09:09:44 GMT
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-fixes-20170309-1:
qxl: clear guest_cursor on QXL_CURSOR_HIDE
ohci: relax link check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/display/qxl.c | 5 | ||||
| -rw-r--r-- | hw/usb/hcd-ohci.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index af4c0ca002..0d02f0efe6 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -477,6 +477,11 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext) qxl->guest_cursor = ext->cmd.data; qemu_mutex_unlock(&qxl->track_lock); } + if (cmd->type == QXL_CURSOR_HIDE) { + qemu_mutex_lock(&qxl->track_lock); + qxl->guest_cursor = 0; + qemu_mutex_unlock(&qxl->track_lock); + } break; } } diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index fe8406ac64..3ada35e954 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -42,7 +42,7 @@ #define OHCI_MAX_PORTS 15 -#define ED_LINK_LIMIT 4 +#define ED_LINK_LIMIT 32 static int64_t usb_frame_time; static int64_t usb_bit_time; |