Nina Schoetterl-Glausch <n...@linux.ibm.com> writes: > From: Pierre Morel <pmo...@linux.ibm.com> > > S390x provides two more topology attributes, entitlement and dedication. > > Let's add these CPU attributes to the QAPI command query-cpu-fast. > > Signed-off-by: Pierre Morel <pmo...@linux.ibm.com> > Reviewed-by: Nina Schoetterl-Glausch <n...@linux.ibm.com> > Co-developed-by: Nina Schoetterl-Glausch <n...@linux.ibm.com> > Reviewed-by: Thomas Huth <th...@redhat.com> > Signed-off-by: Nina Schoetterl-Glausch <n...@linux.ibm.com> > --- > qapi/machine.json | 11 ++++++++++- > target/s390x/cpu.c | 9 +++++++++ > 2 files changed, 19 insertions(+), 1 deletion(-) > > diff --git a/qapi/machine.json b/qapi/machine.json > index 7aacd26af0..072a12d168 100644 > --- a/qapi/machine.json > +++ b/qapi/machine.json > @@ -57,9 +57,18 @@ > # > # @cpu-state: the virtual CPU's state > # > +# @dedicated: the virtual CPU's dedication (since 8.2) > +# > +# @entitlement: the virtual CPU's entitlement (since 8.2) > +# > # Since: 2.12 > ## > -{ 'struct': 'CpuInfoS390', 'data': { 'cpu-state': 'CpuS390State' } } > +{ 'struct': 'CpuInfoS390', > + 'data': { 'cpu-state': 'CpuS390State', > + '*dedicated': 'bool', > + '*entitlement': 'CpuS390Entitlement' > + } > +}
A more common formatting is '*entitlement': 'CpuS390Entitlement' } } > > ## > # @CpuInfoFast: Acked-by: Markus Armbruster <arm...@redhat.com> [...]