[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/14] sm501: replace PROP_PTR with PROP_LINK
|
From: |
Marc-André Lureau |
|
Subject: |
[PATCH 01/14] sm501: replace PROP_PTR with PROP_LINK |
|
Date: |
Fri, 18 Oct 2019 17:41:59 +0200 |
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/display/sm501.c | 5 +++--
hw/sh4/r2d.c | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 1f33c87e65..a87d18efab 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -1930,7 +1930,7 @@ typedef struct {
SM501State state;
uint32_t vram_size;
uint32_t base;
- void *chr_state;
+ Chardev *chr_state;
} SM501SysBusState;
static void sm501_realize_sysbus(DeviceState *dev, Error **errp)
@@ -1968,7 +1968,8 @@ static void sm501_realize_sysbus(DeviceState *dev, Error
**errp)
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_LINK("chr-state", SM501SysBusState, chr_state,
+ TYPE_CHARDEV, Chardev *),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index ee0840f380..5780ee85d9 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -272,7 +272,8 @@ 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));
+ object_property_set_link(OBJECT(dev), OBJECT(serial_hd(2)),
+ "chr-state", &error_abort);
qdev_init_nofail(dev);
sysbus_mmio_map(busdev, 0, 0x10000000);
sysbus_mmio_map(busdev, 1, 0x13e00000);
--
2.23.0.606.g08da6496b6