ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/qxl.c: Fix compilation failures on 32 bit hosts 

Fix compilation failures on 32 bit hosts (cast from pointer to
integer of different size; %ld expects 'long int' not uint64_t).

Reported-by: Steve Langasek <steve.langasek@canonical.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Peter Maydell 2012-03-16 13:50:04 +00:00 committed by Gerd Hoffmann
parent d53291cf59
commit 5dba0d453d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/qxl.c
View File

@ -154,7 +154,7 @@ void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t surface_id,
} else { } else {
assert(cookie != NULL); assert(cookie != NULL);
spice_qxl_update_area_async(&qxl->ssd.qxl, surface_id, area, spice_qxl_update_area_async(&qxl->ssd.qxl, surface_id, area,
clear_dirty_region, (uint64_t)cookie); clear_dirty_region, (uintptr_t)cookie);
} }
} }
@ -178,7 +178,7 @@ static void qxl_spice_destroy_surface_wait(PCIQXLDevice *qxl, uint32_t id,
cookie = qxl_cookie_new(QXL_COOKIE_TYPE_IO, cookie = qxl_cookie_new(QXL_COOKIE_TYPE_IO,
QXL_IO_DESTROY_SURFACE_ASYNC); QXL_IO_DESTROY_SURFACE_ASYNC);
cookie->u.surface_id = id; cookie->u.surface_id = id;
spice_qxl_destroy_surface_async(&qxl->ssd.qxl, id, (uint64_t)cookie); spice_qxl_destroy_surface_async(&qxl->ssd.qxl, id, (uintptr_t)cookie);
} else { } else {
qxl->ssd.worker->destroy_surface_wait(qxl->ssd.worker, id); qxl->ssd.worker->destroy_surface_wait(qxl->ssd.worker, id);
} }
@ -189,8 +189,8 @@ static void qxl_spice_flush_surfaces_async(PCIQXLDevice *qxl)
trace_qxl_spice_flush_surfaces_async(qxl->id, qxl->guest_surfaces.count, trace_qxl_spice_flush_surfaces_async(qxl->id, qxl->guest_surfaces.count,
qxl->num_free_res); qxl->num_free_res);
spice_qxl_flush_surfaces_async(&qxl->ssd.qxl, spice_qxl_flush_surfaces_async(&qxl->ssd.qxl,
(uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO, (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,
QXL_IO_FLUSH_SURFACES_ASYNC)); QXL_IO_FLUSH_SURFACES_ASYNC));
} }
void qxl_spice_loadvm_commands(PCIQXLDevice *qxl, struct QXLCommandExt *ext, void qxl_spice_loadvm_commands(PCIQXLDevice *qxl, struct QXLCommandExt *ext,
@ -226,8 +226,8 @@ static void qxl_spice_destroy_surfaces(PCIQXLDevice *qxl, qxl_async_io async)
trace_qxl_spice_destroy_surfaces(qxl->id, async); trace_qxl_spice_destroy_surfaces(qxl->id, async);
if (async) { if (async) {
spice_qxl_destroy_surfaces_async(&qxl->ssd.qxl, spice_qxl_destroy_surfaces_async(&qxl->ssd.qxl,
(uint64_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO, (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,
QXL_IO_DESTROY_ALL_SURFACES_ASYNC)); QXL_IO_DESTROY_ALL_SURFACES_ASYNC));
} else { } else {
qxl->ssd.worker->destroy_surfaces(qxl->ssd.worker); qxl->ssd.worker->destroy_surfaces(qxl->ssd.worker);
qxl_spice_destroy_surfaces_complete(qxl); qxl_spice_destroy_surfaces_complete(qxl);
@ -764,7 +764,7 @@ static void interface_async_complete_io(PCIQXLDevice *qxl, QXLCookie *cookie)
} }
if (cookie && current_async != cookie->io) { if (cookie && current_async != cookie->io) {
fprintf(stderr, fprintf(stderr,
"qxl: %s: error: current_async = %d != %ld = cookie->io\n", "qxl: %s: error: current_async = %d != %" PRId64 " = cookie->io\n",
__func__, current_async, cookie->io); __func__, current_async, cookie->io);
} }
switch (current_async) { switch (current_async) {
@ -837,7 +837,7 @@ static void interface_update_area_complete(QXLInstance *sin,
static void interface_async_complete(QXLInstance *sin, uint64_t cookie_token) static void interface_async_complete(QXLInstance *sin, uint64_t cookie_token)
{ {
PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl); PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
QXLCookie *cookie = (QXLCookie *)cookie_token; QXLCookie *cookie = (QXLCookie *)(uintptr_t)cookie_token;
switch (cookie->type) { switch (cookie->type) {
case QXL_COOKIE_TYPE_IO: case QXL_COOKIE_TYPE_IO: