diff mbox series

[v1,1/2] qmp.c: (re)implement qmp_cpu

Message ID 20171213181540.7949-2-danielhb@linux.vnet.ibm.com
State New
Headers show
Series QMP: implementing qmp_cpu | expand

Commit Message

Daniel Henrique Barboza Dec. 13, 2017, 6:15 p.m. UTC
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(-)

Comments

Eric Blake Dec. 14, 2017, 2:18 a.m. UTC | #1
On 12/13/2017 12:15 PM, Daniel Henrique Barboza wrote:
> 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.

I'm not sure I like this. HMP is stateful (you have to remember what
previous 'cpu' commands have been run to tell what the current command
will do).  That may be convenient (if not confusing) to humans, but is
lousy for machine interfaces.  QMP should be stateless as much as
possible - for any command that would behave differently according to
what CPU is selected, THAT command (and not a different 'cpu' command
executed previously) should have a cpu argument alongside all its other
parameters.

So unless you have a really strong use case for this, I don't think we
want it.


> +++ 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)
> 

Better yet, let's document that 'cpu' is deprecated, so that we can
remove it from QMP altogether in a couple of releases.
Markus Armbruster Dec. 14, 2017, 3:21 p.m. UTC | #2
Eric Blake <eblake@redhat.com> writes:

> On 12/13/2017 12:15 PM, Daniel Henrique Barboza wrote:
>> 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.

If I remember that part of history correctly, implementing the command
in QMP was just as possible back then, but deemed a Bad Idea for the
reason Eric explains below.

What I don't quite remember is why we had to implement it in QMP as a
no-op.  Might have been due to the way QMP and HMP were entangled back
then.

>>                                                      This patch brings
>> the logic of hmp_cpu to qmp_cpu and converts the HMP function to use its
>> QMP counterpart.
>
> I'm not sure I like this. HMP is stateful (you have to remember what
> previous 'cpu' commands have been run to tell what the current command
> will do).  That may be convenient (if not confusing) to humans, but is
> lousy for machine interfaces.  QMP should be stateless as much as
> possible - for any command that would behave differently according to
> what CPU is selected, THAT command (and not a different 'cpu' command
> executed previously) should have a cpu argument alongside all its other
> parameters.
>
> So unless you have a really strong use case for this, I don't think we
> want it.
>
>
>> +++ 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)
>> 
>
> Better yet, let's document that 'cpu' is deprecated, so that we can
> remove it from QMP altogether in a couple of releases.

Yes.

The standard way to deprecate a feature is to add it to appendix
"Deprecated features" in qemu-doc.texi, and make its use trigger
suitable deprecation messages, pointing to a replacement if any.

Unfortunately, we still lack means to signal "X is deprecated, use Y
instead" to a QMP client.  Not important in this case, because the
command has never worked.
Daniel Henrique Barboza Dec. 14, 2017, 7:46 p.m. UTC | #3
On 12/14/2017 01:21 PM, Markus Armbruster wrote:
> Eric Blake <eblake@redhat.com> writes:
>
>> On 12/13/2017 12:15 PM, Daniel Henrique Barboza wrote:
>>> 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.
> If I remember that part of history correctly, implementing the command
> in QMP was just as possible back then, but deemed a Bad Idea for the
> reason Eric explains below.
>
> What I don't quite remember is why we had to implement it in QMP as a
> no-op.  Might have been due to the way QMP and HMP were entangled back
> then.
Speaking of QMP and HMP 'entanglement', is the content of the wiki
still valid?

https://wiki.qemu.org/Features/QAPI

And under "HMP Conversion" we have:

"For HMP commands that don't have QMP equivalents today, new QMP functions
will be added to support these commands."

This in particular gave me the motivation to go ahead and implement qmp_cpu.
But then again, the last entry on Status is "3/6/2011" so yeah, I should 
have
asked here first whether the info from this wiki was relevant before sending
the patch.

