From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKEDD-00060e-AR for qemu-devel@nongnu.org; Mon, 25 Mar 2013 16:41:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKED7-0005Tg-TQ for qemu-devel@nongnu.org; Mon, 25 Mar 2013 16:41:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49053) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKED7-0005TV-LJ for qemu-devel@nongnu.org; Mon, 25 Mar 2013 16:41:41 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2PKA1lk014825 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 25 Mar 2013 16:10:01 -0400 Date: Mon, 25 Mar 2013 16:09:59 -0400 From: Luiz Capitulino Message-ID: <20130325160959.4d5119d9@redhat.com> In-Reply-To: <1364225711-32566-1-git-send-email-imammedo@redhat.com> References: <514BC592.508@redhat.com> <1364225711-32566-1-git-send-email-imammedo@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 11/12 v2] qmp: add cpu-set qmp command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: qemu-devel@nongnu.org On Mon, 25 Mar 2013 16:35:11 +0100 Igor Mammedov wrote: > Signed-off-by: Igor Mammedov > --- > v2: > * s/cpu_set/cpu-set/ > * qmp doc style fix > * use bool type instead of opencodding online/offline string > suggested-by: Eric Blake > changes are on WIP branch: https://github.com/imammedo/qemu/tree/cpu_set.WIP > > --- > include/sysemu/sysemu.h | 2 ++ > qapi-schema.json | 12 ++++++++++++ > qmp-commands.hx | 24 ++++++++++++++++++++++++ > qmp.c | 9 +++++++++ > stubs/Makefile.objs | 1 + > stubs/do_cpu_hot_add.c | 7 +++++++ > 6 files changed, 55 insertions(+), 0 deletions(-) > create mode 100644 stubs/do_cpu_hot_add.c > > diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h > index 4b8f721..8bcaf26 100644 > --- a/include/sysemu/sysemu.h > +++ b/include/sysemu/sysemu.h > @@ -156,6 +156,8 @@ void drive_hot_add(Monitor *mon, const QDict *qdict); > void qemu_register_cpu_add_notifier(Notifier *notifier); > void qemu_system_cpu_hotplug_request(uint32_t id); > > +void do_cpu_hot_add(const int64_t id, Error **errp); > + > /* pcie aer error injection */ > void pcie_aer_inject_error_print(Monitor *mon, const QObject *data); > int do_pcie_aer_inject_error(Monitor *mon, > diff --git a/qapi-schema.json b/qapi-schema.json > index 088f4e1..aa5f3dc 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -1385,6 +1385,18 @@ > { 'command': 'cpu', 'data': {'index': 'int'} } > > ## > +# @cpu-set > +# > +# Sets specified cpu to online/offline mode > +# > +# @id: cpu id to be updated > +# > +# @online: true to put the cpu online, false to take it offline > +# > +## > +{ 'command': 'cpu-set', 'data': {'id': 'int', 'online': 'bool'} } > + > +## > # @memsave: > # > # Save a portion of guest memory to a file. > diff --git a/qmp-commands.hx b/qmp-commands.hx > index b370060..2f9c256 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -385,6 +385,30 @@ Note: CPUs' indexes are obtained with the 'query-cpus' command. > EQMP > > { > + .name = "cpu-set", > + .args_type = "id:i,online:b", > + .mhandler.cmd_new = qmp_marshal_input_cpu_set, > + }, > + > +SQMP > +cpu-set > +------- > + > +Sets virtual cpu to online/ofline mode > + > +Arguments: > + > +- "id": cpu id (json-int) > +- "online": true to put the cpu online, false to take it offline (json-bool) > + > +Example: > + > +-> { "execute": "cpu-set", "arguments": { "id": 2, "online": true } } > +<- { "return": {} } > + > +EQMP > + > + { > .name = "memsave", > .args_type = "val:l,size:i,filename:s,cpu:i?", > .mhandler.cmd_new = qmp_marshal_input_memsave, > diff --git a/qmp.c b/qmp.c > index 55b056b..c211da5 100644 > --- a/qmp.c > +++ b/qmp.c > @@ -108,6 +108,15 @@ void qmp_cpu(int64_t index, Error **errp) > /* Just do nothing */ > } > > +void qmp_cpu_set(int64_t id, const bool online, Error **errp) > +{ > + if (online) { > + do_cpu_hot_add(id, errp); > + } else { > + error_setg(errp, "Unplug is not implemented"); > + } > +} As a general rule, we don't allow command extensions to be done this way because this is not queriable. A client would have to try online=off to see if QEMU version X supports it, worse: the client would have to parse the error message to be sure the failure actually corresponds to unplug not implemented. The alternative is to have cpu-set-online and later cpu-set-offline. Quite verbose, but doesn't have issues. Eric, what do you think? > + > #ifndef CONFIG_VNC > /* If VNC support is enabled, the "true" query-vnc command is > defined in the VNC subsystem */ > diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs > index 6a492f5..4154a2b 100644 > --- a/stubs/Makefile.objs > +++ b/stubs/Makefile.objs > @@ -26,3 +26,4 @@ stub-obj-$(CONFIG_WIN32) += fd-register.o > stub-obj-y += resume_vcpu.o > stub-obj-y += get_icc_bus.o > stub-obj-y += qemu_system_cpu_hotplug_request.o > +stub-obj-y += do_cpu_hot_add.o > diff --git a/stubs/do_cpu_hot_add.c b/stubs/do_cpu_hot_add.c > new file mode 100644 > index 0000000..1f6d7a6 > --- /dev/null > +++ b/stubs/do_cpu_hot_add.c > @@ -0,0 +1,7 @@ > +#include "qapi/error.h" > +#include "sysemu/sysemu.h" > + > +void do_cpu_hot_add(const int64_t id, Error **errp) > +{ > + error_setg(errp, "Not implemented"); > +}