mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-14 15:02:54 +00:00
machine: adding s390 topology to query-cpu-fast
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> Co-developed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Acked-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com> Message-ID: <20231016183925.2384704-11-nsg@linux.ibm.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
a457c2ab5a
commit
ad2d1afc1d
|
@ -57,9 +57,16 @@
|
||||||
#
|
#
|
||||||
# @cpu-state: the virtual CPU's state
|
# @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
|
# Since: 2.12
|
||||||
##
|
##
|
||||||
{ 'struct': 'CpuInfoS390', 'data': { 'cpu-state': 'CpuS390State' } }
|
{ 'struct': 'CpuInfoS390',
|
||||||
|
'data': { 'cpu-state': 'CpuS390State',
|
||||||
|
'*dedicated': 'bool',
|
||||||
|
'*entitlement': 'CpuS390Entitlement' } }
|
||||||
|
|
||||||
##
|
##
|
||||||
# @CpuInfoFast:
|
# @CpuInfoFast:
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
#include "sysemu/reset.h"
|
#include "sysemu/reset.h"
|
||||||
#endif
|
#endif
|
||||||
|
#include "hw/s390x/cpu-topology.h"
|
||||||
|
|
||||||
#define CR0_RESET 0xE0UL
|
#define CR0_RESET 0xE0UL
|
||||||
#define CR14_RESET 0xC2000000UL;
|
#define CR14_RESET 0xC2000000UL;
|
||||||
|
@ -146,6 +147,14 @@ static void s390_query_cpu_fast(CPUState *cpu, CpuInfoFast *value)
|
||||||
S390CPU *s390_cpu = S390_CPU(cpu);
|
S390CPU *s390_cpu = S390_CPU(cpu);
|
||||||
|
|
||||||
value->u.s390x.cpu_state = s390_cpu->env.cpu_state;
|
value->u.s390x.cpu_state = s390_cpu->env.cpu_state;
|
||||||
|
#if !defined(CONFIG_USER_ONLY)
|
||||||
|
if (s390_has_topology()) {
|
||||||
|
value->u.s390x.has_dedicated = true;
|
||||||
|
value->u.s390x.dedicated = s390_cpu->env.dedicated;
|
||||||
|
value->u.s390x.has_entitlement = true;
|
||||||
|
value->u.s390x.entitlement = s390_cpu->env.entitlement;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* S390CPUClass::reset() */
|
/* S390CPUClass::reset() */
|
||||||
|
|
Loading…
Reference in a new issue