From patchwork Fri Jan 25 13:12:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 215678 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A631F2C008D for ; Sat, 26 Jan 2013 00:34:13 +1100 (EST) Received: from localhost ([::1]:42739 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tyj6u-0000WP-Ci for incoming@patchwork.ozlabs.org; Fri, 25 Jan 2013 08:14:24 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tyj5l-0007UA-KJ for qemu-devel@nongnu.org; Fri, 25 Jan 2013 08:13:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tyj5e-0002C5-W0 for qemu-devel@nongnu.org; Fri, 25 Jan 2013 08:13:13 -0500 Received: from mail-qa0-f42.google.com ([209.85.216.42]:52725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tyj5e-0002Bw-Pw for qemu-devel@nongnu.org; Fri, 25 Jan 2013 08:13:06 -0500 Received: by mail-qa0-f42.google.com with SMTP id dx4so769398qab.15 for ; Fri, 25 Jan 2013 05:13:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=B8tpy+kVQkKSEdL1AKhc/P0KpRFPHeXxdQ7HZhSOolI=; b=BiwOZHY9aaRAxd+Om2RMLmQ5Wlt5yzk1xsm2s8qAaf7Z3eJrQkpPLybLm/sg78SJjj 0plCAD/FKoRiK+kO8NzWZ/NPkiqBxAgzFIW4FAa+DPva3NfRtkT8oHqJ7KLSXVDVqX5N 0DvyjtTXG4e26gzNSCSILyFURRdPYOWVVPSLvD4YzYUBNYNHpP0hAfeseugZvsrxMy45 /naAsE56AIbxMwgwHHpubGhZRxaSZCm9bi/IwxUDLj8iIqIN+JQahM7Qu9nIKGYa9WYk 1KET/VruMz74rdUVLnqPCubp9u6okMy3vFqL8RqDmyrI5Zu+KhMo6SN5GUPZ8SXdIajK KaUg== X-Received: by 10.49.128.231 with SMTP id nr7mr6797747qeb.49.1359119586502; Fri, 25 Jan 2013 05:13:06 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id u8sm416277qeu.2.2013.01.25.05.13.04 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 25 Jan 2013 05:13:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2013 14:12:36 +0100 Message-Id: <1359119559-19075-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1359119559-19075-1-git-send-email-pbonzini@redhat.com> References: <1359119559-19075-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.216.42 Cc: afaerber@suse.de Subject: [Qemu-devel] [PATCH v4 10/13] qdev: inline object_delete into qbus_free/qdev_free X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 1dabcad..09f5969 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)