From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zo8Lx-0000e2-Q5 for qemu-devel@nongnu.org; Mon, 19 Oct 2015 07:11:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zo8Lu-0007Uo-Jp for qemu-devel@nongnu.org; Mon, 19 Oct 2015 07:11:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zo8Lu-0007UP-ED for qemu-devel@nongnu.org; Mon, 19 Oct 2015 07:11:42 -0400 From: Paolo Bonzini Date: Mon, 19 Oct 2015 13:11:39 +0200 Message-Id: <1445253099-16894-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] qdev: free qemu-opts when the QOM path goes away List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: afaerber@suse.de Otherwise there is a race where the DEVICE_DELETED event has been sent but attempts to reuse the ID will fail. Reported-by: Michael S. Tsirkin Signed-off-by: Paolo Bonzini --- hw/core/qdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 4ab04aa..92bd8bb 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -1203,7 +1203,6 @@ static void device_finalize(Object *obj) NamedGPIOList *ngl, *next; DeviceState *dev = DEVICE(obj); - qemu_opts_del(dev->opts); QLIST_FOREACH_SAFE(ngl, &dev->gpios, node, next) { QLIST_REMOVE(ngl, node); @@ -1251,6 +1250,9 @@ static void device_unparent(Object *obj) qapi_event_send_device_deleted(!!dev->id, dev->id, path, &error_abort); g_free(path); } + + qemu_opts_del(dev->opts); + dev->opts = NULL; } static void device_class_init(ObjectClass *class, void *data) -- 2.5.0