[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/9] hw/arm/spitz: Convert TYPE_SPITZ_KEYBOARD from SysBus to QDe
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 7/9] hw/arm/spitz: Convert TYPE_SPITZ_KEYBOARD from SysBus to QDev |
Date: |
Mon, 9 Jan 2023 10:26:15 +0100 |
Nothing in TYPE_SPITZ_KEYBOARD access the SysBus API,
convert it to a plain QDev.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/spitz.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index 5aab0b8565..6605d658ed 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -260,8 +260,10 @@ static const int spitz_gpiomap[5] = {
OBJECT_DECLARE_SIMPLE_TYPE(SpitzKeyboardState, SPITZ_KEYBOARD)
struct SpitzKeyboardState {
- SysBusDevice parent_obj;
+ /*< private >*/
+ DeviceState parent_obj;
+ /*< public >*/
qemu_irq sense[SPITZ_KEY_SENSE_NUM];
qemu_irq gpiomap[5];
int keymap[0x80];
@@ -514,7 +516,7 @@ static void spitz_keyboard_register(PXA2xxState *cpu)
DeviceState *dev;
SpitzKeyboardState *s;
- dev = sysbus_create_simple(TYPE_SPITZ_KEYBOARD, -1, NULL);
+ dev = qdev_create_simple(TYPE_SPITZ_KEYBOARD, &error_fatal);
s = SPITZ_KEYBOARD(dev);
for (i = 0; i < SPITZ_KEY_SENSE_NUM; i ++)
@@ -1193,7 +1195,7 @@ static void spitz_keyboard_class_init(ObjectClass *klass,
void *data)
static const TypeInfo spitz_keyboard_info = {
.name = TYPE_SPITZ_KEYBOARD,
- .parent = TYPE_SYS_BUS_DEVICE,
+ .parent = TYPE_DEVICE,
.instance_size = sizeof(SpitzKeyboardState),
.instance_init = spitz_keyboard_init,
.class_init = spitz_keyboard_class_init,
--
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é, 2023/01/09
- [PATCH 7/9] hw/arm/spitz: Convert TYPE_SPITZ_KEYBOARD from SysBus to QDev,
Philippe Mathieu-Daudé <=
- [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