[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/9] s390x/cpu: Move some CPU initialization into
From: |
Matthew Rosato |
Subject: |
[Qemu-devel] [PATCH v2 5/9] s390x/cpu: Move some CPU initialization into realize |
Date: |
Thu, 19 Nov 2015 10:10:10 -0500 |
In preparation for hotplug, defer some CPU initialization
until the device is actually being realized.
Signed-off-by: Matthew Rosato <address@hidden>
---
target-s390x/cpu.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
index aafbbdc..bc821f7 100644
--- a/target-s390x/cpu.c
+++ b/target-s390x/cpu.c
@@ -36,6 +36,9 @@
#define CR0_RESET 0xE0UL
#define CR14_RESET 0xC2000000UL;
+/* Older kernels require CPUs to be added sequentially by id */
+static int next_cpu_id;
+
/* generate CPU information for cpu -? */
void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf)
{
@@ -194,7 +197,13 @@ static void s390_cpu_realizefn(DeviceState *dev, Error
**errp)
{
CPUState *cs = CPU(dev);
S390CPUClass *scc = S390_CPU_GET_CLASS(dev);
+ S390CPU *cpu = S390_CPU(dev);
+ CPUS390XState *env = &cpu->env;
+#if !defined(CONFIG_USER_ONLY)
+ qemu_register_reset(s390_cpu_machine_reset_cb, cpu);
+#endif
+ env->cpu_num = next_cpu_id++;
s390_cpu_gdb_init(cs);
qemu_init_vcpu(cs);
#if !defined(CONFIG_USER_ONLY)
@@ -212,7 +221,6 @@ static void s390_cpu_initfn(Object *obj)
S390CPU *cpu = S390_CPU(obj);
CPUS390XState *env = &cpu->env;
static bool inited;
- static int cpu_num = 0;
#if !defined(CONFIG_USER_ONLY)
struct tm tm;
#endif
@@ -222,7 +230,6 @@ static void s390_cpu_initfn(Object *obj)
cs->exception_index = EXCP_HLT;
cpu_exec_init(cs, &error_abort);
#if !defined(CONFIG_USER_ONLY)
- qemu_register_reset(s390_cpu_machine_reset_cb, cpu);
qemu_get_timedate(&tm, 0);
env->tod_offset = TOD_UNIX_EPOCH +
(time2tod(mktimegm(&tm)) * 1000000000ULL);
@@ -231,7 +238,6 @@ static void s390_cpu_initfn(Object *obj)
env->cpu_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_cpu_timer, cpu);
s390_cpu_set_state(CPU_STATE_STOPPED, cpu);
#endif
- env->cpu_num = cpu_num++;
if (tcg_enabled() && !inited) {
inited = true;
--
1.9.1
- [Qemu-devel] [PATCH v2 0/9] s390: Allow hotplug of s390 CPUs, Matthew Rosato, 2015/11/19
- [Qemu-devel] [PATCH v2 1/9] cpus: Reclaim vCPU objects, Matthew Rosato, 2015/11/19
- [Qemu-devel] [PATCH v2 6/9] s390x/cpu: Add functions to (un)register CPU state, Matthew Rosato, 2015/11/19
- [Qemu-devel] [PATCH v2 4/9] s390x/cpu: Set initial CPU state in common routine, Matthew Rosato, 2015/11/19
- [Qemu-devel] [PATCH v2 5/9] s390x/cpu: Move some CPU initialization into realize,
Matthew Rosato <=
- [Qemu-devel] [PATCH v2 3/9] s390x/cpu: Cleanup init in preparation for hotplug, Matthew Rosato, 2015/11/19
- [Qemu-devel] [PATCH v2 2/9] cpus: Add a sync version of cpu_remove(), Matthew Rosato, 2015/11/19
- [Qemu-devel] [PATCH v2 7/9] s390x/cpu: Extra cleanup during CPU finalize, Matthew Rosato, 2015/11/19
- [Qemu-devel] [PATCH v2 9/9] s390x/cpu: Allow hot plug/unplug of CPUs, Matthew Rosato, 2015/11/19
- [Qemu-devel] [PATCH v2 8/9] s390/virtio-ccw: Add hotplug handler and prepare for unplug, Matthew Rosato, 2015/11/19