From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VxuMF-00088p-6s for qemu-devel@nongnu.org; Tue, 31 Dec 2013 03:07:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VxuM9-0007yD-84 for qemu-devel@nongnu.org; Tue, 31 Dec 2013 03:07:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46824) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VxuM9-0007y7-04 for qemu-devel@nongnu.org; Tue, 31 Dec 2013 03:07:17 -0500 From: Amos Kong Date: Tue, 31 Dec 2013 16:06:57 +0800 Message-Id: <1388477217-23491-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH] qdev: unparent device when fails to set properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, afaerber@suse.de, aliguori@amazon.com Test steps: (qemu) device_add e1000,addr=adsf Property 'e1000.addr' doesn't take value 'adsf' (qemu) info qtree Then qemu crashed. When it fails to set properties, qdev's parent is already set, but the object hasn't been added to parent object, object_unparent() won't unparent the device. This patch unparents device in the mediacy. Signed-off-by: Amos Kong --- qdev-monitor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index dc37a43..3d8b4f4 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -527,7 +527,9 @@ DeviceState *qdev_device_add(QemuOpts *opts) dev->id = id; } if (qemu_opt_foreach(opts, set_property, dev, 1) != 0) { - object_unparent(OBJECT(dev)); + if (OBJECT(dev)->class->unparent) { + (OBJECT(dev)->class->unparent)(OBJECT(dev)); + } object_unref(OBJECT(dev)); return NULL; } -- 1.8.4.2