[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/9] hw/arm/musicpal: Convert TYPE_MUSICPAL_KEY from SysBus to QD
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 6/9] hw/arm/musicpal: Convert TYPE_MUSICPAL_KEY from SysBus to QDev |
Date: |
Mon, 9 Jan 2023 10:26:14 +0100 |
Nothing in TYPE_MUSICPAL_KEY access the SysBus API,
convert it to a plain QDev.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/musicpal.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 13f4dbdbc3..b496ff8a22 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -1068,7 +1068,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(musicpal_key_state,
MUSICPAL_KEY)
struct musicpal_key_state {
/*< private >*/
- SysBusDevice parent_obj;
+ DeviceState parent_obj;
/*< public >*/
uint32_t kbd_extended;
@@ -1187,7 +1187,7 @@ static void musicpal_key_class_init(ObjectClass *klass,
void *data)
static const TypeInfo musicpal_key_info = {
.name = TYPE_MUSICPAL_KEY,
- .parent = TYPE_SYS_BUS_DEVICE,
+ .parent = TYPE_DEVICE,
.instance_size = sizeof(musicpal_key_state),
.instance_init = musicpal_key_init,
.class_init = musicpal_key_class_init,
@@ -1301,7 +1301,7 @@ static void musicpal_init(MachineState *machine)
i2c = (I2CBus *)qdev_get_child_bus(i2c_dev, "i2c");
lcd_dev = sysbus_create_simple(TYPE_MUSICPAL_LCD, MP_LCD_BASE, NULL);
- key_dev = sysbus_create_simple(TYPE_MUSICPAL_KEY, -1, NULL);
+ key_dev = qdev_create_simple(TYPE_MUSICPAL_KEY, &error_fatal);
/* I2C read data */
qdev_connect_gpio_out(i2c_dev, 0,
--
2.38.1
- [PATCH 0/9] hw: Convert simple devices from SysBus to QDev, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 1/9] hw/arm/musicpal: Remove unused dummy MemoryRegion, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 2/9] qdev: Add qdev_create_simple() helper, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 3/9] hw/i2c/bitbang_i2c: Convert TYPE_GPIO_I2C from SysBus to QDev, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 5/9] hw/arm/palm: Convert TYPE_PALM_MISC_GPIO from SysBus to QDev, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 4/9] hw/arm/tosa: Convert TYPE_TOSA_MISC_GPIO from SysBus to QDev, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 6/9] hw/arm/musicpal: Convert TYPE_MUSICPAL_KEY from SysBus to QDev,
Philippe Mathieu-Daudé <=
- [PATCH 7/9] hw/arm/spitz: Convert TYPE_SPITZ_KEYBOARD from SysBus to QDev, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 8/9] hw/arm/tosa: Convert TYPE_SPITZ_MISC_GPIO from SysBus to QDev, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 9/9] hw/i386/kvm: Convert TYPE_KVM_CLOCK from SysBus to QDev, Philippe Mathieu-Daudé, 2023/01/09
- Re: [PATCH 0/9] hw: Convert simple devices from SysBus to QDev, Peter Maydell, 2023/01/09