[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/9] hw/i2c/bitbang_i2c: Convert TYPE_GPIO_I2C from SysBus to QDe
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 3/9] hw/i2c/bitbang_i2c: Convert TYPE_GPIO_I2C from SysBus to QDev |
Date: |
Mon, 9 Jan 2023 10:26:11 +0100 |
Nothing in TYPE_GPIO_I2C access the SysBus API,
convert it to a plain QDev.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/musicpal.c | 2 +-
hw/i2c/bitbang_i2c.c | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 23359a6ac3..13f4dbdbc3 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -1297,7 +1297,7 @@ static void musicpal_init(MachineState *machine)
dev = sysbus_create_simple(TYPE_MUSICPAL_GPIO, MP_GPIO_BASE,
qdev_get_gpio_in(pic, MP_GPIO_IRQ));
- i2c_dev = sysbus_create_simple(TYPE_GPIO_I2C, -1, NULL);
+ i2c_dev = qdev_create_simple(TYPE_GPIO_I2C, &error_fatal);
i2c = (I2CBus *)qdev_get_child_bus(i2c_dev, "i2c");
lcd_dev = sysbus_create_simple(TYPE_MUSICPAL_LCD, MP_LCD_BASE, NULL);
diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c
index ffc5b95410..58503f2b27 100644
--- a/hw/i2c/bitbang_i2c.c
+++ b/hw/i2c/bitbang_i2c.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "hw/irq.h"
#include "hw/i2c/bitbang_i2c.h"
-#include "hw/sysbus.h"
#include "qemu/module.h"
#include "qom/object.h"
#include "trace.h"
@@ -191,7 +190,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(GPIOI2CState, GPIO_I2C)
struct GPIOI2CState {
/*< private >*/
- SysBusDevice parent_obj;
+ DeviceState parent_obj;
/*< public >*/
bitbang_i2c_interface bitbang;
@@ -233,7 +232,7 @@ static void gpio_i2c_class_init(ObjectClass *klass, void
*data)
static const TypeInfo gpio_i2c_info = {
.name = TYPE_GPIO_I2C,
- .parent = TYPE_SYS_BUS_DEVICE,
+ .parent = TYPE_DEVICE,
.instance_size = sizeof(GPIOI2CState),
.instance_init = gpio_i2c_init,
.class_init = gpio_i2c_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é <=
- [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é, 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