From nobody Mon Feb 9 09:15:44 2026 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=1591768531; cv=none; d=zohomail.com; s=zohoarc; b=BucwtFSAzGtIKjX21r+f4IUCyws0I8eD0s4eS0yl2WJGgjAqzLWfB4tkWqRpuCfwDy3+QWWlm5PvQ4s3Z5OYYLAUBaXZnCrQ0vLKfk6lBl/op2C84O8s6palkuCleFOgHEs3ykD0boWfhZ8/H2a9u7H+XJYUpZZDMyaPtpKQ6ac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591768531; 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=a8ucWRQluooxya9hLd54lAWqMMYexkDTTKyQZF6mOVQ=; b=MoJWkK8fi/c/DE1n+9zId2y3OVyNRBriAOeEK0ZXzLKZpaTHeioN1xiqfnCxEBTZHqgIAahN1mwQXfyATNKJCv5lVK7NJLvTO4bmM49cJEwnpG9tREHTbTTsI/bQjtHzMLZVA7C0BJzkx4eXfVfbXXs3rpYd8NWd583jDjD5Ef4= 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 15917685318071015.5353891487771; Tue, 9 Jun 2020 22:55:31 -0700 (PDT) Received: from localhost ([::1]:52688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jithy-00054z-Cl for importer@patchew.org; Wed, 10 Jun 2020 01:55:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jitMQ-0005FX-0T for qemu-devel@nongnu.org; Wed, 10 Jun 2020 01:33:14 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:55644 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 1jitMC-0003rH-Qp for qemu-devel@nongnu.org; Wed, 10 Jun 2020 01:33:13 -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-140-cb2qUMAvMmm3RvSP9Z9naA-1; Wed, 10 Jun 2020 01:32:57 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F2844805729 for ; Wed, 10 Jun 2020 05:32:56 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-121.ams2.redhat.com [10.36.112.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C303119C71; Wed, 10 Jun 2020 05:32:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D53BB1138484; Wed, 10 Jun 2020 07:32:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591767179; 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=a8ucWRQluooxya9hLd54lAWqMMYexkDTTKyQZF6mOVQ=; b=FPoWQfQdaaNxdMNcPSHvoX3c0Q8syQ46eSWQV29q0cz/+6ZswuCGy0Pnj3rcoihq3AAHxm UhR/f0cpxwIHHoJ3+IQECwG0MeIT0fahrK2zTbPhWv7V5waVYLsi3ek1QsnW2dyc9KhePL QgV000WIPD+DFodq7CTAC9IzWxAG/GA= X-MC-Unique: cb2qUMAvMmm3RvSP9Z9naA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH RESEND v3 46/58] qdev: Drop qdev_realize() support for null bus Date: Wed, 10 Jun 2020 07:32:35 +0200 Message-Id: <20200610053247.1583243-47-armbru@redhat.com> In-Reply-To: <20200610053247.1583243-1-armbru@redhat.com> References: <20200610053247.1583243-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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/06/09 23:51:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=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: Paolo Bonzini 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 Reviewed-by: Paolo Bonzini --- 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 a1fdebb3aa..78a06db76e 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.26.2