[Qemu-devel] [PULL 0/2] spice patch queue

[Qemu-devel] [PULL 0/2] spice patch queue

[Gerd Hoffmann]

  Hi,

Spice patch queue, featuring mouse pointer support for non-qxl cards
and a bugfix for the qxl renderer.

please pull,
  Gerd

The following changes since commit 2a2c4830c0068d70443f3dddc4cc668f0c601b5c:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20140611-1' into staging (2014-06-12 09:51:41 +0100)

are available in the git repository at:


  git://anongit.freedesktop.org/spice/qemu tags/pull-spice-20140613-1

for you to fetch changes up to 788fbf042fc6d5aaeab56757e6dad622ac5f0c21:

  qxl-render: add sanity check (2014-06-13 12:34:57 +0200)

----------------------------------------------------------------
spice: add mouse cursor support
qxl-render: add sanity check

----------------------------------------------------------------
Gerd Hoffmann (2):
      spice: add mouse cursor support
      qxl-render: add sanity check

 hw/display/qxl-render.c    |   6 +++
 hw/display/qxl.c           |   6 ++-
 include/ui/spice-display.h |  14 +++++
 ui/spice-display.c         | 129 +++++++++++++++++++++++++++++++++++++++++----
 4 files changed, 143 insertions(+), 12 deletions(-)

[Qemu-devel] [PULL 1/2] spice: add mouse cursor support

[Gerd Hoffmann]