>>>                                                       This patch brings
>>> the logic of hmp_cpu to qmp_cpu and converts the HMP function to use its
>>> QMP counterpart.
>> I'm not sure I like this. HMP is stateful (you have to remember what
>> previous 'cpu' commands have been run to tell what the current command
>> will do).  That may be convenient (if not confusing) to humans, but is
>> lousy for machine interfaces.  QMP should be stateless as much as
>> possible - for any command that would behave differently according to
>> what CPU is selected, THAT command (and not a different 'cpu' command
>> executed previously) should have a cpu argument alongside all its other
>> parameters.
>>
>> So unless you have a really strong use case for this, I don't think we
>> want it.

My case was simply "HMP has it, QMP doesn't". I wasn't aware that QMP
must be as stateless as possible but HMP can retain state.

Now, is there any command that actually is impacted or makes use of the
current monitor CPU? I've searched a bit in qapi-schema.json and
hmp-commands.hx and haven't found any (although this does not
mean necessarily that no command is making use of it). Supposing
that no command makes good use of it, perhaps it's a good exercise
to evaluate if both qmp_cpu and hmp_cpu should be deprecated.

>>
>>
>>> +++ 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)
>>>
>> Better yet, let's document that 'cpu' is deprecated, so that we can
>> remove it from QMP altogether in a couple of releases.
> Yes.
>
> The standard way to deprecate a feature is to add it to appendix
> "Deprecated features" in qemu-doc.texi, and make its use trigger
> suitable deprecation messages, pointing to a replacement if any.

I'll give a try.


Daniel

>
> Unfortunately, we still lack means to signal "X is deprecated, use Y
> instead" to a QMP client.  Not important in this case, because the
> command has never worked.
>
Markus Armbruster Dec. 15, 2017, 1:56 p.m. UTC | #4
Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> writes:

> On 12/14/2017 01:21 PM, Markus Armbruster wrote:
>> Eric Blake <eblake@redhat.com> writes:
>>
>>> On 12/13/2017 12:15 PM, Daniel Henrique Barboza wrote:
>>>> 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.
>> If I remember that part of history correctly, implementing the command
>> in QMP was just as possible back then, but deemed a Bad Idea for the
>> reason Eric explains below.
>>
>> What I don't quite remember is why we had to implement it in QMP as a
>> no-op.  Might have been due to the way QMP and HMP were entangled back
>> then.
> Speaking of QMP and HMP 'entanglement', is the content of the wiki
> still valid?
>
> https://wiki.qemu.org/Features/QAPI

Looks quite stale to me.  I'm sorry this made you go down this rabbit
hole.

Paolo, we have numerous Features/ pages, and I suspect many of them are
too outdated to serve any purpose but confusing readers.  In theory,
"somebody" could go through them to identify stale ones.  In practice,
"somebody" doesn't exist, I'm afraid.  Should we summarily delete
Features/ pages that haven't seen an update in say more than a year?  Or
at least mark them as obsolete somehow?

> And under "HMP Conversion" we have:
>
> "For HMP commands that don't have QMP equivalents today, new QMP functions
> will be added to support these commands."

QMP need not provide the exact same commands.  It must provide
"equivalence".  Selecting a CPU is an instructive example.  HMP does it
with state: each HMP monitor has a current CPU, controlled with HMP
command cpu.  HMP commands implicitly use their monitor's current CPU.
In contrast, QMP eschews state, and makes the CPU explicit instead: you
specify the it as an argument.

> This in particular gave me the motivation to go ahead and implement qmp_cpu.
> But then again, the last entry on Status is "3/6/2011" so yeah, I
> should have
> asked here first whether the info from this wiki was relevant before sending
> the patch.

Touching base with the maintainer(s) first generally doesn't hurt.

[...]
Paolo Bonzini Dec. 15, 2017, 6:11 p.m. UTC | #5
On 15/12/2017 14:56, Markus Armbruster wrote:
> 
> Paolo, we have numerous Features/ pages, and I suspect many of them are
> too outdated to serve any purpose but confusing readers.  In theory,
> "somebody" could go through them to identify stale ones.  In practice,
> "somebody" doesn't exist, I'm afraid.  Should we summarily delete
> Features/ pages that haven't seen an update in say more than a year?  Or
> at least mark them as obsolete somehow?

