mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi/machine: Rename CpuS390* to S390Cpu*, and drop 'prefix'

Browse Source 
QAPI's 'prefix' feature can make the connection between enumeration
type and its constants less than obvious.  It's best used with
restraint.

CpuS390Entitlement has a 'prefix' to change the generated enumeration
constants' prefix from CPU_S390_ENTITLEMENT to S390_CPU_ENTITLEMENT.
Rename the type to S390CpuEntitlement, so that 'prefix' is not needed.

Likewise change CpuS390Polarization to S390CpuPolarization, and
CpuS390State to S390CpuState.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240904111836.3273842-10-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2024-09-04 13:18:26 +02:00
parent 154fd4d1a0
commit 32cfefb904
9 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/core/qdev-properties-system.c
View File

@ -1188,12 +1188,12 @@ const PropertyInfo qdev_prop_uuid = {
/* --- s390 cpu entitlement policy --- */ /* --- s390 cpu entitlement policy --- */
QEMU_BUILD_BUG_ON(sizeof(CpuS390Entitlement) != sizeof(int)); QEMU_BUILD_BUG_ON(sizeof(S390CpuEntitlement) != sizeof(int));
const PropertyInfo qdev_prop_cpus390entitlement = { const PropertyInfo qdev_prop_cpus390entitlement = {
.name = "CpuS390Entitlement", .name = "S390CpuEntitlement",
.description = "low/medium (default)/high", .description = "low/medium (default)/high",
.enum_table = &CpuS390Entitlement_lookup, .enum_table = &S390CpuEntitlement_lookup,
.get = qdev_propinfo_get_enum, .get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum, .set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum, .set_default_value = qdev_propinfo_set_default_value_enum,

6
hw/s390x/cpu-topology.c
View File

@ -105,7 +105,7 @@ static void s390_topology_init(MachineState *ms)
*/ */
void s390_handle_ptf(S390CPU *cpu, uint8_t r1, uintptr_t ra) void s390_handle_ptf(S390CPU *cpu, uint8_t r1, uintptr_t ra)
{ {
CpuS390Polarization polarization; S390CpuPolarization polarization;
CPUS390XState *env = &cpu->env; CPUS390XState *env = &cpu->env;
uint64_t reg = env->regs[r1]; uint64_t reg = env->regs[r1];
int fc = reg & S390_TOPO_FC_MASK; int fc = reg & S390_TOPO_FC_MASK;
@ -357,7 +357,7 @@ static void s390_change_topology(uint16_t core_id,
bool has_book_id, uint16_t book_id, bool has_book_id, uint16_t book_id,
bool has_drawer_id, uint16_t drawer_id, bool has_drawer_id, uint16_t drawer_id,
bool has_entitlement, bool has_entitlement,
CpuS390Entitlement entitlement, S390CpuEntitlement entitlement,
bool has_dedicated, bool dedicated, bool has_dedicated, bool dedicated,
Error **errp) Error **errp)
{ {
@ -446,7 +446,7 @@ void qmp_set_cpu_topology(uint16_t core,
bool has_socket, uint16_t socket, bool has_socket, uint16_t socket,
bool has_book, uint16_t book, bool has_book, uint16_t book,
bool has_drawer, uint16_t drawer, bool has_drawer, uint16_t drawer,
bool has_entitlement, CpuS390Entitlement entitlement, bool has_entitlement, S390CpuEntitlement entitlement,
bool has_dedicated, bool dedicated, bool has_dedicated, bool dedicated,
Error **errp) Error **errp)
{ {

2
include/hw/qdev-properties-system.h
View File

@ -88,7 +88,7 @@ extern const PropertyInfo qdev_prop_iothread_vq_mapping_list;
#define DEFINE_PROP_CPUS390ENTITLEMENT(_n, _s, _f, _d) \ #define DEFINE_PROP_CPUS390ENTITLEMENT(_n, _s, _f, _d) \
DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_cpus390entitlement, \ DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_cpus390entitlement, \
CpuS390Entitlement) S390CpuEntitlement)
#define DEFINE_PROP_IOTHREAD_VQ_MAPPING_LIST(_name, _state, _field) \ #define DEFINE_PROP_IOTHREAD_VQ_MAPPING_LIST(_name, _state, _field) \
DEFINE_PROP(_name, _state, _field, qdev_prop_iothread_vq_mapping_list, \ DEFINE_PROP(_name, _state, _field, qdev_prop_iothread_vq_mapping_list, \

2
include/hw/s390x/cpu-topology.h
View File

@ -37,7 +37,7 @@ typedef struct S390TopologyEntry {
typedef struct S390Topology { typedef struct S390Topology {
uint8_t *cores_per_socket; uint8_t *cores_per_socket;
CpuS390Polarization polarization; S390CpuPolarization polarization;
} S390Topology; } S390Topology;
typedef QTAILQ_HEAD(, S390TopologyEntry) S390TopologyList; typedef QTAILQ_HEAD(, S390TopologyEntry) S390TopologyList;

5
qapi/machine-common.json
View File

@ -9,13 +9,12 @@
## ##
## ##
# @CpuS390Entitlement: # @S390CpuEntitlement:
# #
# An enumeration of CPU entitlements that can be assumed by a virtual # An enumeration of CPU entitlements that can be assumed by a virtual
# S390 CPU # S390 CPU
# #
# Since: 8.2 # Since: 8.2
## ##
{ 'enum': 'CpuS390Entitlement', { 'enum': 'S390CpuEntitlement',
'prefix': 'S390_CPU_ENTITLEMENT',
'data': [ 'auto', 'low', 'medium', 'high' ] } 'data': [ 'auto', 'low', 'medium', 'high' ] }

11
qapi/machine-target.json
View File

@ -405,15 +405,14 @@
'TARGET_RISCV' ] } } 'TARGET_RISCV' ] } }
## ##
# @CpuS390Polarization: # @S390CpuPolarization:
# #
# An enumeration of CPU polarization that can be assumed by a virtual # An enumeration of CPU polarization that can be assumed by a virtual
# S390 CPU # S390 CPU
# #
# Since: 8.2 # Since: 8.2
## ##
{ 'enum': 'CpuS390Polarization', { 'enum': 'S390CpuPolarization',
'prefix': 'S390_CPU_POLARIZATION',
'data': [ 'horizontal', 'vertical' ], 'data': [ 'horizontal', 'vertical' ],
'if': 'TARGET_S390X' 'if': 'TARGET_S390X'
} }
@ -450,7 +449,7 @@
'*socket-id': 'uint16', '*socket-id': 'uint16',
'*book-id': 'uint16', '*book-id': 'uint16',
'*drawer-id': 'uint16', '*drawer-id': 'uint16',
'*entitlement': 'CpuS390Entitlement', '*entitlement': 'S390CpuEntitlement',
'*dedicated': 'bool' '*dedicated': 'bool'
}, },
'features': [ 'unstable' ], 'features': [ 'unstable' ],
@ -488,7 +487,7 @@
# "timestamp": { "seconds": 1401385907, "microseconds": 422329 } } # "timestamp": { "seconds": 1401385907, "microseconds": 422329 } }
## ##
{ 'event': 'CPU_POLARIZATION_CHANGE', { 'event': 'CPU_POLARIZATION_CHANGE',
'data': { 'polarization': 'CpuS390Polarization' }, 'data': { 'polarization': 'S390CpuPolarization' },
'features': [ 'unstable' ], 'features': [ 'unstable' ],
'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] } 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] }
} }
@ -503,7 +502,7 @@
# Since: 8.2 # Since: 8.2
## ##
{ 'struct': 'CpuPolarizationInfo', { 'struct': 'CpuPolarizationInfo',
'data': { 'polarization': 'CpuS390Polarization' }, 'data': { 'polarization': 'S390CpuPolarization' },
'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] } 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] }
} }

