Merge remote-tracking branch 'remotes/stsquad/tags/pull-ci-updates-210617-2' into...

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

diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c
index f623b040c9b1db9edd48702c669b03e19935bc29..ce1254b5d471362c8a872e30a6c49b3de395a9c7 100644 (file)
--- a/hw/ppc/mpc8544_guts.c
+++ b/hw/ppc/mpc8544_guts.c
@@ -17,6 +17,9 @@
  *
  */
 
  *
  */
 

+#include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"

 #include "hw/hw.h"
 #include "sysemu/sysemu.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "sysemu/sysemu.h"
 #include "hw/sysbus.h"


@@ -68,7 +71,8 @@ static uint64_t mpc8544_guts_read(void *opaque, hwaddr addr,
                                   unsigned size)
 {
     uint32_t value = 0;
                                   unsigned size)
 {
     uint32_t value = 0;

-    CPUPPCState *env = cpu_single_env;
+    PowerPCCPU *cpu = POWERPC_CPU(current_cpu);
+    CPUPPCState *env = &cpu->env;

 
     addr &= MPC8544_GUTS_MMIO_SIZE - 1;
     switch (addr) {
 
     addr &= MPC8544_GUTS_MMIO_SIZE - 1;
     switch (addr) {


@@ -94,7 +98,7 @@ static void mpc8544_guts_write(void *opaque, hwaddr addr,
     switch (addr) {
     case MPC8544_GUTS_ADDR_RSTCR:
         if (value & MPC8544_GUTS_RSTCR_RESET) {
     switch (addr) {
     case MPC8544_GUTS_ADDR_RSTCR:
         if (value & MPC8544_GUTS_RSTCR_RESET) {

-            qemu_system_reset_request();
+            qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);

         }
         break;
     default:
         }
         break;
     default:


@@ -114,29 +118,21 @@ static const MemoryRegionOps mpc8544_guts_ops = {
     },
 };
 
     },
 };
 

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

 {
 {

-    GutsState *s = MPC8544_GUTS(dev);
+    SysBusDevice *d = SYS_BUS_DEVICE(obj);
+    GutsState *s = MPC8544_GUTS(obj);

 
 

-    memory_region_init_io(&s->iomem, &mpc8544_guts_ops, s,
+    memory_region_init_io(&s->iomem, OBJECT(s), &mpc8544_guts_ops, s,

                           "mpc8544.guts", MPC8544_GUTS_MMIO_SIZE);
                           "mpc8544.guts", MPC8544_GUTS_MMIO_SIZE);

-    sysbus_init_mmio(dev, &s->iomem);
-
-    return 0;
-}
-
-static void mpc8544_guts_class_init(ObjectClass *klass, void *data)
-{
-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
-
-    k->init = mpc8544_guts_initfn;
+    sysbus_init_mmio(d, &s->iomem);

 }
 
 static const TypeInfo mpc8544_guts_info = {
     .name          = TYPE_MPC8544_GUTS,
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(GutsState),
 }
 
 static const TypeInfo mpc8544_guts_info = {
     .name          = TYPE_MPC8544_GUTS,
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(GutsState),

-    .class_init    = mpc8544_guts_class_init,
+    .instance_init = mpc8544_guts_initfn,

 };
 
 static void mpc8544_guts_register_types(void)
 };
 
 static void mpc8544_guts_register_types(void)