cphp: remove deprecated cpu-add command(s)
PATCH v2 1/1 cphp: remove deprecated cpu-add command(s)
theses were deprecated since 4.0, remove both HMP and QMP variants.
Users should use device_add command instead. To get list of possible CPUs and options, use 'info hotpluggable-cpus' HMP or query-hotpluggable-cpus QMP command.
--- include/hw/boards.h | 1 - include/hw/i386/pc.h | 1 - include/monitor/hmp.h | 1 - docs/system/deprecated.rst | 25 +++++---- hmp-commands.hx | 15 ------ hw/core/machine-hmp-cmds.c | 12 ----- hw/core/machine-qmp-cmds.c | 12 ----- hw/i386/pc.c | 27 ---------- hw/i386/pc_piix.c | 1 - hw/s390x/s390-virtio-ccw.c | 12 ----- qapi/machine.json | 24 --------- tests/qtest/cpu-plug-test.c | 100 ++++-------------------------------- tests/qtest/test-hmp.c | 1 - 13 files changed, 21 insertions(+), 211 deletions(-)
include/hw/boards.h +0 -1
@@ -169,7 +169,6 @@ struct MachineClass {void (*init)(MachineState *state);void (*reset)(MachineState *state);void (*wakeup)(MachineState *state); -void (*hot_add_cpu)(MachineState *state,const int64_t id,Error **errp);int (*kvm_type)(MachineState *machine,const char *arg);void (*smp_parse)(MachineState *ms,QemuOpts *opts);
include/hw/i386/pc.h +0 -1
@@ -135,7 +135,6 @@ extern int fd_bootchk;void pc_acpi_smi_interrupt (void *opaque,int irq,int level); -void pc_hot_add_cpu (MachineState *ms,const int64_t id,Error **errp);void pc_smp_parse (MachineState *ms,QemuOpts *opts);void pc_guest_info_init (PCMachineState *pcms);
include/monitor/hmp.h +0 -1
@@ -89,7 +89,6 @@ void hmp_chardev_add(Monitor *mon, const QDict *qdict);void hmp_chardev_change (Monitor *mon,const QDict *qdict);void hmp_chardev_remove (Monitor *mon,const QDict *qdict);void hmp_chardev_send_break (Monitor *mon,const QDict *qdict); -void hmp_cpu_add (Monitor *mon,const QDict *qdict);void hmp_object_add (Monitor *mon,const QDict *qdict);void hmp_object_del (Monitor *mon,const QDict *qdict);void hmp_info_memdev (Monitor *mon,const QDict *qdict);
docs/system/deprecated.rst +12 -13
@@ -284,13 +284,6 @@ The ``query-cpus`` command is replaced by the ``query-cpus-fast`` command. The ``arch`` output member of the ``query-cpus-fast`` command is replaced by the ``target`` output member. -``cpu-add`` (since 4.0) -''''''''''''''''''''''' - -Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``. See -documentation of ``query-hotpluggable-cpus`` for additional -details. - ``query-events`` (since 4.0) ''''''''''''''''''''''''''''
@@ -306,12 +299,6 @@ the 'wait' field, which is only applicable to sockets in server mode Human Monitor Protocol (HMP) commands ------------------------------------- -``cpu-add`` (since 4.0) -''''''''''''''''''''''' - -Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``. See -documentation of ``query-hotpluggable-cpus`` for additional details. - ``acl_show``, ``acl_reset``, ``acl_policy``, ``acl_add``, ``acl_remove`` (since 4.0.0) ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
@@ -521,6 +508,12 @@ QEMU Machine Protocol (QMP) commands The "autoload" parameter has been ignored since 2.12.0. All bitmaps are automatically loaded from qcow2 images. +``cpu-add`` (removed in 5.2) +'''''''''''''''''''''''''''' + +Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``. See +documentation of ``query-hotpluggable-cpus`` for additional details. + Human Monitor Protocol (HMP) commands -------------------------------------
@@ -530,6 +523,12 @@ The ``hub_id`` parameter of ``hostfwd_add`` / ``hostfwd_remove`` (removed in 5.0 The ``[hub_id name]`` parameter tuple of the 'hostfwd_add' and 'hostfwd_remove' HMP commands has been replaced by ``netdev_id``. +``cpu-add`` (removed in 5.2) +'''''''''''''''''''''''''''' + +Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``. See +documentation of ``query-hotpluggable-cpus`` for additional details. + Guest Emulator ISAs -------------------
hmp-commands.hx +0 -15
@@ -1761,21 +1761,6 @@ SRST Executes a qemu-io command on the given block device. ERST - { - .name = "cpu-add", - .args_type = "id:i", - .params = "id", - .help = "add cpu (deprecated, use device_add instead)", - .cmd = hmp_cpu_add, - }, - -SRST -``cpu-add`` *id* - Add CPU with id *id*. This command is deprecated, please - +use ``device_add`` instead. For details, refer to - 'docs/cpu-hotplug.rst'. -ERST - { .name = "qom-list", .args_type = "path:s?",
hw/core/machine-hmp-cmds.c +0 -12
@@ -46,18 +46,6 @@ void hmp_info_cpus(Monitor *mon, const QDict *qdict)qapi_free_CpuInfoFastList (cpu_list); } -void hmp_cpu_add (Monitor *mon,const QDict *qdict) -{ -int cpuid; -Error *err =NULL ; - -error_report ("cpu_add is deprecated, please use device_add instead" ); - - cpuid =qdict_get_int (qdict,"id" ); -qmp_cpu_add (cpuid, &err); -hmp_handle_error (mon, err); -} -void hmp_hotpluggable_cpus (Monitor *mon,const QDict *qdict) {Error *err =NULL ;
hw/core/machine-qmp-cmds.c +0 -12
@@ -284,18 +284,6 @@ HotpluggableCPUList *qmp_query_hotpluggable_cpus(Error **errp)return machine_query_hotpluggable_cpus (ms); } -void qmp_cpu_add (int64_t id,Error **errp) -{ -MachineClass *mc; - - mc =MACHINE_GET_CLASS (current_machine); -if (mc->hot_add_cpu) { - mc->hot_add_cpu (current_machine, id, errp); - }else { -error_setg (errp,"Not supported" ); - } -} -void qmp_set_numa_node (NumaOptions *cmd,Error **errp) {if (!runstate_check (RUN_STATE_PRECONFIG )) {
hw/i386/pc.c +0 -27
@@ -777,32 +777,6 @@ void pc_smp_parse(MachineState *ms, QemuOpts *opts) } } -void pc_hot_add_cpu (MachineState *ms,const int64_t id,Error **errp) -{ -X86MachineState *x86ms =X86_MACHINE (ms); -int64_t apic_id =x86_cpu_apic_id_from_index (x86ms, id); -Error *local_err =NULL ; - -if (id <0 ) { -error_setg (errp,"Invalid CPU id: %" PRIi64, id); -return ; - } - -if (apic_id >=ACPI_CPU_HOTPLUG_ID_LIMIT ) { -error_setg (errp,"Unable to add CPU: %" PRIi64 -", resulting APIC ID (%" PRIi64") is too large" , - id, apic_id); -return ; - } - - -x86_cpu_new (X86_MACHINE (ms), apic_id, &local_err); -if (local_err) { -error_propagate (errp, local_err); -return ; - } -} -static void rtc_set_cpus_count (ISADevice *rtc,uint16_t cpus_count) {if (cpus_count >0xff ) {
@@ -1966,7 +1940,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) mc->auto_enable_numa_with_memdev = true; mc->has_hotpluggable_cpus = true; mc->default_boot_order ="cad" ; - mc->hot_add_cpu = pc_hot_add_cpu; mc->smp_parse = pc_smp_parse; mc->block_default_type =IF_IDE ; mc->max_cpus =255 ;
hw/i386/pc_piix.c +0 -1
@@ -752,7 +752,6 @@ static void pc_i440fx_1_4_machine_options(MachineClass *m) {pc_i440fx_1_5_machine_options (m); m->hw_version ="1.4.0" ; - m->hot_add_cpu =NULL ;compat_props_add (m->compat_props, pc_compat_1_4, pc_compat_1_4_len); }
hw/s390x/s390-virtio-ccw.c +0 -12
@@ -553,17 +553,6 @@ static HotplugHandler *s390_get_hotplug_handler(MachineState *machine,return NULL ; } -static void s390_hot_add_cpu (MachineState *machine, -const int64_t id,Error **errp) -{ -ObjectClass *oc; - -g_assert (machine->possible_cpus->cpus[0 ].cpu); - oc =OBJECT_CLASS (CPU_GET_CLASS (machine->possible_cpus->cpus[0 ].cpu)); - -s390x_new_cpu (object_class_get_name (oc), id, errp); -} -static void s390_nmi (NMIState *n,int cpu_index,Error **errp) {CPUState *cs =qemu_get_cpu (cpu_index);
@@ -604,7 +593,6 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) s390mc->hpage_1m_allowed = true; mc->init = ccw_init; mc->reset = s390_machine_reset; - mc->hot_add_cpu = s390_hot_add_cpu; mc->block_default_type =IF_VIRTIO ; mc->no_cdrom =1 ; mc->no_floppy =1 ;
qapi/machine.json +0 -24
@@ -307,30 +307,6 @@ ## { 'command': 'query-cpus-fast', 'returns': [ 'CpuInfoFast' ] } -## -# @cpu-add: -# -# Adds CPU with specified ID. -# -# @id: ID of CPU to be created, valid values [0..max_cpus) -# -# Features: -# @deprecated: This command is deprecated. Use `device_add` instead. -# See the `query-hotpluggable-cpus` command for details. -# -# Returns: Nothing on success -# -# Since: 1.5 -# -# Example: -# -# -> { "execute": "cpu-add", "arguments": { "id": 2 } } -# <- { "return": {} } -# -## -{ 'command': 'cpu-add', 'data': {'id': 'int'}, - 'features': [ 'deprecated' ] } - ## # @MachineInfo: #
tests/qtest/cpu-plug-test.c +9 -91
127 lines not on this page · raw message
tests/qtest/test-hmp.c +0 -1
@@ -27,7 +27,6 @@ static const char *hmp_cmds[] = {"chardev-change testchardev1 ringbuf" ,"chardev-remove testchardev1" ,"commit all" , -"cpu-add 1" ,"cpu 0" ,"device_add ?" , "device_add usb-mouse,id=mouse1",
Signature · 1 line
2.27.0
Quoted 9 lines · Igor Mammedov
theses were deprecated since 4.0, remove both HMP and QMP variants.
Users should use
device_addcommand instead. To get list of possible CPUs and options, use 'info hotpluggable-cpus' HMP or query-hotpluggable-cpus QMP command.Signed-off-by Igor Mammedov <[email protected]>Reviewed-by Thomas Huth <[email protected]>
Quoted 15 lines
--- include/hw/boards.h | 1 - include/hw/i386/pc.h | 1 - include/monitor/hmp.h | 1 - docs/system/deprecated.rst | 25 +++++---- hmp-commands.hx | 15 ------ hw/core/machine-hmp-cmds.c | 12 ----- hw/core/machine-qmp-cmds.c | 12 ----- hw/i386/pc.c | 27 ---------- hw/i386/pc_piix.c | 1 - hw/s390x/s390-virtio-ccw.c | 12 ----- qapi/machine.json | 24 --------- tests/qtest/cpu-plug-test.c | 100 ++++-------------------------------- tests/qtest/test-hmp.c | 1 - 13 files changed, 21 insertions(+), 211 deletions(-)
Thanks to Peter Libvirt uses device_add instead cpu_add whenever possible. Hence this is okay from Libvirt's POV.
Michal
Quoted 26 lines · On Mon, 14 Sep 2020 10:07:36 +0200 Michal Privoznik <[email protected]> wrote:
Quoted 9 lines · Igor Mammedov
theses were deprecated since 4.0, remove both HMP and QMP variants.
Users should use
device_addcommand instead. To get list of possible CPUs and options, use 'info hotpluggable-cpus' HMP or query-hotpluggable-cpus QMP command.Signed-off-by Igor Mammedov <[email protected]>Reviewed-by Thomas Huth <[email protected]>Quoted 15 lines
--- include/hw/boards.h | 1 - include/hw/i386/pc.h | 1 - include/monitor/hmp.h | 1 - docs/system/deprecated.rst | 25 +++++---- hmp-commands.hx | 15 ------ hw/core/machine-hmp-cmds.c | 12 ----- hw/core/machine-qmp-cmds.c | 12 ----- hw/i386/pc.c | 27 ---------- hw/i386/pc_piix.c | 1 - hw/s390x/s390-virtio-ccw.c | 12 ----- qapi/machine.json | 24 --------- tests/qtest/cpu-plug-test.c | 100 ++++-------------------------------- tests/qtest/test-hmp.c | 1 - 13 files changed, 21 insertions(+), 211 deletions(-)
Quoted 2 lines
Thanks to Peter Libvirt uses
device_addinsteadcpu_addwhenever possible. Hence this is okay from Libvirt's POV.
we shoul make libvirt switch from -numa node,cpus= to -numa cpu= to get rid of the 'last' interface that uses cpu-index as input.
To help libvirt to migrate existing configs from older syntax to the newer one, we can introduce field x-cpu-index to query-hotplugable-cpus output (with a goal to deprecate it in few years). Would it work for you?
Quoted 2 lines
Reviewed-by Michal Privoznik <[email protected]>
Thanks!
Quoted 3 lines
Michal
Quoted 1 line · On Mon, 14 Sep 2020 03:46:14 -0400 Igor Mammedov <[email protected]> wrote:
theses were deprecated since 4.0, remove both HMP and QMP variants.
s/theses/These/
Quoted 8 lines
Users should use
device_addcommand instead. To get list of possible CPUs and options, use 'info hotpluggable-cpus' HMP or query-hotpluggable-cpus QMP command.Signed-off-by Igor Mammedov <[email protected]>Reviewed-by Thomas Huth <[email protected]>
Quoted 15 lines
--- include/hw/boards.h | 1 - include/hw/i386/pc.h | 1 - include/monitor/hmp.h | 1 - docs/system/deprecated.rst | 25 +++++---- hmp-commands.hx | 15 ------ hw/core/machine-hmp-cmds.c | 12 ----- hw/core/machine-qmp-cmds.c | 12 ----- hw/i386/pc.c | 27 ---------- hw/i386/pc_piix.c | 1 - hw/s390x/s390-virtio-ccw.c | 12 ----- qapi/machine.json | 24 --------- tests/qtest/cpu-plug-test.c | 100 ++++-------------------------------- tests/qtest/test-hmp.c | 1 - 13 files changed, 21 insertions(+), 211 deletions(-)