Plenty of them are marked as complete or obsolete:

https://wiki.qemu.org/Category:Completed_feature_pages
https://wiki.qemu.org/Category:Obsolete_feature_pages

Last time I cleaned them up, I couldn't quite decide if some were
completed or obsolete, and QAPI is one of them.

Paolo
Dr. David Alan Gilbert Dec. 15, 2017, 6:59 p.m. UTC | #6
* Daniel Henrique Barboza (danielhb@linux.vnet.ibm.com) wrote:
> 
> 
> On 12/14/2017 01:21 PM, Markus Armbruster wrote:
> > Eric Blake <eblake@redhat.com> writes:
> > 
> > > On 12/13/2017 12:15 PM, Daniel Henrique Barboza wrote:
> > > > 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.
> > If I remember that part of history correctly, implementing the command
> > in QMP was just as possible back then, but deemed a Bad Idea for the
> > reason Eric explains below.
> > 
> > What I don't quite remember is why we had to implement it in QMP as a
> > no-op.  Might have been due to the way QMP and HMP were entangled back
> > then.
> Speaking of QMP and HMP 'entanglement', is the content of the wiki
> still valid?
> 
> https://wiki.qemu.org/Features/QAPI
> 
> And under "HMP Conversion" we have:
> 
> "For HMP commands that don't have QMP equivalents today, new QMP functions
> will be added to support these commands."
> 
> This in particular gave me the motivation to go ahead and implement qmp_cpu.
> But then again, the last entry on Status is "3/6/2011" so yeah, I should
> have
> asked here first whether the info from this wiki was relevant before sending
> the patch.
> 
> > > >                                                       This patch brings
> > > > the logic of hmp_cpu to qmp_cpu and converts the HMP function to use its
> > > > QMP counterpart.
> > > I'm not sure I like this. HMP is stateful (you have to remember what
> > > previous 'cpu' commands have been run to tell what the current command
> > > will do).  That may be convenient (if not confusing) to humans, but is
> > > lousy for machine interfaces.  QMP should be stateless as much as
> > > possible - for any command that would behave differently according to
> > > what CPU is selected, THAT command (and not a different 'cpu' command
> > > executed previously) should have a cpu argument alongside all its other
> > > parameters.
> > > 
> > > So unless you have a really strong use case for this, I don't think we
> > > want it.
> 
> My case was simply "HMP has it, QMP doesn't". I wasn't aware that QMP
> must be as stateless as possible but HMP can retain state.
> 
> Now, is there any command that actually is impacted or makes use of the
> current monitor CPU? I've searched a bit in qapi-schema.json and
> hmp-commands.hx and haven't found any (although this does not
> mean necessarily that no command is making use of it). Supposing
> that no command makes good use of it, perhaps it's a good exercise
> to evaluate if both qmp_cpu and hmp_cpu should be deprecated.

I don't think there should be anything that uses it in qmp, there are in
hmp - for example 'info registers' or 'info lapic' use the current cpu
in HMP.

Dave

> > > 
> > > 
> > > > +++ 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)
> > > > 
> > > Better yet, let's document that 'cpu' is deprecated, so that we can
> > > remove it from QMP altogether in a couple of releases.
> > Yes.
> > 
> > The standard way to deprecate a feature is to add it to appendix
> > "Deprecated features" in qemu-doc.texi, and make its use trigger
> > suitable deprecation messages, pointing to a replacement if any.
> 
> I'll give a try.
> 
> 
> Daniel
> 
> > 
> > Unfortunately, we still lack means to signal "X is deprecated, use Y
> > instead" to a QMP client.  Not important in this case, because the
> > command has never worked.
> > 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Markus Armbruster Dec. 18, 2017, 9:12 a.m. UTC | #7
"Dr. David Alan Gilbert" <dgilbert@redhat.com> writes:

