* [Qemu-devel] [PATCH 0/4] QOM'ify hw/audio files
@ 2016-03-16 9:24 xiaoqiang zhao
2016-03-16 9:24 ` [Qemu-devel] [PATCH 1/4] hw/audio: QOM'ify cs4231.c xiaoqiang zhao
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: xiaoqiang zhao @ 2016-03-16 9:24 UTC (permalink / raw
To: qemu-devel; +Cc: michael, kraxel, afaerber
This patch set QOM'ify some files under hw/audio directory.
See each patch's commit message for details.
xiaoqiang zhao (4):
hw/audio: QOM'ify cs4231.c
hw/audio: QOM cleanup for intel-hda
hw/audio: QOM'ify intel-hda
hw/audio: QOM'ify milkymist-ac97.c
hw/audio/cs4231.c | 12 +++++-------
hw/audio/intel-hda.c | 30 ++++++++++++++++--------------
hw/audio/milkymist-ac97.c | 13 +++++--------
3 files changed, 26 insertions(+), 29 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH 1/4] hw/audio: QOM'ify cs4231.c
2016-03-16 9:24 [Qemu-devel] [PATCH 0/4] QOM'ify hw/audio files xiaoqiang zhao
@ 2016-03-16 9:24 ` xiaoqiang zhao
2016-03-16 16:30 ` Paolo Bonzini
2016-03-16 9:24 ` [Qemu-devel] [PATCH 2/4] hw/audio: QOM cleanup for intel-hda xiaoqiang zhao
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: xiaoqiang zhao @ 2016-03-16 9:24 UTC (permalink / raw
To: qemu-devel; +Cc: michael, kraxel, afaerber
Drop the old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
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,
};
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH 2/4] hw/audio: QOM cleanup for intel-hda
2016-03-16 9:24 [Qemu-devel] [PATCH 0/4] QOM'ify hw/audio files xiaoqiang zhao
2016-03-16 9:24 ` [Qemu-devel] [PATCH 1/4] hw/audio: QOM'ify cs4231.c xiaoqiang zhao
@ 2016-03-16 9:24 ` xiaoqiang zhao
2016-03-16 9:24 ` [Qemu-devel] [PATCH 3/4] hw/audio: QOM'ify intel-hda xiaoqiang zhao
2016-03-16 9:24 ` [Qemu-devel] [PATCH 4/4] hw/audio: QOM'ify milkymist-ac97.c xiaoqiang zhao
3 siblings, 0 replies; 8+ messages in thread
From: xiaoqiang zhao @ 2016-03-16 9:24 UTC (permalink / raw
To: qemu-devel; +Cc: michael, kraxel, afaerber
drop the DO_UPCAST macro
Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
hw/audio/intel-hda.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index d372d4a..5b1e760 100644
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -52,8 +52,8 @@ void hda_codec_bus_init(DeviceState *dev, HDACodecBus *bus, size_t bus_size,
static int hda_codec_dev_init(DeviceState *qdev)
{
- HDACodecBus *bus = DO_UPCAST(HDACodecBus, qbus, qdev->parent_bus);
- HDACodecDevice *dev = DO_UPCAST(HDACodecDevice, qdev, qdev);
+ HDACodecBus *bus = HDA_BUS(qdev->parent_bus);
+ HDACodecDevice *dev = HDA_CODEC_DEVICE(qdev);
HDACodecDeviceClass *cdc = HDA_CODEC_DEVICE_GET_CLASS(dev);
if (dev->cad == -1) {
@@ -68,7 +68,7 @@ static int hda_codec_dev_init(DeviceState *qdev)
static int hda_codec_dev_exit(DeviceState *qdev)
{
- HDACodecDevice *dev = DO_UPCAST(HDACodecDevice, qdev, qdev);
+ HDACodecDevice *dev = HDA_CODEC_DEVICE(qdev);
HDACodecDeviceClass *cdc = HDA_CODEC_DEVICE_GET_CLASS(dev);
if (cdc->exit) {
@@ -84,7 +84,7 @@ HDACodecDevice *hda_codec_find(HDACodecBus *bus, uint32_t cad)
QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) {
DeviceState *qdev = kid->child;
- cdev = DO_UPCAST(HDACodecDevice, qdev, qdev);
+ cdev = HDA_CODEC_DEVICE(qdev);
if (cdev->cad == cad) {
return cdev;
}
@@ -94,14 +94,14 @@ HDACodecDevice *hda_codec_find(HDACodecBus *bus, uint32_t cad)
void hda_codec_response(HDACodecDevice *dev, bool solicited, uint32_t response)
{
- HDACodecBus *bus = DO_UPCAST(HDACodecBus, qbus, dev->qdev.parent_bus);
+ HDACodecBus *bus = HDA_BUS(dev->qdev.parent_bus);
bus->response(dev, solicited, response);
}
bool hda_codec_xfer(HDACodecDevice *dev, uint32_t stnr, bool output,
uint8_t *buf, uint32_t len)
{
- HDACodecBus *bus = DO_UPCAST(HDACodecBus, qbus, dev->qdev.parent_bus);
+ HDACodecBus *bus = HDA_BUS(dev->qdev.parent_bus);
return bus->xfer(dev, stnr, output, buf, len);
}
@@ -337,7 +337,7 @@ static void intel_hda_corb_run(IntelHDAState *d)
static void intel_hda_response(HDACodecDevice *dev, bool solicited, uint32_t response)
{
- HDACodecBus *bus = DO_UPCAST(HDACodecBus, qbus, dev->qdev.parent_bus);
+ HDACodecBus *bus = HDA_BUS(dev->qdev.parent_bus);
IntelHDAState *d = container_of(bus, IntelHDAState, codecs);
hwaddr addr;
uint32_t wp, ex;
@@ -386,7 +386,7 @@ static void intel_hda_response(HDACodecDevice *dev, bool solicited, uint32_t res
static bool intel_hda_xfer(HDACodecDevice *dev, uint32_t stnr, bool output,
uint8_t *buf, uint32_t len)
{
- HDACodecBus *bus = DO_UPCAST(HDACodecBus, qbus, dev->qdev.parent_bus);
+ HDACodecBus *bus = HDA_BUS(dev->qdev.parent_bus);
IntelHDAState *d = container_of(bus, IntelHDAState, codecs);
hwaddr addr;
uint32_t s, copy, left;
@@ -493,7 +493,7 @@ static void intel_hda_notify_codecs(IntelHDAState *d, uint32_t stream, bool runn
DeviceState *qdev = kid->child;
HDACodecDeviceClass *cdc;
- cdev = DO_UPCAST(HDACodecDevice, qdev, qdev);
+ cdev = HDA_CODEC_DEVICE(qdev);
cdc = HDA_CODEC_DEVICE_GET_CLASS(cdev);
if (cdc->stream) {
cdc->stream(cdev, stream, running, output);
@@ -1120,7 +1120,7 @@ static void intel_hda_reset(DeviceState *dev)
/* reset codecs */
QTAILQ_FOREACH(kid, &d->codecs.qbus.children, sibling) {
DeviceState *qdev = kid->child;
- cdev = DO_UPCAST(HDACodecDevice, qdev, qdev);
+ cdev = HDA_CODEC_DEVICE(qdev);
device_reset(DEVICE(cdev));
d->state_sts |= (1 << cdev->cad);
}
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH 3/4] hw/audio: QOM'ify intel-hda
2016-03-16 9:24 [Qemu-devel] [PATCH 0/4] QOM'ify hw/audio files xiaoqiang zhao
2016-03-16 9:24 ` [Qemu-devel] [PATCH 1/4] hw/audio: QOM'ify cs4231.c xiaoqiang zhao
2016-03-16 9:24 ` [Qemu-devel] [PATCH 2/4] hw/audio: QOM cleanup for intel-hda xiaoqiang zhao
@ 2016-03-16 9:24 ` xiaoqiang zhao
2016-03-16 9:24 ` [Qemu-devel] [PATCH 4/4] hw/audio: QOM'ify milkymist-ac97.c xiaoqiang zhao
3 siblings, 0 replies; 8+ messages in thread
From: xiaoqiang zhao @ 2016-03-16 9:24 UTC (permalink / raw
To: qemu-devel; +Cc: michael, kraxel, afaerber
use DeviceClass::realize instead of DeviceClass::init
Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
hw/audio/intel-hda.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index 5b1e760..36afbf2 100644
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -50,7 +50,7 @@ void hda_codec_bus_init(DeviceState *dev, HDACodecBus *bus, size_t bus_size,
bus->xfer = xfer;
}
-static int hda_codec_dev_init(DeviceState *qdev)
+static void hda_codec_dev_realize(DeviceState *qdev, Error **errp)
{
HDACodecBus *bus = HDA_BUS(qdev->parent_bus);
HDACodecDevice *dev = HDA_CODEC_DEVICE(qdev);
@@ -60,10 +60,12 @@ static int hda_codec_dev_init(DeviceState *qdev)
dev->cad = bus->next_cad;
}
if (dev->cad >= 15) {
- return -1;
+ error_setg(errp, "HDA audio codec address is full!");
+ return;
}
bus->next_cad = dev->cad + 1;
- return cdc->init(dev);
+ if (cdc->init(dev) != 0)
+ error_setg(errp, "HDA audio init failed.");
}
static int hda_codec_dev_exit(DeviceState *qdev)
@@ -1298,7 +1300,7 @@ static const TypeInfo intel_hda_info_ich9 = {
static void hda_codec_device_class_init(ObjectClass *klass, void *data)
{
DeviceClass *k = DEVICE_CLASS(klass);
- k->init = hda_codec_dev_init;
+ k->realize = hda_codec_dev_realize;
k->exit = hda_codec_dev_exit;
set_bit(DEVICE_CATEGORY_SOUND, k->categories);
k->bus_type = TYPE_HDA_BUS;
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH 4/4] hw/audio: QOM'ify milkymist-ac97.c
2016-03-16 9:24 [Qemu-devel] [PATCH 0/4] QOM'ify hw/audio files xiaoqiang zhao
` (2 preceding siblings ...)
2016-03-16 9:24 ` [Qemu-devel] [PATCH 3/4] hw/audio: QOM'ify intel-hda xiaoqiang zhao
@ 2016-03-16 9:24 ` xiaoqiang zhao
2016-03-16 16:30 ` Paolo Bonzini
3 siblings, 1 reply; 8+ messages in thread
From: xiaoqiang zhao @ 2016-03-16 9:24 UTC (permalink / raw
To: qemu-devel; +Cc: michael, kraxel, afaerber
Drop the old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
hw/audio/milkymist-ac97.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c
index 6a3b536..ac78e00 100644
--- a/hw/audio/milkymist-ac97.c
+++ b/hw/audio/milkymist-ac97.c
@@ -284,10 +284,10 @@ static int ac97_post_load(void *opaque, int version_id)
return 0;
}
-static int milkymist_ac97_init(SysBusDevice *dev)
+static void milkymist_ac97_init(Object *obj)
{
- MilkymistAC97State *s = MILKYMIST_AC97(dev);
-
+ MilkymistAC97State *s = MILKYMIST_AC97(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
struct audsettings as;
sysbus_init_irq(dev, &s->crrequest_irq);
sysbus_init_irq(dev, &s->crreply_irq);
@@ -306,11 +306,9 @@ static int milkymist_ac97_init(SysBusDevice *dev)
s->voice_out = AUD_open_out(&s->card, s->voice_out,
"mm_ac97.out", s, ac97_out_cb, &as);
- memory_region_init_io(&s->regs_region, OBJECT(s), &ac97_mmio_ops, s,
+ memory_region_init_io(&s->regs_region, obj, &ac97_mmio_ops, s,
"milkymist-ac97", R_MAX * 4);
sysbus_init_mmio(dev, &s->regs_region);
-
- return 0;
}
static const VMStateDescription vmstate_milkymist_ac97 = {
@@ -327,9 +325,7 @@ static const VMStateDescription vmstate_milkymist_ac97 = {
static void milkymist_ac97_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = milkymist_ac97_init;
dc->reset = milkymist_ac97_reset;
dc->vmsd = &vmstate_milkymist_ac97;
}
@@ -338,6 +334,7 @@ static const TypeInfo milkymist_ac97_info = {
.name = TYPE_MILKYMIST_AC97,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(MilkymistAC97State),
+ .instance_init = milkymist_ac97_init,
.class_init = milkymist_ac97_class_init,
};
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 4/4] hw/audio: QOM'ify milkymist-ac97.c
2016-03-16 9:24 ` [Qemu-devel] [PATCH 4/4] hw/audio: QOM'ify milkymist-ac97.c xiaoqiang zhao
@ 2016-03-16 16:30 ` Paolo Bonzini
2016-03-17 1:39 ` xiaoqiang zhao
0 siblings, 1 reply; 8+ messages in thread
From: Paolo Bonzini @ 2016-03-16 16:30 UTC (permalink / raw
To: xiaoqiang zhao, qemu-devel; +Cc: michael, kraxel, afaerber
On 16/03/2016 10:24, xiaoqiang zhao wrote:
> s->voice_out = AUD_open_out(&s->card, s->voice_out,
> "mm_ac97.out", s, ac97_out_cb, &as);
>
AUD_open_out should not be done before realize.
Paolo
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 1/4] hw/audio: QOM'ify cs4231.c
2016-03-16 9:24 ` [Qemu-devel] [PATCH 1/4] hw/audio: QOM'ify cs4231.c xiaoqiang zhao
@ 2016-03-16 16:30 ` Paolo Bonzini
0 siblings, 0 replies; 8+ messages in thread
From: Paolo Bonzini @ 2016-03-16 16:30 UTC (permalink / raw
To: xiaoqiang zhao, qemu-devel; +Cc: michael, kraxel, afaerber
On 16/03/2016 10:24, xiaoqiang zhao wrote:
> Drop the old SysBus init function and use instance_init
>
> Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
> ---
> 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,
> };
>
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 4/4] hw/audio: QOM'ify milkymist-ac97.c
2016-03-16 16:30 ` Paolo Bonzini
@ 2016-03-17 1:39 ` xiaoqiang zhao
0 siblings, 0 replies; 8+ messages in thread
From: xiaoqiang zhao @ 2016-03-17 1:39 UTC (permalink / raw
To: Paolo Bonzini, qemu-devel; +Cc: michael, kraxel, afaerber
在 2016年03月17日 00:30, Paolo Bonzini 写道:
>
> On 16/03/2016 10:24, xiaoqiang zhao wrote:
>> s->voice_out = AUD_open_out(&s->card, s->voice_out,
>> "mm_ac97.out", s, ac97_out_cb, &as);
>>
> AUD_open_out should not be done before realize.
>
> Paolo
I wil move it to DeviceClasss::realize in the next version.
Thank you Paolo !
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-03-17 1:41 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-16 9:24 [Qemu-devel] [PATCH 0/4] QOM'ify hw/audio files xiaoqiang zhao
2016-03-16 9:24 ` [Qemu-devel] [PATCH 1/4] hw/audio: QOM'ify cs4231.c xiaoqiang zhao
2016-03-16 16:30 ` Paolo Bonzini
2016-03-16 9:24 ` [Qemu-devel] [PATCH 2/4] hw/audio: QOM cleanup for intel-hda xiaoqiang zhao
2016-03-16 9:24 ` [Qemu-devel] [PATCH 3/4] hw/audio: QOM'ify intel-hda xiaoqiang zhao
2016-03-16 9:24 ` [Qemu-devel] [PATCH 4/4] hw/audio: QOM'ify milkymist-ac97.c xiaoqiang zhao
2016-03-16 16:30 ` Paolo Bonzini
2016-03-17 1:39 ` xiaoqiang zhao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.