[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/3] test-qga: Avoid qobject_from_jsonf("%"PRId6
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH 2/3] test-qga: Avoid qobject_from_jsonf("%"PRId64) |
Date: |
Wed, 23 Nov 2016 04:23:21 -0500 (EST) |
----- Original Message -----
> From: "Eric Blake" <address@hidden>
> To: address@hidden
> Cc: address@hidden, address@hidden, address@hidden
> Sent: Wednesday, November 23, 2016 5:16:27 AM
> Subject: [PATCH 2/3] test-qga: Avoid qobject_from_jsonf("%"PRId64)
>
> 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 <address@hidden>
> Signed-off-by: Eric Blake <address@hidden>
> ---
> 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);
This is too ugly to see. :) Why not use %lld, or just make pid an
int? Are there really systems with 64-bit pid_t?
Paolo
> + 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
>
>
[Qemu-devel] [PATCH 1/3] qmp-event: Avoid qobject_from_jsonf("%"PRId64), Eric Blake, 2016/11/22