| Message ID | 20230222142105.84700-10-pmorel@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x: CPU Topology | expand |
On 22/02/2023 15.21, Pierre Morel wrote: > 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 <pmorel@linux.ibm.com> > Reviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com> > --- > qapi/machine.json | 9 ++++++++- > hw/core/machine-qmp-cmds.c | 2 ++ > 2 files changed, 10 insertions(+), 1 deletion(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
On 2/27/23 14:27, Thomas Huth wrote: > On 22/02/2023 15.21, Pierre Morel wrote: >> 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 <pmorel@linux.ibm.com> >> Reviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com> >> --- >> qapi/machine.json | 9 ++++++++- >> hw/core/machine-qmp-cmds.c | 2 ++ >> 2 files changed, 10 insertions(+), 1 deletion(-) > > Reviewed-by: Thomas Huth <thuth@redhat.com> > > Thanks. Regards, Pierre
diff --git a/qapi/machine.json b/qapi/machine.json index b359549943..d069ad0152 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -66,10 +66,17 @@ # Additional information about a virtual S390 CPU # # @cpu-state: the virtual CPU's state +# @dedicated: the virtual CPU's dedication (since 8.0) +# @entitlement: the virtual CPU's entitlement (since 8.0) # # Since: 2.12 ## -{ 'struct': 'CpuInfoS390', 'data': { 'cpu-state': 'CpuS390State' } } +{ 'struct': 'CpuInfoS390', + 'data': { 'cpu-state': 'CpuS390State', + 'dedicated': 'bool', + 'entitlement': 'CpuS390Entitlement' + } +} ## # @CpuInfoFast: diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 44b5da8880..e9d9e0f0c3 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -35,6 +35,8 @@ static void cpustate_to_cpuinfo_s390(CpuInfoS390 *info, const CPUState *cpu) CPUS390XState *env = &s390_cpu->env; info->cpu_state = env->cpu_state; + info->dedicated = env->dedicated; + info->entitlement = env->entitlement; #else abort(); #endif