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@xxxxxxxxxxxxx> --- qapi/machine.json | 9 ++++++++- target/s390x/cpu.c | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/qapi/machine.json b/qapi/machine.json index 08245beea1..a1920cb78d 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -56,10 +56,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/target/s390x/cpu.c b/target/s390x/cpu.c index 74405beb51..01938635eb 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -146,6 +146,10 @@ static void s390_query_cpu_fast(CPUState *cpu, CpuInfoFast *value) S390CPU *s390_cpu = S390_CPU(cpu); value->u.s390x.cpu_state = s390_cpu->env.cpu_state; +#if !defined(CONFIG_USER_ONLY) + value->u.s390x.dedicated = s390_cpu->env.dedicated; + value->u.s390x.entitlement = s390_cpu->env.entitlement; +#endif } /* S390CPUClass::reset() */ -- 2.31.1