From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIHgp-0001vC-Vh for qemu-devel@nongnu.org; Fri, 15 Aug 2014 09:37:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XIHgf-00065W-SO for qemu-devel@nongnu.org; Fri, 15 Aug 2014 09:37:07 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:42479 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIHgf-00064z-Kw for qemu-devel@nongnu.org; Fri, 15 Aug 2014 09:36:57 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Fri, 15 Aug 2014 15:35:40 +0200 Message-Id: <1408109759-1100-9-git-send-email-benoit.canet@nodalink.com> In-Reply-To: <1408109759-1100-1-git-send-email-benoit.canet@nodalink.com> References: <1408109759-1100-1-git-send-email-benoit.canet@nodalink.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 08/26] monitor: Extract qmp_human_monitor_command into monitor-system.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Signed-off-by: Beno=C3=AEt Canet --- monitor-system.c | 43 +++++++++++++++++++++++++++++++++++++++++++ monitor.c | 44 -------------------------------------------- 2 files changed, 43 insertions(+), 44 deletions(-) diff --git a/monitor-system.c b/monitor-system.c index 51ca21f..90758db 100644 --- a/monitor-system.c +++ b/monitor-system.c @@ -67,3 +67,46 @@ int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream, return 0; } =20 +static void monitor_data_destroy(Monitor *mon) +{ + QDECREF(mon->outbuf); + qemu_mutex_destroy(&mon->out_lock); +} + +char *qmp_human_monitor_command(const char *command_line, bool has_cpu_i= ndex, + int64_t cpu_index, Error **errp) +{ + char *output =3D NULL; + Monitor *old_mon, hmp; + + monitor_data_init(&hmp); + hmp.skip_flush =3D true; + + old_mon =3D cur_mon; + cur_mon =3D &hmp; + + if (has_cpu_index) { + int ret =3D monitor_set_cpu(cpu_index); + if (ret < 0) { + cur_mon =3D old_mon; + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", + "a CPU number"); + goto out; + } + } + + handle_user_command(&hmp, command_line); + cur_mon =3D old_mon; + + qemu_mutex_lock(&hmp.out_lock); + if (qstring_get_length(hmp.outbuf) > 0) { + output =3D g_strdup(qstring_get_str(hmp.outbuf)); + } else { + output =3D g_strdup(""); + } + qemu_mutex_unlock(&hmp.out_lock); + +out: + monitor_data_destroy(&hmp); + return output; +} diff --git a/monitor.c b/monitor.c index 24f4a53..106efb5 100644 --- a/monitor.c +++ b/monitor.c @@ -552,50 +552,6 @@ void monitor_data_init(Monitor *mon) mon->cmd_table =3D mon_cmds; } =20 -static void monitor_data_destroy(Monitor *mon) -{ - QDECREF(mon->outbuf); - qemu_mutex_destroy(&mon->out_lock); -} - -char *qmp_human_monitor_command(const char *command_line, bool has_cpu_i= ndex, - int64_t cpu_index, Error **errp) -{ - char *output =3D NULL; - Monitor *old_mon, hmp; - - monitor_data_init(&hmp); - hmp.skip_flush =3D true; - - old_mon =3D cur_mon; - cur_mon =3D &hmp; - - if (has_cpu_index) { - int ret =3D monitor_set_cpu(cpu_index); - if (ret < 0) { - cur_mon =3D old_mon; - error_set(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", - "a CPU number"); - goto out; - } - } - - handle_user_command(&hmp, command_line); - cur_mon =3D old_mon; - - qemu_mutex_lock(&hmp.out_lock); - if (qstring_get_length(hmp.outbuf) > 0) { - output =3D g_strdup(qstring_get_str(hmp.outbuf)); - } else { - output =3D g_strdup(""); - } - qemu_mutex_unlock(&hmp.out_lock); - -out: - monitor_data_destroy(&hmp); - return output; -} - int compare_cmd(const char *name, const char *list) { const char *p, *pstart; --=20 2.1.0.rc1