[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 22/38] target/s390x: set cpu->id for linux user wh
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL v2 22/38] target/s390x: set cpu->id for linux user when realizing |
Date: |
Tue, 19 Sep 2017 18:43:21 +0200 |
From: David Hildenbrand <address@hidden>
scc->next_cpu_id is updated when realizing. Setting it just before that
point looks cleaner.
Reviewed-by: Matthew Rosato <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target/s390x/cpu.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 74b3e4fd0d..5f9315fb16 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -194,7 +194,11 @@ static void s390_cpu_realizefn(DeviceState *dev, Error
**errp)
", max allowed: %d", cpu->id, max_cpus - 1);
goto out;
}
+#else
+ /* implicitly set for linux-user only */
+ cpu->id = scc->next_cpu_id;
#endif
+
if (cpu_exists(cpu->id)) {
error_setg(&err, "Unable to add CPU: %" PRIi64
", it already exists", cpu->id);
@@ -306,13 +310,6 @@ static void s390_cpu_initfn(Object *obj)
inited = true;
s390x_translate_init();
}
-
-#if defined(CONFIG_USER_ONLY)
- {
- S390CPUClass *scc = S390_CPU_GET_CLASS(obj);
- cpu->id = scc->next_cpu_id;
- }
-#endif
}
static void s390_cpu_finalize(Object *obj)
--
2.13.5
- [Qemu-devel] [PULL v2 12/38] cpu: drop old comments describing members, (continued)
- [Qemu-devel] [PULL v2 12/38] cpu: drop old comments describing members, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 13/38] s390x: get rid of s390-virtio.c, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 14/38] s390x: rename s390-virtio.h to s390-virtio-hcall.h, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 15/38] s390x: move s390_virtio_hypercall() to s390-virtio-hcall.h, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 16/38] s390x: move subsystem_reset() to s390-virtio-ccw.h, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 17/38] target/s390x: move some s390x typedefs to cpu-qom.h, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 18/38] s390x: move sclp_service_call() to sclp.h, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 19/38] target/s390x: use trigger_pgm_exception() in s390_cpu_handle_mmu_fault(), Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 20/38] target/s390x: use program_interrupt() in per_check_exception(), Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 21/38] s390x: allow only 1 CPU with TCG, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 22/38] target/s390x: set cpu->id for linux user when realizing,
Cornelia Huck <=
- [Qemu-devel] [PULL v2 23/38] target/s390x: use "core-id" for cpu number/address/id handling, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 24/38] target/s390x: rename next_cpu_id to next_core_id, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 25/38] s390x: print CPU definitions in sorted order, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 26/38] s390x: allow cpu hotplug via device_add, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 27/38] s390x: CPU hot unplug via device_del cannot work for now, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 28/38] s390x: implement query-hotpluggable-cpus, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 29/38] s390x: get rid of cpu_states and use possible_cpus instead, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 31/38] s390x: generate sclp cpu information from possible_cpus, Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 30/38] s390x: get rid of cpu_s390x_create(), Cornelia Huck, 2017/09/19
- [Qemu-devel] [PULL v2 32/38] s390x: allow CPU hotplug in random core-id order, Cornelia Huck, 2017/09/19