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_POLARIZATION to S390_CPU_POLARIZATION.
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>
---
qapi/machine-common.json | 5 ++---
qapi/machine-target.json | 11 +++++------
qapi/machine.json | 9 ++++-----
qapi/pragma.json | 6 +++---
include/hw/qdev-properties-system.h | 2 +-
include/hw/s390x/cpu-topology.h | 2 +-
target/s390x/cpu.h | 2 +-
hw/core/qdev-properties-system.c | 6 +++---
hw/s390x/cpu-topology.c | 6 +++---
9 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/qapi/machine-common.json b/qapi/machine-common.json
index fa6bd71d12..b64e4895cf 100644
--- a/qapi/machine-common.json
+++ b/qapi/machine-common.json
@@ -9,13 +9,12 @@
##
##
-# @CpuS390Entitlement:
+# @S390CpuEntitlement:
#
# An enumeration of CPU entitlements that can be assumed by a virtual
# S390 CPU
#
# Since: 8.2
##
-{ 'enum': 'CpuS390Entitlement',
- 'prefix': 'S390_CPU_ENTITLEMENT',
+{ 'enum': 'S390CpuEntitlement',
'data': [ 'auto', 'low', 'medium', 'high' ] }
diff --git a/qapi/machine-target.json b/qapi/machine-target.json
index a552e2b0ce..6ee682adad 100644
--- a/qapi/machine-target.json
+++ b/qapi/machine-target.json
@@ -400,15 +400,14 @@
'TARGET_RISCV' ] } }
##
-# @CpuS390Polarization:
+# @S390CpuPolarization:
#
# An enumeration of CPU polarization that can be assumed by a virtual
# S390 CPU
#
# Since: 8.2
##
-{ 'enum': 'CpuS390Polarization',
- 'prefix': 'S390_CPU_POLARIZATION',
+{ 'enum': 'S390CpuPolarization',
'data': [ 'horizontal', 'vertical' ],
'if': 'TARGET_S390X'
}
@@ -445,7 +444,7 @@
'*socket-id': 'uint16',
'*book-id': 'uint16',
'*drawer-id': 'uint16',
- '*entitlement': 'CpuS390Entitlement',
+ '*entitlement': 'S390CpuEntitlement',
'*dedicated': 'bool'
},
'features': [ 'unstable' ],
@@ -483,7 +482,7 @@
# "timestamp": { "seconds": 1401385907, "microseconds": 422329 } }
##
{ 'event': 'CPU_POLARIZATION_CHANGE',
- 'data': { 'polarization': 'CpuS390Polarization' },
+ 'data': { 'polarization': 'S390CpuPolarization' },
'features': [ 'unstable' ],
'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] }
}
@@ -498,7 +497,7 @@
# Since: 8.2
##
{ 'struct': 'CpuPolarizationInfo',
- 'data': { 'polarization': 'CpuS390Polarization' },
+ 'data': { 'polarization': 'S390CpuPolarization' },
'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] }
}
diff --git a/qapi/machine.json b/qapi/machine.json
index fcfd249e2d..bdb418696d 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -41,15 +41,14 @@
'x86_64', 'xtensa', 'xtensaeb' ] }
##
-# @CpuS390State:
+# @S390CpuState:
#
# An enumeration of cpu states that can be assumed by a virtual S390
# CPU
#
# Since: 2.12
##
-{ 'enum': 'CpuS390State',
- 'prefix': 'S390_CPU_STATE',
+{ 'enum': 'S390CpuState',
'data': [ 'uninitialized', 'stopped', 'check-stop', 'operating', 'load' ] }
##
@@ -66,9 +65,9 @@
# Since: 2.12
##
{ 'struct': 'CpuInfoS390',
- 'data': { 'cpu-state': 'CpuS390State',
+ 'data': { 'cpu-state': 'S390CpuState',
'*dedicated': 'bool',
- '*entitlement': 'CpuS390Entitlement' } }
+ '*entitlement': 'S390CpuEntitlement' } }
##
# @CpuInfoFast:
diff --git a/qapi/pragma.json b/qapi/pragma.json
index 59fbe74b8c..beddea5ca4 100644
--- a/qapi/pragma.json
+++ b/qapi/pragma.json
@@ -47,9 +47,9 @@
'BlockdevSnapshotWrapper',
'BlockdevVmdkAdapterType',
'ChardevBackendKind',
- 'CpuS390Entitlement',
- 'CpuS390Polarization',
- 'CpuS390State',
+ 'S390CpuEntitlement',
+ 'S390CpuPolarization',
+ 'S390CpuState',
'CxlCorErrorType',
'DisplayProtocol',
'DriveBackupWrapper',
diff --git a/include/hw/qdev-properties-system.h b/include/hw/qdev-properties-system.h
index 438f65389f..cdcc63056e 100644
--- a/include/hw/qdev-properties-system.h
+++ b/include/hw/qdev-properties-system.h
@@ -88,7 +88,7 @@ extern const PropertyInfo qdev_prop_iothread_vq_mapping_list;
#define DEFINE_PROP_CPUS390ENTITLEMENT(_n, _s, _f, _d) \
DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_cpus390entitlement, \
- CpuS390Entitlement)
+ S390CpuEntitlement)
#define DEFINE_PROP_IOTHREAD_VQ_MAPPING_LIST(_name, _state, _field) \
DEFINE_PROP(_name, _state, _field, qdev_prop_iothread_vq_mapping_list, \
diff --git a/include/hw/s390x/cpu-topology.h b/include/hw/s390x/cpu-topology.h
index c064f427e9..a11b1baa77 100644
--- a/include/hw/s390x/cpu-topology.h
+++ b/include/hw/s390x/cpu-topology.h
@@ -37,7 +37,7 @@ typedef struct S390TopologyEntry {
typedef struct S390Topology {
uint8_t *cores_per_socket;
- CpuS390Polarization polarization;
+ S390CpuPolarization polarization;
} S390Topology;
typedef QTAILQ_HEAD(, S390TopologyEntry) S390TopologyList;
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index d6b75ad0e0..6cbd77dfdf 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -133,7 +133,7 @@ typedef struct CPUArchState {
int32_t book_id;
int32_t drawer_id;
bool dedicated;
- CpuS390Entitlement entitlement; /* Used only for vertical polarization */
+ S390CpuEntitlement entitlement; /* Used only for vertical polarization */
uint64_t cpuid;
#endif
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index f13350b4fb..f2db20417a 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -1188,12 +1188,12 @@ const PropertyInfo qdev_prop_uuid = {
/* --- 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 = {
- .name = "CpuS390Entitlement",
+ .name = "S390CpuEntitlement",
.description = "low/medium (default)/high",
- .enum_table = &CpuS390Entitlement_lookup,
+ .enum_table = &S390CpuEntitlement_lookup,
.get = qdev_propinfo_get_enum,
.set = qdev_propinfo_set_enum,
.set_default_value = qdev_propinfo_set_default_value_enum,
diff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c
index f16bdf65fa..7d4e1f5472 100644
--- a/hw/s390x/cpu-topology.c
+++ b/hw/s390x/cpu-topology.c
@@ -105,7 +105,7 @@ static void s390_topology_init(MachineState *ms)
*/
void s390_handle_ptf(S390CPU *cpu, uint8_t r1, uintptr_t ra)
{
- CpuS390Polarization polarization;
+ S390CpuPolarization polarization;
CPUS390XState *env = &cpu->env;
uint64_t reg = env->regs[r1];
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_drawer_id, uint16_t drawer_id,
bool has_entitlement,
- CpuS390Entitlement entitlement,
+ S390CpuEntitlement entitlement,
bool has_dedicated, bool dedicated,
Error **errp)
{
@@ -446,7 +446,7 @@ void qmp_set_cpu_topology(uint16_t core,
bool has_socket, uint16_t socket,
bool has_book, uint16_t book,
bool has_drawer, uint16_t drawer,
- bool has_entitlement, CpuS390Entitlement entitlement,
+ bool has_entitlement, S390CpuEntitlement entitlement,
bool has_dedicated, bool dedicated,
Error **errp)
{
--
2.45.0On 30/07/2024 10.10, Markus Armbruster wrote: > 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_POLARIZATION to S390_CPU_POLARIZATION. > 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> > --- Acked-by: Thomas Huth <thuth@redhat.com>
On Tue, Jul 30, 2024 at 10:10:23AM +0200, Markus Armbruster wrote:
> Date: Tue, 30 Jul 2024 10:10:23 +0200
> From: Markus Armbruster <armbru@redhat.com>
> Subject: [PATCH 09/18] qapi/machine: Rename CpuS390* to S390Cpu, and drop
> 'prefix'
>
> 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_POLARIZATION to S390_CPU_POLARIZATION.
^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^
CPU_S390_ENTITLEMENT 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>
> ---
> qapi/machine-common.json | 5 ++---
> qapi/machine-target.json | 11 +++++------
> qapi/machine.json | 9 ++++-----
> qapi/pragma.json | 6 +++---
> include/hw/qdev-properties-system.h | 2 +-
> include/hw/s390x/cpu-topology.h | 2 +-
> target/s390x/cpu.h | 2 +-
> hw/core/qdev-properties-system.c | 6 +++---
> hw/s390x/cpu-topology.c | 6 +++---
> 9 files changed, 23 insertions(+), 26 deletions(-)
[snip]
> diff --git a/qapi/pragma.json b/qapi/pragma.json
> index 59fbe74b8c..beddea5ca4 100644
> --- a/qapi/pragma.json
> +++ b/qapi/pragma.json
> @@ -47,9 +47,9 @@
> 'BlockdevSnapshotWrapper',
> 'BlockdevVmdkAdapterType',
> 'ChardevBackendKind',
> - 'CpuS390Entitlement',
> - 'CpuS390Polarization',
> - 'CpuS390State',
> + 'S390CpuEntitlement',
> + 'S390CpuPolarization',
> + 'S390CpuState',
> 'CxlCorErrorType',
> 'DisplayProtocol',
> 'DriveBackupWrapper',
It seems to be in alphabetical order. The new names don't follow the
original order.
Just the above nits,
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Zhao Liu <zhao1.liu@intel.com> writes: > On Tue, Jul 30, 2024 at 10:10:23AM +0200, Markus Armbruster wrote: >> Date: Tue, 30 Jul 2024 10:10:23 +0200 >> From: Markus Armbruster <armbru@redhat.com> >> Subject: [PATCH 09/18] qapi/machine: Rename CpuS390* to S390Cpu, and drop >> 'prefix' >> >> 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_POLARIZATION to S390_CPU_POLARIZATION. > ^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^ > CPU_S390_ENTITLEMENT S390_CPU_ENTITLEMENT Yes. >> 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> >> --- >> qapi/machine-common.json | 5 ++--- >> qapi/machine-target.json | 11 +++++------ >> qapi/machine.json | 9 ++++----- >> qapi/pragma.json | 6 +++--- >> include/hw/qdev-properties-system.h | 2 +- >> include/hw/s390x/cpu-topology.h | 2 +- >> target/s390x/cpu.h | 2 +- >> hw/core/qdev-properties-system.c | 6 +++--- >> hw/s390x/cpu-topology.c | 6 +++--- >> 9 files changed, 23 insertions(+), 26 deletions(-) > > [snip] > >> diff --git a/qapi/pragma.json b/qapi/pragma.json >> index 59fbe74b8c..beddea5ca4 100644 >> --- a/qapi/pragma.json >> +++ b/qapi/pragma.json >> @@ -47,9 +47,9 @@ >> 'BlockdevSnapshotWrapper', >> 'BlockdevVmdkAdapterType', >> 'ChardevBackendKind', >> - 'CpuS390Entitlement', >> - 'CpuS390Polarization', >> - 'CpuS390State', >> + 'S390CpuEntitlement', >> + 'S390CpuPolarization', >> + 'S390CpuState', >> 'CxlCorErrorType', >> 'DisplayProtocol', >> 'DriveBackupWrapper', > > It seems to be in alphabetical order. The new names don't follow the > original order. You're right. > Just the above nits, > > Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Thanks!
On Tue, Jul 30, 2024 at 10:10:23AM +0200, Markus Armbruster wrote: > 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_POLARIZATION to S390_CPU_POLARIZATION. > 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> > --- > qapi/machine-common.json | 5 ++--- > qapi/machine-target.json | 11 +++++------ > qapi/machine.json | 9 ++++----- > qapi/pragma.json | 6 +++--- > include/hw/qdev-properties-system.h | 2 +- > include/hw/s390x/cpu-topology.h | 2 +- > target/s390x/cpu.h | 2 +- > hw/core/qdev-properties-system.c | 6 +++--- > hw/s390x/cpu-topology.c | 6 +++--- > 9 files changed, 23 insertions(+), 26 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
© 2016 - 2024 Red Hat, Inc.