So you'll have a mouse pointer when running non-qxl gfx cards with
mouse pointer support (virtio-gpu, IIRC vmware too).

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/display/qxl.c           |   6 ++-
 include/ui/spice-display.h |  14 +++++
 ui/spice-display.c         | 129 +++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 137 insertions(+), 12 deletions(-)

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 7fb83e4..736fd3c 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -710,7 +710,11 @@ static void interface_release_resource(QXLInstance *sin,
 
     if (ext.group_id == MEMSLOT_GROUP_HOST) {
         /* host group -> vga mode update request */
-        qemu_spice_destroy_update(&qxl->ssd, (void *)(intptr_t)ext.info->id);
+        QXLCommandExt *cmdext = (void *)(ext.info->id);
+        SimpleSpiceUpdate *update;
+        g_assert(cmdext->cmd.type == QXL_CMD_DRAW);
+        update = container_of(cmdext, SimpleSpiceUpdate, ext);
+        qemu_spice_destroy_update(&qxl->ssd, update);
         return;
     }
 
diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h
index a46bc80..4252ab8 100644
--- a/include/ui/spice-display.h
+++ b/include/ui/spice-display.h
@@ -69,6 +69,7 @@ QXLCookie *qxl_cookie_new(int type, uint64_t io);
 
 typedef struct SimpleSpiceDisplay SimpleSpiceDisplay;
 typedef struct SimpleSpiceUpdate SimpleSpiceUpdate;
+typedef struct SimpleSpiceCursor SimpleSpiceCursor;
 
 struct SimpleSpiceDisplay {
     DisplaySurface *ds;
@@ -92,6 +93,13 @@ struct SimpleSpiceDisplay {
      */
     QemuMutex lock;
     QTAILQ_HEAD(, SimpleSpiceUpdate) updates;
+
+    /* cursor (without qxl): displaychangelistener -> spice server */
+    SimpleSpiceCursor *ptr_define;
+    SimpleSpiceCursor *ptr_move;
+    uint16_t ptr_x, ptr_y;
+
+    /* cursor (with qxl): qxl local renderer -> displaychangelistener */
     QEMUCursor *cursor;
     int mouse_x, mouse_y;
 };
@@ -104,6 +112,12 @@ struct SimpleSpiceUpdate {
     QTAILQ_ENTRY(SimpleSpiceUpdate) next;
 };
 
+struct SimpleSpiceCursor {
+    QXLCursorCmd cmd;
+    QXLCommandExt ext;
+    QXLCursor cursor;
+};
+
 int qemu_spice_rect_is_empty(const QXLRect* r);
 void qemu_spice_rect_union(QXLRect *dest, const QXLRect *r);
 
diff --git a/ui/spice-display.c b/ui/spice-display.c
index ce6b220..03040b1 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -153,7 +153,7 @@ static void qemu_spice_create_one_update(SimpleSpiceDisplay *ssd,
     drawable->bbox            = *rect;
     drawable->clip.type       = SPICE_CLIP_TYPE_NONE;
     drawable->effect          = QXL_EFFECT_OPAQUE;
-    drawable->release_info.id = (uintptr_t)update;
+    drawable->release_info.id = (uintptr_t)(&update->ext);
     drawable->type            = QXL_DRAW_COPY;
     drawable->surfaces_dest[0] = -1;
     drawable->surfaces_dest[1] = -1;
@@ -264,6 +264,49 @@ static void qemu_spice_create_update(SimpleSpiceDisplay *ssd)
     memset(&ssd->dirty, 0, sizeof(ssd->dirty));
 }
 
+static SimpleSpiceCursor*
+qemu_spice_create_cursor_update(SimpleSpiceDisplay *ssd,
+                                QEMUCursor *c)
+{
+    size_t size = c ? c->width * c->height * 4 : 0;
+    SimpleSpiceCursor *update;
+    QXLCursorCmd *ccmd;
+    QXLCursor *cursor;
+    QXLCommand *cmd;
+
+    update   = g_malloc0(sizeof(*update) + size);
+    ccmd     = &update->cmd;
+    cursor   = &update->cursor;
+    cmd      = &update->ext.cmd;
+
+    if (c) {
+        ccmd->type = QXL_CURSOR_SET;
+        ccmd->u.set.position.x = ssd->ptr_x;
+        ccmd->u.set.position.y = ssd->ptr_y;
+        ccmd->u.set.visible    = true;
+        ccmd->u.set.shape      = (uintptr_t)cursor;
+        cursor->header.unique     = ssd->unique++;
+        cursor->header.type       = SPICE_CURSOR_TYPE_ALPHA;
+        cursor->header.width      = c->width;
+        cursor->header.height     = c->height;
+        cursor->header.hot_spot_x = c->hot_x;
+        cursor->header.hot_spot_y = c->hot_y;
+        cursor->data_size         = size;
+        cursor->chunk.data_size   = size;
+        memcpy(cursor->chunk.data, c->data, size);
+    } else {
+        ccmd->type = QXL_CURSOR_MOVE;
+        ccmd->u.position.x = ssd->ptr_x;
+        ccmd->u.position.y = ssd->ptr_y;
+    }
+    ccmd->release_info.id = (uintptr_t)(&update->ext);
+
+    cmd->type = QXL_CMD_CURSOR;
+    cmd->data = (uintptr_t)ccmd;
+
+    return update;
+}
+
 /*
  * Called from spice server thread context (via interface_release_resource)
  * We do *not* hold the global qemu mutex here, so extra care is needed
@@ -483,20 +526,50 @@ static int interface_req_cmd_notification(QXLInstance *sin)
 }
 
 static void interface_release_resource(QXLInstance *sin,
-                                       struct QXLReleaseInfoExt ext)
+                                       struct QXLReleaseInfoExt rext)
 {
     SimpleSpiceDisplay *ssd = container_of(sin, SimpleSpiceDisplay, qxl);
-    uintptr_t id;
+    SimpleSpiceUpdate *update;
+    SimpleSpiceCursor *cursor;
+    QXLCommandExt *ext;
 
     dprint(2, "%s/%d:\n", __func__, ssd->qxl.id);
-    id = ext.info->id;
-    qemu_spice_destroy_update(ssd, (void*)id);
+    ext = (void *)(rext.info->id);
+    switch (ext->cmd.type) {
+    case QXL_CMD_DRAW:
+        update = container_of(ext, SimpleSpiceUpdate, ext);
+        qemu_spice_destroy_update(ssd, update);
+        break;
+    case QXL_CMD_CURSOR:
+        cursor = container_of(ext, SimpleSpiceCursor, ext);
+        g_free(cursor);
+        break;
+    default:
+        g_assert_not_reached();
+    }
 }
 
 static int interface_get_cursor_command(QXLInstance *sin, struct QXLCommandExt *ext)
 {
-    dprint(3, "%s:\n", __FUNCTION__);
-    return false;
+    SimpleSpiceDisplay *ssd = container_of(sin, SimpleSpiceDisplay, qxl);
+    int ret;
+
+    dprint(3, "%s/%d:\n", __func__, ssd->qxl.id);
+
+    qemu_mutex_lock(&ssd->lock);
+    if (ssd->ptr_define) {
+        *ext = ssd->ptr_define->ext;
+        ssd->ptr_define = NULL;
+        ret = true;
+    } else if (ssd->ptr_move) {
+        *ext = ssd->ptr_move->ext;
+        ssd->ptr_move = NULL;
+        ret = true;
+    } else {
+        ret = false;
+    }
+    qemu_mutex_unlock(&ssd->lock);
+    return ret;
 }
 
 static int interface_req_cursor_notification(QXLInstance *sin)
@@ -617,11 +690,45 @@ static void display_refresh(DisplayChangeListener *dcl)
     qemu_spice_display_refresh(ssd);
 }
 
+static void display_mouse_set(DisplayChangeListener *dcl,
+                              int x, int y, int on)
+{
+    SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
+
+    qemu_mutex_lock(&ssd->lock);
+    ssd->ptr_x = x;
+    ssd->ptr_y = x;
+    if (ssd->ptr_move) {
+        g_free(ssd->ptr_move);
+    }
+    ssd->ptr_move = qemu_spice_create_cursor_update(ssd, NULL);
+    qemu_mutex_unlock(&ssd->lock);
+}
+
+static void display_mouse_define(DisplayChangeListener *dcl,
+                                 QEMUCursor *c)
+{
+    SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
+
+    qemu_mutex_lock(&ssd->lock);
+    if (ssd->ptr_move) {
+        g_free(ssd->ptr_move);
+        ssd->ptr_move = NULL;
+    }
+    if (ssd->ptr_define) {
+        g_free(ssd->ptr_define);
+    }
+    ssd->ptr_define = qemu_spice_create_cursor_update(ssd, c);
+    qemu_mutex_unlock(&ssd->lock);
+}
+
 static const DisplayChangeListenerOps display_listener_ops = {
-    .dpy_name        = "spice",
-    .dpy_gfx_update  = display_update,
-    .dpy_gfx_switch  = display_switch,
-    .dpy_refresh     = display_refresh,
+    .dpy_name          = "spice",
+    .dpy_gfx_update    = display_update,
+    .dpy_gfx_switch    = display_switch,
+    .dpy_refresh       = display_refresh,
+    .dpy_mouse_set     = display_mouse_set,
+    .dpy_cursor_define = display_mouse_define,
 };
 
 static void qemu_spice_display_init_one(QemuConsole *con)
-- 
1.8.3.1

[Qemu-devel] [PULL 2/2] qxl-render: add sanity check

[Gerd Hoffmann]

Verify dirty rectangle is completely within the primary surface,
just ignore it in case it isn't.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/display/qxl-render.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c
index 84f1367..cc2c2b1 100644
--- a/hw/display/qxl-render.c
+++ b/hw/display/qxl-render.c
@@ -138,6 +138,12 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl)
         if (qemu_spice_rect_is_empty(qxl->dirty+i)) {
             break;
         }
+        if (qxl->dirty[i].left > qxl->dirty[i].right ||
+            qxl->dirty[i].top > qxl->dirty[i].bottom ||
+            qxl->dirty[i].right > qxl->guest_primary.surface.width ||
+            qxl->dirty[i].bottom > qxl->guest_primary.surface.height) {
+            continue;
+        }
         qxl_blit(qxl, qxl->dirty+i);
         dpy_gfx_update(vga->con,
                        qxl->dirty[i].left, qxl->dirty[i].top,
-- 
1.8.3.1

Re: [Qemu-devel] [PULL 0/2] spice patch queue

[Peter Maydell]

On 13 June 2014 12:27, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Spice patch queue, featuring mouse pointer support for non-qxl cards
> and a bugfix for the qxl renderer.
>
> please pull,
>   Gerd
>
> The following changes since commit 2a2c4830c0068d70443f3dddc4cc668f0c601b5c:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20140611-1' into staging (2014-06-12 09:51:41 +0100)
>
> are available in the git repository at:
>
>
>   git://anongit.freedesktop.org/spice/qemu tags/pull-spice-20140613-1
>
> for you to fetch changes up to 788fbf042fc6d5aaeab56757e6dad622ac5f0c21:
>
>   qxl-render: add sanity check (2014-06-13 12:34:57 +0200)
>
> ----------------------------------------------------------------
> spice: add mouse cursor support
> qxl-render: add sanity check
>

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL 0/2] spice patch queue

[Peter Maydell]

On 11 June 2015 at 08:52, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Here comes the small spice patch queue with only two patches,
> one of them fixing a segfault though.
>
> please pull,
>   Gerd
>
> The following changes since commit 0e12e61ff9a3407d123d0dbc4d945aec98d60fdf:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150610-1' into staging (2015-06-10 18:13:58 +0100)
>
> are available in the git repository at:
>
>
>   git://anongit.freedesktop.org/spice/qemu tags/pull-spice-20150611-1
>
> for you to fetch changes up to 5a9259a0b5d6f9424f94539cd9c715b1d166d90c:
>
>   spice: ui_info tweaks (2015-06-11 09:06:14 +0200)
>
> ----------------------------------------------------------------
> spice: fix segfault in qemu_spice_create_update, ui_info tweaks.
>

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/2] spice patch queue

[Gerd Hoffmann]

  Hi,

Here comes the small spice patch queue with only two patches,
one of them fixing a segfault though.

please pull,
  Gerd

The following changes since commit 0e12e61ff9a3407d123d0dbc4d945aec98d60fdf:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150610-1' into staging (2015-06-10 18:13:58 +0100)

are available in the git repository at:


  git://anongit.freedesktop.org/spice/qemu tags/pull-spice-20150611-1

for you to fetch changes up to 5a9259a0b5d6f9424f94539cd9c715b1d166d90c:

  spice: ui_info tweaks (2015-06-11 09:06:14 +0200)

----------------------------------------------------------------
spice: fix segfault in qemu_spice_create_update, ui_info tweaks.

----------------------------------------------------------------
Gerd Hoffmann (2):
      spice-display: fix segfault in qemu_spice_create_update
      spice: ui_info tweaks

 ui/spice-display.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

Re: [Qemu-devel] [PULL 0/2] spice patch queue

[Peter Maydell]

On 29 September 2014 11:20, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Short spice patch queue, adding a new graphic_console_set_hwops function
> to the console core, which in turn allows to simplify switching between
> vga and native mode in qxl.
>
> please pull,
>   Gerd
>
> The following changes since commit 81ab11a7a524d12412a59ef49c6b270671e62ea0:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-09-26 15:41:50 +0100)
>
> are available in the git repository at:
>
>
>   git://anongit.freedesktop.org/spice/qemu tags/pull-spice-20140929-1
>
> for you to fetch changes up to 151623353f4a3da4daec29d658c10ef3b57bd462:
>
>   qxl: use graphic_console_set_hwops (2014-09-29 10:20:09 +0200)
>
> ----------------------------------------------------------------
> add and use graphic_console_set_hwops
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/2] spice patch queue

[Gerd Hoffmann]

  Hi,

Short spice patch queue, adding a new graphic_console_set_hwops function
to the console core, which in turn allows to simplify switching between
vga and native mode in qxl.

please pull,
  Gerd

The following changes since commit 81ab11a7a524d12412a59ef49c6b270671e62ea0:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-09-26 15:41:50 +0100)

are available in the git repository at:


  git://anongit.freedesktop.org/spice/qemu tags/pull-spice-20140929-1

for you to fetch changes up to 151623353f4a3da4daec29d658c10ef3b57bd462:

  qxl: use graphic_console_set_hwops (2014-09-29 10:20:09 +0200)

----------------------------------------------------------------
add and use graphic_console_set_hwops

----------------------------------------------------------------
Gerd Hoffmann (2):
      console: add graphic_console_set_hwops
      qxl: use graphic_console_set_hwops

 hw/display/qxl.c     | 49 +++++++++----------------------------------------
 include/ui/console.h |  3 +++
 ui/console.c         | 11 +++++++++--
 3 files changed, 21 insertions(+), 42 deletions(-)

Re: [Qemu-devel] [PULL 0/2] spice patch queue

[Peter Maydell]

On 2 September 2014 09:59, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Here comes the spice patch queue, pretty small this time, carrying an
> additional qxl sanity check and a minor spice display channel tweak.
>
> please pull,
>   Gerd
>
> The following changes since commit 8b3030114a449e66c68450acaac4b66f26d91416:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140829' into staging (2014-08-29 15:48:15 +0100)
>
> are available in the git repository at:
>
>
>   git://anongit.freedesktop.org/spice/qemu tags/pull-spice-20140902-1
>
> for you to fetch changes up to cd56cc6b079f44fbcca3d8a773ae87f7479c6585:
>
>   spice: use console index as display id (2014-09-01 10:19:03 +0200)
>
> ----------------------------------------------------------------
> sanity check for qxl, minor spice display channel tweak.
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/2] spice patch queue

[Gerd Hoffmann]

  Hi,

Here comes the spice patch queue, pretty small this time, carrying an
additional qxl sanity check and a minor spice display channel tweak.

please pull,
  Gerd

The following changes since commit 8b3030114a449e66c68450acaac4b66f26d91416:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140829' into staging (2014-08-29 15:48:15 +0100)

are available in the git repository at:


  git://anongit.freedesktop.org/spice/qemu tags/pull-spice-20140902-1

for you to fetch changes up to cd56cc6b079f44fbcca3d8a773ae87f7479c6585:

  spice: use console index as display id (2014-09-01 10:19:03 +0200)

----------------------------------------------------------------
sanity check for qxl, minor spice display channel tweak.

----------------------------------------------------------------
Gerd Hoffmann (2):
      qxl-render: add more sanity checks
      spice: use console index as display id

 hw/display/qxl-render.c | 4 +++-
 ui/spice-core.c         | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

Re: [Qemu-devel] [PULL 0/2] spice patch queue

[Peter Maydell]

On 8 May 2014 09:51, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Here comes the spice patch queue with two little bugfixes.
>
> please pull,
>   Gerd
>
> The following changes since commit ff788b6fe67f694666781f821c1af812e8c7999b:
>
>   Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-05-07' into staging (2014-05-07 18:38:39 +0100)
>
> are available in the git repository at:
>
>
>   git://anongit.freedesktop.org/spice/qemu tags/pull-spice-7
>
> for you to fetch changes up to a76a2f729aae21c45c7e9eef8d1d80e94d1cc930:
>
>   spice: fix libvirt snapshots (2014-05-08 10:45:54 +0200)

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/2] spice patch queue

[Gerd Hoffmann]

  Hi,

Here comes the spice patch queue with two little bugfixes.

please pull,
  Gerd

The following changes since commit ff788b6fe67f694666781f821c1af812e8c7999b:

  Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-05-07' into staging (2014-05-07 18:38:39 +0100)

are available in the git repository at:


  git://anongit.freedesktop.org/spice/qemu tags/pull-spice-7

for you to fetch changes up to a76a2f729aae21c45c7e9eef8d1d80e94d1cc930:

  spice: fix libvirt snapshots (2014-05-08 10:45:54 +0200)

----------------------------------------------------------------
spice: small fixes

----------------------------------------------------------------
Gerd Hoffmann (2):
      spice: fix "info spice"
      spice: fix libvirt snapshots

 ui/spice-core.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

[Qemu-devel] [PULL 0/2] spice patch queue

[Gerd Hoffmann]

  Hi,

Tiny spice patch queue with only two patches, one adding a spice cmd
line option and one bugfix.

please pull,
  Gerd

The following changes since commit 576156ffed72ab4feb0b752979db86ff8759a2a1:

  Merge remote-tracking branch 'bonzini/iommu-for-anthony' into staging (2013-06-20 16:53:39 -0500)

are available in the git repository at:


  git://anongit.freedesktop.org/spice/qemu spice.v71

for you to fetch changes up to 5ad24e5f3b5968240d50fb2e5b6e19517b041052:

  spice: Add -spice disable-agent-file-transfer cmdline option (rhbz#961850) (2013-06-24 08:23:09 +0200)

----------------------------------------------------------------
Gerd Hoffmann (1):
      qxl: fix Coverity scan SIGN_EXTENSION error

Hans de Goede (1):
      spice: Add -spice disable-agent-file-transfer cmdline option (rhbz#961850)

 hw/display/qxl-render.c |    2 +-
 qemu-options.hx         |    7 +++++--
 ui/spice-core.c         |   13 +++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

Re: [Qemu-devel] [PULL 0/2] spice patch queue

[Anthony Liguori]

Pulled, thanks.

Regards,

Anthony Liguori

[Qemu-devel] [PULL 0/2] spice patch queue

[Gerd Hoffmann]

  Hi,

Here comes the spice patch queue, carrying two coverity fixes in qxl.

please pull,
  Gerd

The following changes since commit 63fb2590839162afdf14d7c0ee02d460766c0956:

  Merge branch 'target-arm.next' of git://git.linaro.org/people/pmaydell/qemu-arm (2013-01-12 12:47:07 +0000)

are available in the git repository at:


  git://anongit.freedesktop.org/spice/qemu spice.v67

for you to fetch changes up to 08688af04dc1137ac2f420b35c235183926b4a23:

  qxl: Don't drop client capability bits (2013-01-14 08:59:38 +0100)

----------------------------------------------------------------
Markus Armbruster (2):
      qxl: Fix SPICE_RING_PROD_ITEM(), SPICE_RING_CONS_ITEM() sanity check
      qxl: Don't drop client capability bits

 hw/qxl.c |   26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)