qdev: Free opts on failed do_device_add
PATCH 1/1 qdev: Free opts on failed do_device_add
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 <[email protected]>
--- hw/qdev.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
hw/qdev.c +5 -2
@@ -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)
Signature · 1 line
1.6.6
Quoted 2 lines · Kevin Wolf
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.
Acked-by Gerd Hoffmann <[email protected]>
cheers,
Gerd
Anthony Liguori
AppliedQuoted 5 lines · Kevin Wolf
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<[email protected]>
Applied. Thanks.
Regards,
Anthony Liguori
Quoted 23 lines
--- hw/qdev.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)hw/qdev.c +5
-2@@ -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)