haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qmp: Use QDict * instead of QObject * for response objects

Browse source 
By using the more specific type, we get fewer downcasts.  The
downcasts are safe, but not obviously so, at least not locally.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180703085358.13941-24-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2018-07-03 10:53:49 +02:00
parent cee32796ca
commit d43b16945a
5 changed files with 32 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/qapi/qmp/dispatch.h
View file

@ -48,8 +48,8 @@ bool qmp_command_is_enabled(const QmpCommand *cmd);
const char *qmp_command_name(const QmpCommand *cmd); const char *qmp_command_name(const QmpCommand *cmd);
bool qmp_has_success_response(const QmpCommand *cmd); bool qmp_has_success_response(const QmpCommand *cmd);
QDict *qmp_error_response(Error *err); QDict *qmp_error_response(Error *err);
QObject *qmp_dispatch(QmpCommandList *cmds, QObject *request, QDict *qmp_dispatch(QmpCommandList *cmds, QObject *request,
bool allow_oob); bool allow_oob);
bool qmp_is_oob(QDict *dict); bool qmp_is_oob(QDict *dict);
typedef void (*qmp_cmd_callback_fn)(QmpCommand *cmd, void *opaque); typedef void (*qmp_cmd_callback_fn)(QmpCommand *cmd, void *opaque);

31
monitor.c
View file

@ -379,7 +379,7 @@ static void monitor_qmp_cleanup_req_queue_locked(Monitor *mon)
static void monitor_qmp_cleanup_resp_queue_locked(Monitor *mon) static void monitor_qmp_cleanup_resp_queue_locked(Monitor *mon)
{ {
while (!g_queue_is_empty(mon->qmp.qmp_responses)) { while (!g_queue_is_empty(mon->qmp.qmp_responses)) {
qobject_unref((QObject *)g_queue_pop_head(mon->qmp.qmp_responses)); qobject_unref((QDict *)g_queue_pop_head(mon->qmp.qmp_responses));
} }
} }
@ -528,7 +528,8 @@ static void monitor_json_emitter(Monitor *mon, QObject *data)
* responder thread). * responder thread).
*/ */
qemu_mutex_lock(&mon->qmp.qmp_queue_lock); qemu_mutex_lock(&mon->qmp.qmp_queue_lock);
g_queue_push_tail(mon->qmp.qmp_responses, qobject_ref(data)); g_queue_push_tail(mon->qmp.qmp_responses,
qobject_ref(qobject_to(QDict, data)));
qemu_mutex_unlock(&mon->qmp.qmp_queue_lock); qemu_mutex_unlock(&mon->qmp.qmp_queue_lock);
qemu_bh_schedule(qmp_respond_bh); qemu_bh_schedule(qmp_respond_bh);
} else { } else {
@ -542,13 +543,13 @@ static void monitor_json_emitter(Monitor *mon, QObject *data)
struct QMPResponse { struct QMPResponse {
Monitor *mon; Monitor *mon;
QObject *data; QDict *data;
}; };
typedef struct QMPResponse QMPResponse; typedef struct QMPResponse QMPResponse;
static QObject *monitor_qmp_response_pop_one(Monitor *mon) static QDict *monitor_qmp_response_pop_one(Monitor *mon)
{ {
QObject *data; QDict *data;
qemu_mutex_lock(&mon->qmp.qmp_queue_lock); qemu_mutex_lock(&mon->qmp.qmp_queue_lock);
data = g_queue_pop_head(mon->qmp.qmp_responses); data = g_queue_pop_head(mon->qmp.qmp_responses);
@ -559,10 +560,10 @@ static QObject *monitor_qmp_response_pop_one(Monitor *mon)
static void monitor_qmp_response_flush(Monitor *mon) static void monitor_qmp_response_flush(Monitor *mon)
{ {
QObject *data; QDict *data;
while ((data = monitor_qmp_response_pop_one(mon))) { while ((data = monitor_qmp_response_pop_one(mon))) {
monitor_json_emitter_raw(mon, data); monitor_json_emitter_raw(mon, QOBJECT(data));
qobject_unref(data); qobject_unref(data);
} }
} }
@ -574,7 +575,7 @@ static void monitor_qmp_response_flush(Monitor *mon)
static bool monitor_qmp_response_pop_any(QMPResponse *response) static bool monitor_qmp_response_pop_any(QMPResponse *response)
{ {
Monitor *mon; Monitor *mon;
QObject *data = NULL; QDict *data = NULL;
qemu_mutex_lock(&monitor_lock); qemu_mutex_lock(&monitor_lock);
QTAILQ_FOREACH(mon, &mon_list, entry) { QTAILQ_FOREACH(mon, &mon_list, entry) {
@ -594,7 +595,7 @@ static void monitor_qmp_bh_responder(void *opaque)
QMPResponse response; QMPResponse response;
while (monitor_qmp_response_pop_any(&response)) { while (monitor_qmp_response_pop_any(&response)) {
monitor_json_emitter_raw(response.mon, response.data); monitor_json_emitter_raw(response.mon, QOBJECT(response.data));
qobject_unref(response.data); qobject_unref(response.data);
} }
} }
@ -4104,20 +4105,20 @@ static int monitor_can_read(void *opaque)
* 2. rsp, err, and id may be NULL. * 2. rsp, err, and id may be NULL.
* 3. If err != NULL then rsp must be NULL. * 3. If err != NULL then rsp must be NULL.
*/ */
static void monitor_qmp_respond(Monitor *mon, QObject *rsp, static void monitor_qmp_respond(Monitor *mon, QDict *rsp,
Error *err, QObject *id) Error *err, QObject *id)
{ {
if (err) { if (err) {
assert(!rsp); assert(!rsp);
rsp = QOBJECT(qmp_error_response(err)); rsp = qmp_error_response(err);
} }
if (rsp) { if (rsp) {
if (id) { if (id) {
qdict_put_obj(qobject_to(QDict, rsp), "id", qobject_ref(id)); qdict_put_obj(rsp, "id", qobject_ref(id));
} }
monitor_json_emitter(mon, rsp); monitor_json_emitter(mon, QOBJECT(rsp));
} }
qobject_unref(id); qobject_unref(id);
@ -4127,7 +4128,7 @@ static void monitor_qmp_respond(Monitor *mon, QObject *rsp,
static void monitor_qmp_dispatch(Monitor *mon, QObject *req, QObject *id) static void monitor_qmp_dispatch(Monitor *mon, QObject *req, QObject *id)
{ {
Monitor *old_mon; Monitor *old_mon;
QObject *rsp; QDict *rsp;
QDict *error; QDict *error;
old_mon = cur_mon; old_mon = cur_mon;
@ -4138,7 +4139,7 @@ static void monitor_qmp_dispatch(Monitor *mon, QObject *req, QObject *id)
cur_mon = old_mon; cur_mon = old_mon;
if (mon->qmp.commands == &qmp_cap_negotiation_commands) { if (mon->qmp.commands == &qmp_cap_negotiation_commands) {
error = qdict_get_qdict(qobject_to(QDict, rsp), "error"); error = qdict_get_qdict(rsp, "error");
if (error if (error
&& !g_strcmp0(qdict_get_try_str(error, "class"), && !g_strcmp0(qdict_get_try_str(error, "class"),
QapiErrorClass_str(ERROR_CLASS_COMMAND_NOT_FOUND))) { QapiErrorClass_str(ERROR_CLASS_COMMAND_NOT_FOUND))) {

6
qapi/qmp-dispatch.c
View file

@ -161,8 +161,8 @@ bool qmp_is_oob(QDict *dict)
&& !qdict_haskey(dict, "execute"); && !qdict_haskey(dict, "execute");
} }
QObject *qmp_dispatch(QmpCommandList *cmds, QObject *request, QDict *qmp_dispatch(QmpCommandList *cmds, QObject *request,
bool allow_oob) bool allow_oob)
{ {
Error *err = NULL; Error *err = NULL;
QObject *ret; QObject *ret;
@ -179,5 +179,5 @@ QObject *qmp_dispatch(QmpCommandList *cmds, QObject *request,
rsp = NULL; rsp = NULL;
} }
return QOBJECT(rsp); return rsp;
} }

8
qga/main.c
View file

@ -545,7 +545,7 @@ fail:
#endif #endif
} }
static int send_response(GAState *s, QObject *payload) static int send_response(GAState *s, QDict *payload)
{ {
const char *buf; const char *buf;
QString *payload_qstr, *response_qstr; QString *payload_qstr, *response_qstr;
@ -553,7 +553,7 @@ static int send_response(GAState *s, QObject *payload)
g_assert(payload && s->channel); g_assert(payload && s->channel);
payload_qstr = qobject_to_json(payload); payload_qstr = qobject_to_json(QOBJECT(payload));
if (!payload_qstr) { if (!payload_qstr) {
return -EINVAL; return -EINVAL;
} }
@ -581,7 +581,7 @@ static int send_response(GAState *s, QObject *payload)
static void process_command(GAState *s, QDict *req) static void process_command(GAState *s, QDict *req)
{ {
QObject *rsp = NULL; QDict *rsp;
int ret; int ret;
g_assert(req); g_assert(req);
@ -629,7 +629,7 @@ static void process_event(JSONMessageParser *parser, GQueue *tokens)
error_setg(&err, QERR_UNSUPPORTED); error_setg(&err, QERR_UNSUPPORTED);
qdict = qmp_error_response(err); qdict = qmp_error_response(err);
} }
ret = send_response(s, QOBJECT(qdict)); ret = send_response(s, qdict);
if (ret < 0) { if (ret < 0) {
g_warning("error sending error response: %s", strerror(-ret)); g_warning("error sending error response: %s", strerror(-ret));
} }

17
tests/test-qmp-cmds.c
View file

@ -98,13 +98,13 @@ __org_qemu_x_Union1 *qmp___org_qemu_x_command(__org_qemu_x_EnumList *a,
static void test_dispatch_cmd(void) static void test_dispatch_cmd(void)
{ {
QDict *req = qdict_new(); QDict *req = qdict_new();
QObject *resp; QDict *resp;
qdict_put_str(req, "execute", "user_def_cmd"); qdict_put_str(req, "execute", "user_def_cmd");
resp = qmp_dispatch(&qmp_commands, QOBJECT(req), false); resp = qmp_dispatch(&qmp_commands, QOBJECT(req), false);
assert(resp != NULL); assert(resp != NULL);
assert(!qdict_haskey(qobject_to(QDict, resp), "error")); assert(!qdict_haskey(resp, "error"));
qobject_unref(resp); qobject_unref(resp);
qobject_unref(req); qobject_unref(req);
@ -115,13 +115,13 @@ static void test_dispatch_cmd_failure(void)
{ {
QDict *req = qdict_new(); QDict *req = qdict_new();
QDict *args = qdict_new(); QDict *args = qdict_new();
QObject *resp; QDict *resp;
qdict_put_str(req, "execute", "user_def_cmd2"); qdict_put_str(req, "execute", "user_def_cmd2");
resp = qmp_dispatch(&qmp_commands, QOBJECT(req), false); resp = qmp_dispatch(&qmp_commands, QOBJECT(req), false);
assert(resp != NULL); assert(resp != NULL);
assert(qdict_haskey(qobject_to(QDict, resp), "error")); assert(qdict_haskey(resp, "error"));
qobject_unref(resp); qobject_unref(resp);
qobject_unref(req); qobject_unref(req);
@ -135,7 +135,7 @@ static void test_dispatch_cmd_failure(void)
resp = qmp_dispatch(&qmp_commands, QOBJECT(req), false); resp = qmp_dispatch(&qmp_commands, QOBJECT(req), false);
assert(resp != NULL); assert(resp != NULL);
assert(qdict_haskey(qobject_to(QDict, resp), "error")); assert(qdict_haskey(resp, "error"));
qobject_unref(resp); qobject_unref(resp);
qobject_unref(req); qobject_unref(req);
@ -143,18 +143,15 @@ static void test_dispatch_cmd_failure(void)
static QObject *test_qmp_dispatch(QDict *req) static QObject *test_qmp_dispatch(QDict *req)
{ {
QObject *resp_obj;
QDict *resp; QDict *resp;
QObject *ret; QObject *ret;
resp_obj = qmp_dispatch(&qmp_commands, QOBJECT(req), false); resp = qmp_dispatch(&qmp_commands, QOBJECT(req), false);
assert(resp_obj);
resp = qobject_to(QDict, resp_obj);
assert(resp && !qdict_haskey(resp, "error")); assert(resp && !qdict_haskey(resp, "error"));
ret = qdict_get(resp, "return"); ret = qdict_get(resp, "return");
assert(ret); assert(ret);
qobject_ref(ret); qobject_ref(ret);
qobject_unref(resp_obj); qobject_unref(resp);
return ret; return ret;
} }