On Thu, Nov 03 2022, Pierre Morel <pmorel@xxxxxxxxxxxxx> wrote:
> We keep the possibility to switch on/off the topology on newer
> machines with the property topology=[on|off].
>
> Signed-off-by: Pierre Morel <pmorel@xxxxxxxxxxxxx>
> ---
> include/hw/boards.h | 3 +++
> include/hw/s390x/cpu-topology.h | 8 +++-----
> include/hw/s390x/s390-virtio-ccw.h | 1 +
> hw/core/machine.c | 3 +++
> hw/s390x/cpu-topology.c | 19 +++++++++++++++++++
> hw/s390x/s390-virtio-ccw.c | 28 ++++++++++++++++++++++++++++
> util/qemu-config.c | 4 ++++
> qemu-options.hx | 6 +++++-
> 8 files changed, 66 insertions(+), 6 deletions(-)
>
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 311ed17e18..67147c47bf 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -379,6 +379,9 @@ struct MachineState {
> } \
> type_init(machine_initfn##_register_types)
>
> +extern GlobalProperty hw_compat_7_2[];
> +extern const size_t hw_compat_7_2_len;
This still needs to go into a separate patch that introduces the 8.0
machine types for the relevant machines... I'll probably write that
patch soon (next week or so), you can pick it then into this series.
> +
> extern GlobalProperty hw_compat_7_1[];
> extern const size_t hw_compat_7_1_len;
>
