[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 28/32] qmp: Switch timestamp_put() to qdict_from_jso
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 28/32] qmp: Switch timestamp_put() to qdict_from_jsonf_nofail() |
Date: |
Mon, 2 Jul 2018 18:22:14 +0200 |
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 <address@hidden>
---
qapi/qmp-event.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/qapi/qmp-event.c b/qapi/qmp-event.c
index 9d7e88e84a..5b8854043e 100644
--- a/qapi/qmp-event.c
+++ b/qapi/qmp-event.c
@@ -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);
}
/*
--
2.17.1
- Re: [Qemu-devel] [PATCH 02/32] monitor: Spell "I/O thread" consistently in comments, (continued)
- [Qemu-devel] [PATCH 23/32] qmp: Use QDict * instead of QObject * for response objects, Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 03/32] docs/interop/qmp: Improve OOB documentation, Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 20/32] monitor: Peel off @mon_global wrapper, Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 22/32] qmp: De-duplicate error response building, Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 28/32] qmp: Switch timestamp_put() to qdict_from_jsonf_nofail(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 30/32] qmp: Clean up capability negotiation after commit 02130314d8c, Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 26/32] qmp: Simplify monitor_qmp_respond(), Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 13/32] qmp: Revert change to handle_qmp_command tracepoint, Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 01/32] qmp: Say "out-of-band" instead of "Out-Of-Band", Markus Armbruster, 2018/07/02