Now that SerialState inherits from SysBusDevice we can take advantage of having the reset method called by the bus hierarchy rather than having to plug and unplug it manually.
Signed-off-by: Bernhard Beschow <[email protected]> --- hw/char/serial.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index c58337bd20..c4537e5764 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -31,7 +31,6 @@ #include "chardev/char-serial.h" #include "qapi/error.h" #include "qemu/timer.h" -#include "system/reset.h" #include "system/runstate.h" #include "qemu/error-report.h" #include "trace.h" @@ -853,9 +852,9 @@ const VMStateDescription vmstate_serial = { } }; -static void serial_reset(void *opaque) +static void serial_reset(DeviceState *dev) { - SerialState *s = opaque; + SerialState *s = SERIAL(dev); if (s->watch_tag > 0) { g_source_remove(s->watch_tag); @@ -928,7 +927,6 @@ static void serial_realize(DeviceState *dev, Error **errp) s->modem_status_poll = timer_new_ns(QEMU_CLOCK_VIRTUAL, (QEMUTimerCB *) serial_update_msl, s); s->fifo_timeout_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, (QEMUTimerCB *) fifo_timeout_int, s); - qemu_register_reset(serial_reset, s); qemu_chr_fe_set_handlers(&s->chr, serial_can_receive1, serial_receive1, serial_event, serial_be_change, s, NULL, true); @@ -951,8 +949,6 @@ static void serial_unrealize(DeviceState *dev) fifo8_destroy(&s->recv_fifo); fifo8_destroy(&s->xmit_fifo); - - qemu_unregister_reset(serial_reset, s); } const MemoryRegionOps serial_io_ops = { @@ -982,6 +978,7 @@ static void serial_class_init(ObjectClass *klass, const void *data) dc->user_creatable = false; dc->realize = serial_realize; dc->unrealize = serial_unrealize; + device_class_set_legacy_reset(dc, serial_reset); device_class_set_props(dc, serial_properties); } -- 2.53.0
