[kvm-unit-tests PATCH 07/10] s390x: topology: Rename topology_core to topology_cpu

Nina Schoetterl-Glausch
2023-10-20T14:49:24Z

This is more in line with the nomenclature in the PoP.

Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Nico Boehr <nrb@linux.ibm.com>
Signed-off-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
---
lib/s390x/stsi.h | 4 ++--
s390x/topology.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/s390x/stsi.h b/lib/s390x/stsi.h
index 2f6182c1..1e9d0958 100644
--- a/lib/s390x/stsi.h
+++ b/lib/s390x/stsi.h
@@ -30,7 +30,7 @@ struct sysinfo_3_2_2 {
};

#define CPUS_TLE_RES_BITS 0x00fffffff8000000UL
-struct topology_core {
+struct topology_cpu {
uint8_t nl;
uint8_t reserved1[3];
uint8_t reserved4:5;
@@ -61,7 +61,7 @@ struct topology_container {

union topology_entry {
uint8_t nl;
- struct topology_core cpu;
+ struct topology_cpu cpu;
struct topology_container container;
};

diff --git a/s390x/topology.c b/s390x/topology.c
index 6a5f100e..df158aef 100644
--- a/s390x/topology.c
+++ b/s390x/topology.c
@@ -247,7 +247,7 @@ done:
static uint8_t *check_tle(void *tc)
{
struct topology_container *container = tc;
- struct topology_core *cpus;
+ struct topology_cpu *cpus;
int n;

if (container->nl) {
--
2.41.0