From patchwork Mon Aug 6 20:14:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 954232 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41kq5J3q6rz9ryt for ; Tue, 7 Aug 2018 06:29:56 +1000 (AEST) Received: from localhost ([::1]:36180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmm8X-0001s7-Vo for incoming@patchwork.ozlabs.org; Mon, 06 Aug 2018 16:29:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmlun-0006gS-TI for qemu-devel@nongnu.org; Mon, 06 Aug 2018 16:15:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fmluk-00074W-1M for qemu-devel@nongnu.org; Mon, 06 Aug 2018 16:15:41 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:60174 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fmlug-00071n-HI; Mon, 06 Aug 2018 16:15:34 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1EEFD81663FD; Mon, 6 Aug 2018 20:15:34 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-58.ams2.redhat.com [10.36.116.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7F7B2166BA0; Mon, 6 Aug 2018 20:15:31 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, alex.williamson@redhat.com, mst@redhat.com, jean-philippe.brucker@arm.com Date: Mon, 6 Aug 2018 22:14:41 +0200 Message-Id: <1533586484-5737-14-git-send-email-eric.auger@redhat.com> In-Reply-To: <1533586484-5737-1-git-send-email-eric.auger@redhat.com> References: <1533586484-5737-1-git-send-email-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 06 Aug 2018 20:15:34 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 06 Aug 2018 20:15:34 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'eric.auger@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [RFC v7 13/16] qdev: export qbus_find_recursive X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wei@redhat.com, kevin.tian@intel.com, tn@semihalf.com, will.deacon@arm.com, drjones@redhat.com, peterx@redhat.com, linuc.decode@gmail.com, bharat.bhushan@nxp.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We intend to create the virtio-iommu from the virt machine realize() code and not by passing the -device virtio-iommu-device option. That way the instantiation of the virtio-iommu can depend on a virt machine option, as it is currently done for the smmuv3 iommu. Its parent bus, the virtio-bus will need to be located and set. We intend to locate it by using qbus_find_recursive(). Signed-off-by: Eric Auger --- include/hw/qdev-core.h | 3 +++ qdev-monitor.c | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index f1fd0f8..f359c52 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -377,6 +377,9 @@ void qbus_reset_all_fn(void *opaque); /* This should go away once we get rid of the NULL bus hack */ BusState *sysbus_get_default(void); +BusState *qbus_find_recursive(BusState *bus, const char *name, + const char *bus_typename); + char *qdev_get_fw_dev_path(DeviceState *dev); char *qdev_get_own_fw_dev_path_from_handler(BusState *bus, DeviceState *dev); diff --git a/qdev-monitor.c b/qdev-monitor.c index 61e0300..666e439 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -410,8 +410,8 @@ static inline bool qbus_is_full(BusState *bus) * If more than one exists, prefer one that can take another device. * Return the bus if found, else %NULL. */ -static BusState *qbus_find_recursive(BusState *bus, const char *name, - const char *bus_typename) +BusState *qbus_find_recursive(BusState *bus, const char *name, + const char *bus_typename) { BusChild *kid; BusState *pick, *child, *ret; @@ -567,7 +567,6 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) error_setg(errp, QERR_MISSING_PARAMETER, "driver"); return NULL; } - /* find driver */ dc = qdev_get_device_class(&driver, errp); if (!dc) {