[Spice-commits] Branch 'spice.v11' - 5 commits - hw/qxl-render.c hw/qxl.c osdep.c spice-display.c spice-display.h

[Gerd Hoffmann]

 hw/qxl-render.c |    4 ++--
 hw/qxl.c        |    3 ++-
 osdep.c         |    5 +++++
 spice-display.c |    8 ++++----
 spice-display.h |    6 +++---
 5 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit be160f088aa3e891fd01f10db07a2e5153b829cf
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Thu Jun 24 16:13:28 2010 +0200

    qxl: switch to new QXLRect

diff --git a/hw/qxl-render.c b/hw/qxl-render.c
index 7536d39..d9ebca4 100644
--- a/hw/qxl-render.c
+++ b/hw/qxl-render.c
@@ -8,7 +8,7 @@
 
 #include "qxl.h"
 
-static void qxl_flip(PCIQXLDevice *qxl, SpiceRect *rect)
+static void qxl_flip(PCIQXLDevice *qxl, QXLRect *rect)
 {
     uint8_t *src = qxl->guest_primary.data;
     uint8_t *dst = qxl->guest_primary.flipped;
@@ -60,7 +60,7 @@ void qxl_render_resize(PCIQXLDevice *qxl)
 void qxl_render_update(PCIQXLDevice *qxl)
 {
     VGACommonState *vga = &qxl->vga;
-    SpiceRect dirty[32], update;
+    QXLRect dirty[32], update;
     void *ptr;
     int i;
 
diff --git a/hw/qxl.c b/hw/qxl.c
index f260ec8..5552aec 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -893,7 +893,7 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val)
     switch (io_port) {
     case QXL_IO_UPDATE_AREA:
     {
-        SpiceRect update = d->ram->update_area;
+        QXLRect update = d->ram->update_area;
         d->ssd.worker->update_area(d->ssd.worker, d->ram->update_surface,
                                    &update, NULL, 0, 0);
         break;
commit 353eadba0c33437c4fba4b68257ec357132d3b50
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Thu Jun 24 16:13:18 2010 +0200

    spice-display: switch to new QXLRect

diff --git a/spice-display.c b/spice-display.c
index f859e3f..f419706 100644
--- a/spice-display.c
+++ b/spice-display.c
@@ -17,12 +17,12 @@
 
 static int debug = 1;
 
-int qemu_spice_rect_is_empty(const SpiceRect* r)
+int qemu_spice_rect_is_empty(const QXLRect* r)
 {
     return r->top == r->bottom || r->left == r->right;
 }
 
-void qemu_spice_rect_union(SpiceRect *dest, const SpiceRect *r)
+void qemu_spice_rect_union(QXLRect *dest, const QXLRect *r)
 {
     if (qemu_spice_rect_is_empty(r)) {
         return;
@@ -176,7 +176,7 @@ void qemu_spice_vm_change_state_handler(void *opaque, int running, int reason)
 void qemu_spice_display_update(SimpleSpiceDisplay *ssd,
                                int x, int y, int w, int h)
 {
-    SpiceRect update_area;
+    QXLRect update_area;
 
     if (debug > 1)
         fprintf(stderr, "%s: x %d y %d w %d h %d\n", __FUNCTION__, x, y, w, h);
diff --git a/spice-display.h b/spice-display.h
index e738644..70a7be4 100644
--- a/spice-display.h
+++ b/spice-display.h
@@ -24,7 +24,7 @@ typedef struct SimpleSpiceDisplay {
     QemuPfConv *conv;
 
     pthread_mutex_t lock;
-    SpiceRect dirty;
+    QXLRect dirty;
     int notify;
     int running;
 } SimpleSpiceDisplay;
@@ -36,8 +36,8 @@ typedef struct SimpleSpiceUpdate {
     uint8_t *bitmap;
 } SimpleSpiceUpdate;
 
-int qemu_spice_rect_is_empty(const SpiceRect* r);
-void qemu_spice_rect_union(SpiceRect *dest, const SpiceRect *r);
+int qemu_spice_rect_is_empty(const QXLRect* r);
+void qemu_spice_rect_union(QXLRect *dest, const QXLRect *r);
 
 SimpleSpiceUpdate *qemu_spice_create_update(SimpleSpiceDisplay *sdpy);
 void qemu_spice_destroy_update(SimpleSpiceDisplay *sdpy, SimpleSpiceUpdate *update);
commit cd8c3736d86a58f2ac7245d915bb416d1f89c0b8
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Wed Jun 23 15:23:40 2010 +0200

    spice-display: fix rop_decriptor tyops

diff --git a/spice-display.c b/spice-display.c
index 2d9ebd7..f859e3f 100644
--- a/spice-display.c
+++ b/spice-display.c
@@ -73,7 +73,7 @@ SimpleSpiceUpdate *qemu_spice_create_update(SimpleSpiceDisplay *ssd)
     drawable->release_info.id = (intptr_t)update;
     drawable->type            = QXL_DRAW_COPY;
 
-    drawable->u.copy.rop_decriptor   = SPICE_ROPD_OP_PUT;
+    drawable->u.copy.rop_descriptor  = SPICE_ROPD_OP_PUT;
     drawable->u.copy.src_bitmap      = (intptr_t)image;
     drawable->u.copy.src_area.right  = bw;
     drawable->u.copy.src_area.bottom = bh;
commit daab1935d13e51044d025f1199bcc1274e9a0ebe
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Mon Jun 14 09:53:48 2010 +0200

    [ElectricFence] use memalign instead of posix_memalign

diff --git a/osdep.c b/osdep.c
index abbc8a2..adb9737 100644
--- a/osdep.c
+++ b/osdep.c
@@ -100,7 +100,12 @@ void *qemu_memalign(size_t alignment, size_t size)
 #if defined(_POSIX_C_SOURCE) && !defined(__sun__)
     int ret;
     void *ptr;
+#if 0
     ret = posix_memalign(&ptr, alignment, size);
+#else
+    ptr = memalign(alignment, size);
+    ret = (ptr == NULL) ? -1 : 0;
+#endif
     if (ret != 0) {
         fprintf(stderr, "Failed to allocate %zu B: %s\n",
                 size, strerror(ret));
commit 2bb9bf64e5d3b8f5fc2d6651412894fd66401b97
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Thu Jun 24 17:24:59 2010 +0200

    qxl: allow cursor notify requests in QXL_MODE_UNDEFINED.

diff --git a/hw/qxl.c b/hw/qxl.c
index 04342e3..f260ec8 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -492,6 +492,7 @@ static int interface_req_cursor_notification(QXLInstance *sin)
     switch (qxl->mode) {
     case QXL_MODE_COMPAT:
     case QXL_MODE_NATIVE:
+    case QXL_MODE_UNDEFINED:
         SPICE_RING_CONS_WAIT(&qxl->ram->cursor_ring, wait);
         qxl_ring_set_dirty(qxl);
         break;