From: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: dgilbert@redhat.com, armbru@redhat.com,
Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH v1 1/2] qmp.c: (re)implement qmp_cpu
Date: Wed, 13 Dec 2017 16:15:39 -0200 [thread overview]
Message-ID: <20171213181540.7949-2-danielhb@linux.vnet.ibm.com> (raw)
In-Reply-To: <20171213181540.7949-1-danielhb@linux.vnet.ibm.com>
Commit 755f196898 ("qapi: Convert the cpu command") added the qmp_cpu
function in qmp.c, leaving it blank. It the same commit, a working
hmp_cpu was implemented. Since then, no further changes were made in
qmp_cpu, resulting now in a working 'cpu' command that works in HMP
and a 'cpu' command in QMP that does nothing.
Regardless of what constraints were involved that time in not implemeting
qmp_cpu, at this moment it is possible to have both. This patch brings
the logic of hmp_cpu to qmp_cpu and converts the HMP function to use its
QMP counterpart.
Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com>
---
hmp.c | 8 +++-----
qapi-schema.json | 14 +++++++++++---
qmp.c | 4 +++-
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/hmp.c b/hmp.c
index 35a7041824..7506f105a0 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1070,13 +1070,11 @@ void hmp_system_powerdown(Monitor *mon, const QDict *qdict)
void hmp_cpu(Monitor *mon, const QDict *qdict)
{
int64_t cpu_index;
+ Error *err = NULL;
- /* XXX: drop the monitor_set_cpu() usage when all HMP commands that
- use it are converted to the QAPI */
cpu_index = qdict_get_int(qdict, "index");
- if (monitor_set_cpu(cpu_index) < 0) {
- monitor_printf(mon, "invalid CPU index\n");
- }
+ qmp_cpu(cpu_index, &err);
+ hmp_handle_error(mon, &err);
}
void hmp_memsave(Monitor *mon, const QDict *qdict)
diff --git a/qapi-schema.json b/qapi-schema.json
index 18457954a8..4c8f2d405e 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1048,11 +1048,19 @@
##
# @cpu:
#
-# This command is a nop that is only provided for the purposes of compatibility.
+# Set the default CPU.
#
-# Since: 0.14.0
+# @index: The index of the virtual CPU to be set as default
+#
+# Returns: Nothing on success
+#
+# Since: 2.12.0
+#
+# Example:
+#
+# -> { "execute": "cpu", "arguments": { "index": 2 } }
+# <- { "return": {} }
#
-# Notes: Do not use this command.
##
{ 'command': 'cpu', 'data': {'index': 'int'} }
diff --git a/qmp.c b/qmp.c
index e8c303116a..c482225d5c 100644
--- a/qmp.c
+++ b/qmp.c
@@ -115,7 +115,9 @@ void qmp_system_powerdown(Error **erp)
void qmp_cpu(int64_t index, Error **errp)
{
- /* Just do nothing */
+ if (monitor_set_cpu(index) < 0) {
+ error_setg(errp, "Invalid CPU index");
+ }
}
void qmp_cpu_add(int64_t id, Error **errp)
--
2.13.6
next prev parent reply other threads:[~2017-12-13 18:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-13 18:15 [Qemu-devel] [PATCH v1 0/2] QMP: implementing qmp_cpu Daniel Henrique Barboza
2017-12-13 18:15 ` Daniel Henrique Barboza [this message]
2017-12-14 2:18 ` [Qemu-devel] [PATCH v1 1/2] qmp.c: (re)implement qmp_cpu Eric Blake
2017-12-14 15:21 ` Markus Armbruster
2017-12-14 19:46 ` Daniel Henrique Barboza
2017-12-15 13:56 ` Markus Armbruster
2017-12-15 18:11 ` Paolo Bonzini
2017-12-18 9:20 ` Markus Armbruster
2017-12-15 18:59 ` Dr. David Alan Gilbert
2017-12-18 9:12 ` Markus Armbruster
2017-12-13 18:15 ` [Qemu-devel] [PATCH v1 2/2] cpus.c: change qmp_query_cpus 'value->current' logic Daniel Henrique Barboza
2017-12-14 19:50 ` Daniel Henrique Barboza
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171213181540.7949-2-danielhb@linux.vnet.ibm.com \
--to=danielhb@linux.vnet.ibm.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.