From nobody Fri Nov 14 20:41:09 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=1589901072; cv=none; d=zohomail.com; s=zohoarc; b=FJGHjOVkMmL2Q7u+Pm5ASRM6+ppaHSwT5trMcyt8b0Odia36Hsr7dS51I3vu+ml+nNxxT2uhqautn1mqOGyob6SI4TcrOnwQqafcn4ELH/zJIsbibxPeDQRRROTV6nvgj6YLAfXhzzJE5dJCEb+SodsFtZHOuf/qOA6XOyWK8uk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589901072; 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=m/i9JBEq4R0ji+yEYdPYchsyzsw8pPQ6/iN1V5cSMeM=; b=JfguT8pVnh9d9+xeRy9DIR7JO4WZqMSRPixNynsW9+I6Oyoe4VTWoENAdxEqPAoP7cpovSDCjt3fhsN+TDl4TkKbgeb7drqhUjuf8AxeRo61nRvxNeGjclvSlWcJ8ZwBXgnDd8Jruj+eNNNxQ/vomFTtC1uzzjyuZ/A7U6l99s4= 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 1589901072565206.35743184174476; Tue, 19 May 2020 08:11:12 -0700 (PDT) Received: from localhost ([::1]:60018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jb3tf-0007Bs-91 for importer@patchew.org; Tue, 19 May 2020 11:11:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jb3f8-0001TH-EO for qemu-devel@nongnu.org; Tue, 19 May 2020 10:56:10 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:22075 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 1jb3f1-0003WQ-UO for qemu-devel@nongnu.org; Tue, 19 May 2020 10:56:10 -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-50-QtZ_pYn-Or-WVSKb8FOM8w-1; Tue, 19 May 2020 10:56:01 -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 5A7C6107ACCA for ; Tue, 19 May 2020 14:56:00 +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 2AB386442A; Tue, 19 May 2020 14:56:00 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 559A41135229; Tue, 19 May 2020 16:55:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589900162; 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=m/i9JBEq4R0ji+yEYdPYchsyzsw8pPQ6/iN1V5cSMeM=; b=XKyIeaYfMtHRdjal+k8E8P5dzZ0guiR2gp9Ps+Wxv3TJxcstJS4clINyTD7mShB6kM5FDO 1+YdvdfntMnpBQektQ2JzpX4BozVetIgYPUSMDTdad0mZXZ+K/clPIpuh6pFrTS2+Olx1/ TZdCmqeLDVgHy5FgYSPemDyNe3m4uLE= X-MC-Unique: QtZ_pYn-Or-WVSKb8FOM8w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 44/55] qdev: Drop qdev_realize() support for null bus Date: Tue, 19 May 2020 16:55:40 +0200 Message-Id: <20200519145551.22836-45-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=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/18 23:19:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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_H2=-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" The "null @bus means main system bus" convenience feature is no longer used. Drop it. Signed-off-by: Markus Armbruster --- hw/core/qdev.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 8a9e8155d4..323b6328c8 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -408,8 +408,7 @@ void qdev_init_nofail(DeviceState *dev) /* * Realize @dev. * @dev must not be plugged into a bus. - * Plug @dev into @bus if non-null, else into the main system bus. - * This takes a reference to @dev. + * Plug @dev into @bus. This takes a reference to @dev. * If @dev has no QOM parent, make one up, taking another reference. * On success, return true. * On failure, store an error through @errp and return false. @@ -419,18 +418,7 @@ bool qdev_realize(DeviceState *dev, BusState *bus, Err= or **errp) Error *err =3D NULL; =20 assert(!dev->realized && !dev->parent_bus); - - if (!bus) { - /* - * Assert that the device really is a SysBusDevice before we - * put it onto the sysbus. Non-sysbus devices which aren't - * being put onto a bus should be realized with - * object_property_set_bool(OBJECT(dev), true, "realized", - * errp); - */ - g_assert(object_dynamic_cast(OBJECT(dev), TYPE_SYS_BUS_DEVICE)); - bus =3D sysbus_get_default(); - } + assert(bus); =20 qdev_set_parent_bus(dev, bus); =20 --=20 2.21.1