From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9xDp-00078I-EG for qemu-devel@nongnu.org; Tue, 20 Mar 2012 07:27:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S9xDM-0000oi-5C for qemu-devel@nongnu.org; Tue, 20 Mar 2012 07:27:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25739) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9xDL-0000lk-TP for qemu-devel@nongnu.org; Tue, 20 Mar 2012 07:26:56 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2KBQsse024823 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 20 Mar 2012 07:26:54 -0400 From: Gerd Hoffmann Date: Tue, 20 Mar 2012 12:26:52 +0100 Message-Id: <1332242812-6993-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH] spice: fix 32bit build List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- 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