target-arm: Fix segfault on startup when KVM enabled

Commit 50a2c6e55fa introduced a bug where QEMU would segfault on startup
when using KVM on ARM hosts, because kvm_arm_reset_cpu() accesses
cpu->cpreg_reset_values, which is not allocated before
kvm_arch_init_vcpu(). Fix this by not calling cpu_reset() until after
qemu_init_vcpu().

Acked-by: Paolo Bonzini <[email protected]>
Reviewed-by: Peter Maydell <[email protected]>
Reviewed-by: Andreas Faerber <[email protected]>
Signed-off-by: Christoffer Dall <[email protected]>
Message-id: 1401194263[email protected]
Signed-off-by: Peter Maydell <[email protected]>

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 6c6f2b3d4661708df6f31282b50989d793d1df9e..794dcb9fb70102ab74b116db818447d6687765f2 100644 (file)
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -370,8 +370,8 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
 
     init_cpreg_list(cpu);
 
-    cpu_reset(cs);
     qemu_init_vcpu(cs);
+    cpu_reset(cs);
 
     acc->parent_realize(dev, errp);
 }