OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qmp: Replace get_qmp_greeting() by qmp_greeting() 

get_qmp_greeting() returns a QDict * as QObject *.  It's caller
converts it right back.

Return QDict * instead.  While there, rename to qmp_greeting().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180703085358.13941-26-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2018-07-03 10:53:51 +02:00
parent 65e3fe6743
commit 1816604b62
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
monitor.c
View File

@ -4382,7 +4382,7 @@ void monitor_resume(Monitor *mon)
trace_monitor_suspend(mon, -1);
}
static QObject *get_qmp_greeting(Monitor *mon)
static QDict *qmp_greeting(Monitor *mon)
{
QList *cap_list = qlist_new();
QObject *ver = NULL;
@ -4398,8 +4398,9 @@ static QObject *get_qmp_greeting(Monitor *mon)
qlist_append_str(cap_list, QMPCapability_str(cap));
}
return qobject_from_jsonf("{'QMP': {'version': %p, 'capabilities': %p}}",
ver, cap_list);
return qdict_from_jsonf_nofail(
"{'QMP': {'version': %p, 'capabilities': %p}}",
ver, cap_list);
}
static void monitor_qmp_caps_reset(Monitor *mon)
@ -4409,15 +4410,15 @@ static void monitor_qmp_caps_reset(Monitor *mon)
static void monitor_qmp_event(void *opaque, int event)
{
QObject *data;
QDict *data;
Monitor *mon = opaque;
switch (event) {
case CHR_EVENT_OPENED:
mon->qmp.commands = &qmp_cap_negotiation_commands;
monitor_qmp_caps_reset(mon);
data = get_qmp_greeting(mon);
qmp_queue_response(mon, qobject_to(QDict, data));
data = qmp_greeting(mon);
qmp_queue_response(mon, data);
qobject_unref(data);
mon_refcount++;
break;