openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/audio: QOM'ify intel-hda 

* use DeviceClass::realize instead of DeviceClass::init

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Message-id: 1463111220-30335-4-git-send-email-zxq_yx_007@163.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
xiaoqiang zhao 2016-05-13 11:46:59 +08:00 committed by Gerd Hoffmann
parent e19202af79
commit bda8d9b8b1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/audio/intel-hda.c
View File

@ -26,6 +26,7 @@
#include "intel-hda.h" #include "intel-hda.h"
#include "intel-hda-defs.h" #include "intel-hda-defs.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include "qapi/error.h"
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* hda bus */ /* hda bus */
@ -50,7 +51,7 @@ void hda_codec_bus_init(DeviceState *dev, HDACodecBus *bus, size_t bus_size,
bus->xfer = xfer; 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); HDACodecBus *bus = HDA_BUS(qdev->parent_bus);
HDACodecDevice *dev = HDA_CODEC_DEVICE(qdev); HDACodecDevice *dev = HDA_CODEC_DEVICE(qdev);
@ -60,10 +61,13 @@ static int hda_codec_dev_init(DeviceState *qdev)
dev->cad = bus->next_cad; dev->cad = bus->next_cad;
} }
if (dev->cad >= 15) { if (dev->cad >= 15) {
return -1; error_setg(errp, "HDA audio codec address is full");
return;
} }
bus->next_cad = dev->cad + 1; 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) static int hda_codec_dev_exit(DeviceState *qdev)
@ -1298,7 +1302,7 @@ static const TypeInfo intel_hda_info_ich9 = {
static void hda_codec_device_class_init(ObjectClass *klass, void *data) static void hda_codec_device_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *k = DEVICE_CLASS(klass); DeviceClass *k = DEVICE_CLASS(klass);
k->init = hda_codec_dev_init; k->realize = hda_codec_dev_realize;
k->exit = hda_codec_dev_exit; k->exit = hda_codec_dev_exit;
set_bit(DEVICE_CATEGORY_SOUND, k->categories); set_bit(DEVICE_CATEGORY_SOUND, k->categories);
k->bus_type = TYPE_HDA_BUS; k->bus_type = TYPE_HDA_BUS;