From patchwork Mon Feb 8 07:27:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TeLeMan X-Patchwork-Id: 44764 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 73373B7D1A for ; Mon, 8 Feb 2010 18:39:46 +1100 (EST) Received: from localhost ([127.0.0.1]:36868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NeO3E-00058z-Ke for incoming@patchwork.ozlabs.org; Mon, 08 Feb 2010 02:28:56 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NeO1x-00057f-Fp for qemu-devel@nongnu.org; Mon, 08 Feb 2010 02:27:37 -0500 Received: from [199.232.76.173] (port=52015 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NeO1w-00056x-OD for qemu-devel@nongnu.org; Mon, 08 Feb 2010 02:27:36 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NeO1s-0008W1-0a for qemu-devel@nongnu.org; Mon, 08 Feb 2010 02:27:36 -0500 Received: from mail-pz0-f176.google.com ([209.85.222.176]:47284) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NeO1r-0008Vh-MH for qemu-devel@nongnu.org; Mon, 08 Feb 2010 02:27:31 -0500 Received: by pzk6 with SMTP id 6so4746816pzk.18 for ; Sun, 07 Feb 2010 23:27:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=LUplxnDQL9qDXKhmf5Flpmd99zbHKdEwAjVYVnfGwUI=; b=tD7FhsN37oLYVSiTnXC22JcIS42JuhvnuDbBblxMlnxCJTT/j8Y4BRoiHmH+aDBMfC VQ24mt1vyMFw/z6DcaTQay5zGeCIDDGd9/d0o/Is3i1Q8K5bGetV5mJA/oVfbFPwkGaY DH6RcMFS35NvbyBxHi/RDeoT4TAbPwYIOSnn4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=EwcUj7gur+oaQJy97YXBMlvI4wsJmJSGeOMEjZtpdhUNXr1kQXR+VSlrMQRljuze2Y I8JYmcyImA9DoNSzIkE7xUnGY/NrNn0Z+SAK+9gQYRNzHLO2xrjv7gFR+W0+e6jCe+tk NS5HsvLrcEvxxeldUpqRD+gEnBB8PvZQQ0YuE= MIME-Version: 1.0 Received: by 10.141.2.4 with SMTP id e4mr4187997rvi.192.1265614050482; Sun, 07 Feb 2010 23:27:30 -0800 (PST) Date: Mon, 8 Feb 2010 15:27:29 +0800 Message-ID: From: TeLeMan To: qemu-devel X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH] use "%lld" instead of "%I64d" for qobject_from_jsonf in monitor.c and migration.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The json parser does not support "%I64d", so we have to use "%lld" instead of "%I64d". Signed-off-by: TeLeMan --- migration.c | 6 +++--- monitor.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/migration.c b/migration.c index f20315f..f44b857 100644 --- a/migration.c +++ b/migration.c @@ -180,9 +180,9 @@ static void migrate_put_status(QDict *qdict, const char *name, { QObject *obj; - obj = qobject_from_jsonf("{ 'transferred': %" PRId64 ", " - "'remaining': %" PRId64 ", " - "'total': %" PRId64 " }", trans, rem, total); + obj = qobject_from_jsonf("{ 'transferred': %lld, " + "'remaining': %lld, " + "'total': %lld }", trans, rem, total); assert(obj != NULL); qdict_put_obj(qdict, name, obj); diff --git a/monitor.c b/monitor.c index a86454b..1738d2a 100644 --- a/monitor.c +++ b/monitor.c @@ -342,8 +342,8 @@ static void timestamp_put(QDict *qdict) if (err < 0) return; - obj = qobject_from_jsonf("{ 'seconds': %" PRId64 ", " - "'microseconds': %" PRId64 " }", + obj = qobject_from_jsonf("{ 'seconds': %lld, " + "'microseconds': %lld }", (int64_t) tv.tv_sec, (int64_t) tv.tv_usec); assert(obj != NULL);