46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 3b36dd31d54b24e02493fdd86269ba5286086c98 Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Wed, 8 Feb 2012 15:58:35 +0100
|
|
Subject: [PATCH 403/434] qxl: fix warnings on 32bit
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
---
|
|
hw/qxl.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/hw/qxl.c b/hw/qxl.c
|
|
index e0f9d4a..4fd5e4e 100644
|
|
--- a/hw/qxl.c
|
|
+++ b/hw/qxl.c
|
|
@@ -628,7 +628,7 @@ static void interface_release_resource(QXLInstance *sin,
|
|
|
|
if (ext.group_id == MEMSLOT_GROUP_HOST) {
|
|
/* host group -> vga mode update request */
|
|
- qemu_spice_destroy_update(&qxl->ssd, (void*)ext.info->id);
|
|
+ qemu_spice_destroy_update(&qxl->ssd, (void *)(intptr_t)ext.info->id);
|
|
return;
|
|
}
|
|
|
|
@@ -751,7 +751,8 @@ static void interface_async_complete(QXLInstance *sin, uint64_t cookie)
|
|
qxl->current_async = QXL_UNDEFINED_IO;
|
|
qemu_mutex_unlock(&qxl->async_lock);
|
|
|
|
- dprint(qxl, 2, "async_complete: %d (%ld) done\n", current_async, cookie);
|
|
+ dprint(qxl, 2, "async_complete: %d (%" PRId64 ") done\n",
|
|
+ current_async, cookie);
|
|
switch (current_async) {
|
|
case QXL_IO_CREATE_PRIMARY_ASYNC:
|
|
qxl_create_guest_primary_complete(qxl);
|
|
@@ -1018,7 +1019,7 @@ void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id)
|
|
|
|
switch (group_id) {
|
|
case MEMSLOT_GROUP_HOST:
|
|
- return (void*)offset;
|
|
+ return (void *)(intptr_t)offset;
|
|
case MEMSLOT_GROUP_GUEST:
|
|
PANIC_ON(slot >= NUM_MEMSLOTS);
|
|
PANIC_ON(!qxl->guest_slots[slot].active);
|
|
--
|
|
1.7.10
|
|
|