From nobody Sun Feb 8 05:09:07 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=1590761509; cv=none; d=zohomail.com; s=zohoarc; b=hfQ62f40g78JcxpmPssUhsiwkLU7zH+uRSbQfR179V+UgxSiAvdwtIC2ned0coqDOnBX8KiegrCQ0b/+SdKoG7GYO4teuFoDWyDDupbu99p9LysD0XjTuZXmT9RaZx4fYxhBilBQ3LZ1bPc7gC4+kwF15+UkV+YmAS/JpGudCJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590761509; h=Content-Type:Content-Transfer-Encoding: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=sXROpCUXgrvHyVyz6Kt1auwiAIA3jkDztMYy9GiXZCI=; b=Y4lZEitZYseJzdbcFHpIkk2NAgy38X5vDYNlkILSFhJqEunvKj8QJGfhBVdAYo2gFU24cevxlQNV3IRkJwuCiUt6rfSNkYO5GBY+T4LcQ7Rw18ScXtwSkfuEUjdrGJXU8TcUWsTAqVwmjMMsTiWieBlg/vTyc1MhrP5EOVjI1vs= 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 1590761509145170.4587395772346; Fri, 29 May 2020 07:11:49 -0700 (PDT) Received: from localhost ([::1]:42556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jefjf-0006dq-Pq for importer@patchew.org; Fri, 29 May 2020 10:11:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jefKZ-0003DA-Ce for qemu-devel@nongnu.org; Fri, 29 May 2020 09:45:51 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:46599 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 1jefKM-00076t-H3 for qemu-devel@nongnu.org; Fri, 29 May 2020 09:45:50 -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-228-dN4zhh7ePDuWgkLOGmDDOg-1; Fri, 29 May 2020 09:45:35 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E6F518FE86C for ; Fri, 29 May 2020 13:45:34 +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 10EFB707A0 for ; Fri, 29 May 2020 13:45:34 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A7F67113524F; Fri, 29 May 2020 15:45:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590759936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sXROpCUXgrvHyVyz6Kt1auwiAIA3jkDztMYy9GiXZCI=; b=iDN1jZkshl5lhyHLqyKC4RpoOYdW1a55Oou4cQZlFVBEAdRJUMqB3h4K2LKKmGULARpdF4 Q7iu5+IEEnwg/wcLRP5Eaw9R5Porz2hgpSVMRMfdEQbLr8JLi2YjZOmYa/lWW46ZzDXZx9 r/0mfeT0GIKIdNoKP6RldmYv9zt5l3Y= X-MC-Unique: dN4zhh7ePDuWgkLOGmDDOg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 54/58] qdev: Make qdev_realize() support bus-less devices Date: Fri, 29 May 2020 15:45:19 +0200 Message-Id: <20200529134523.8477-55-armbru@redhat.com> In-Reply-To: <20200529134523.8477-1-armbru@redhat.com> References: <20200529134523.8477-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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/29 03:05:19 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_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: , 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" So far, qdev_realize() supports only devices that plug into a bus: argument @bus cannot be null. Extend it to support bus-less devices, too. Signed-off-by: Markus Armbruster --- hw/core/qdev.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 78a06db76e..50336168f2 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -408,7 +408,7 @@ void qdev_init_nofail(DeviceState *dev) /* * Realize @dev. * @dev must not be plugged into a bus. - * Plug @dev into @bus. This takes a reference to @dev. + * If @bus, 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. @@ -418,9 +418,12 @@ bool qdev_realize(DeviceState *dev, BusState *bus, Err= or **errp) Error *err =3D NULL; =20 assert(!dev->realized && !dev->parent_bus); - assert(bus); =20 - qdev_set_parent_bus(dev, bus); + if (bus) { + qdev_set_parent_bus(dev, bus); + } else { + assert(!DEVICE_GET_CLASS(dev)->bus_type); + } =20 object_property_set_bool(OBJECT(dev), true, "realized", &err); if (err) { --=20 2.21.3