diff options
| -rw-r--r-- | hw/spapr_vio.c | 12 | ||||
| -rw-r--r-- | hw/spapr_vio.h | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c index 0bf2c3179c..fccf48bd67 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 626d04f90e..10ab3594c0 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; |