From: Zhao Liu <zhao1.liu@xxxxxxxxx>
To keep the same naming style as cpu-core, rename CPUClusterState to
CPUCluster.
Signed-off-by: Zhao Liu <zhao1.liu@xxxxxxxxx>
---
gdbstub/system.c | 2 +-
hw/cpu/cluster.c | 8 ++++----
include/hw/arm/armsse.h | 2 +-
include/hw/arm/xlnx-versal.h | 4 ++--
include/hw/arm/xlnx-zynqmp.h | 4 ++--
include/hw/cpu/cluster.h | 6 +++---
include/hw/riscv/microchip_pfsoc.h | 4 ++--
include/hw/riscv/sifive_u.h | 4 ++--
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/gdbstub/system.c b/gdbstub/system.c
index 783ac140b982..1c0b55d3ebe7 100644
--- a/gdbstub/system.c
+++ b/gdbstub/system.c
@@ -277,7 +277,7 @@ static int find_cpu_clusters(Object *child, void *opaque)
{
if (object_dynamic_cast(child, TYPE_CPU_CLUSTER)) {
GDBState *s = (GDBState *) opaque;
- CPUClusterState *cluster = CPU_CLUSTER(child);
+ CPUCluster *cluster = CPU_CLUSTER(child);
GDBProcess *process;
s->processes = g_renew(GDBProcess, s->processes, ++s->process_num);
diff --git a/hw/cpu/cluster.c b/hw/cpu/cluster.c
index 61289a840d46..fd978a543e40 100644
--- a/hw/cpu/cluster.c
+++ b/hw/cpu/cluster.c
@@ -26,12 +26,12 @@
#include "qapi/error.h"
static Property cpu_cluster_properties[] = {
- DEFINE_PROP_UINT32("cluster-id", CPUClusterState, cluster_id, 0),
+ DEFINE_PROP_UINT32("cluster-id", CPUCluster, cluster_id, 0),
DEFINE_PROP_END_OF_LIST()
};
typedef struct CallbackData {
- CPUClusterState *cluster;
+ CPUCluster *cluster;
int cpu_count;
} CallbackData;
@@ -50,7 +50,7 @@ static int add_cpu_to_cluster(Object *obj, void *opaque)
static void cpu_cluster_realize(DeviceState *dev, Error **errp)
{
/* Iterate through all our CPU children and set their cluster_index */
- CPUClusterState *cluster = CPU_CLUSTER(dev);
+ CPUCluster *cluster = CPU_CLUSTER(dev);
Object *cluster_obj = OBJECT(dev);
CallbackData cbdata = {
.cluster = cluster,
@@ -87,7 +87,7 @@ static void cpu_cluster_class_init(ObjectClass *klass, void *data)
static const TypeInfo cpu_cluster_type_info = {
.name = TYPE_CPU_CLUSTER,
.parent = TYPE_DEVICE,
- .instance_size = sizeof(CPUClusterState),
+ .instance_size = sizeof(CPUCluster),
.class_init = cpu_cluster_class_init,
};
diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h
index 88b3b759c5a8..886586a3bed4 100644
--- a/include/hw/arm/armsse.h
+++ b/include/hw/arm/armsse.h
@@ -153,7 +153,7 @@ struct ARMSSE {
/*< public >*/
ARMv7MState armv7m[SSE_MAX_CPUS];
- CPUClusterState cluster[SSE_MAX_CPUS];
+ CPUCluster cluster[SSE_MAX_CPUS];
IoTKitSecCtl secctl;
TZPPC apb_ppc[NUM_INTERNAL_PPCS];
TZMPC mpc[IOTS_NUM_MPC];
diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h
index b24fa64557fd..61bde52b6af5 100644
--- a/include/hw/arm/xlnx-versal.h
+++ b/include/hw/arm/xlnx-versal.h
@@ -58,7 +58,7 @@ struct Versal {
struct {
struct {
MemoryRegion mr;
- CPUClusterState cluster;
+ CPUCluster cluster;
ARMCPU cpu[XLNX_VERSAL_NR_ACPUS];
GICv3State gic;
} apu;
@@ -88,7 +88,7 @@ struct Versal {
MemoryRegion mr;
MemoryRegion mr_ps_alias;
- CPUClusterState cluster;
+ CPUCluster cluster;
ARMCPU cpu[XLNX_VERSAL_NR_RCPUS];
} rpu;
diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h
index 96358d51ebb7..5eea765ea76c 100644
--- a/include/hw/arm/xlnx-zynqmp.h
+++ b/include/hw/arm/xlnx-zynqmp.h
@@ -98,8 +98,8 @@ struct XlnxZynqMPState {
DeviceState parent_obj;
/*< public >*/
- CPUClusterState apu_cluster;
- CPUClusterState rpu_cluster;
+ CPUCluster apu_cluster;
+ CPUCluster rpu_cluster;
ARMCPU apu_cpu[XLNX_ZYNQMP_NUM_APU_CPUS];
ARMCPU rpu_cpu[XLNX_ZYNQMP_NUM_RPU_CPUS];
GICState gic;
diff --git a/include/hw/cpu/cluster.h b/include/hw/cpu/cluster.h
index 53fbf36af542..644b87350268 100644
--- a/include/hw/cpu/cluster.h
+++ b/include/hw/cpu/cluster.h
@@ -55,7 +55,7 @@
*/
#define TYPE_CPU_CLUSTER "cpu-cluster"
-OBJECT_DECLARE_SIMPLE_TYPE(CPUClusterState, CPU_CLUSTER)
+OBJECT_DECLARE_SIMPLE_TYPE(CPUCluster, CPU_CLUSTER)
/*
* This limit is imposed by TCG, which puts the cluster ID into an
@@ -64,13 +64,13 @@ OBJECT_DECLARE_SIMPLE_TYPE(CPUClusterState, CPU_CLUSTER)
#define MAX_CLUSTERS 255
/**
- * CPUClusterState:
+ * CPUCluster:
* @cluster_id: The cluster ID. This value is for internal use only and should
* not be exposed directly to the user or to the guest.
*
* State of a CPU cluster.
*/
-struct CPUClusterState {
+struct CPUCluster {
/*< private >*/
DeviceState parent_obj;
diff --git a/include/hw/riscv/microchip_pfsoc.h b/include/hw/riscv/microchip_pfsoc.h
index daef086da602..c9ac14e35625 100644
--- a/include/hw/riscv/microchip_pfsoc.h
+++ b/include/hw/riscv/microchip_pfsoc.h
@@ -38,8 +38,8 @@ typedef struct MicrochipPFSoCState {
DeviceState parent_obj;
/*< public >*/
- CPUClusterState e_cluster;
- CPUClusterState u_cluster;
+ CPUCluster e_cluster;
+ CPUCluster u_cluster;
RISCVHartArrayState e_cpus;
RISCVHartArrayState u_cpus;
DeviceState *plic;
diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h
index 0696f8594277..fda4a708e960 100644
--- a/include/hw/riscv/sifive_u.h
+++ b/include/hw/riscv/sifive_u.h
@@ -40,8 +40,8 @@ typedef struct SiFiveUSoCState {
DeviceState parent_obj;
/*< public >*/
- CPUClusterState e_cluster;
- CPUClusterState u_cluster;
+ CPUCluster e_cluster;
+ CPUCluster u_cluster;
RISCVHartArrayState e_cpus;
RISCVHartArrayState u_cpus;
DeviceState *plic;
--
2.34.1
