xspice: qxl_unmap_memory: stop worker and track worker status

stop the worker thread and track the status, ignoring io requests (i.e.
prevent red_dispatcher writes to red_worker) if red_worker is stopped.

This fixes spice red_worker asserts from actions attepted after X
has destroyed a screen. X runs in a loop destroying and recreating screens
multiple times during the process lifetime, whenever the last X client
has exited.

Note that the spice server is kept up during a X screen restart. This is
on purpose, to avoid a spice-client closing when doing a window manager
restart. Cleanup of the spice-server on atexit - still to do.

3 files changed, 12 insertions, 0 deletions

diff --git a/src/qxl.h b/src/qxl.h
index bc5847d..86927df 100644
--- a/src/qxl.h
+++ b/src/qxl.h
@@ -191,6 +191,7 @@ struct _qxl_screen_t
     struct QXLRom		shadow_rom;    /* Parameter RAM */
     SpiceServer *       spice_server;
     QXLWorker *         worker;
+    int                 worker_running;
     QXLInstance         display_sin;
     /* XSpice specific, dragged from the Device */
     QXLReleaseInfo     *last_release;
diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index bfbf444..336cd25 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -302,6 +302,12 @@ map_memory_helper(qxl_screen_t *qxl, int scrnIndex)
 static void
 qxl_unmap_memory(qxl_screen_t *qxl, int scrnIndex)
 {
+#ifdef XSPICE
+    if (qxl->worker) {
+        qxl->worker->stop(qxl->worker);
+        qxl->worker_running = FALSE;
+    }
+#endif
     unmap_memory_helper(qxl, scrnIndex);
     qxl->ram = qxl->ram_physical = qxl->vram = qxl->rom = NULL;
 
@@ -913,6 +919,7 @@ spiceqxl_screen_init(int scrnIndex, ScrnInfoPtr pScrn, qxl_screen_t *qxl)
         spice_server_init(qxl->spice_server, core);
         qxl_add_spice_display_interface(qxl);
         qxl->worker->start(qxl->worker);
+        qxl->worker_running = TRUE;
     }
     qxl->spice_server = qxl->spice_server;
 }
diff --git a/src/spiceqxl_io_port.c b/src/spiceqxl_io_port.c
index 89a9657..2139c86 100644
--- a/src/spiceqxl_io_port.c
+++ b/src/spiceqxl_io_port.c
@@ -171,6 +171,10 @@ void ioport_write(qxl_screen_t *qxl, uint32_t io_port, uint32_t val)
 {
     QXLRam *header = get_ram_header(qxl);
 
+    if (!qxl->worker_running) {
+        return;
+    }
+
     switch (io_port) {
     case QXL_IO_UPDATE_AREA:
     {