[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/37] serial: replace serial_exit_core() with unrealize
From: |
Marc-André Lureau |
Subject: |
[PULL 11/37] serial: replace serial_exit_core() with unrealize |
Date: |
Tue, 7 Jan 2020 19:04:16 +0400 |
Instead of calling serial_exit_core() directly, use the QDev unrealize
callback.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
include/hw/char/serial.h | 1 -
hw/char/serial-pci-multi.c | 2 +-
hw/char/serial-pci.c | 2 +-
hw/char/serial.c | 5 ++++-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
index 571aab97c8..548944b06a 100644
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -83,7 +83,6 @@ typedef struct SerialState {
extern const VMStateDescription vmstate_serial;
extern const MemoryRegionOps serial_io_ops;
-void serial_exit_core(SerialState *s);
void serial_set_frequency(SerialState *s, uint32_t frequency);
#define TYPE_SERIAL "serial"
diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c
index 0e1fdb75d2..e343a1235c 100644
--- a/hw/char/serial-pci-multi.c
+++ b/hw/char/serial-pci-multi.c
@@ -56,7 +56,7 @@ static void multi_serial_pci_exit(PCIDevice *dev)
for (i = 0; i < pci->ports; i++) {
s = pci->state + i;
- serial_exit_core(s);
+ object_property_set_bool(OBJECT(s), false, "realized", NULL);
memory_region_del_subregion(&pci->iobar, &s->io);
g_free(pci->name[i]);
}
diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
index 4b6a217365..b6a73c65a9 100644
--- a/hw/char/serial-pci.c
+++ b/hw/char/serial-pci.c
@@ -68,7 +68,7 @@ static void serial_pci_exit(PCIDevice *dev)
PCISerialState *pci = DO_UPCAST(PCISerialState, dev, dev);
SerialState *s = &pci->state;
- serial_exit_core(s);
+ object_property_set_bool(OBJECT(s), false, "realized", NULL);
qemu_free_irq(s->irq);
}
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 8328cc62c3..ec388f3876 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -950,8 +950,10 @@ static void serial_realize(DeviceState *dev, Error **errp)
serial_reset(s);
}
-void serial_exit_core(SerialState *s)
+static void serial_unrealize(DeviceState *dev, Error **errp)
{
+ SerialState *s = SERIAL(dev);
+
qemu_chr_fe_deinit(&s->chr, false);
timer_del(s->modem_status_poll);
@@ -1014,6 +1016,7 @@ static void serial_class_init(ObjectClass *klass, void*
data)
/* internal device for serialio/serialmm, not user-creatable */
dc->user_creatable = false;
dc->realize = serial_realize;
+ dc->unrealize = serial_unrealize;
dc->vmsd = &vmstate_serial;
dc->props = serial_properties;
}
--
2.25.0.rc1.20.g2443f3f80d
- [PULL 01/37] hw/display/sm501: Always map the UART0, (continued)
- [PULL 01/37] hw/display/sm501: Always map the UART0, Marc-André Lureau, 2020/01/07
- [PULL 02/37] sysbus: remove unused sysbus_try_create*, Marc-André Lureau, 2020/01/07
- [PULL 03/37] sysbus: remove outdated comment, Marc-André Lureau, 2020/01/07
- [PULL 04/37] chardev: generate an internal id when none given, Marc-André Lureau, 2020/01/07
- [PULL 05/37] serial-pci-multi: factor out multi_serial_get_port_count(), Marc-André Lureau, 2020/01/07
- [PULL 06/37] serial: initial qom-ification, Marc-André Lureau, 2020/01/07
- [PULL 07/37] serial: register vmsd with DeviceClass, Marc-André Lureau, 2020/01/07
- [PULL 08/37] serial: add "chardev" property, Marc-André Lureau, 2020/01/07
- [PULL 09/37] serial: add "baudbase" property, Marc-André Lureau, 2020/01/07
- [PULL 10/37] serial: realize the serial device, Marc-André Lureau, 2020/01/07
- [PULL 11/37] serial: replace serial_exit_core() with unrealize,
Marc-André Lureau <=
- [PULL 12/37] serial: start making SerialMM a sysbus device, Marc-André Lureau, 2020/01/07
- [PULL 13/37] serial-mm: add "regshift" property, Marc-André Lureau, 2020/01/07
- [PULL 14/37] serial-mm: add endianness property, Marc-André Lureau, 2020/01/07
- [PULL 15/37] serial-mm: use sysbus facilities, Marc-André Lureau, 2020/01/07
- [PULL 17/37] mips: inline serial_init(), Marc-André Lureau, 2020/01/07
- [PULL 16/37] serial: make SerialIO a sysbus device, Marc-André Lureau, 2020/01/07
- [PULL 18/37] mips: baudbase is 115200 by default, Marc-André Lureau, 2020/01/07
- [PULL 19/37] mips: use sysbus_add_io(), Marc-André Lureau, 2020/01/07
- [PULL 20/37] mips: use sysbus_mmio_get_region() instead of internal fields, Marc-André Lureau, 2020/01/07
- [PULL 21/37] sm501: make SerialMM a child, export chardev property, Marc-André Lureau, 2020/01/07