From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgLq4-0000Hy-I3 for qemu-devel@nongnu.org; Wed, 05 Dec 2012 15:45:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgLq3-0001II-4W for qemu-devel@nongnu.org; Wed, 05 Dec 2012 15:45:04 -0500 Received: from mail-ea0-f173.google.com ([209.85.215.173]:49597) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgLq2-0001D6-VY for qemu-devel@nongnu.org; Wed, 05 Dec 2012 15:45:03 -0500 Received: by mail-ea0-f173.google.com with SMTP id i13so2322945eaa.4 for ; Wed, 05 Dec 2012 12:45:02 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 5 Dec 2012 21:44:39 +0100 Message-Id: <1354740282-20679-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1354740282-20679-1-git-send-email-pbonzini@redhat.com> References: <1354740282-20679-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 08/11] 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 62b6c14..dcd39b3 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -268,7 +268,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) @@ -485,7 +486,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.0.1