diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2023-10-04 09:37:47 +0100 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2023-10-06 10:33:43 +0200 |
| commit | d43e967f692ab5389da9a8fa3064ffc6586a3d13 (patch) | |
| tree | 83625ea2b8e4e256a8db2fda22faa0faf89b12db /hw | |
| parent | 2f3913f4b2ad74baeb5a6f1d36efbd9ecdf1057d (diff) | |
| download | qemu-d43e967f692ab5389da9a8fa3064ffc6586a3d13.zip qemu-d43e967f692ab5389da9a8fa3064ffc6586a3d13.tar.gz qemu-d43e967f692ab5389da9a8fa3064ffc6586a3d13.tar.bz2 | |
q800-glue.c: convert to Resettable interface
Convert the GLUE device to 3-phase reset. The legacy method
doesn't do anything that's invalid in the hold phase, so the
conversion is simple and not a behaviour change.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-ID: <20231004083806.757242-2-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/m68k/q800-glue.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c index 34c4f0e..710a5c3 100644 --- a/hw/m68k/q800-glue.c +++ b/hw/m68k/q800-glue.c @@ -166,9 +166,9 @@ static void glue_nmi_release(void *opaque) GLUE_set_irq(s, GLUE_IRQ_IN_NMI, 0); } -static void glue_reset(DeviceState *dev) +static void glue_reset_hold(Object *obj) { - GLUEState *s = GLUE(dev); + GLUEState *s = GLUE(obj); s->ipr = 0; s->auxmode = 0; @@ -223,11 +223,12 @@ static void glue_init(Object *obj) static void glue_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); + ResettableClass *rc = RESETTABLE_CLASS(klass); NMIClass *nc = NMI_CLASS(klass); dc->vmsd = &vmstate_glue; - dc->reset = glue_reset; device_class_set_props(dc, glue_properties); + rc->phases.hold = glue_reset_hold; nc->nmi_monitor_handler = glue_nmi; } |