[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 19/33] sm501: make SerialMM a child, export chardev property
From: |
Marc-André Lureau |
Subject: |
[PATCH v3 19/33] sm501: make SerialMM a child, export chardev property |
Date: |
Wed, 23 Oct 2019 19:31:40 +0200 |
Embed the SerialMM sybus device, and re-export its "chardev" property.
That way, we can get rid of PROP_PTR "chr-state" and better track
devices relationship.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/display/sm501.c | 31 ++++++++++++++++++++++---------
hw/sh4/r2d.c | 2 +-
2 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 1f33c87e65..6efdf764c1 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -1930,13 +1930,14 @@ typedef struct {
SM501State state;
uint32_t vram_size;
uint32_t base;
- void *chr_state;
+ SerialMM serial;
} SM501SysBusState;
static void sm501_realize_sysbus(DeviceState *dev, Error **errp)
{
SM501SysBusState *s = SYSBUS_SM501(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+ SerialState *ss = &s->serial.serial;
DeviceState *usb_dev;
sm501_init(&s->state, dev, s->vram_size);
@@ -1958,17 +1959,18 @@ static void sm501_realize_sysbus(DeviceState *dev,
Error **errp)
sysbus_pass_irq(sbd, SYS_BUS_DEVICE(usb_dev));
/* bridge to serial emulation module */
- if (s->chr_state) {
- serial_mm_init(&s->state.mmio_region, SM501_UART0, 2,
- NULL, /* TODO : chain irq to IRL */
- 115200, s->chr_state, DEVICE_LITTLE_ENDIAN);
+ if (qemu_chr_fe_backend_connected(&ss->chr)) {
+ MemoryRegion *mr;
+ qdev_init_nofail(DEVICE(&s->serial));
+ mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->serial), 0);
+ memory_region_add_subregion(&s->state.mmio_region, SM501_UART0, mr);
+ /* TODO : chain irq to IRL */
}
}
static Property sm501_sysbus_properties[] = {
DEFINE_PROP_UINT32("vram-size", SM501SysBusState, vram_size, 0),
DEFINE_PROP_UINT32("base", SM501SysBusState, base, 0),
- DEFINE_PROP_PTR("chr-state", SM501SysBusState, chr_state),
DEFINE_PROP_END_OF_LIST(),
};
@@ -1999,9 +2001,19 @@ static void sm501_sysbus_class_init(ObjectClass *klass,
void *data)
dc->props = sm501_sysbus_properties;
dc->reset = sm501_reset_sysbus;
dc->vmsd = &vmstate_sm501_sysbus;
- /* Note: pointer property "chr-state" may remain null, thus
- * no need for dc->user_creatable = false;
- */
+}
+
+static void sm501_sysbus_init(Object *o)
+{
+ SM501SysBusState *self = SYSBUS_SM501(o);
+ SerialMM *s = &self->serial;
+
+ sysbus_init_child_obj(o, "serial", s, sizeof(SerialMM), TYPE_SERIAL_MM);
+ qdev_prop_set_int32(DEVICE(s), "instance-id", SM501_UART0);
+ qdev_prop_set_uint8(DEVICE(s), "regshift", 2);
+ qdev_prop_set_uint8(DEVICE(s), "endianness", DEVICE_LITTLE_ENDIAN);
+
+ object_property_add_alias(o, "chardev", OBJECT(s), "chardev",
&error_abort);
}
static const TypeInfo sm501_sysbus_info = {
@@ -2009,6 +2021,7 @@ static const TypeInfo sm501_sysbus_info = {
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(SM501SysBusState),
.class_init = sm501_sysbus_class_init,
+ .instance_init = sm501_sysbus_init,
};
#define TYPE_PCI_SM501 "sm501"
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index ee0840f380..72bb5285cc 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -272,7 +272,7 @@ static void r2d_init(MachineState *machine)
busdev = SYS_BUS_DEVICE(dev);
qdev_prop_set_uint32(dev, "vram-size", SM501_VRAM_SIZE);
qdev_prop_set_uint32(dev, "base", 0x10000000);
- qdev_prop_set_ptr(dev, "chr-state", serial_hd(2));
+ qdev_prop_set_chr(dev, "chardev", serial_hd(2));
qdev_init_nofail(dev);
sysbus_mmio_map(busdev, 0, 0x10000000);
sysbus_mmio_map(busdev, 1, 0x13e00000);
--
2.23.0.606.g08da6496b6
- Re: [PATCH v3 21/33] lance: replace PROP_PTR with PROP_LINK, (continued)
[PATCH v3 20/33] vmmouse: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/10/23
[PATCH v3 23/33] dp8393x: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/10/23
[PATCH v3 19/33] sm501: make SerialMM a child, export chardev property,
Marc-André Lureau <=
[PATCH v3 22/33] etraxfs: remove PROP_PTR usage, Marc-André Lureau, 2019/10/23
[PATCH v3 24/33] leon3: use qemu_irq framework instead of callback as property, Marc-André Lureau, 2019/10/23
[PATCH v3 25/33] sparc: move PIL irq handling to cpu.c, Marc-André Lureau, 2019/10/23
[PATCH v3 26/33] RFC: mips/cps: fix setting saar property, Marc-André Lureau, 2019/10/23
[PATCH v3 27/33] cris: improve passing PIC interrupt vector to the CPU, Marc-André Lureau, 2019/10/23
[PATCH v3 29/33] omap-intc: remove PROP_PTR, Marc-André Lureau, 2019/10/23
[PATCH v3 28/33] smbus-eeprom: remove PROP_PTR, Marc-André Lureau, 2019/10/23
[PATCH v3 30/33] omap-i2c: remove PROP_PTR, Marc-André Lureau, 2019/10/23