> * Daniel Henrique Barboza (danielhb@linux.vnet.ibm.com) wrote:
>> 
>> 
>> On 12/14/2017 01:21 PM, Markus Armbruster wrote:
>> > Eric Blake <eblake@redhat.com> writes:
>> > 
>> > > On 12/13/2017 12:15 PM, Daniel Henrique Barboza wrote:
>> > > > 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.
>> > If I remember that part of history correctly, implementing the command
>> > in QMP was just as possible back then, but deemed a Bad Idea for the
>> > reason Eric explains below.
>> > 
>> > What I don't quite remember is why we had to implement it in QMP as a
>> > no-op.  Might have been due to the way QMP and HMP were entangled back
>> > then.
>> Speaking of QMP and HMP 'entanglement', is the content of the wiki
>> still valid?
>> 
>> https://wiki.qemu.org/Features/QAPI
>> 
>> And under "HMP Conversion" we have:
>> 
>> "For HMP commands that don't have QMP equivalents today, new QMP functions
>> will be added to support these commands."
>> 
>> This in particular gave me the motivation to go ahead and implement qmp_cpu.
>> But then again, the last entry on Status is "3/6/2011" so yeah, I should
>> have
>> asked here first whether the info from this wiki was relevant before sending
>> the patch.
>> 
>> > > >                                                       This patch brings
>> > > > the logic of hmp_cpu to qmp_cpu and converts the HMP function to use its
>> > > > QMP counterpart.
>> > > I'm not sure I like this. HMP is stateful (you have to remember what
>> > > previous 'cpu' commands have been run to tell what the current command
>> > > will do).  That may be convenient (if not confusing) to humans, but is
>> > > lousy for machine interfaces.  QMP should be stateless as much as
>> > > possible - for any command that would behave differently according to
>> > > what CPU is selected, THAT command (and not a different 'cpu' command
>> > > executed previously) should have a cpu argument alongside all its other
>> > > parameters.
>> > > 
>> > > So unless you have a really strong use case for this, I don't think we
>> > > want it.
>> 
>> My case was simply "HMP has it, QMP doesn't". I wasn't aware that QMP
>> must be as stateless as possible but HMP can retain state.
>> 
>> Now, is there any command that actually is impacted or makes use of the
>> current monitor CPU? I've searched a bit in qapi-schema.json and
>> hmp-commands.hx and haven't found any (although this does not
>> mean necessarily that no command is making use of it). Supposing
>> that no command makes good use of it, perhaps it's a good exercise
>> to evaluate if both qmp_cpu and hmp_cpu should be deprecated.
>
> I don't think there should be anything that uses it in qmp, there are in
> hmp - for example 'info registers' or 'info lapic' use the current cpu
> in HMP.

Search for mon_get_cpu().

Any use in QMP would be a bug.
Markus Armbruster Dec. 18, 2017, 9:20 a.m. UTC | #8
Paolo Bonzini <pbonzini@redhat.com> writes:

> On 15/12/2017 14:56, Markus Armbruster wrote:
>> 
>> Paolo, we have numerous Features/ pages, and I suspect many of them are
>> too outdated to serve any purpose but confusing readers.  In theory,
>> "somebody" could go through them to identify stale ones.  In practice,
>> "somebody" doesn't exist, I'm afraid.  Should we summarily delete
>> Features/ pages that haven't seen an update in say more than a year?  Or
>> at least mark them as obsolete somehow?
>
> Plenty of them are marked as complete or obsolete:
>
> https://wiki.qemu.org/Category:Completed_feature_pages
> https://wiki.qemu.org/Category:Obsolete_feature_pages

I see.

> Last time I cleaned them up, I couldn't quite decide if some were
> completed or obsolete, and QAPI is one of them.

Probably because Features/QAPI is both: it was completed long ago, less
a number of ideas described in this page.

The page should be updated accordingly.  I'll try to find time for it,
but don't hold your breath.
diff mbox series

Patch

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)