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: 3856 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6EF5B23EFB for ; Sat, 3 Sep 2011 13:49:08 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 4D167A18061 for ; Sat, 3 Sep 2011 13:49:08 +0000 (UTC) Received: by fxd18 with SMTP id 18so3539216fxd.11 for ; Sat, 03 Sep 2011 06:49:08 -0700 (PDT) Received: by 10.223.24.21 with SMTP id t21mr1760843fab.24.1315057748124; Sat, 03 Sep 2011 06:49:08 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.11.8 with SMTP id m8cs4594lab; Sat, 3 Sep 2011 06:49:07 -0700 (PDT) Received: by 10.216.48.11 with SMTP id u11mr2155674web.4.1315057712654; Sat, 03 Sep 2011 06:48:32 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id v7si1710139wec.34.2011.09.03.06.48.31 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 03 Sep 2011 06:48:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk 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 Cc: Gerd Hoffmann , patches@linaro.org Subject: [PATCH] hw/qxl: Fix format string errors 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 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;