qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] spice: fix 32bit build
@ 2014-06-20  6:12 Gerd Hoffmann
  2014-06-20 13:35 ` Luiz Capitulino
  0 siblings, 1 reply; 11+ messages in thread
From: Gerd Hoffmann @ 2014-06-20  6:12 UTC (permalink / raw)
  To: qemu-devel; +Cc: Gerd Hoffmann, Anthony Liguori, lcapitulino

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/display/qxl.c   | 2 +-
 ui/spice-display.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 736fd3c..d43aa49 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -710,7 +710,7 @@ static void interface_release_resource(QXLInstance *sin,
 
     if (ext.group_id == MEMSLOT_GROUP_HOST) {
         /* host group -> vga mode update request */
-        QXLCommandExt *cmdext = (void *)(ext.info->id);
+        QXLCommandExt *cmdext = (void *)(intptr_t)(ext.info->id);
         SimpleSpiceUpdate *update;
         g_assert(cmdext->cmd.type == QXL_CMD_DRAW);
         update = container_of(cmdext, SimpleSpiceUpdate, ext);
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 03040b1..66e2578 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -534,7 +534,7 @@ static void interface_release_resource(QXLInstance *sin,
     QXLCommandExt *ext;
 
     dprint(2, "%s/%d:\n", __func__, ssd->qxl.id);
-    ext = (void *)(rext.info->id);
+    ext = (void *)(intptr_t)(rext.info->id);
     switch (ext->cmd.type) {
     case QXL_CMD_DRAW:
         update = container_of(ext, SimpleSpiceUpdate, ext);
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Qemu-devel] [PATCH] spice: fix 32bit build
@ 2012-03-20 11:26 Gerd Hoffmann
  2012-03-20 11:42 ` Peter Maydell
  2012-03-20 12:45 ` Michael Tokarev
  0 siblings, 2 replies; 11+ messages in thread
From: Gerd Hoffmann @ 2012-03-20 11:26 UTC (permalink / raw)
  To: qemu-devel; +Cc: Gerd Hoffmann

New 32bit warnings sneaked in, this time in
ui/spice-display.c, fix them.

This gets annonying, /me sets up a ubuntu buildbot
slave for 32bit spice testbuilds.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 roms/seabios       |    2 +-
 ui/spice-display.c |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/roms/seabios b/roms/seabios
index 2e8bd61..80d11e8 160000
--- a/roms/seabios
+++ b/roms/seabios
@@ -1 +1 @@
-Subproject commit 2e8bd611ce4e1e36b5a80c9ca6e256e23802f095
+Subproject commit 80d11e8577bf03e98f2eb1b0cb3a281ab2879c9e
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.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-06-20 16:02 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-20  6:12 [Qemu-devel] [PATCH] spice: fix 32bit build Gerd Hoffmann
2014-06-20 13:35 ` Luiz Capitulino
2014-06-20 15:57   ` Peter Maydell
2014-06-20 16:02     ` Luiz Capitulino
  -- strict thread matches above, loose matches on Subject: below --
2012-03-20 11:26 Gerd Hoffmann
2012-03-20 11:42 ` Peter Maydell
2012-03-20 12:13   ` Gerd Hoffmann
2012-03-20 12:14     ` Peter Maydell
2012-03-20 12:45 ` Michael Tokarev
2012-03-20 13:19   ` Alon Levy
2012-03-20 13:38   ` Peter Maydell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).