[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 14/21] target/s390x: rename next_cpu_id to next_c
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v3 14/21] target/s390x: rename next_cpu_id to next_core_id |
Date: |
Thu, 7 Sep 2017 22:13:28 +0200 |
Adapt to the new term "core_id". While at it, fix the type and drop the
initialization to 0 (which is superfluous).
Reviewed-by: Matthew Rosato <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
target/s390x/cpu-qom.h | 2 +-
target/s390x/cpu.c | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h
index c8fbf8ae03..21ea15e642 100644
--- a/target/s390x/cpu-qom.h
+++ b/target/s390x/cpu-qom.h
@@ -52,7 +52,7 @@ typedef struct S390CPUClass {
bool is_migration_safe;
const char *desc;
- int64_t next_cpu_id;
+ uint32_t next_core_id;
DeviceRealize parent_realize;
void (*parent_reset)(CPUState *cpu);
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index a2570bbc6b..105ff13034 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -197,7 +197,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error
**errp)
}
#else
/* implicitly set for linux-user only */
- cpu->env.core_id = scc->next_cpu_id;
+ cpu->env.core_id = scc->next_core_id;
#endif
if (cpu_exists(cpu->env.core_id)) {
@@ -205,10 +205,10 @@ static void s390_cpu_realizefn(DeviceState *dev, Error
**errp)
cpu->env.core_id);
goto out;
}
- if (cpu->env.core_id != scc->next_cpu_id) {
+ if (cpu->env.core_id != scc->next_core_id) {
error_setg(&err, "Unable to add CPU: %" PRIu32
- ", the next available nr is %" PRIi64, cpu->env.core_id,
- scc->next_cpu_id);
+ ", the next available id is %" PRIu32, cpu->env.core_id,
+ scc->next_core_id);
goto out;
}
@@ -218,7 +218,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error
**errp)
if (err != NULL) {
goto out;
}
- scc->next_cpu_id++;
+ scc->next_core_id++;
#if !defined(CONFIG_USER_ONLY)
qemu_register_reset(s390_cpu_machine_reset_cb, cpu);
@@ -463,7 +463,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
CPUClass *cc = CPU_CLASS(scc);
DeviceClass *dc = DEVICE_CLASS(oc);
- scc->next_cpu_id = 0;
scc->parent_realize = dc->realize;
dc->realize = s390_cpu_realizefn;
dc->props = s390x_cpu_properties;
--
2.13.5
- [Qemu-devel] [PATCH v3 03/21] s390x: get rid of s390-virtio.c, (continued)
- [Qemu-devel] [PATCH v3 03/21] s390x: get rid of s390-virtio.c, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 05/21] target/s390x: move typedef of S390CPU to its definition, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 06/21] s390x: move s390_virtio_hypercall() to s390-virtio-hcall.h, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 07/21] s390x: move subsystem_reset() to s390-virtio-ccw.h, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 08/21] s390x: move sclp_service_call() to sclp.h, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 09/21] target/s390x: use trigger_pgm_exception() in s390_cpu_handle_mmu_fault(), David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 10/21] target/s390x: use program_interrupt() in per_check_exception(), David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 11/21] s390x: allow only 1 CPU with TCG, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 12/21] target/s390x: set cpu->id for linux user when realizing, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 13/21] target/s390x: use "core-id" for cpu number/address/id handling, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 14/21] target/s390x: rename next_cpu_id to next_core_id,
David Hildenbrand <=
- [Qemu-devel] [PATCH v3 15/21] s390x: print CPU definitions in sorted order, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 16/21] s390x: allow cpu hotplug via device_add, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 17/21] s390x: CPU hot unplug via device_del cannot work for now, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 18/21] s390x: implement query-hotpluggable-cpus, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 19/21] s390x: get rid of cpu_s390x_create(), David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 20/21] s390x: generate sclp cpu information from possible_cpus, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 21/21] s390x: allow CPU hotplug in random core-id order, David Hildenbrand, 2017/09/07