[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH] qdev: Free opts on failed do_device_add

From: Anthony Liguori
Subject: Re: [Qemu-devel] [PATCH] qdev: Free opts on failed do_device_add
Date: Fri, 19 Feb 2010 16:01:05 -0600
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv: Gecko/20091209 Fedora/3.0-4.fc12 Lightning/1.0pre Thunderbird/3.0

On 02/16/2010 06:12 AM, Kevin Wolf wrote:
If the device can't be created, don't leak the QemuOpts and release the id of
the device that should have been added by the failed device_add.

Signed-off-by: Kevin Wolf<address@hidden>

Applied.  Thanks.


Anthony Liguori
  hw/qdev.c |    7 +++++--
  1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hw/qdev.c b/hw/qdev.c
index 539b5a2..d0052d4 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -749,8 +749,11 @@ void do_device_add(Monitor *mon, const QDict *qdict)

      opts = qemu_opts_parse(&qemu_device_opts,
                             qdict_get_str(qdict, "config"), "driver");
-    if (opts&&  !qdev_device_help(opts))
-        qdev_device_add(opts);
+    if (opts) {
+        if (qdev_device_help(opts) || qdev_device_add(opts) == NULL) {
+            qemu_opts_del(opts);
+        }
+    }

  void do_device_del(Monitor *mon, const QDict *qdict)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]