From patchwork Mon Oct 24 13:26:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 121348 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9FCCCB6F9C for ; Tue, 25 Oct 2011 00:27:59 +1100 (EST) Received: from localhost ([::1]:34233 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIKZ8-0000VA-Jj for incoming@patchwork.ozlabs.org; Mon, 24 Oct 2011 09:27:46 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIKYr-0000ST-6n for qemu-devel@nongnu.org; Mon, 24 Oct 2011 09:27:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIKYo-0003Yj-PQ for qemu-devel@nongnu.org; Mon, 24 Oct 2011 09:27:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63015) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIKYo-0003YR-BT for qemu-devel@nongnu.org; Mon, 24 Oct 2011 09:27:26 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9ODROMO026669 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 24 Oct 2011 09:27:24 -0400 Received: from localhost (ovpn-113-89.phx2.redhat.com [10.3.113.89]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p9ODRNv9021904; Mon, 24 Oct 2011 09:27:24 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 24 Oct 2011 11:26:57 -0200 Message-Id: <1319462832-12199-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1319462832-12199-1-git-send-email-lcapitulino@redhat.com> References: <1319462832-12199-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, armbru@redhat.com, aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 04/19] Monitor: Make mon_set_cpu() public X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Also rename it to monitor_set_cpu(). Signed-off-by: Luiz Capitulino --- monitor.c | 11 +++++------ monitor.h | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/monitor.c b/monitor.c index ea5ccd8..3f99ea0 100644 --- a/monitor.c +++ b/monitor.c @@ -514,7 +514,6 @@ static int do_qmp_capabilities(Monitor *mon, const QDict *params, return 0; } -static int mon_set_cpu(int cpu_index); static void handle_user_command(Monitor *mon, const char *cmdline); static int do_hmp_passthrough(Monitor *mon, const QDict *params, @@ -532,7 +531,7 @@ static int do_hmp_passthrough(Monitor *mon, const QDict *params, cur_mon = &hmp; if (qdict_haskey(params, "cpu-index")) { - ret = mon_set_cpu(qdict_get_int(params, "cpu-index")); + ret = monitor_set_cpu(qdict_get_int(params, "cpu-index")); if (ret < 0) { cur_mon = old_mon; qerror_report(QERR_INVALID_PARAMETER_VALUE, "cpu-index", "a CPU number"); @@ -772,8 +771,8 @@ CommandInfoList *qmp_query_commands(Error **errp) return cmd_list; } -/* get the current CPU defined by the user */ -static int mon_set_cpu(int cpu_index) +/* set the current CPU defined by the user */ +int monitor_set_cpu(int cpu_index) { CPUState *env; @@ -789,7 +788,7 @@ static int mon_set_cpu(int cpu_index) static CPUState *mon_get_cpu(void) { if (!cur_mon->mon_cpu) { - mon_set_cpu(0); + monitor_set_cpu(0); } cpu_synchronize_state(cur_mon->mon_cpu); return cur_mon->mon_cpu; @@ -901,7 +900,7 @@ static void do_info_cpus(Monitor *mon, QObject **ret_data) static int do_cpu_set(Monitor *mon, const QDict *qdict, QObject **ret_data) { int index = qdict_get_int(qdict, "index"); - if (mon_set_cpu(index) < 0) { + if (monitor_set_cpu(index) < 0) { qerror_report(QERR_INVALID_PARAMETER_VALUE, "index", "a CPU number"); return -1; diff --git a/monitor.h b/monitor.h index 4f2d328..9b723b2 100644 --- a/monitor.h +++ b/monitor.h @@ -57,6 +57,7 @@ void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) void monitor_printf(Monitor *mon, const char *fmt, ...) GCC_FMT_ATTR(2, 3); void monitor_print_filename(Monitor *mon, const char *filename); void monitor_flush(Monitor *mon); +int monitor_set_cpu(int cpu_index); typedef void (MonitorCompletion)(void *opaque, QObject *ret_data);