On 21/10/2020 22.56, Paolo Bonzini wrote:
> Deprecated since 3.1 and complicates the initialization sequence,
> remove it.
>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> ---
> docs/system/deprecated.rst | 12 ++++++------
> hw/core/machine.c | 24 +-----------------------
> include/hw/boards.h | 1 -
> migration/migration.c | 10 ----------
> qemu-options.hx | 8 --------
> 5 files changed, 7 insertions(+), 48 deletions(-)
>
> diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
> index 895433c356..0ebce37a19 100644
> --- a/docs/system/deprecated.rst
> +++ b/docs/system/deprecated.rst
> @@ -21,12 +21,6 @@ deprecated.
> 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)
> '''''''''''''''''''''''''''''
>
> @@ -689,6 +683,12 @@ Support for invalid topologies is removed, the user must
> ensure
> topologies described with -smp include all possible cpus, i.e.
> *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
> -------------
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index d740a7e963..80a918895a 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -26,6 +26,7 @@
> #include "sysemu/qtest.h"
> #include "hw/pci/pci.h"
> #include "hw/mem/nvdimm.h"
> +#include "migration/misc.h"
This new include does not make much sense to me, if all you did was removing
code from this file. Why did you add this here?
With this hunk removed:
Reviewed-by: Thomas Huth <th...@redhat.com>
