diff mbox

[18/20] pseries: Correctly use the device model reset hooks

Message ID 1334515144-26485-19-git-send-email-afaerber@suse.de
State New
Headers show

Commit Message

Andreas Färber April 15, 2012, 6:39 p.m. UTC 
From: David Gibson <david@gibson.dropbear.id.au>

Recently we added code to properly clean away VIO CRQs on reset  However,
this directly uses qemu_register, rather than the existing device model
reset callbacks.  This patch cleans this up by adding proper use of the
reset hook to the VIO bus model.  The existing CRQ reset code is converted
to the new method.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/spapr_vio.c |   12 ++++++++----
 hw/spapr_vio.h |    1 +
 2 files changed, 9 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c
index 0bf2c31..fccf48b 100644
--- a/hw/spapr_vio.c
+++ b/hw/spapr_vio.c
@@ -648,13 +648,18 @@  static int spapr_vio_check_reg(VIOsPAPRDevice *sdev)
     return 0;
 }
 
-static void spapr_vio_busdev_reset(void *opaque)
+static void spapr_vio_busdev_reset(DeviceState *qdev)
 {
-    VIOsPAPRDevice *dev = (VIOsPAPRDevice *)opaque;
+    VIOsPAPRDevice *dev = DO_UPCAST(VIOsPAPRDevice, qdev, qdev);
+    VIOsPAPRDeviceClass *pc = VIO_SPAPR_DEVICE_GET_CLASS(dev);
 
     if (dev->crq.qsize) {
         free_crq(dev);
     }
+
+    if (pc->reset) {
+        pc->reset(dev);
+    }
 }
 
 static int spapr_vio_busdev_init(DeviceState *qdev)
@@ -685,8 +690,6 @@  static int spapr_vio_busdev_init(DeviceState *qdev)
 
     rtce_init(dev);
 
-    qemu_register_reset(spapr_vio_busdev_reset, dev);
-
     return pc->init(dev);
 }
 
@@ -776,6 +779,7 @@  static void vio_spapr_device_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *k = DEVICE_CLASS(klass);
     k->init = spapr_vio_busdev_init;
+    k->reset = spapr_vio_busdev_reset;
     k->bus_info = &spapr_vio_bus_info;
 }
 
diff --git a/hw/spapr_vio.h b/hw/spapr_vio.h
index 626d04f..10ab359 100644
--- a/hw/spapr_vio.h
+++ b/hw/spapr_vio.h
@@ -64,6 +64,7 @@  typedef struct VIOsPAPRDeviceClass {
     const char *dt_name, *dt_type, *dt_compatible;
     target_ulong signal_mask;
     int (*init)(VIOsPAPRDevice *dev);
+    void (*reset)(VIOsPAPRDevice *dev);
     int (*devnode)(VIOsPAPRDevice *dev, void *fdt, int node_off);
 } VIOsPAPRDeviceClass;