Skip to content

Commit

Permalink
qmp: Switch timestamp_put() to qdict_from_jsonf_nofail()
Browse files Browse the repository at this point in the history
There's just one use of qobject_from_jsonf() to parse a JSON object
left: timestamp_put().  Switch it to qdict_from_jsonf_nofail().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180703085358.13941-29-armbru@redhat.com>
  • Loading branch information
Markus Armbruster committed Jul 3, 2018
1 parent 62e93be commit cd499d2
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions qapi/qmp-event.c
Expand Up @@ -34,15 +34,15 @@ QMPEventFuncEmit qmp_event_get_func_emit(void)
static void timestamp_put(QDict *qdict)
{
int err;
QObject *obj;
QDict *ts;
qemu_timeval tv;

err = qemu_gettimeofday(&tv);
/* Put -1 to indicate failure of getting host time */
obj = qobject_from_jsonf("{ 'seconds': %lld, 'microseconds': %lld }",
err < 0 ? -1LL : (long long)tv.tv_sec,
err < 0 ? -1LL : (long long)tv.tv_usec);
qdict_put_obj(qdict, "timestamp", obj);
ts = qdict_from_jsonf_nofail("{ 'seconds': %lld, 'microseconds': %lld }",
err < 0 ? -1LL : (long long)tv.tv_sec,
err < 0 ? -1LL : (long long)tv.tv_usec);
qdict_put(qdict, "timestamp", ts);
}

/*
Expand Down

0 comments on commit cd499d2

Please sign in to comment.