From patchwork Thu Nov 12 14:53:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 543378 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47A6F1402BF for ; Fri, 13 Nov 2015 01:54:22 +1100 (AEDT) Received: from localhost ([::1]:47121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwtGV-0008Vh-V2 for incoming@patchwork.ozlabs.org; Thu, 12 Nov 2015 09:54:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54703) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwtG8-0007xx-Vf for qemu-devel@nongnu.org; Thu, 12 Nov 2015 09:53:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwtG4-0004PB-Pt for qemu-devel@nongnu.org; Thu, 12 Nov 2015 09:53:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54587) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwtG4-0004P7-Ke for qemu-devel@nongnu.org; Thu, 12 Nov 2015 09:53:52 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 838D78C1A9; Thu, 12 Nov 2015 14:53:51 +0000 (UTC) Received: from redhat.com (ovpn-116-139.ams2.redhat.com [10.36.116.139]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id tACErnwm026155; Thu, 12 Nov 2015 09:53:49 -0500 Date: Thu, 12 Nov 2015 16:53:48 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1447340003-12265-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Amit Shah , Peter Maydell , dgilbert@redhat.com, Juan Quintela Subject: [Qemu-devel] [PATCH] migration/ram: fix build on 32 bit hosts 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 ram_addr_t must be printed with RAM_ADDR_FMT not %z. Also, change size print to %zx to match what RAM_ADDR_FMT does. Signed-off-by: Michael S. Tsirkin --- migration/ram.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 62cf42b..80a67bb 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1184,7 +1184,7 @@ int ram_save_queue_pages(MigrationState *ms, const char *rbname, } trace_ram_save_queue_pages(ramblock->idstr, start, len); if (start+len > ramblock->used_length) { - error_report("%s request overrun start=%zx len=%zx blocklen=%zx", + error_report("%s request overrun start=0x" RAM_ADDR_FMT " len=0x" RAM_ADDR_FMT " blocklen=0x" RAM_ADDR_FMT, __func__, start, len, ramblock->used_length); goto err; } @@ -1845,7 +1845,7 @@ int ram_discard_range(MigrationIncomingState *mis, ret = postcopy_ram_discard_range(mis, host_startaddr, length); } else { error_report("ram_discard_range: Overrun block '%s' (%" PRIu64 - "/%zu/%zu)", + "/%zx/0x" RAM_ADDR_FMT ")", block_name, start, length, rb->used_length); }