qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] hw/char/parallel: Convert reset handler to DeviceReset


From: Philippe Mathieu-Daudé
Subject: [PATCH] hw/char/parallel: Convert reset handler to DeviceReset
Date: Mon, 4 May 2020 11:56:23 +0200

As TYPE_ISA_PARALLEL inherits from TYPE_ISA_DEVICE, it also
inherits from the DEVICE methods. Convert its reset handler
into a proper DeviceReset method.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
 hw/char/parallel.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index 8dd67d1375..f68a96da8e 100644
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -523,6 +523,13 @@ static int parallel_can_receive(void *opaque)
      return 1;
 }
 
+static void parallel_isa_reset(DeviceState *dev)
+{
+    ISAParallelState *isa = ISA_PARALLEL(dev);
+
+    parallel_reset(&isa->state);
+}
+
 static void parallel_isa_realizefn(DeviceState *dev, Error **errp)
 {
     static int index;
@@ -552,7 +559,6 @@ static void parallel_isa_realizefn(DeviceState *dev, Error 
**errp)
 
     base = isa->iobase;
     isa_init_irq(isadev, &s->irq, isa->isairq);
-    qemu_register_reset(parallel_reset, s);
 
     qemu_chr_fe_set_handlers(&s->chr, parallel_can_receive, NULL,
                              NULL, NULL, s, NULL, true);
@@ -625,6 +631,7 @@ static void parallel_isa_class_initfn(ObjectClass *klass, 
void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
 
+    dc->reset = parallel_isa_reset;
     dc->realize = parallel_isa_realizefn;
     dc->vmsd = &vmstate_parallel_isa;
     device_class_set_props(dc, parallel_isa_properties);
-- 
2.21.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]