[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 12/28] serial: replace serial_exit_core() with unrealize
From: |
Marc-André Lureau |
Subject: |
[PATCH v2 12/28] serial: replace serial_exit_core() with unrealize |
Date: |
Tue, 22 Oct 2019 18:21:21 +0200 |
Instead of calling serial_exit_core() directly, use the QDev unrealize
callback.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/char/serial-pci-multi.c | 2 +-
hw/char/serial-pci.c | 2 +-
hw/char/serial.c | 5 ++++-
include/hw/char/serial.h | 1 -
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c
index 60c1c948b8..a3200555aa 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 35a8552674..54bdd98325 100644
--- a/hw/char/serial-pci.c
+++ b/hw/char/serial-pci.c
@@ -69,7 +69,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 1500216c69..72d48b5cd8 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -952,8 +952,10 @@ static void serial_realize(DeviceState *dev, Error **errp)
qdev_set_legacy_instance_id(dev, s->base, 2);
}
-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);
@@ -1015,6 +1017,7 @@ static void serial_class_init(ObjectClass *klass, void*
data)
DeviceClass *dc = DEVICE_CLASS(klass);
dc->realize = serial_realize;
+ dc->unrealize = serial_unrealize;
dc->user_creatable = false;
dc->vmsd = &vmstate_serial;
dc->props = serial_properties;
diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
index 28bce0a791..5e657d8ade 100644
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -89,7 +89,6 @@ typedef struct SerialMMState {
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"
--
2.23.0.606.g08da6496b6
- [PATCH v2 05/28] serial: add and set "chardev" property, (continued)
- [PATCH v2 05/28] serial: add and set "chardev" property, Marc-André Lureau, 2019/10/22
- [PATCH v2 06/28] serial: make SerialMMState actually a different type, Marc-André Lureau, 2019/10/22
- [PATCH v2 07/28] serial: add and set "regshift" property, Marc-André Lureau, 2019/10/22
- [PATCH v2 08/28] serial: convert irq to qdev gpio properties, Marc-André Lureau, 2019/10/22
- [PATCH v2 09/28] serial: add "baudbase" property, Marc-André Lureau, 2019/10/22
- [PATCH v2 10/28] serial: add "base" property, Marc-André Lureau, 2019/10/22
- [PATCH v2 11/28] serial: realize the serial device, Marc-André Lureau, 2019/10/22
- [PATCH v2 12/28] serial: replace serial_exit_core() with unrealize,
Marc-André Lureau <=
- [PATCH v2 13/28] serial: factor out serial_mm_connect, Marc-André Lureau, 2019/10/22
- [PATCH v2 14/28] sm501: embed the serial device, Marc-André Lureau, 2019/10/22
- [PATCH v2 15/28] vmmouse: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/10/22
- [PATCH v2 17/28] etraxfs: remove PROP_PTR usage, Marc-André Lureau, 2019/10/22
- [PATCH v2 16/28] lance: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/10/22
- [PATCH v2 18/28] dp8393x: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/10/22
- [PATCH v2 19/28] leon3: use qemu_irq framework instead of callback as property, Marc-André Lureau, 2019/10/22
- [PATCH v2 20/28] sparc: move PIL irq handling to cpu.c, Marc-André Lureau, 2019/10/22
- [PATCH v2 21/28] RFC: mips/cps: fix setting saar property, Marc-André Lureau, 2019/10/22