From ab6b1105a2259c7072905887f71caa850ce63190 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 7 Mar 2017 09:40:18 +0100 Subject: [PATCH 1/2] ohci: relax link check The strict td link limit added by commit "95ed569 usb: ohci: limit the number of link eds" causes problems with macos guests. Lets raise the limit. Reported-by: Programmingkid Reported-by: Howard Spoelstra Signed-off-by: Gerd Hoffmann Reviewed-by: BALATON Zoltan Reviewed-by: John Arbuckle Message-id: 1488876018-31576-1-git-send-email-kraxel@redhat.com --- hw/usb/hcd-ohci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From dbb5fb8d3519130559b10fa4e1395e4486c633f8 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 6 Mar 2017 09:31:51 +0100 Subject: [PATCH 2/2] qxl: clear guest_cursor on QXL_CURSOR_HIDE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make sure we don't leave guest_cursor pointing into nowhere. This might lead to (rare) live migration failures, due to target trying to restore the cursor from the stale pointer. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1421788 Reported-by: Dr. David Alan Gilbert Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-André Lureau Message-id: 1488789111-27340-1-git-send-email-kraxel@redhat.com --- hw/display/qxl.c | 5 +++++ 1 file changed, 5 insertions(+) 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; } }