[Xen-changelog] [qemu-upstream-unstable] qdev-monitor: Unref device when device_add fails

[patchbot@xxxxxxx]

commit 03060dc086ec8a75929b7bb58df9e67a305a810d
Author:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
AuthorDate: Tue Sep 10 18:21:08 2013 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Mon Dec 9 11:40:30 2013 -0600

    qdev-monitor: Unref device when device_add fails
    
    qdev_device_add() leaks the created device upon failure.  I suspect this
    problem crept in because qdev_free() unparents the device but does not
    drop a reference - confusing name.
    
    Cc: qemu-stable@xxxxxxxxxx
    Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
    Reviewed-by: Eric Blake <eblake@xxxxxxxxxx>
    Signed-off-by: Andreas Färber <afaerber@xxxxxxx>
    (cherry picked from commit ee6abeb6ec08473713848ce9028110f1684853b7)
    
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 qdev-monitor.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/qdev-monitor.c b/qdev-monitor.c
index bb2e1b6..1b2c606 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -518,6 +518,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
     }
     if (qemu_opt_foreach(opts, set_property, qdev, 1) != 0) {
         qdev_free(qdev);
+        object_unref(OBJECT(qdev));
         return NULL;
     }
     if (qdev->id) {
@@ -531,6 +532,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
         g_free(name);
     }        
     if (qdev_init(qdev) < 0) {
+        object_unref(OBJECT(qdev));
         qerror_report(QERR_DEVICE_INIT_FAILED, driver);
         return NULL;
     }
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog