[Qemu-devel] [PULL for-2.9 0/2] bugfixes for ohci and qxl

[Qemu-devel] [PULL for-2.9 0/2] bugfixes for ohci and qxl

[Gerd Hoffmann]

  Hi,

2.9 fixes queue, with two patches for qxl and ohci.

please pull,
  Gerd

The following changes since commit 87467097f8811258cd91d42c141a7bd8492ed08a:

  Merge remote-tracking branch 'remotes/armbru/tags/pull-block-2017-02-28-v4' into staging (2017-03-07 17:06:48 +0000)

are available in the git repository at:


  git://git.kraxel.org/qemu tags/pull-fixes-20170309-1

for you to fetch changes up to dbb5fb8d3519130559b10fa4e1395e4486c633f8:

  qxl: clear guest_cursor on QXL_CURSOR_HIDE (2017-03-09 09:47:26 +0100)

----------------------------------------------------------------
2.9 bugfixes for ohci and qxl

----------------------------------------------------------------
Gerd Hoffmann (2):
      ohci: relax link check
      qxl: clear guest_cursor on QXL_CURSOR_HIDE

 hw/display/qxl.c  | 5 +++++
 hw/usb/hcd-ohci.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

[Qemu-devel] [PULL 1/2] ohci: relax link check

[Gerd Hoffmann]

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 <programmingkidx@gmail.com>
Reported-by: Howard Spoelstra <hsp.cat7@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: John Arbuckle <programmingkidx@gmail.com>
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 fe8406a..3ada35e 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;
-- 
1.8.3.1

[Qemu-devel] [PULL 2/2] qxl: clear guest_cursor on QXL_CURSOR_HIDE

[Gerd Hoffmann]

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 <dgilbert@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
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 af4c0ca..0d02f0e 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;
     }
     }
-- 
1.8.3.1

Re: [Qemu-devel] [PULL for-2.9 0/2] bugfixes for ohci and qxl

[Peter Maydell]

On 9 March 2017 at 10:10, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> 2.9 fixes queue, with two patches for qxl and ohci.
>
> please pull,
>   Gerd
>
> The following changes since commit 87467097f8811258cd91d42c141a7bd8492ed08a:
>
>   Merge remote-tracking branch 'remotes/armbru/tags/pull-block-2017-02-28-v4' into staging (2017-03-07 17:06:48 +0000)
>
> are available in the git repository at:
>
>
>   git://git.kraxel.org/qemu tags/pull-fixes-20170309-1
>
> for you to fetch changes up to dbb5fb8d3519130559b10fa4e1395e4486c633f8:
>
>   qxl: clear guest_cursor on QXL_CURSOR_HIDE (2017-03-09 09:47:26 +0100)
>
> ----------------------------------------------------------------
> 2.9 bugfixes for ohci and qxl
>
> ----------------------------------------------------------------
> Gerd Hoffmann (2):
>       ohci: relax link check
>       qxl: clear guest_cursor on QXL_CURSOR_HIDE
>
>  hw/display/qxl.c  | 5 +++++
>  hw/usb/hcd-ohci.c | 2 +-
>  2 files changed, 6 insertions(+), 1 deletion(-)
>


Applied, thanks.

-- PMM