pseries: Allow HPT resizing with KVM

[qemu.git] / hw / ppc / e500.c

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index cf8b122afe01c315c152c794ef6232f0f53edb7d..62f18572064e28c49b4e7cecf8a0d322308f30ee 100644 (file)
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -774,7 +774,7 @@ static qemu_irq *ppce500_init_mpic(MachineState *machine, PPCE500Params *params,
 static void ppce500_power_off(void *opaque, int line, int on)
 {
     if (on) {
 static void ppce500_power_off(void *opaque, int line, int on)
 {
     if (on) {

-        qemu_system_shutdown_request();
+        qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

     }
 }
 
     }
 }
 


@@ -827,6 +827,12 @@ void ppce500_init(MachineState *machine, PPCE500Params *params)
         env = &cpu->env;
         cs = CPU(cpu);
 
         env = &cpu->env;
         cs = CPU(cpu);
 

+        if (env->mmu_model != POWERPC_MMU_BOOKE206) {
+            fprintf(stderr, "MMU model %i not supported by this machine.\n",
+                env->mmu_model);
+            exit(1);
+        }
+

         if (!firstenv) {
             firstenv = env;
         }
         if (!firstenv) {
             firstenv = env;
         }


@@ -1049,27 +1055,18 @@ void ppce500_init(MachineState *machine, PPCE500Params *params)
     boot_info->dt_size = dt_size;
 }
 
     boot_info->dt_size = dt_size;
 }
 

-static int e500_ccsr_initfn(SysBusDevice *dev)
+static void e500_ccsr_initfn(Object *obj)

 {
 {

-    PPCE500CCSRState *ccsr;
-
-    ccsr = CCSR(dev);
-    memory_region_init(&ccsr->ccsr_space, OBJECT(ccsr), "e500-ccsr",
+    PPCE500CCSRState *ccsr = CCSR(obj);
+    memory_region_init(&ccsr->ccsr_space, obj, "e500-ccsr",

                        MPC8544_CCSRBAR_SIZE);
                        MPC8544_CCSRBAR_SIZE);

-    return 0;
-}
-
-static void e500_ccsr_class_init(ObjectClass *klass, void *data)
-{
-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
-    k->init = e500_ccsr_initfn;

 }
 
 static const TypeInfo e500_ccsr_info = {
     .name          = TYPE_CCSR,
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(PPCE500CCSRState),
 }
 
 static const TypeInfo e500_ccsr_info = {
     .name          = TYPE_CCSR,
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(PPCE500CCSRState),

-    .class_init    = e500_ccsr_class_init,
+    .instance_init = e500_ccsr_initfn,

 };
 
 static void e500_register_types(void)
 };
 
 static void e500_register_types(void)