Re: [PATCH v10 6/9] s390x/cpu topology: add topology-disable machine property

[Pierre Morel]

On 10/19/22 11:03, Cornelia Huck wrote:
> On Tue, Oct 18 2022, Cédric Le Goater <clg@kaod.org> wrote:
>
> > On 10/12/22 18:21, Pierre Morel wrote:
> > > S390 CPU topology is only allowed for s390-virtio-ccw-7.3 and
> > > newer S390 machines.
> > > We keep the possibility to disable the topology on these newer
> > > machines with the property topology-disable.
> > >
> > > Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
> > > ---
> > >    include/hw/boards.h                |  3 ++
> > >    include/hw/s390x/cpu-topology.h    | 18 +++++++++-
> > >    include/hw/s390x/s390-virtio-ccw.h |  2 ++
> > >    hw/core/machine.c                  |  5 +++
> > >    hw/s390x/s390-virtio-ccw.c         | 53 +++++++++++++++++++++++++++++-
> > >    util/qemu-config.c                 |  4 +++
> > >    qemu-options.hx                    |  6 +++-
> > >    7 files changed, 88 insertions(+), 3 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;
> >
> > QEMU 7.2 is not out yet.
>
> Yes, and the introduction of the new compat machines needs to go into a
> separate patch. I'm usually preparing that patch while QEMU is in
> freeze, but feel free to cook up a patch earlier if you need it.

OK, Thanks, I understand I put it in a separate file so it can be 
adapted at the moment the series will need to be merged.

Regards,
Pierre

--
Pierre Morel
IBM Lab Boeblingen