[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/5] hw/audio: QOM'ify cs4231.c
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 2/5] hw/audio: QOM'ify cs4231.c |
Date: |
Mon, 6 Jun 2016 09:02:56 +0200 |
From: xiaoqiang zhao <address@hidden>
Drop the old SysBus init function and use instance_init
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: xiaoqiang zhao <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/audio/cs4231.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c
index caf97c1..30690f9 100644
--- a/hw/audio/cs4231.c
+++ b/hw/audio/cs4231.c
@@ -145,16 +145,15 @@ static const VMStateDescription vmstate_cs4231 = {
}
};
-static int cs4231_init1(SysBusDevice *dev)
+static void cs4231_init(Object *obj)
{
- CSState *s = CS4231(dev);
+ CSState *s = CS4231(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
- memory_region_init_io(&s->iomem, OBJECT(s), &cs_mem_ops, s, "cs4321",
+ memory_region_init_io(&s->iomem, obj, &cs_mem_ops, s, "cs4321",
CS_SIZE);
sysbus_init_mmio(dev, &s->iomem);
sysbus_init_irq(dev, &s->irq);
-
- return 0;
}
static Property cs4231_properties[] = {
@@ -164,9 +163,7 @@ static Property cs4231_properties[] = {
static void cs4231_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = cs4231_init1;
dc->reset = cs_reset;
dc->vmsd = &vmstate_cs4231;
dc->props = cs4231_properties;
@@ -176,6 +173,7 @@ static const TypeInfo cs4231_info = {
.name = TYPE_CS4231,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(CSState),
+ .instance_init = cs4231_init,
.class_init = cs4231_class_init,
};
--
1.8.3.1
- [Qemu-devel] [PULL 0/5] audio patch queue, Gerd Hoffmann, 2016/06/06
- [Qemu-devel] [PULL 5/5] hw/audio: QOM'ify milkymist-ac97.c, Gerd Hoffmann, 2016/06/06
- [Qemu-devel] [PULL 3/5] hw/audio: QOM cleanup for intel-hda, Gerd Hoffmann, 2016/06/06
- [Qemu-devel] [PULL 2/5] hw/audio: QOM'ify cs4231.c,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 1/5] audio: pa: Set volume of recording stream instead of recording device, Gerd Hoffmann, 2016/06/06
- [Qemu-devel] [PULL 4/5] hw/audio: QOM'ify intel-hda, Gerd Hoffmann, 2016/06/06
- Re: [Qemu-devel] [PULL 0/5] audio patch queue, Peter Maydell, 2016/06/06