From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c9OzC-0001Of-NJ for qemu-devel@nongnu.org; Tue, 22 Nov 2016 23:16:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c9OzA-00020H-8E for qemu-devel@nongnu.org; Tue, 22 Nov 2016 23:16:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38178) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c9OzA-0001zX-2h for qemu-devel@nongnu.org; Tue, 22 Nov 2016 23:16:40 -0500 From: Eric Blake Date: Tue, 22 Nov 2016 22:16:27 -0600 Message-Id: <1479874588-1969-3-git-send-email-eblake@redhat.com> In-Reply-To: <1479874588-1969-1-git-send-email-eblake@redhat.com> References: <1479874588-1969-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] test-qga: Avoid qobject_from_jsonf("%"PRId64) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: programmingkidx@gmail.com, armbru@redhat.com, pbonzini@redhat.com The qobject_from_jsonf() function implements a pseudo-printf language for creating a QObject; however, it is hard-coded to only parse a subset of formats understood by printf(). In particular, any use of a 64-bit integer works only if the system's definition of PRId64 matches what the parser expects; which works on glibc (%lld) and mingw (%I64d), but not on Mac OS (%qd). Rather than enhance the parser, it is just as easy to use normal printf() for this particular conversion, matching what is done elsewhere in this file. Reported by: G 3 Signed-off-by: Eric Blake --- tests/test-qga.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/test-qga.c b/tests/test-qga.c index 40af649..421e27c 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -852,8 +852,13 @@ static void test_qga_guest_exec(gconstpointer fix) /* wait for completion */ now = g_get_monotonic_time(); do { - ret = qmp_fd(fixture->fd, "{'execute': 'guest-exec-status'," - " 'arguments': { 'pid': %" PRId64 " } }", pid); + char *cmd; + + cmd = g_strdup_printf("{'execute': 'guest-exec-status'," + " 'arguments': { 'pid': %" PRId64 " } }", + pid); + ret = qmp_fd(fixture->fd, cmd); + g_free(cmd); g_assert_nonnull(ret); val = qdict_get_qdict(ret, "return"); exited = qdict_get_bool(val, "exited"); -- 2.7.4