From patchwork Mon Jan 21 12:30:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 214141 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 6EDE72C0084 for ; Mon, 21 Jan 2013 23:58:55 +1100 (EST) Received: from localhost ([::1]:42612 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxGX6-0006QX-5h for incoming@patchwork.ozlabs.org; Mon, 21 Jan 2013 07:31:24 -0500 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) 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=oK18zVALr3ICELsQv3V3zd7zTqaz2VbN8ZsHgkS2hRg=; b=QO5VceVwQCBwCwHuhAc9Z/qusG/08KGXJwICLSWEk0M+GJBl9cpdyh7ZEx8P8NMPMi 87S034lR+mOJj+QeR9QAkgIG0BsivR2YZGGhJs9tRJfsKtSVWGxovMkowfctyB4HeUOn IYGf/c3ZT7U5Ph4Iw0a0ZhullvSGBwlTpPNUz8ahBSOzmQD97UG6ClAzCMvU1tM81eMT eYnPba0StDw4kyc7HLQWDrrAPU8rtpxWUFmERqNWP8JRGN09yRLHw2gH1VCr4Gy7EP9l 6gZm2z4uOOaLgYv1XBpKKMIqSsNkxE0Xf+UBqATAtqVDQWxOuOYiTAVErXxhUEsM6V4U ut4A== X-Received: by 10.14.1.195 with SMTP id 43mr60302325eed.31.1358771447431; Mon, 21 Jan 2013 04:30:47 -0800 (PST) Received: from yakj.lan (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id 46sm22102581eeg.4.2013.01.21.04.30.45 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 21 Jan 2013 04:30:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2013 13:30:19 +0100 Message-Id: <1358771422-14282-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1358771422-14282-1-git-send-email-pbonzini@redhat.com> References: <1358771422-14282-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.125.83.52 Cc: aliguori@us.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v2 09/12] 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 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)