Re: [PATCH v15 09/11] machine: adding s390 topology to query-cpu-fast

[Pierre Morel]

On 2/6/23 13:38, Thomas Huth wrote:
> On 01/02/2023 14.20, Pierre Morel wrote:
> > S390x provides two more topology containers above the sockets,
> > books and drawers.
>
> books and drawers are already handled via the entries in 
> CpuInstanceProperties, so this sentence looks like a wrong leftover now?

yes it is

> I'd suggest talking about "dedication" and "polarity" instead?

OK.

> > Let's add these CPU attributes to the QAPI command query-cpu-fast.
> >
> > Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
> > ---
> >   qapi/machine.json          | 13 ++++++++++---
> >   hw/core/machine-qmp-cmds.c |  2 ++
> >   2 files changed, 12 insertions(+), 3 deletions(-)
> >
> > diff --git a/qapi/machine.json b/qapi/machine.json
> > index 3036117059..e36c39e258 100644
> > --- a/qapi/machine.json
> > +++ b/qapi/machine.json
> > @@ -53,11 +53,18 @@
> >   #
> >   # Additional information about a virtual S390 CPU
> >   #
> > -# @cpu-state: the virtual CPU's state
> > +# @cpu-state: the virtual CPU's state (since 2.12)
> > +# @dedicated: the virtual CPU's dedication (since 8.0)
> > +# @polarity: the virtual CPU's polarity (since 8.0)
> >   #
> >   # Since: 2.12
> >   ##
> > -{ 'struct': 'CpuInfoS390', 'data': { 'cpu-state': 'CpuS390State' } }
> > +{ 'struct': 'CpuInfoS390',
> > +    'data': { 'cpu-state': 'CpuS390State',
> > +              'dedicated': 'bool',
> > +              'polarity': 'int'
> > +    }
> > +}
> >   ##
> >   # @CpuInfoFast:
> > @@ -70,7 +77,7 @@
> >   #
> >   # @thread-id: ID of the underlying host thread
> >   #
> > -# @props: properties describing to which node/socket/core/thread
> > +# @props: properties describing to which 
> > node/drawer/book/socket/core/thread
>
> I think this hunk should rather be moved to patch 1 now.

yes it should.
Thanks.

Regards,
Pierre

--
Pierre Morel
IBM Lab Boeblingen