From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MrGhM-0006bT-JZ for qemu-devel@nongnu.org; Fri, 25 Sep 2009 15:43:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MrGhH-0006Vr-SB for qemu-devel@nongnu.org; Fri, 25 Sep 2009 15:43:19 -0400 Received: from [199.232.76.173] (port=56065 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MrGhG-0006VR-SN for qemu-devel@nongnu.org; Fri, 25 Sep 2009 15:43:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10816) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MrGhG-0004gM-DB for qemu-devel@nongnu.org; Fri, 25 Sep 2009 15:43:14 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8PJhDa6032679 for ; Fri, 25 Sep 2009 15:43:13 -0400 From: Gerd Hoffmann Date: Fri, 25 Sep 2009 21:42:49 +0200 Message-Id: <1253907769-1067-25-git-send-email-kraxel@redhat.com> In-Reply-To: <1253907769-1067-1-git-send-email-kraxel@redhat.com> References: <1253907769-1067-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 24/24] store a pointer to QemuOpts in DeviceState, release it when zapping a device. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/qdev.c | 3 +++ hw/qdev.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 00cb849..ae24df7 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -218,6 +218,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) qdev_free(qdev); return NULL; } + qdev->opts = opts; return qdev; } @@ -276,6 +277,8 @@ void qdev_free(DeviceState *dev) qemu_unregister_reset(dev->info->reset, dev); if (dev->info->exit) dev->info->exit(dev); + if (dev->opts) + qemu_opts_del(dev->opts); } QLIST_REMOVE(dev, sibling); qemu_free(dev); diff --git a/hw/qdev.h b/hw/qdev.h index 8b6e4fe..1884160 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -29,6 +29,7 @@ enum DevState { struct DeviceState { const char *id; enum DevState state; + QemuOpts *opts; int hotplugged; DeviceInfo *info; BusState *parent_bus; -- 1.6.2.5