From bbe362cd6a386d98a94ac791f1263671bd79b754 Mon Sep 17 00:00:00 2001

From: Alon Levy <alevy@redhat.com>

Date: Fri, 24 Feb 2012 23:19:30 +0200

Subject: [PATCH 417/434] qxl: introduce QXLCookie

Will be used in the next patch.

Signed-off-by: Alon Levy <alevy@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

---

 hw/qxl-render.c    |    2 +-

 hw/qxl.c           |   61 ++++++++++++++++++++++++++++++++++++++++------------

 hw/qxl.h           |    2 +-

 ui/spice-display.c |   22 ++++++++++++++++---

 ui/spice-display.h |   14 ++++++++++++

 5 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/hw/qxl-render.c b/hw/qxl-render.c

index 5811d74..4c22166 100644

--- a/hw/qxl-render.c

+++ b/hw/qxl-render.c

@@ -127,7 +127,7 @@ void qxl_render_update(PCIQXLDevice *qxl)

     if (runstate_is_running() && qxl->guest_primary.commands) {

         qxl->guest_primary.commands = 0;

         qxl_spice_update_area(qxl, 0, &update,

-                              dirty, ARRAY_SIZE(dirty), 1, QXL_SYNC);

+                              dirty, ARRAY_SIZE(dirty), 1, QXL_SYNC, NULL);

     }

     if (redraw) {

         memset(dirty, 0, sizeof(dirty));

diff --git a/hw/qxl.c b/hw/qxl.c

index 0be9859..e6e65d9 100644

--- a/hw/qxl.c

+++ b/hw/qxl.c

@@ -141,14 +141,15 @@ void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t surface_id,

                            struct QXLRect *area, struct QXLRect *dirty_rects,

                            uint32_t num_dirty_rects,

                            uint32_t clear_dirty_region,

-                           qxl_async_io async)

+                           qxl_async_io async, struct QXLCookie *cookie)

 {

     if (async == QXL_SYNC) {

         qxl->ssd.worker->update_area(qxl->ssd.worker, surface_id, area,

                         dirty_rects, num_dirty_rects, clear_dirty_region);

     } else {

+        assert(cookie != NULL);

         spice_qxl_update_area_async(&qxl->ssd.qxl, surface_id, area,

-                                    clear_dirty_region, 0);

+                                    clear_dirty_region, (uint64_t)cookie);

     }

 }

