mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qmp: Switch timestamp_put() to qdict_from_jsonf_nofail()

Browse Source 
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>
This commit is contained in:
Markus Armbruster 2018-07-03 10:53:54 +02:00
parent 62e93be286
commit cd499d2058
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qapi/qmp-event.c
View File

@ -34,15 +34,15 @@ QMPEventFuncEmit qmp_event_get_func_emit(void)
static void timestamp_put(QDict *qdict) static void timestamp_put(QDict *qdict)
{ {
int err; int err;
QObject *obj; QDict *ts;
qemu_timeval tv; qemu_timeval tv;
err = qemu_gettimeofday(&tv); err = qemu_gettimeofday(&tv);
/* Put -1 to indicate failure of getting host time */ /* Put -1 to indicate failure of getting host time */
obj = qobject_from_jsonf("{ 'seconds': %lld, 'microseconds': %lld }", ts = qdict_from_jsonf_nofail("{ 'seconds': %lld, 'microseconds': %lld }",
err < 0 ? -1LL : (long long)tv.tv_sec, err < 0 ? -1LL : (long long)tv.tv_sec,
err < 0 ? -1LL : (long long)tv.tv_usec); err < 0 ? -1LL : (long long)tv.tv_usec);
qdict_put_obj(qdict, "timestamp", obj); qdict_put(qdict, "timestamp", ts);
} }
/* /*