From patchwork Mon Jan 30 20:21:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 648574 Delivered-To: patch@linaro.org Received: by 2002:a17:906:c198:b0:888:9ecf:6623 with SMTP id g24csp881111ejz; Mon, 30 Jan 2023 12:31:09 -0800 (PST) X-Google-Smtp-Source: AK7set/zInvt5J4XP0g/brufLxQ7VoeL/11GhxJIE2BEAM0+XqYa1aHhlSyo0nC8iQQcSUJf+sI6 X-Received: by 2002:ac8:7c4e:0:b0:3b5:4aae:cb0b with SMTP id o14-20020ac87c4e000000b003b54aaecb0bmr14585544qtv.22.1675110669332; Mon, 30 Jan 2023 12:31:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675110669; cv=none; d=google.com; s=arc-20160816; b=A7IcG11WWNEBDnpODwYZ0E18ZzMpaw7C2ObUKEJbpX41hXViTmTSlm3WAjc+ldy7yp GP6xkNfyvr2K00h9ZslSZ0WbfCCvQvFKOvdH/twhfcx90vOkfttrgUyMtK6wXCWIW28D jo9CoARXxqisKXgFDz11il0/819R5v9tquYUUI4WDV/ywCRFZW28pC++3sJViPJ7YX4G mq7pYhfwCNsTxIpGNYiDn2SS9VQ5CbtHc8cKJNOc/3ofeVWV1DYqsfR3NdrPz4bEcCf8 afkplREn1zuHYXmR20usza/6/0NtPjZj3AIE41NByCo/9GlyU5fmtxbLyaHUmQP7kL3j Q6vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=r+Cb3vXl1fpQEI2y2/OxkPT/k9MpHs9866vAhPGYmTs=; b=vRM1TeaCV165mjUgfCKIMq+5kmxwPjM6J4nFMOpRFbJF7GAH7jgvbra1MGa5H5vwFw pkQ4vS+SZ+6yysz3L4UqTMRnFeN+aQeANIdtWsxPFBfOPD9eUo1yao3i+vqHDKItYFJK YurX+xQgJwzjVJBoJE6VTHV8TJvEocDg24pYy9BERJ3j5gTEzpREY0fKpB5nkXEekhCj DGkEfIdWm8SCZewUqC+OXp+Rk14mkDeP3NU1Z9PB4CQwL2pcuNsfV2Z2RZLxvsc3lPIu ADAHyND9drID7oTn0WEiWUZAkW5l+KYkQHPE7k/N9K/5TxLLh5O/tENtK2YuuDs2nuYv kcYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=f3BtcfUZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z8-20020a05622a060800b003b63f045aafsi7261464qta.291.2023.01.30.12.31.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Jan 2023 12:31:09 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=f3BtcfUZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMaiW-0003r1-JG; Mon, 30 Jan 2023 15:25:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMaeu-0007Ka-Tx for qemu-devel@nongnu.org; Mon, 30 Jan 2023 15:21:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMaep-0007TQ-NF for qemu-devel@nongnu.org; Mon, 30 Jan 2023 15:21:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675110099; 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=r+Cb3vXl1fpQEI2y2/OxkPT/k9MpHs9866vAhPGYmTs=; b=f3BtcfUZ5dgPCkmvnEF0xQObqe+HM9FODM2qyt63FLwLvwB0Nyb5Y7+mWU7X4duyTApZrH TCzcISDUJxxDwg7m/8c6maJDARhOXmHrK30T91/zxLj+oyrevDW6pi1lWRfNiaTZz1dQqZ h4Xw2bgsyyt0fzjGQOHBtw0DFLrX1Mo= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-194-I2phwKpnOVW6HkM0P7G0WA-1; Mon, 30 Jan 2023 15:21:38 -0500 X-MC-Unique: I2phwKpnOVW6HkM0P7G0WA-1 Received: by mail-ed1-f70.google.com with SMTP id o21-20020aa7dd55000000b004a245f58006so2756226edw.12 for ; Mon, 30 Jan 2023 12:21:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=r+Cb3vXl1fpQEI2y2/OxkPT/k9MpHs9866vAhPGYmTs=; b=GQKtPSDC96S0jDk7N0aT5bt63vpZahCnzPDK6J3Lul0eoILy97NOx0P9JHJVCQ97yr O3Bz19FVOarW5FgzL+SRRlZ4WQNxUqCcKSiJOP305Y9Q0WWXhB71N1mnGytkdbqAg5+R dHsTs97NF1SMQl4wcSZo5vaAC7j0HDVrvCOLqvnX6ayK8OUaijgpK0akzZ8HJBqdFUtc 0O5zXuKVmH3onIuVRl2BJ18ESjFHqxHgSXGICA2gbPiev4phcQhI5Wg/Nq1mBicaYTOp belfhic4nEK4WNKKcMyomulYEPfBwDYQrPmj7Ydg0x2eoe4HZ9yj412JoGdPCYQXys6e 2ZXQ== X-Gm-Message-State: AO0yUKVuVMLZ8QldWG5PHvCMKyNmYFv46mbRCXDnDUVaOVQX9LnCUqG2 vZOCKMYfjNR5+f2TqFwIpFzvLW/b2cDOsrhFJLpe4o/dSOf6Z6SgsM9uV5k5PdjIvqf+1I2caGl dAKPnBWzUhg/J8sGz108t+m8tdA52TLdmHwCe+nrZ9BAr++qBc8vOOhdqOSfL X-Received: by 2002:a17:906:c350:b0:888:33a:e359 with SMTP id ci16-20020a170906c35000b00888033ae359mr5793585ejb.38.1675110096308; Mon, 30 Jan 2023 12:21:36 -0800 (PST) X-Received: by 2002:a17:906:c350:b0:888:33a:e359 with SMTP id ci16-20020a170906c35000b00888033ae359mr5793570ejb.38.1675110096025; Mon, 30 Jan 2023 12:21:36 -0800 (PST) Received: from redhat.com ([2.52.144.173]) by smtp.gmail.com with ESMTPSA id v18-20020a1709064e9200b0084c7f96d023sm7408399eju.147.2023.01.30.12.21.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 12:21:35 -0800 (PST) Date: Mon, 30 Jan 2023 15:21:33 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Philippe =?utf-8?q?Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Eric Auger , qemu-arm@nongnu.org Subject: [PULL 52/56] hw: Use TYPE_PCI_BUS definition where appropriate Message-ID: <20230130201810.11518-53-mst@redhat.com> References: <20230130201810.11518-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230130201810.11518-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Use the proper QOM type definition instead of magic string. This also helps during eventual refactor while using git-grep. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20230117193014.83502-1-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Eric Auger --- hw/arm/smmu-common.c | 3 ++- hw/virtio/virtio-iommu.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 54186f31cb..733c964778 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -535,7 +535,8 @@ static void smmu_base_reset_hold(Object *obj) static Property smmu_dev_properties[] = { DEFINE_PROP_UINT8("bus_num", SMMUState, bus_num, 0), - DEFINE_PROP_LINK("primary-bus", SMMUState, primary_bus, "PCI", PCIBus *), + DEFINE_PROP_LINK("primary-bus", SMMUState, primary_bus, + TYPE_PCI_BUS, PCIBus *), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index 23c470977e..1cd258135d 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -1366,7 +1366,8 @@ static const VMStateDescription vmstate_virtio_iommu = { }; static Property virtio_iommu_properties[] = { - DEFINE_PROP_LINK("primary-bus", VirtIOIOMMU, primary_bus, "PCI", PCIBus *), + DEFINE_PROP_LINK("primary-bus", VirtIOIOMMU, primary_bus, + TYPE_PCI_BUS, PCIBus *), DEFINE_PROP_BOOL("boot-bypass", VirtIOIOMMU, boot_bypass, true), DEFINE_PROP_END_OF_LIST(), };