@@ -164,9 +165,13 @@ static void qxl_spice_destroy_surface_wait_complete(PCIQXLDevice *qxl,

 static void qxl_spice_destroy_surface_wait(PCIQXLDevice *qxl, uint32_t id,

                                            qxl_async_io async)

 {

+    QXLCookie *cookie;

+

     if (async) {

-        spice_qxl_destroy_surface_async(&qxl->ssd.qxl, id,

-                                        (uint64_t)id);

+        cookie = qxl_cookie_new(QXL_COOKIE_TYPE_IO,

+                                QXL_IO_DESTROY_SURFACE_ASYNC);

+        cookie->u.surface_id = id;

+        spice_qxl_destroy_surface_async(&qxl->ssd.qxl, id, (uint64_t)cookie);

     } else {

         qxl->ssd.worker->destroy_surface_wait(qxl->ssd.worker, id);

         qxl_spice_destroy_surface_wait_complete(qxl, id);

@@ -175,7 +180,9 @@ static void qxl_spice_destroy_surface_wait(PCIQXLDevice *qxl, uint32_t id,

 static void qxl_spice_flush_surfaces_async(PCIQXLDevice *qxl)

 {

-    spice_qxl_flush_surfaces_async(&qxl->ssd.qxl, 0);

+    spice_qxl_flush_surfaces_async(&qxl->ssd.qxl,

+        (uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

+                                 QXL_IO_FLUSH_SURFACES_ASYNC));

 }

 void qxl_spice_loadvm_commands(PCIQXLDevice *qxl, struct QXLCommandExt *ext,

@@ -205,7 +212,9 @@ static void qxl_spice_destroy_surfaces_complete(PCIQXLDevice *qxl)

 static void qxl_spice_destroy_surfaces(PCIQXLDevice *qxl, qxl_async_io async)

 {

     if (async) {

-        spice_qxl_destroy_surfaces_async(&qxl->ssd.qxl, 0);

+        spice_qxl_destroy_surfaces_async(&qxl->ssd.qxl,

+                (uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

+                                         QXL_IO_DESTROY_ALL_SURFACES_ASYNC));

     } else {

         qxl->ssd.worker->destroy_surfaces(qxl->ssd.worker);

         qxl_spice_destroy_surfaces_complete(qxl);

@@ -721,9 +730,8 @@ static int interface_flush_resources(QXLInstance *sin)

 static void qxl_create_guest_primary_complete(PCIQXLDevice *d);

 /* called from spice server thread context only */

-static void interface_async_complete(QXLInstance *sin, uint64_t cookie)

+static void interface_async_complete_io(PCIQXLDevice *qxl, QXLCookie *cookie)

 {

-    PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);

     uint32_t current_async;

     qemu_mutex_lock(&qxl->async_lock);

@@ -731,8 +739,16 @@ static void interface_async_complete(QXLInstance *sin, uint64_t cookie)

     qxl->current_async = QXL_UNDEFINED_IO;

     qemu_mutex_unlock(&qxl->async_lock);

-    dprint(qxl, 2, "async_complete: %d (%" PRId64 ") done\n",

-           current_async, cookie);

+    dprint(qxl, 2, "async_complete: %d (%p) done\n", current_async, cookie);

+    if (!cookie) {

+        fprintf(stderr, "qxl: %s: error, cookie is NULL\n", __func__);

+        return;

+    }

+    if (cookie && current_async != cookie->io) {

+        fprintf(stderr,

+                "qxl: %s: error: current_async = %d != %ld = cookie->io\n",

+                __func__, current_async, cookie->io);

+    }

     switch (current_async) {

     case QXL_IO_CREATE_PRIMARY_ASYNC:

         qxl_create_guest_primary_complete(qxl);

@@ -741,12 +757,29 @@ static void interface_async_complete(QXLInstance *sin, uint64_t cookie)

         qxl_spice_destroy_surfaces_complete(qxl);

         break;

     case QXL_IO_DESTROY_SURFACE_ASYNC:

-        qxl_spice_destroy_surface_wait_complete(qxl, (uint32_t)cookie);

+        qxl_spice_destroy_surface_wait_complete(qxl, cookie->u.surface_id);

         break;

     }

     qxl_send_events(qxl, QXL_INTERRUPT_IO_CMD);

 }

+/* called from spice server thread context only */

+static void interface_async_complete(QXLInstance *sin, uint64_t cookie_token)

+{

+    PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);

+    QXLCookie *cookie = (QXLCookie *)cookie_token;

+

+    switch (cookie->type) {

+    case QXL_COOKIE_TYPE_IO:

+        interface_async_complete_io(qxl, cookie);

+        break;

+    default:

+        fprintf(stderr, "qxl: %s: unexpected cookie type %d\n",

+                __func__, cookie->type);

+    }

+    g_free(cookie);

+}

+

 static const QXLInterface qxl_interface = {

     .base.type               = SPICE_INTERFACE_QXL,

     .base.description        = "qxl gpu",

@@ -1057,9 +1090,7 @@ static int qxl_destroy_primary(PCIQXLDevice *d, qxl_async_io async)

     if (d->mode == QXL_MODE_UNDEFINED) {

         return 0;

     }

-

     dprint(d, 1, "%s\n", __FUNCTION__);

-

     d->mode = QXL_MODE_UNDEFINED;

     qemu_spice_destroy_primary_surface(&d->ssd, 0, async);

     qxl_spice_reset_cursor(d);

@@ -1187,7 +1218,9 @@ async_common:

     {

         QXLRect update = d->ram->update_area;

         qxl_spice_update_area(d, d->ram->update_surface,

-                              &update, NULL, 0, 0, async);

+                              &update, NULL, 0, 0, async,

+                              qxl_cookie_new(QXL_COOKIE_TYPE_IO,

+                                             QXL_IO_UPDATE_AREA_ASYNC));

         break;

     }

     case QXL_IO_NOTIFY_CMD:

diff --git a/hw/qxl.h b/hw/qxl.h

index 53a3ace..1443925 100644

--- a/hw/qxl.h

+++ b/hw/qxl.h

@@ -118,7 +118,7 @@ void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t surface_id,

                            struct QXLRect *area, struct QXLRect *dirty_rects,

                            uint32_t num_dirty_rects,

                            uint32_t clear_dirty_region,

-                           qxl_async_io async);

+                           qxl_async_io async, QXLCookie *cookie);

 void qxl_spice_loadvm_commands(PCIQXLDevice *qxl, struct QXLCommandExt *ext,

                                uint32_t count);

 void qxl_spice_oom(PCIQXLDevice *qxl);

diff --git a/ui/spice-display.c b/ui/spice-display.c

index ad76bae..ab266ae 100644

--- a/ui/spice-display.c

+++ b/ui/spice-display.c

@@ -60,11 +60,23 @@ void qemu_spice_rect_union(QXLRect *dest, const QXLRect *r)

     dest->right = MAX(dest->right, r->right);

 }

+QXLCookie *qxl_cookie_new(int type, uint64_t io)

+{

+    QXLCookie *cookie;

+

+    cookie = g_malloc0(sizeof(*cookie));

+    cookie->type = type;

+    cookie->io = io;

+    return cookie;

+}

+

 void qemu_spice_add_memslot(SimpleSpiceDisplay *ssd, QXLDevMemSlot *memslot,

                             qxl_async_io async)

 {

     if (async != QXL_SYNC) {

-        spice_qxl_add_memslot_async(&ssd->qxl, memslot, 0);

+        spice_qxl_add_memslot_async(&ssd->qxl, memslot,

+                (uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

+                                         QXL_IO_MEMSLOT_ADD_ASYNC));

     } else {

         ssd->worker->add_memslot(ssd->worker, memslot);

     }

@@ -80,7 +92,9 @@ void qemu_spice_create_primary_surface(SimpleSpiceDisplay *ssd, uint32_t id,

                                        qxl_async_io async)

 {

     if (async != QXL_SYNC) {

-        spice_qxl_create_primary_surface_async(&ssd->qxl, id, surface, 0);

+        spice_qxl_create_primary_surface_async(&ssd->qxl, id, surface,

+                (uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

+                                         QXL_IO_CREATE_PRIMARY_ASYNC));

     } else {

         ssd->worker->create_primary_surface(ssd->worker, id, surface);

     }

@@ -91,7 +105,9 @@ void qemu_spice_destroy_primary_surface(SimpleSpiceDisplay *ssd,

                                         uint32_t id, qxl_async_io async)

 {

     if (async != QXL_SYNC) {

-        spice_qxl_destroy_primary_surface_async(&ssd->qxl, id, 0);

+        spice_qxl_destroy_primary_surface_async(&ssd->qxl, id,

+                (uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

+                                         QXL_IO_DESTROY_PRIMARY_ASYNC));

     } else {

         ssd->worker->destroy_primary_surface(ssd->worker, id);

     }

diff --git a/ui/spice-display.h b/ui/spice-display.h

index a23bfc8..8a010cb 100644

--- a/ui/spice-display.h

+++ b/ui/spice-display.h

@@ -48,6 +48,20 @@ typedef enum qxl_async_io {

     QXL_ASYNC,

 } qxl_async_io;

+enum {

+    QXL_COOKIE_TYPE_IO,

+};

+

+typedef struct QXLCookie {

+    int      type;

+    uint64_t io;

+    union {

+        uint32_t surface_id;

+    } u;

+} QXLCookie;

+

+QXLCookie *qxl_cookie_new(int type, uint64_t io);

+

 typedef struct SimpleSpiceDisplay SimpleSpiceDisplay;

 typedef struct SimpleSpiceUpdate SimpleSpiceUpdate;

-- 

1.7.10