mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-24 12:09:58 +00:00
043b5a4951
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 -Wformat, and is not a straight synonym to bare printf(). In particular, any use of an int64_t integer works only if the system's definition of PRId64 matches what the parser expects; which works on glibc (%lld or %ld depending on 32- vs. 64-bit) and mingw (%I64d), but not on Mac OS (%qd). Rather than enhance the parser, it is just as easy to use 'long long', which we know always works. There are few enough callers of qobject_from_json[fv]() that it is easy to audit that this is the only non-testsuite caller that was actually relying on this particular conversion. Reported by: G 3 <programmingkidx@gmail.com> Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <1479922617-4400-2-git-send-email-eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> [Cast tv.tv_sec, tv.tv_usec to long long for type correctness] Signed-off-by: Markus Armbruster <armbru@redhat.com>
58 lines
1.3 KiB
C
58 lines
1.3 KiB
C
/*
|
|
* QMP Event related
|
|
*
|
|
* Copyright (c) 2014 Wenchao Xia
|
|
*
|
|
* Authors:
|
|
* Wenchao Xia <wenchaoqemu@gmail.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
|
|
#include "qemu-common.h"
|
|
#include "qapi/qmp-event.h"
|
|
#include "qapi/qmp/qstring.h"
|
|
#include "qapi/qmp/qjson.h"
|
|
|
|
static QMPEventFuncEmit qmp_emit;
|
|
|
|
void qmp_event_set_func_emit(QMPEventFuncEmit emit)
|
|
{
|
|
qmp_emit = emit;
|
|
}
|
|
|
|
QMPEventFuncEmit qmp_event_get_func_emit(void)
|
|
{
|
|
return qmp_emit;
|
|
}
|
|
|
|
static void timestamp_put(QDict *qdict)
|
|
{
|
|
int err;
|
|
QObject *obj;
|
|
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);
|
|
}
|
|
|
|
/*
|
|
* Build a QDict, then fill event name and time stamp, caller should free the
|
|
* QDict after usage.
|
|
*/
|
|
QDict *qmp_event_build_dict(const char *event_name)
|
|
{
|
|
QDict *dict = qdict_new();
|
|
qdict_put(dict, "event", qstring_from_str(event_name));
|
|
timestamp_put(dict);
|
|
return dict;
|
|
}
|