From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxGWY-0005Ob-0r for qemu-devel@nongnu.org; Mon, 21 Jan 2013 07:30:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TxGWW-0006fy-Fo for qemu-devel@nongnu.org; Mon, 21 Jan 2013 07:30:49 -0500 Received: from mail-ee0-f52.google.com ([74.125.83.52]:54090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxGWW-0006fq-7F for qemu-devel@nongnu.org; Mon, 21 Jan 2013 07:30:48 -0500 Received: by mail-ee0-f52.google.com with SMTP id b15so2655836eek.25 for ; Mon, 21 Jan 2013 04:30:47 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 21 Jan 2013 13:30:19 +0100 Message-Id: <1358771422-14282-10-git-send-email-pbonzini@redhat.com> In-Reply-To: <1358771422-14282-1-git-send-email-pbonzini@redhat.com> References: <1358771422-14282-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 09/12] qdev: inline object_delete into qbus_free/qdev_free List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, afaerber@suse.de We want object_delete to disappear, and we will do this one class at a time. Inline it for the qdev case, which we will tackle first. Signed-off-by: Paolo Bonzini --- hw/qdev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 24bb19a..e65b32f 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -267,7 +267,8 @@ void qdev_init_nofail(DeviceState *dev) /* Unlink device from bus and free the structure. */ void qdev_free(DeviceState *dev) { - object_delete(OBJECT(dev)); + object_unparent(OBJECT(dev)); + object_unref(OBJECT(dev)); } void qdev_machine_creation_done(void) @@ -472,7 +473,8 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam void qbus_free(BusState *bus) { - object_delete(OBJECT(bus)); + object_unparent(OBJECT(bus)); + object_unref(OBJECT(bus)); } static char *bus_get_fw_dev_path(BusState *bus, DeviceState *dev) -- 1.8.1