ppc: Pass PowerPCCPU to [h]decr callbacks

[qemu.git] / ui / spice-display.h

diff --git a/ui/spice-display.h b/ui/spice-display.h
index 5e52df99beb37ed9f6bac050aef37e54305b2530..38b6ea98b3207386938d155e25caada86a4b9992 100644 (file)
--- a/ui/spice-display.h
+++ b/ui/spice-display.h
@@ -20,8 +20,7 @@
 #include <spice/qxl_dev.h>
 
 #include "qemu-thread.h"
 #include <spice/qxl_dev.h>
 
 #include "qemu-thread.h"

-#include "console.h"
-#include "pflib.h"
+#include "qemu-pixman.h"

 #include "sysemu.h"
 
 #define NUM_MEMSLOTS 8
 #include "sysemu.h"
 
 #define NUM_MEMSLOTS 8


@@ -32,8 +31,6 @@
 #define MEMSLOT_GROUP_GUEST 1
 #define NUM_MEMSLOTS_GROUPS 2
 
 #define MEMSLOT_GROUP_GUEST 1
 #define NUM_MEMSLOTS_GROUPS 2
 

-#define NUM_SURFACES 1024
-

 /*
  * Internal enum to differenciate between options for
  * io calls that have a sync (old) version and an _async (new)
 /*
  * Internal enum to differenciate between options for
  * io calls that have a sync (old) version and an _async (new)


@@ -48,6 +45,27 @@ typedef enum qxl_async_io {
     QXL_ASYNC,
 } qxl_async_io;
 
     QXL_ASYNC,
 } qxl_async_io;
 

+enum {
+    QXL_COOKIE_TYPE_IO,
+    QXL_COOKIE_TYPE_RENDER_UPDATE_AREA,
+    QXL_COOKIE_TYPE_POST_LOAD_MONITORS_CONFIG,
+};
+
+typedef struct QXLCookie {
+    int      type;
+    uint64_t io;
+    union {
+        uint32_t surface_id;
+        QXLRect area;
+        struct {
+            QXLRect area;
+            int redraw;
+        } render;
+    } u;
+} QXLCookie;
+
+QXLCookie *qxl_cookie_new(int type, uint64_t io);
+

 typedef struct SimpleSpiceDisplay SimpleSpiceDisplay;
 typedef struct SimpleSpiceUpdate SimpleSpiceUpdate;
 
 typedef struct SimpleSpiceDisplay SimpleSpiceDisplay;
 typedef struct SimpleSpiceUpdate SimpleSpiceUpdate;
 


@@ -58,11 +76,12 @@ struct SimpleSpiceDisplay {
     QXLWorker *worker;
     QXLInstance qxl;
     uint32_t unique;
     QXLWorker *worker;
     QXLInstance qxl;
     uint32_t unique;

-    QemuPfConv *conv;
+    pixman_image_t *surface;
+    pixman_image_t *mirror;
+    int32_t num_surfaces;

 
     QXLRect dirty;
     int notify;
 
     QXLRect dirty;
     int notify;

-    int running;

 
     /*
      * All struct members below this comment can be accessed from
 
     /*
      * All struct members below this comment can be accessed from


@@ -70,7 +89,7 @@ struct SimpleSpiceDisplay {
      * to them must be protected by the lock.
      */
     QemuMutex lock;
      * to them must be protected by the lock.
      */
     QemuMutex lock;

-    SimpleSpiceUpdate *update;
+    QTAILQ_HEAD(, SimpleSpiceUpdate) updates;

     QEMUCursor *cursor;
     int mouse_x, mouse_y;
 };
     QEMUCursor *cursor;
     int mouse_x, mouse_y;
 };


@@ -80,6 +99,7 @@ struct SimpleSpiceUpdate {
     QXLImage image;
     QXLCommandExt ext;
     uint8_t *bitmap;
     QXLImage image;
     QXLCommandExt ext;
     uint8_t *bitmap;

+    QTAILQ_ENTRY(SimpleSpiceUpdate) next;

 };
 
 int qemu_spice_rect_is_empty(const QXLRect* r);
 };
 
 int qemu_spice_rect_is_empty(const QXLRect* r);


@@ -97,6 +117,7 @@ void qemu_spice_display_update(SimpleSpiceDisplay *ssd,
                                int x, int y, int w, int h);
 void qemu_spice_display_resize(SimpleSpiceDisplay *ssd);
 void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd);
                                int x, int y, int w, int h);
 void qemu_spice_display_resize(SimpleSpiceDisplay *ssd);
 void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd);

+void qemu_spice_cursor_refresh_unlocked(SimpleSpiceDisplay *ssd);

 
 void qemu_spice_add_memslot(SimpleSpiceDisplay *ssd, QXLDevMemSlot *memslot,
                             qxl_async_io async);
 
 void qemu_spice_add_memslot(SimpleSpiceDisplay *ssd, QXLDevMemSlot *memslot,
                             qxl_async_io async);


@@ -108,5 +129,6 @@ void qemu_spice_create_primary_surface(SimpleSpiceDisplay *ssd, uint32_t id,
 void qemu_spice_destroy_primary_surface(SimpleSpiceDisplay *ssd,
                                         uint32_t id, qxl_async_io async);
 void qemu_spice_wakeup(SimpleSpiceDisplay *ssd);
 void qemu_spice_destroy_primary_surface(SimpleSpiceDisplay *ssd,
                                         uint32_t id, qxl_async_io async);
 void qemu_spice_wakeup(SimpleSpiceDisplay *ssd);

-void qemu_spice_start(SimpleSpiceDisplay *ssd);
-void qemu_spice_stop(SimpleSpiceDisplay *ssd);
+void qemu_spice_display_start(void);
+void qemu_spice_display_stop(void);
+int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd);