From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxGfG-0001Uh-9W for qemu-devel@nongnu.org; Tue, 26 May 2015 11:21:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxGfA-0006mo-I7 for qemu-devel@nongnu.org; Tue, 26 May 2015 11:21:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45555) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxGfA-0006me-A6 for qemu-devel@nongnu.org; Tue, 26 May 2015 11:21:04 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4QFL3jS023014 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 26 May 2015 11:21:03 -0400 From: Markus Armbruster Date: Tue, 26 May 2015 17:20:51 +0200 Message-Id: <1432653655-30745-17-git-send-email-armbru@redhat.com> In-Reply-To: <1432653655-30745-1-git-send-email-armbru@redhat.com> References: <1432653655-30745-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 16/20] monitor: Unbox Monitor member mc and rename to qmp List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com While there, rename its type as well, from MonitorControl to MonitorQMP. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- monitor.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/monitor.c b/monitor.c index 0a6197a..e90502f 100644 --- a/monitor.c +++ b/monitor.c @@ -161,11 +161,11 @@ struct MonFdset { QLIST_ENTRY(MonFdset) next; }; -typedef struct MonitorControl { +typedef struct { QObject *id; JSONMessageParser parser; int command_mode; -} MonitorControl; +} MonitorQMP; /* * To prevent flooding clients, events can be throttled. The @@ -195,7 +195,7 @@ struct Monitor { int mux_out; ReadLineState *rs; - MonitorControl *mc; + MonitorQMP qmp; CPUState *mon_cpu; BlockCompletionFunc *password_completion_cb; void *password_opaque; @@ -228,7 +228,7 @@ static void monitor_command_cb(void *opaque, const char *cmdline, static inline int qmp_cmd_mode(const Monitor *mon) { - return (mon->mc ? mon->mc->command_mode : 0); + return mon->qmp.command_mode; } /* Return true if in control mode, false otherwise */ @@ -424,9 +424,9 @@ static void monitor_protocol_emitter(Monitor *mon, QObject *data, qmp = build_qmp_error_dict(err); } - if (mon->mc->id) { - qdict_put_obj(qmp, "id", mon->mc->id); - mon->mc->id = NULL; + if (mon->qmp.id) { + qdict_put_obj(qmp, "id", mon->qmp.id); + mon->qmp.id = NULL; } monitor_json_emitter(mon, QOBJECT(qmp)); @@ -568,7 +568,7 @@ static int do_qmp_capabilities(Monitor *mon, const QDict *params, { /* Will setup QMP capabilities in the future */ if (monitor_ctrl_mode(mon)) { - mon->mc->command_mode = 1; + mon->qmp.command_mode = 1; } return 0; @@ -4992,8 +4992,8 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) goto err_out; } - mon->mc->id = qdict_get(input, "id"); - qobject_incref(mon->mc->id); + mon->qmp.id = qdict_get(input, "id"); + qobject_incref(mon->qmp.id); cmd_name = qdict_get_str(input, "execute"); trace_handle_qmp_command(mon, cmd_name); @@ -5047,7 +5047,7 @@ static void monitor_qmp_read(void *opaque, const uint8_t *buf, int size) cur_mon = opaque; - json_message_parser_feed(&cur_mon->mc->parser, (const char *) buf, size); + json_message_parser_feed(&cur_mon->qmp.parser, (const char *) buf, size); cur_mon = old_mon; } @@ -5113,15 +5113,15 @@ static void monitor_qmp_event(void *opaque, int event) switch (event) { case CHR_EVENT_OPENED: - mon->mc->command_mode = 0; + mon->qmp.command_mode = 0; data = get_qmp_greeting(); monitor_json_emitter(mon, data); qobject_decref(data); mon_refcount++; break; case CHR_EVENT_CLOSED: - json_message_parser_destroy(&mon->mc->parser); - json_message_parser_init(&mon->mc->parser, handle_qmp_command); + json_message_parser_destroy(&mon->qmp.parser); + json_message_parser_init(&mon->qmp.parser, handle_qmp_command); mon_refcount--; monitor_fdsets_cleanup(); break; @@ -5254,13 +5254,10 @@ void monitor_init(CharDriverState *chr, int flags) } if (monitor_ctrl_mode(mon)) { - mon->mc = g_malloc0(sizeof(MonitorControl)); - /* Control mode requires special handlers */ qemu_chr_add_handlers(chr, monitor_can_read, monitor_qmp_read, monitor_qmp_event, mon); qemu_chr_fe_set_echo(chr, true); - - json_message_parser_init(&mon->mc->parser, handle_qmp_command); + json_message_parser_init(&mon->qmp.parser, handle_qmp_command); } else { qemu_chr_add_handlers(chr, monitor_can_read, monitor_read, monitor_event, mon); -- 1.9.3