9
qapi/machine.json
View File

@ -41,15 +41,14 @@
'x86_64', 'xtensa', 'xtensaeb' ] } 'x86_64', 'xtensa', 'xtensaeb' ] }
## ##
# @CpuS390State: # @S390CpuState:
# #
# An enumeration of cpu states that can be assumed by a virtual S390 # An enumeration of cpu states that can be assumed by a virtual S390
# CPU # CPU
# #
# Since: 2.12 # Since: 2.12
## ##
{ 'enum': 'CpuS390State', { 'enum': 'S390CpuState',
'prefix': 'S390_CPU_STATE',
'data': [ 'uninitialized', 'stopped', 'check-stop', 'operating', 'load' ] } 'data': [ 'uninitialized', 'stopped', 'check-stop', 'operating', 'load' ] }
## ##
@ -66,9 +65,9 @@
# Since: 2.12 # Since: 2.12
## ##
{ 'struct': 'CpuInfoS390', { 'struct': 'CpuInfoS390',
'data': { 'cpu-state': 'CpuS390State', 'data': { 'cpu-state': 'S390CpuState',
'*dedicated': 'bool', '*dedicated': 'bool',
'*entitlement': 'CpuS390Entitlement' } } '*entitlement': 'S390CpuEntitlement' } }
## ##
# @CpuInfoFast: # @CpuInfoFast:

6
qapi/pragma.json
View File

@ -47,9 +47,6 @@
'BlockdevSnapshotWrapper', 'BlockdevSnapshotWrapper',
'BlockdevVmdkAdapterType', 'BlockdevVmdkAdapterType',
'ChardevBackendKind', 'ChardevBackendKind',
'CpuS390Entitlement',
'CpuS390Polarization',
'CpuS390State',
'CxlCorErrorType', 'CxlCorErrorType',
'DisplayProtocol', 'DisplayProtocol',
'DriveBackupWrapper', 'DriveBackupWrapper',
@ -74,6 +71,9 @@
'QKeyCode', 'QKeyCode',
'RbdAuthMode', 'RbdAuthMode',
'RbdImageEncryptionFormat', 'RbdImageEncryptionFormat',
'S390CpuEntitlement',
'S390CpuPolarization',
'S390CpuState',
'String', 'String',
'StringWrapper', 'StringWrapper',
'SysEmuTarget', 'SysEmuTarget',

2
target/s390x/cpu.h
View File

@ -133,7 +133,7 @@ typedef struct CPUArchState {
int32_t book_id; int32_t book_id;
int32_t drawer_id; int32_t drawer_id;
bool dedicated; bool dedicated;
CpuS390Entitlement entitlement; /* Used only for vertical polarization */ S390CpuEntitlement entitlement; /* Used only for vertical polarization */
uint64_t cpuid; uint64_t cpuid;
#endif #endif