Merge remote-tracking branch 'sstabellini/xen-2013-09-25' into staging

[qemu.git] / target-moxie / cpu.c

diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c
index 91f61973ab3668d4c8671a114de15d4ae98a083a..d97a091eb43e94eff3b7daabf9897d27afcbca39 100644 (file)
--- a/target-moxie/cpu.c
+++ b/target-moxie/cpu.c
@@ -45,10 +45,11 @@ static void moxie_cpu_reset(CPUState *s)
 
 static void moxie_cpu_realizefn(DeviceState *dev, Error **errp)
 {
 
 static void moxie_cpu_realizefn(DeviceState *dev, Error **errp)
 {

-    MoxieCPU *cpu = MOXIE_CPU(dev);
+    CPUState *cs = CPU(dev);

     MoxieCPUClass *mcc = MOXIE_CPU_GET_CLASS(dev);
 
     MoxieCPUClass *mcc = MOXIE_CPU_GET_CLASS(dev);
 

-    cpu_reset(CPU(cpu));
+    qemu_init_vcpu(cs);
+    cpu_reset(cs);

 
     mcc->parent_realize(dev, errp);
 }
 
     mcc->parent_realize(dev, errp);
 }


@@ -101,7 +102,10 @@ static void moxie_cpu_class_init(ObjectClass *oc, void *data)
     cc->do_interrupt = moxie_cpu_do_interrupt;
     cc->dump_state = moxie_cpu_dump_state;
     cc->set_pc = moxie_cpu_set_pc;
     cc->do_interrupt = moxie_cpu_do_interrupt;
     cc->dump_state = moxie_cpu_dump_state;
     cc->set_pc = moxie_cpu_set_pc;

-    cpu_class_set_vmsd(cc, &vmstate_moxie_cpu);
+#ifndef CONFIG_USER_ONLY
+    cc->get_phys_page_debug = moxie_cpu_get_phys_page_debug;
+    cc->vmsd = &vmstate_moxie_cpu;
+#endif

 }
 
 static void moxielite_initfn(Object *obj)
 }
 
 static void moxielite_initfn(Object *obj)