From nobody Fri Nov 14 20:40:44 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589900413; cv=none; d=zohomail.com; s=zohoarc; b=gHwTsM7/WQrYT2QUmk+O38D6zXM3bNXnVKzp5PN1dAqKqewZfha7pVm0I29ozX3B83mt87xWbnyDr0upN1WCNQlP84V8qDli647YvqoHv2rsXAxOsH9J2YZy9dr78ll4sXmJHuGsRUvOKh8cDtzpZqpP2HD0UWW6wR67vrRKlzE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589900413; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EPdfzh9iPmGPapCS63eEK/WjS/+7d1SZUvn8eYLfk9k=; b=RgpY/itALLYYlItCL/zMcRV+QD/tYoVtDRp5+9vuIhLRlfT/3SuVdI7XWJHKudJczH3vtTLDiH1Y/L8m+HcCTaNBTFKBUeMpOBwRRhDitLp0x3ECTRodMRqmiamo1vLQQtWp67UiXwhFpLPIrtoyt58cBKfVEiniYjFJbMUldGM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589900413747492.51795055453965; Tue, 19 May 2020 08:00:13 -0700 (PDT) Received: from localhost ([::1]:36346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jb3iv-0001F2-HM for importer@patchew.org; Tue, 19 May 2020 11:00:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jb3ex-00011t-BB for qemu-devel@nongnu.org; Tue, 19 May 2020 10:55:59 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:30690 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jb3ew-0003Tc-FC for qemu-devel@nongnu.org; Tue, 19 May 2020 10:55:58 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-207-NwrjrGxvOAeY4T0ICcteBg-1; Tue, 19 May 2020 10:55:55 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D234F1800D42 for ; Tue, 19 May 2020 14:55:54 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-32.ams2.redhat.com [10.36.112.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A1EF56E71C; Tue, 19 May 2020 14:55:54 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BFF6C11358C1; Tue, 19 May 2020 16:55:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589900157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EPdfzh9iPmGPapCS63eEK/WjS/+7d1SZUvn8eYLfk9k=; b=EpX2zC9k+k3izeqa4x3dTP0IpJneHRlPShpojkGAzW8NN/2omUeEy0ZRoZlhCNOR+Z7tte E3OsN1Lj67xawwWz+A9BrX4USAkzKDikgmX9KMj7h3nN4pLzMCW62mFQkEV2urPAqWczRw vL+NrPn6HvwJskdSYMssyN2iIACqgq8= X-MC-Unique: NwrjrGxvOAeY4T0ICcteBg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 05/55] qdev: Convert to qbus_realize(), qbus_unrealize() Date: Tue, 19 May 2020 16:55:01 +0200 Message-Id: <20200519145551.22836-6-armbru@redhat.com> In-Reply-To: <20200519145551.22836-1-armbru@redhat.com> References: <20200519145551.22836-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/19 00:34:39 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" I'm going to convert device realization to qdev_realize() with the help of Coccinelle. Convert bus realization to qbus_realize() first, to get it out of Coccinelle's way. Readability improves. Signed-off-by: Markus Armbruster --- hw/core/qdev.c | 10 +++------- hw/pci/pci.c | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 82deeb7841..0f4adac865 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -1028,9 +1028,7 @@ static void device_set_realized(Object *obj, bool val= ue, Error **errp) resettable_state_clear(&dev->reset); =20 QLIST_FOREACH(bus, &dev->child_bus, sibling) { - object_property_set_bool(OBJECT(bus), true, "realized", - &local_err); - if (local_err !=3D NULL) { + if (!qbus_realize(bus, errp)) { goto child_realize_fail; } } @@ -1055,8 +1053,7 @@ static void device_set_realized(Object *obj, bool val= ue, Error **errp) =20 } else if (!value && dev->realized) { QLIST_FOREACH(bus, &dev->child_bus, sibling) { - object_property_set_bool(OBJECT(bus), false, "realized", - &error_abort); + qbus_unrealize(bus); } if (qdev_get_vmsd(dev)) { vmstate_unregister(VMSTATE_IF(dev), qdev_get_vmsd(dev), dev); @@ -1074,8 +1071,7 @@ static void device_set_realized(Object *obj, bool val= ue, Error **errp) =20 child_realize_fail: QLIST_FOREACH(bus, &dev->child_bus, sibling) { - object_property_set_bool(OBJECT(bus), false, "realized", - &error_abort); + qbus_unrealize(bus); } =20 if (qdev_get_vmsd(dev)) { diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 70c66965f5..6947c741c3 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -456,7 +456,7 @@ void pci_root_bus_cleanup(PCIBus *bus) { pci_bus_uninit(bus); /* the caller of the unplug hotplug handler will delete this device */ - object_property_set_bool(OBJECT(bus), false, "realized", &error_abort); + qbus_unrealize(BUS(bus)); } =20 void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, pci_map_irq_fn map_= irq, --=20 2.21.1