From patchwork Sat Sep 3 13:48:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 113232 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9ED8CB6F76 for ; Sat, 3 Sep 2011 23:48:41 +1000 (EST) Received: from localhost ([::1]:45736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzqaM-00047J-5J for incoming@patchwork.ozlabs.org; Sat, 03 Sep 2011 09:48:38 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzqaF-000470-DL for qemu-devel@nongnu.org; Sat, 03 Sep 2011 09:48:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzqaE-0005Nw-5c for qemu-devel@nongnu.org; Sat, 03 Sep 2011 09:48:31 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:55328) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzqaD-0005Nm-PM for qemu-devel@nongnu.org; Sat, 03 Sep 2011 09:48:30 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1Qzqa9-0001Im-Ez; Sat, 03 Sep 2011 14:48:25 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Sat, 3 Sep 2011 14:48:25 +0100 Message-Id: <1315057705-4981-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: Gerd Hoffmann , patches@linaro.org Subject: [Qemu-devel] [PATCH] hw/qxl: Fix format string errors X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fix format string errors causing compile failure on 32 bit hosts when spice is enabled. Signed-off-by: Peter Maydell Reviewed-by: Alon Levy --- This fixes the easy parts of the 32 bit compile failures with spice enabled. It leaves the following two warnings: hw/qxl.c: In function 'interface_release_resource': hw/qxl.c:627:46: error: cast to pointer from integer of different size hw/qxl.c: In function 'qxl_phys2virt': hw/qxl.c:1003:16: error: cast to pointer from integer of different size which appear to be making deeper "pointers are 64 bits" assumptions that I don't know enough about the spice code to suggest fixes for. (Throwing in (intptr_t) casts suppresses the warning but seems a bit icky...) Could somebody else take a look at those, please? hw/qxl-logger.c | 2 +- hw/qxl.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/qxl-logger.c b/hw/qxl-logger.c index 74cadba..367aad1 100644 --- a/hw/qxl-logger.c +++ b/hw/qxl-logger.c @@ -224,7 +224,7 @@ void qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext) if (!qxl->cmdlog) { return; } - fprintf(stderr, "%ld qxl-%d/%s:", qemu_get_clock_ns(vm_clock), + fprintf(stderr, "%" PRId64 " qxl-%d/%s:", qemu_get_clock_ns(vm_clock), qxl->id, ring); fprintf(stderr, " cmd @ 0x%" PRIx64 " %s%s", ext->cmd.data, qxl_name(qxl_type, ext->cmd.type), diff --git a/hw/qxl.c b/hw/qxl.c index 45e2401..1fe0b53 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -959,7 +959,7 @@ static void qxl_add_memslot(PCIQXLDevice *d, uint32_t slot_id, uint64_t delta, memslot.generation = d->rom->slot_generation = 0; qxl_rom_set_dirty(d); - dprint(d, 1, "%s: slot %d: host virt 0x%" PRIx64 " - 0x%" PRIx64 "\n", + dprint(d, 1, "%s: slot %d: host virt 0x%lx - 0x%lx\n", __FUNCTION__, memslot.slot_id, memslot.virt_start, memslot.virt_end); @@ -1090,8 +1090,8 @@ static void qxl_set_mode(PCIQXLDevice *d, int modenr, int loadvm) .mem = devmem + d->shadow_rom.draw_area_offset, }; - dprint(d, 1, "%s: mode %d [ %d x %d @ %d bpp devmem 0x%lx ]\n", __FUNCTION__, - modenr, mode->x_res, mode->y_res, mode->bits, devmem); + dprint(d, 1, "%s: mode %d [ %d x %d @ %d bpp devmem 0x%" PRIx64 " ]\n", + __func__, modenr, mode->x_res, mode->y_res, mode->bits, devmem); if (!loadvm) { qxl_hard_reset(d, 0); } @@ -1229,7 +1229,7 @@ async_common: break; case QXL_IO_LOG: if (d->guestdebug) { - fprintf(stderr, "qxl/guest-%d: %ld: %s", d->id, + fprintf(stderr, "qxl/guest-%d: %" PRId64 ": %s", d->id, qemu_get_clock_ns(vm_clock), d->ram->log_buf); } break;