From patchwork Tue Mar 26 12:38:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 231192 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 E8C642C007A for ; Tue, 26 Mar 2013 23:41:22 +1100 (EST) Received: from localhost ([::1]:34692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKTBp-00057g-6a for incoming@patchwork.ozlabs.org; Tue, 26 Mar 2013 08:41:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKT9U-0001ZC-Op for qemu-devel@nongnu.org; Tue, 26 Mar 2013 08:39:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKT9S-0002Ez-P3 for qemu-devel@nongnu.org; Tue, 26 Mar 2013 08:38:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKT9S-0002Eg-Gd for qemu-devel@nongnu.org; Tue, 26 Mar 2013 08:38:54 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2QCcrc5026557 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 26 Mar 2013 08:38:53 -0400 Received: from localhost (ovpn-113-125.phx2.redhat.com [10.3.113.125]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2QCcrd0017454; Tue, 26 Mar 2013 08:38:53 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 26 Mar 2013 08:38:46 -0400 Message-Id: <1364301526-11431-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1364301526-11431-1-git-send-email-lcapitulino@redhat.com> References: <1364301526-11431-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PULL 4/4] 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 From: Michal Novotny 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 Signed-off-by: Luiz Capitulino --- hmp-commands.hx | 2 ++ hmp.c | 8 ++++++++ hmp.h | 1 + monitor.c | 7 +++++++ qapi-schema.json | 11 +++++++++++ qmp-commands.hx | 22 ++++++++++++++++++++++ vl.c | 5 +++++ 7 files changed, 56 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index df44906..3d98604 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1643,6 +1643,8 @@ show qdev device model list show roms @item info tpm show the TPM device +@item info cpu_max +show the number of CPUs supported by the machine being emulated. @end table ETEXI diff --git a/hmp.c b/hmp.c index d319897..c12c495 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/monitor.c b/monitor.c index 2d9e887..e450919 100644 --- a/monitor.c +++ b/monitor.c @@ -2746,6 +2746,13 @@ static mon_cmd_t info_cmds[] = { .mhandler.cmd = hmp_info_tpm, }, { + .name = "cpu_max", + .args_type = "", + .params = "", + .help = "Get maximum number of VCPUs supported by machine", + .mhandler.cmd = hmp_query_cpu_max, + }, + { .name = NULL, }, }; diff --git a/qapi-schema.json b/qapi-schema.json index 0d16d14..af499bd 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 3aa6bd1..2051fcb 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 */