From patchwork Thu Jun 27 19:00:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 255122 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8F0DE2C00AB for ; Fri, 28 Jun 2013 05:00:33 +1000 (EST) Received: from localhost ([::1]:39632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsHQl-0001Q9-IE for incoming@patchwork.ozlabs.org; Thu, 27 Jun 2013 15:00:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsHQX-0001Q0-By for qemu-devel@nongnu.org; Thu, 27 Jun 2013 15:00:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsHQR-00027B-Tj for qemu-devel@nongnu.org; Thu, 27 Jun 2013 15:00:17 -0400 Received: from [2a03:4000:2:362::1] (port=33822 helo=v2201305906712890.yourvserver.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsHQR-00025B-NO for qemu-devel@nongnu.org; Thu, 27 Jun 2013 15:00:11 -0400 Received: by v2201305906712890.yourvserver.net (Postfix, from userid 1000) id 7B583181384; Thu, 27 Jun 2013 21:00:07 +0200 (CEST) From: Stefan Weil To: aliguori@us.ibm.com Date: Thu, 27 Jun 2013 21:00:06 +0200 Message-Id: <1372359606-2759-1-git-send-email-sw@weilnetz.de> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a03:4000:2:362::1 Cc: Stefan Weil , "Michael R. Hines" , qemu-devel Subject: [Qemu-devel] [PATCH] arch_init: Fix format string by using RAM_ADDR_FMT 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 length is a ram_addr_t, so RAM_ADDR_FMT must be used instead of %ld. This fixes a recently introduced regression for w64 builds. Using RAM_ADDR_FMT also changes decimal output to sedecimal. This is good here because length and block->length should both use the same base in the error message. Signed-off-by: Stefan Weil --- arch_init.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch_init.c b/arch_init.c index ea9ddad..4255db9 100644 --- a/arch_init.c +++ b/arch_init.c @@ -815,8 +815,9 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) QTAILQ_FOREACH(block, &ram_list.blocks, next) { if (!strncmp(id, block->idstr, sizeof(id))) { if (block->length != length) { - fprintf(stderr, "Length mismatch: %s: %ld " - "in != " RAM_ADDR_FMT "\n", id, length, + fprintf(stderr, + "Length mismatch: %s: " RAM_ADDR_FMT + " in != " RAM_ADDR_FMT "\n", id, length, block->length); ret = -EINVAL; goto done;