From nobody Sun Sep 28 16:30:39 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1758865022; cv=none; d=zohomail.com; s=zohoarc; b=k6XPXFOV+l+RjuyzX+0P4Ia5P9nLIHyGzGbPyNW9dILcglI59ac7YO/1Aq5YMtTJiFwTvnMUwvt9fl8UNaNCrgbv73nIvicfb17/rzn0Xz1n+7Zaweh2ab2vm6szOi2QCAitJs+Tp3lTBgI89vVd34wCMAqTIaMhcjb45Tisem0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758865022; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jGNYZrfWhSesxz0a2yRX7ofpdrxFXUQ/L0oIa38+Lms=; b=NQJM3tL/OtCxDzUpVVWfgj6F+Rm0K4118eEnSunhNf6q+MbvekBTle69LnA+x2NarTCvg93FP2DohuWswNeLejNl/oFsKaHoWu3yEYFUqmV1V/U7OQQcfgWNW1E8xChlHrmGIX9KoIAWK8XW9VFXwIPxHkXNaPtx6ZmzejSyZ3I= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1758865022734500.48578773329336; Thu, 25 Sep 2025 22:37:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v216j-0008Po-16; Fri, 26 Sep 2025 01:35:01 -0400 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 1v216c-0008Md-Hw for qemu-devel@nongnu.org; Fri, 26 Sep 2025 01:34:54 -0400 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 1v216Q-0000q6-Vb for qemu-devel@nongnu.org; Fri, 26 Sep 2025 01:34:53 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-262-XtQwKdrCMgaORm8EzdhAKw-1; Fri, 26 Sep 2025 01:34:33 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4EE2A19560B2; Fri, 26 Sep 2025 05:34:32 +0000 (UTC) Received: from corto.redhat.com (unknown [10.45.226.26]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7FE4D1800452; Fri, 26 Sep 2025 05:34:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758864877; 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=jGNYZrfWhSesxz0a2yRX7ofpdrxFXUQ/L0oIa38+Lms=; b=jIjIJS2sUkxR4KOwBgMSTXnj2T500jdNFrSSUmK8h9GzLcCqpLj4soOZAybb68QuCHLegL mlQiB4g8S4wsTPMBg8dIT11mNhq8Nu0sIPYN7eGODEZBO2Il0t7iTMLVzxShtvXFOfSWZ5 Mx3QjBQ68DIZYz837TmuIc02pPqCAdY= X-MC-Unique: XtQwKdrCMgaORm8EzdhAKw-1 X-Mimecast-MFC-AGG-ID: XtQwKdrCMgaORm8EzdhAKw_1758864872 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , Mark Cave-Ayland , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 11/29] vfio/spapr.c: use QOM casts where appropriate Date: Fri, 26 Sep 2025 07:33:40 +0200 Message-ID: <20250926053358.308198-12-clg@redhat.com> In-Reply-To: <20250926053358.308198-1-clg@redhat.com> References: <20250926053358.308198-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, T_SPF_TEMPERROR=0.01 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1758865024229116600 From: Mark Cave-Ayland Use QOM casts to convert between VFIOSpaprContainer and VFIOLegacyContainer instead of accessing bcontainer directly. Signed-off-by: Mark Cave-Ayland Reviewed-by: C=C3=A9dric Le Goater Link: https://lore.kernel.org/qemu-devel/20250925113159.1760317-11-mark.cav= eayland@nutanix.com Signed-off-by: C=C3=A9dric Le Goater --- hw/vfio/spapr.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index acaa9c141916f127a87440d239facf285f9e34e0..c883ba6da9e984f392a8d75adfb= 0fb8c74027d08 100644 --- a/hw/vfio/spapr.c +++ b/hw/vfio/spapr.c @@ -61,7 +61,7 @@ static void vfio_prereg_listener_region_add(MemoryListene= r *listener, { VFIOSpaprContainer *scontainer =3D container_of(listener, VFIOSpaprCon= tainer, prereg_listener); - VFIOLegacyContainer *container =3D &scontainer->container; + VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(scontainer); VFIOContainer *bcontainer =3D VFIO_IOMMU(container); const hwaddr gpa =3D section->offset_within_address_space; hwaddr end; @@ -121,7 +121,7 @@ static void vfio_prereg_listener_region_del(MemoryListe= ner *listener, { VFIOSpaprContainer *scontainer =3D container_of(listener, VFIOSpaprCon= tainer, prereg_listener); - VFIOLegacyContainer *container =3D &scontainer->container; + VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(scontainer); const hwaddr gpa =3D section->offset_within_address_space; hwaddr end; int ret; @@ -245,8 +245,7 @@ static bool vfio_spapr_create_window(VFIOLegacyContaine= r *container, { int ret =3D 0; VFIOContainer *bcontainer =3D VFIO_IOMMU(container); - VFIOSpaprContainer *scontainer =3D container_of(container, VFIOSpaprCo= ntainer, - container); + VFIOSpaprContainer *scontainer =3D VFIO_IOMMU_SPAPR(bcontainer); IOMMUMemoryRegion *iommu_mr =3D IOMMU_MEMORY_REGION(section->mr); uint64_t pagesize =3D memory_region_iommu_get_min_page_size(iommu_mr),= pgmask; unsigned entries, bits_total, bits_per_level, max_levels, ddw_levels; @@ -353,8 +352,7 @@ vfio_spapr_container_add_section_window(VFIOContainer *= bcontainer, Error **errp) { VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); - VFIOSpaprContainer *scontainer =3D container_of(container, VFIOSpaprCo= ntainer, - container); + VFIOSpaprContainer *scontainer =3D VFIO_IOMMU_SPAPR(container); VFIOHostDMAWindow *hostwin; hwaddr pgsize =3D 0; int ret; @@ -443,8 +441,7 @@ vfio_spapr_container_del_section_window(VFIOContainer *= bcontainer, MemoryRegionSection *section) { VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); - VFIOSpaprContainer *scontainer =3D container_of(container, VFIOSpaprCo= ntainer, - container); + VFIOSpaprContainer *scontainer =3D VFIO_IOMMU_SPAPR(container); =20 if (container->iommu_type !=3D VFIO_SPAPR_TCE_v2_IOMMU) { return; @@ -464,8 +461,7 @@ vfio_spapr_container_del_section_window(VFIOContainer *= bcontainer, static void vfio_spapr_container_release(VFIOContainer *bcontainer) { VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); - VFIOSpaprContainer *scontainer =3D container_of(container, VFIOSpaprCo= ntainer, - container); + VFIOSpaprContainer *scontainer =3D VFIO_IOMMU_SPAPR(container); VFIOHostDMAWindow *hostwin, *next; =20 if (container->iommu_type =3D=3D VFIO_SPAPR_TCE_v2_IOMMU) { @@ -482,8 +478,7 @@ static bool vfio_spapr_container_setup(VFIOContainer *b= container, Error **errp) { VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); - VFIOSpaprContainer *scontainer =3D container_of(container, VFIOSpaprCo= ntainer, - container); + VFIOSpaprContainer *scontainer =3D VFIO_IOMMU_SPAPR(container); struct vfio_iommu_spapr_tce_info info; bool v2 =3D container->iommu_type =3D=3D VFIO_SPAPR_TCE_v2_IOMMU; int ret, fd =3D container->fd; --=20 2.51.0