Message ID | 20181001220942.2382-8-f4bug@amsat.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | another SysBusDevice::init to Device::realize cleanup | expand |
On 1 October 2018 at 23:09, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > Convert the gt64120_reset() function into a proper Device reset method. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/mips/gt64xxx_pci.c | 17 +++-------------- > 1 file changed, 3 insertions(+), 14 deletions(-) Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
On 10/2/18 12:09 AM, Philippe Mathieu-Daudé wrote: > Convert the gt64120_reset() function into a proper Device reset method. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > hw/mips/gt64xxx_pci.c | 17 +++-------------- > 1 file changed, 3 insertions(+), 14 deletions(-) > > diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c > index 24ad0ad024..dcd1a66329 100644 > --- a/hw/mips/gt64xxx_pci.c > +++ b/hw/mips/gt64xxx_pci.c > @@ -992,9 +992,9 @@ static void gt64120_pci_set_irq(void *opaque, int irq_num, int level) > } > > > -static void gt64120_reset(void *opaque) > +static void gt64120_reset(DeviceState *dev) > { > - GT64120State *s = opaque; > + GT64120State *s = GT64120_PCI_HOST_BRIDGE(dev); > > /* FIXME: Malta specific hw assumptions ahead */ > > @@ -1184,16 +1184,6 @@ PCIBus *gt64120_register(qemu_irq *pic) > return phb->bus; > } > > -static int gt64120_init(SysBusDevice *dev) > -{ > - GT64120State *s; > - > - s = GT64120_PCI_HOST_BRIDGE(dev); > - > - qemu_register_reset(gt64120_reset, s); > - return 0; > -} > - > static void gt64120_pci_realize(PCIDevice *d, Error **errp) > { > /* FIXME: Malta specific hw assumptions ahead */ > @@ -1241,9 +1231,8 @@ static const TypeInfo gt64120_pci_info = { > static void gt64120_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > - SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); > > - sdc->init = gt64120_init; > + dc->reset = gt64120_reset; > dc->vmsd = &vmstate_gt64120; > } > >
diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index 24ad0ad024..dcd1a66329 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -992,9 +992,9 @@ static void gt64120_pci_set_irq(void *opaque, int irq_num, int level) } -static void gt64120_reset(void *opaque) +static void gt64120_reset(DeviceState *dev) { - GT64120State *s = opaque; + GT64120State *s = GT64120_PCI_HOST_BRIDGE(dev); /* FIXME: Malta specific hw assumptions ahead */ @@ -1184,16 +1184,6 @@ PCIBus *gt64120_register(qemu_irq *pic) return phb->bus; } -static int gt64120_init(SysBusDevice *dev) -{ - GT64120State *s; - - s = GT64120_PCI_HOST_BRIDGE(dev); - - qemu_register_reset(gt64120_reset, s); - return 0; -} - static void gt64120_pci_realize(PCIDevice *d, Error **errp) { /* FIXME: Malta specific hw assumptions ahead */ @@ -1241,9 +1231,8 @@ static const TypeInfo gt64120_pci_info = { static void gt64120_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); - sdc->init = gt64120_init; + dc->reset = gt64120_reset; dc->vmsd = &vmstate_gt64120; }
Convert the gt64120_reset() function into a proper Device reset method. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/mips/gt64xxx_pci.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)