diff mbox

[RESEND,v2,3/4] hw/audio: QOM'ify intel-hda

Message ID 1458205576-21646-4-git-send-email-zxq_yx_007@163.com (mailing list archive)
State New, archived
Headers show

Commit Message

zhao xiao qiang March 17, 2016, 9:06 a.m. UTC 
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(-)

Comments

Gerd Hoffmann May 11, 2016, 11:27 a.m. UTC | #1 
>      bus->next_cad = dev->cad + 1;
> -    return cdc->init(dev);
> +    if (cdc->init(dev) != 0)
> +        error_setg(errp, "HDA audio init failed.");

=== checkpatch complains ===
WARNING: braces {} are necessary for all arms of this statement
#25: FILE: hw/audio/intel-hda.c:67:
+    if (cdc->init(dev) != 0)
[...]

cheers,
  Gerd
zhao xiao qiang May 11, 2016, 11:47 a.m. UTC | #2 
? 2016?5?11??19:27?Gerd Hoffmann <kraxel@redhat.com> ???

>>     bus->next_cad = dev->cad + 1;
>> -    return cdc->init(dev);
>> +    if (cdc->init(dev) != 0)
>> +        error_setg(errp, "HDA audio init failed.");
> 
> === checkpatch complains ===
> WARNING: braces {} are necessary for all arms of this statement
> #25: FILE: hw/audio/intel-hda.c:67:
> +    if (cdc->init(dev) != 0)
> [...]
> 
> cheers,
>  Gerd
> 
> 

Thanks ?fix in the next version.
diff mbox

Patch

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;