mirror of https://github.com/proxmox/mirror_qemu
hw/intc/pxa2xx: Convert to Resettable interface
Factor reset code out of the DeviceRealize() handler. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-id: 20231020130331.50048-7-philmd@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>master
parent
cbf08c1851
commit
ead17ebf53
|
@ -271,12 +271,9 @@ static int pxa2xx_pic_post_load(void *opaque, int version_id)
|
|||
return 0;
|
||||
}
|
||||
|
||||
DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu)
|
||||
static void pxa2xx_pic_reset_hold(Object *obj)
|
||||
{
|
||||
DeviceState *dev = qdev_new(TYPE_PXA2XX_PIC);
|
||||
PXA2xxPICState *s = PXA2XX_PIC(dev);
|
||||
|
||||
s->cpu = cpu;
|
||||
PXA2xxPICState *s = PXA2XX_PIC(obj);
|
||||
|
||||
s->int_pending[0] = 0;
|
||||
s->int_pending[1] = 0;
|
||||
|
@ -284,6 +281,14 @@ DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu)
|
|||
s->int_enabled[1] = 0;
|
||||
s->is_fiq[0] = 0;
|
||||
s->is_fiq[1] = 0;
|
||||
}
|
||||
|
||||
DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu)
|
||||
{
|
||||
DeviceState *dev = qdev_new(TYPE_PXA2XX_PIC);
|
||||
PXA2xxPICState *s = PXA2XX_PIC(dev);
|
||||
|
||||
s->cpu = cpu;
|
||||
|
||||
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
||||
|
||||
|
@ -319,9 +324,11 @@ static const VMStateDescription vmstate_pxa2xx_pic_regs = {
|
|||
static void pxa2xx_pic_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
ResettableClass *rc = RESETTABLE_CLASS(klass);
|
||||
|
||||
dc->desc = "PXA2xx PIC";
|
||||
dc->vmsd = &vmstate_pxa2xx_pic_regs;
|
||||
rc->phases.hold = pxa2xx_pic_reset_hold;
|
||||
}
|
||||
|
||||
static const TypeInfo pxa2xx_pic_info = {
|
||||
|
|
Loading…
Reference in New Issue