mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

machine: remove deprecated -machine enforce-config-section option

Browse Source 
Deprecated since 3.1 and complicates the initialization sequence,
remove it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-10-21 05:39:33 -04:00
parent 7a3b7f6b94
commit 9f2931bc65
5 changed files with 6 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/system/deprecated.rst
View File

@ -21,12 +21,6 @@ deprecated.
System emulator command line arguments System emulator command line arguments
-------------------------------------- --------------------------------------
``-machine enforce-config-section=on|off`` (since 3.1)
''''''''''''''''''''''''''''''''''''''''''''''''''''''
The ``enforce-config-section`` parameter is replaced by the
``-global migration.send-configuration={on|off}`` option.
``-usbdevice`` (since 2.10.0) ``-usbdevice`` (since 2.10.0)
''''''''''''''''''''''''''''' '''''''''''''''''''''''''''''
@ -689,6 +683,12 @@ Support for invalid topologies is removed, the user must ensure
topologies described with -smp include all possible cpus, i.e. topologies described with -smp include all possible cpus, i.e.
*sockets* * *cores* * *threads* = *maxcpus*. *sockets* * *cores* * *threads* = *maxcpus*.
``-machine enforce-config-section=on|off`` (removed 5.2)
''''''''''''''''''''''''''''''''''''''''''''''''''''''''
The ``enforce-config-section`` property was replaced by the
``-global migration.send-configuration={on|off}`` option.
Block devices Block devices
------------- -------------

23
hw/core/machine.c
View File

@ -411,24 +411,6 @@ static bool machine_get_suppress_vmdesc(Object *obj, Error **errp)
return ms->suppress_vmdesc; return ms->suppress_vmdesc;
} }
static void machine_set_enforce_config_section(Object *obj, bool value,
Error **errp)
{
MachineState *ms = MACHINE(obj);
warn_report("enforce-config-section is deprecated, please use "
"-global migration.send-configuration=on|off instead");
ms->enforce_config_section = value;
}
static bool machine_get_enforce_config_section(Object *obj, Error **errp)
{
MachineState *ms = MACHINE(obj);
return ms->enforce_config_section;
}
static char *machine_get_memory_encryption(Object *obj, Error **errp) static char *machine_get_memory_encryption(Object *obj, Error **errp)
{ {
MachineState *ms = MACHINE(obj); MachineState *ms = MACHINE(obj);
@ -857,11 +839,6 @@ static void machine_class_init(ObjectClass *oc, void *data)
object_class_property_set_description(oc, "suppress-vmdesc", object_class_property_set_description(oc, "suppress-vmdesc",
"Set on to disable self-describing migration"); "Set on to disable self-describing migration");
object_class_property_add_bool(oc, "enforce-config-section",
machine_get_enforce_config_section, machine_set_enforce_config_section);
object_class_property_set_description(oc, "enforce-config-section",
"Set on to enforce configuration section migration");
object_class_property_add_str(oc, "memory-encryption", object_class_property_add_str(oc, "memory-encryption",
machine_get_memory_encryption, machine_set_memory_encryption); machine_get_memory_encryption, machine_set_memory_encryption);
object_class_property_set_description(oc, "memory-encryption", object_class_property_set_description(oc, "memory-encryption",

1
include/hw/boards.h
View File

@ -268,7 +268,6 @@ struct MachineState {
char *firmware; char *firmware;
bool iommu; bool iommu;
bool suppress_vmdesc; bool suppress_vmdesc;
bool enforce_config_section;
bool enable_graphics; bool enable_graphics;
char *memory_encryption; char *memory_encryption;
char *ram_memdev_id; char *ram_memdev_id;

10
migration/migration.c
View File

@ -145,7 +145,6 @@ static void migrate_fd_cancel(MigrationState *s);
void migration_object_init(void) void migration_object_init(void)
{ {
MachineState *ms = MACHINE(qdev_get_machine());
Error *err = NULL; Error *err = NULL;
/* This can only be called once. */ /* This can only be called once. */
@ -170,15 +169,6 @@ void migration_object_init(void)
error_report_err(err); error_report_err(err);
exit(1); exit(1);
} }
/*
* We cannot really do this in migration_instance_init() since at
* that time global properties are not yet applied, then this
* value will be definitely replaced by something else.
*/
if (ms->enforce_config_section) {
current_migration->send_configuration = true;
}
} }
void migration_shutdown(void) void migration_shutdown(void)

8
qemu-options.hx
View File

@ -34,7 +34,6 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \
" dea-key-wrap=on|off controls support for DEA key wrapping (default=on)\n" " dea-key-wrap=on|off controls support for DEA key wrapping (default=on)\n"
" suppress-vmdesc=on|off disables self-describing migration (default=off)\n" " suppress-vmdesc=on|off disables self-describing migration (default=off)\n"
" nvdimm=on|off controls NVDIMM support (default=off)\n" " nvdimm=on|off controls NVDIMM support (default=off)\n"
" enforce-config-section=on|off enforce configuration section migration (default=off)\n"
" memory-encryption=@var{} memory encryption object to use (default=none)\n" " memory-encryption=@var{} memory encryption object to use (default=none)\n"
" hmat=on|off controls ACPI HMAT support (default=off)\n", " hmat=on|off controls ACPI HMAT support (default=off)\n",
QEMU_ARCH_ALL) QEMU_ARCH_ALL)
@ -91,13 +90,6 @@ SRST
``nvdimm=on|off`` ``nvdimm=on|off``
Enables or disables NVDIMM support. The default is off. Enables or disables NVDIMM support. The default is off.
``enforce-config-section=on|off``
If ``enforce-config-section`` is set to on, force migration code
to send configuration section even if the machine-type sets the
``migration.send-configuration`` property to off. NOTE: this
parameter is deprecated. Please use ``-global``
``migration.send-configuration``\ =on\|off instead.
``memory-encryption=`` ``memory-encryption=``
Memory encryption object to use. The default is none. Memory encryption object to use. The default is none.