commit 18cfeb52d17825dddadfc74e99255530aa889136
author Markus Armbruster <armbru@redhat.com> Wed Oct 07 01:15:56 2009 +0200
committer Anthony Liguori <aliguori@us.ibm.com> Wed Oct 07 08:54:53 2009 -0500
tree 532b36d74abb74846aa9815a2bd07cc773808fd3
parent 05a91699292dbb814c37d55da72fd35fa2a686a2

Make qdev_init() destroy the device on failure

Before, every caller had to do this.  Only two actually did.

Patchworks-ID: 35170
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

hw/qdev.c

diff --git a/hw/qdev.c b/hw/qdev.c
index 253e255..8a62001 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -216,7 +216,6 @@
     }
     if (qdev_init(qdev) != 0) {
         qemu_error("Error initializing device %s\n", driver);
-        qdev_free(qdev);
         return NULL;
     }
     qdev->opts = opts;
@@ -232,15 +231,19 @@
 
 /* Initialize a device.  Device properties should be set before calling
    this function.  IRQs and MMIO regions should be connected/mapped after
-   calling this function.  */
+   calling this function.
+   On failure, destroy the device and return negative value.
+   Return 0 on success.  */
 int qdev_init(DeviceState *dev)
 {
     int rc;
 
     assert(dev->state == DEV_STATE_CREATED);
     rc = dev->info->init(dev, dev->info);
-    if (rc < 0)
+    if (rc < 0) {
+        qdev_free(dev);
         return rc;
+    }
     qemu_register_reset(qdev_reset, dev);
     if (dev->info->vmsd)
         vmstate_register(-1, dev->info->vmsd, dev);