From patchwork Mon Mar 25 16:31:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Novotny X-Patchwork-Id: 230999 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8D51D2C0099 for ; Tue, 26 Mar 2013 09:18:02 +1100 (EST) Received: from localhost ([::1]:34377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKFiK-0006oj-D5 for incoming@patchwork.ozlabs.org; Mon, 25 Mar 2013 18:18:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKFhy-0006oY-FJ for qemu-devel@nongnu.org; Mon, 25 Mar 2013 18:17:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKFht-0003bj-HF for qemu-devel@nongnu.org; Mon, 25 Mar 2013 18:17:38 -0400 Received: from ip-94-113-21-219.net.upcbroadband.cz ([94.113.21.219]:59120 helo=miglaptop.brq.redhat.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKFht-0003bH-1B for qemu-devel@nongnu.org; Mon, 25 Mar 2013 18:17:33 -0400 Received: from miglaptop.brq.redhat.com (example.com [127.0.0.1]) by miglaptop.brq.redhat.com (8.14.5/8.14.5) with ESMTP id r2PGVXM5021238; Mon, 25 Mar 2013 17:31:34 +0100 Received: (from mig@localhost) by miglaptop.brq.redhat.com (8.14.5/8.14.5/Submit) id r2PGVXRZ021237; Mon, 25 Mar 2013 17:31:33 +0100 From: Michal Novotny To: qemu-devel@nongnu.org Date: Mon, 25 Mar 2013 17:31:33 +0100 Message-Id: <385f3a1ca045e1b008de2b880eca1c8cce2a5231.1364229059.git.minovotn@redhat.com> X-Mailer: git-send-email 1.7.11.7 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 94.113.21.219 Cc: Michal Novotny , lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v3] New QMP command query-cpu-max and HMP command cpu_max 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 These commands return the maximum number of CPUs supported by the currently running emulator instance, as defined in its QEMUMachine struct. Signed-off-by: Michal Novotny --- hmp-commands.hx | 14 ++++++++++++++ hmp.c | 8 ++++++++ hmp.h | 1 + qapi-schema.json | 11 +++++++++++ qmp-commands.hx | 22 ++++++++++++++++++++++ vl.c | 5 +++++ 6 files changed, 61 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index df44906..c976459 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -690,6 +690,20 @@ Set the default CPU. ETEXI { + .name = "cpu_max", + .args_type = "", + .params = "", + .help = "Get maximum number of VCPUs supported by machine", + .mhandler.cmd = hmp_query_cpu_max, + }, + +STEXI +@item cpu_max +@findex cpu_max +Returns the number of CPUs supported by the machine being emulated. +ETEXI + + { .name = "mouse_move", .args_type = "dx_str:s,dy_str:s,dz_str:s?", .params = "dx dy [dz]", diff --git a/hmp.c b/hmp.c index b0a861c..205db8f 100644 --- a/hmp.c +++ b/hmp.c @@ -748,6 +748,14 @@ void hmp_ringbuf_read(Monitor *mon, const QDict *qdict) g_free(data); } +void hmp_query_cpu_max(Monitor *mon, const QDict *qdict) +{ + int cpu_max; + + cpu_max = qmp_query_cpu_max(NULL); + monitor_printf(mon, "Maximum number of CPUs is %d\n", cpu_max); +} + static void hmp_cont_cb(void *opaque, int err) { if (!err) { diff --git a/hmp.h b/hmp.h index 95fe76e..80e8b41 100644 --- a/hmp.h +++ b/hmp.h @@ -42,6 +42,7 @@ void hmp_stop(Monitor *mon, const QDict *qdict); void hmp_system_reset(Monitor *mon, const QDict *qdict); void hmp_system_powerdown(Monitor *mon, const QDict *qdict); void hmp_cpu(Monitor *mon, const QDict *qdict); +void hmp_query_cpu_max(Monitor *mon, const QDict *qdict); void hmp_memsave(Monitor *mon, const QDict *qdict); void hmp_pmemsave(Monitor *mon, const QDict *qdict); void hmp_ringbuf_write(Monitor *mon, const QDict *qdict); diff --git a/qapi-schema.json b/qapi-schema.json index 088f4e1..a8187fd 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1832,6 +1832,17 @@ { 'command': 'query-migrate-cache-size', 'returns': 'int' } ## +## @query-cpu-max +## +## query maximum number of CPUs supported by machine +## +## Returns: number of CPUs +## +## Since: 1.5 +### +{ 'command': 'query-cpu-max', 'returns': 'int' } + +## # @ObjectPropertyInfo: # # @name: the name of the property diff --git a/qmp-commands.hx b/qmp-commands.hx index b370060..9c6b802 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -385,6 +385,28 @@ Note: CPUs' indexes are obtained with the 'query-cpus' command. EQMP { + .name = "query-cpu-max", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_query_cpu_max, + }, + +SQMP +query-cpu-max +------------- + +Get the maximum CPUs supported by the machine being currently +emulated. + +Returns json-int. + +Example: + +-> { "execute": "query-cpu-max" } +<- { "return": 255 } + +EQMP + + { .name = "memsave", .args_type = "val:l,size:i,filename:s,cpu:i?", .mhandler.cmd_new = qmp_marshal_input_memsave, diff --git a/vl.c b/vl.c index aeed7f4..7643f16 100644 --- a/vl.c +++ b/vl.c @@ -662,6 +662,11 @@ StatusInfo *qmp_query_status(Error **errp) return info; } +int64_t qmp_query_cpu_max(Error **errp) +{ + return current_machine->max_cpus; +} + /***********************************************************/ /* real time host monotonic timer */