[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 10/28] serial: add "base" property
From: |
Marc-André Lureau |
Subject: |
[PATCH v2 10/28] serial: add "base" property |
Date: |
Tue, 22 Oct 2019 18:21:19 +0200 |
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/char/serial.c | 3 +++
include/hw/char/serial.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 0ae52ec60c..4748a2b023 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -990,6 +990,7 @@ SerialState *serial_init(int base, qemu_irq irq, int
baudbase,
qdev_connect_gpio_out_named(dev, "serial-irq", 0, irq);
qdev_prop_set_uint32(dev, "baudbase", baudbase);
qdev_prop_set_chr(dev, "chardev", chr);
+ qdev_prop_set_uint64(dev, "base", base);
serial_realize_core(s, &error_fatal);
qdev_set_legacy_instance_id(dev, base, 2);
qdev_init_nofail(dev);
@@ -1003,6 +1004,7 @@ SerialState *serial_init(int base, qemu_irq irq, int
baudbase,
static Property serial_properties[] = {
DEFINE_PROP_CHR("chardev", SerialState, chr),
DEFINE_PROP_UINT32("baudbase", SerialState, baudbase, 115200),
+ DEFINE_PROP_UINT64("base", SerialState, base, 0),
DEFINE_PROP_END_OF_LIST(),
};
@@ -1083,6 +1085,7 @@ SerialState *serial_mm_init(MemoryRegion *address_space,
qdev_prop_set_uint32(dev, "baudbase", baudbase);
qdev_prop_set_chr(dev, "chardev", chr);
qdev_prop_set_uint8(dev, "regshift", regshift);
+ qdev_prop_set_uint64(dev, "base", base);
serial_realize_core(s, &error_fatal);
qdev_set_legacy_instance_id(DEVICE(s), base, 2);
diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
index ecbd3f1b40..6e9c9768ed 100644
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -77,6 +77,7 @@ typedef struct SerialState {
QEMUTimer *modem_status_poll;
MemoryRegion io;
+ uint64_t base;
} SerialState;
typedef struct SerialMMState {
--
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, 2019/10/22
- [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 10/28] serial: add "base" property,
Marc-André Lureau <=
- [PATCH v2 09/28] serial: add "baudbase" 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, 2019/10/22
- [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