From 2b4d2ccd83280b22d2fea0801e11af5a944a135d Mon Sep 17 00:00:00 2001

From: Peter Maydell <peter.maydell@linaro.org>

Date: Wed, 7 Mar 2012 13:36:48 +0000

Subject: [PATCH 429/434] ui/spice-display.c: Fix compilation warnings on 32

 bit hosts

Fix compilation failures ("cast from pointer to integer of

different size [-Werror=pointer-to-int-cast]") by using

uintptr_t instead.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

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

---

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

 1 file changed, 6 insertions(+), 6 deletions(-)

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

index 28d6d4a..6d7563f 100644

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

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

@@ -80,8 +80,8 @@ void qemu_spice_add_memslot(SimpleSpiceDisplay *ssd, QXLDevMemSlot *memslot,

     if (async != QXL_SYNC) {

         spice_qxl_add_memslot_async(&ssd->qxl, memslot,

-                (uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

-                                         QXL_IO_MEMSLOT_ADD_ASYNC));

+                (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

+                                          QXL_IO_MEMSLOT_ADD_ASYNC));

     } else {

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

     }

@@ -100,8 +100,8 @@ void qemu_spice_create_primary_surface(SimpleSpiceDisplay *ssd, uint32_t id,

     trace_qemu_spice_create_primary_surface(ssd->qxl.id, id, surface, async);

     if (async != QXL_SYNC) {

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

-                (uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

-                                         QXL_IO_CREATE_PRIMARY_ASYNC));

+                (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

+                                          QXL_IO_CREATE_PRIMARY_ASYNC));

     } else {

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

     }

@@ -113,8 +113,8 @@ void qemu_spice_destroy_primary_surface(SimpleSpiceDisplay *ssd,

     trace_qemu_spice_destroy_primary_surface(ssd->qxl.id, id, async);

     if (async != QXL_SYNC) {

         spice_qxl_destroy_primary_surface_async(&ssd->qxl, id,

-                (uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

-                                         QXL_IO_DESTROY_PRIMARY_ASYNC));

+                (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,

+                                          QXL_IO_DESTROY_PRIMARY_ASYNC));

     } else {

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

     }

-- 

1.7.10