| Message ID | 20230425161456.21031-10-pmorel@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x: CPU Topology | expand |
Hello Pierre, On 4/25/23 18:14, 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> > Reviewed-by: Thomas Huth <thuth@redhat.com> > --- > qapi/machine.json | 9 ++++++++- > hw/core/machine-qmp-cmds.c | 2 ++ > 2 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/qapi/machine.json b/qapi/machine.json > index 1cdd83f3fd..c6a12044e0 100644 > --- a/qapi/machine.json > +++ b/qapi/machine.json > @@ -55,10 +55,17 @@ > # Additional information about a virtual S390 CPU > # > # @cpu-state: the virtual CPU's state > +# @dedicated: the virtual CPU's dedication (since 8.1) > +# @entitlement: the virtual CPU's entitlement (since 8.1) > # > # 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 b98ff15089..3f35ed83a6 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; When you resend, please protect these assignments with : #if !defined(CONFIG_USER_ONLY) Thanks, C. > #else > abort(); > #endif
On 6/12/23 09:55, Cédric Le Goater wrote: > Hello Pierre, > > On 4/25/23 18:14, 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> >> Reviewed-by: Thomas Huth <thuth@redhat.com> >> --- >> qapi/machine.json | 9 ++++++++- >> hw/core/machine-qmp-cmds.c | 2 ++ >> 2 files changed, 10 insertions(+), 1 deletion(-) >> >> diff --git a/qapi/machine.json b/qapi/machine.json >> index 1cdd83f3fd..c6a12044e0 100644 >> --- a/qapi/machine.json >> +++ b/qapi/machine.json >> @@ -55,10 +55,17 @@ >> # Additional information about a virtual S390 CPU >> # >> # @cpu-state: the virtual CPU's state >> +# @dedicated: the virtual CPU's dedication (since 8.1) >> +# @entitlement: the virtual CPU's entitlement (since 8.1) >> # >> # 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 b98ff15089..3f35ed83a6 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; > > When you resend, please protect these assignments with : > > #if !defined(CONFIG_USER_ONLY) > > Thanks, > > C. Hello Cedric, Yes, thanks. (I though I already answered but can not find a trace of it) Regards, Pierre
diff --git a/qapi/machine.json b/qapi/machine.json index 1cdd83f3fd..c6a12044e0 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -55,10 +55,17 @@ # Additional information about a virtual S390 CPU # # @cpu-state: the virtual CPU's state +# @dedicated: the virtual CPU's dedication (since 8.1) +# @entitlement: the virtual CPU's entitlement (since 8.1) # # 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 b98ff15089..3f35ed83a6 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