[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/28] serial: register vmsd with DeviceClass
From: |
Marc-André Lureau |
Subject: |
[PATCH v2 04/28] serial: register vmsd with DeviceClass |
Date: |
Tue, 22 Oct 2019 18:21:13 +0200 |
QOM-ify further.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/char/serial.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/char/serial.c b/hw/char/serial.c
index fb0dd98103..143e39c1b1 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -990,8 +990,7 @@ SerialState *serial_init(int base, qemu_irq irq, int
baudbase,
s->baudbase = baudbase;
qemu_chr_fe_init(&s->chr, chr, &error_abort);
serial_realize_core(s, &error_fatal);
-
- vmstate_register(NULL, base, &vmstate_serial, s);
+ qdev_set_legacy_instance_id(dev, base, 2);
qdev_init_nofail(dev);
memory_region_init_io(&s->io, NULL, &serial_io_ops, s, "serial", 8);
@@ -1005,6 +1004,7 @@ static void serial_class_init(ObjectClass *klass, void*
data)
DeviceClass *dc = DEVICE_CLASS(klass);
dc->user_creatable = false;
+ dc->vmsd = &vmstate_serial;
}
static const TypeInfo serial_info = {
@@ -1068,7 +1068,7 @@ SerialState *serial_mm_init(MemoryRegion *address_space,
qemu_chr_fe_init(&s->chr, chr, &error_abort);
serial_realize_core(s, &error_fatal);
- vmstate_register(NULL, base, &vmstate_serial, s);
+ qdev_set_legacy_instance_id(DEVICE(s), base, 2);
qdev_init_nofail(dev);
memory_region_init_io(&s->io, NULL, &serial_mm_ops[end], s,
--
2.23.0.606.g08da6496b6
- [PATCH v2 00/28] Clean-ups: qom-ify serial and remove QDEV_PROP_PTR, Marc-André Lureau, 2019/10/22
- [PATCH v2 01/28] chardev: generate an internal id when none given, Marc-André Lureau, 2019/10/22
- [PATCH v2 02/28] serial-pci-multi: factor out multi_serial_get_nr_ports, Marc-André Lureau, 2019/10/22
- [PATCH v2 03/28] serial: initial qom-ification, Marc-André Lureau, 2019/10/22
- [PATCH v2 04/28] serial: register vmsd with DeviceClass,
Marc-André Lureau <=
- [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