From nobody Sun Sep 28 16:30:44 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=1758865270; cv=none; d=zohomail.com; s=zohoarc; b=QF/QhAYsmhpDAF0xa3F5UuyNWX9pBsv9xWP5nl8KYXMzn6+Vv2nZLGiWTkmmnOHJb1tiQb5g5HOf/i5JgJUazxUUGtXtJUolRjS2H5yZJNq8+Hm5B5qR9vjPlSx7n/ICIz/TjsmCJYFqMWau9VcS1jvldx9xSqGuj75wOt4HFU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758865270; 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=zs8DV9S9EBu4KwMxL4Gn3/doWA0m3P/pLkeyRYvOciw=; b=IrBRsciVRn+QwF0OH1FaaxpQ3VyvEASeNde4hdSAVENFNWZY5OMNmlri0gEO11ob+s9XNUxrWRjsb64jnQMa5Xr0YnZLP8BTymxPPjYtPJgBtXdzhfWXcvOwFbxl5DeL+w48KqsvcFmEjfA++9uqkEu26kS63dlhU6NHMt/79vU= 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 1758865270818884.2034606683242; Thu, 25 Sep 2025 22:41:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v216E-0008Cm-2O; Fri, 26 Sep 2025 01:34:30 -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-0008Bu-WA for qemu-devel@nongnu.org; Fri, 26 Sep 2025 01:34:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v2166-0000kT-R4 for qemu-devel@nongnu.org; Fri, 26 Sep 2025 01:34:27 -0400 Received: from mx-prod-mc-05.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-167-DN4SXsMkO1235RLXxEDJBg-1; Fri, 26 Sep 2025 01:34:14 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0AB271977309; Fri, 26 Sep 2025 05:34:14 +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 2648D1800452; Fri, 26 Sep 2025 05:34:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758864857; 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=zs8DV9S9EBu4KwMxL4Gn3/doWA0m3P/pLkeyRYvOciw=; b=QQgFCY9mr5R39lTdzeEJHC5bRxiBjm7jaiRIZzpdGZvWJfTcJ5X0EG2Qnyd1C9V6I/72T5 2nSLOL2G1xY/RzOdRaumJ9OVsue2KLqS+iAVhJ4S/SpBi+RybvWA7dhWFfcDyEj5M+Nfj9 NQB05UD1AYrrPraXPhk+JbNqNmGedtE= X-MC-Unique: DN4SXsMkO1235RLXxEDJBg-1 X-Mimecast-MFC-AGG-ID: DN4SXsMkO1235RLXxEDJBg_1758864854 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 04/29] include/hw/vfio/vfio-container.h: rename file to vfio-container-legacy.h Date: Fri, 26 Sep 2025 07:33:33 +0200 Message-ID: <20250926053358.308198-5-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.129.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_H4=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, SPF_PASS=-0.001 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: 1758865271539116600 From: Mark Cave-Ayland With the rename of VFIOContainer to VFIOLegacyContainer, the vfio-container= .h header file containing the struct definition is misleading. Rename it from vfio-container.h to vfio-container-legacy.h accordingly, fixing up the name of the include guard at the same time. Signed-off-by: Mark Cave-Ayland Reviewed-by: C=C3=A9dric Le Goater Link: https://lore.kernel.org/qemu-devel/20250925113159.1760317-4-mark.cave= ayland@nutanix.com Signed-off-by: C=C3=A9dric Le Goater --- .../hw/vfio/{vfio-container.h =3D> vfio-container-legacy.h} | 6 +++--- hw/ppc/spapr_pci_vfio.c | 2 +- hw/s390x/s390-pci-vfio.c | 2 +- hw/vfio/container.c | 2 +- hw/vfio/cpr-legacy.c | 2 +- hw/vfio/spapr.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename include/hw/vfio/{vfio-container.h =3D> vfio-container-legacy.h} (88= %) diff --git a/include/hw/vfio/vfio-container.h b/include/hw/vfio/vfio-contai= ner-legacy.h similarity index 88% rename from include/hw/vfio/vfio-container.h rename to include/hw/vfio/vfio-container-legacy.h index a84dfb0dee79d8d9e310cbcd84166c269a877b4a..ab5130d26eaa0e9fe586e49efe7= 8aef6c0450540 100644 --- a/include/hw/vfio/vfio-container.h +++ b/include/hw/vfio/vfio-container-legacy.h @@ -6,8 +6,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ =20 -#ifndef HW_VFIO_CONTAINER_H -#define HW_VFIO_CONTAINER_H +#ifndef HW_VFIO_CONTAINER_LEGACY_H +#define HW_VFIO_CONTAINER_LEGACY_H =20 #include "hw/vfio/vfio-container-base.h" #include "hw/vfio/vfio-cpr.h" @@ -36,4 +36,4 @@ struct VFIOLegacyContainer { =20 OBJECT_DECLARE_SIMPLE_TYPE(VFIOLegacyContainer, VFIO_IOMMU_LEGACY); =20 -#endif /* HW_VFIO_CONTAINER_H */ +#endif /* HW_VFIO_CONTAINER_LEGACY_H */ diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index c8175dd8a89b16e04f464e535306abe83a4ca74f..a748a0bf4c987e604a4a8c5bea3= 148bcdc7d2db0 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -24,7 +24,7 @@ #include "hw/pci-host/spapr.h" #include "hw/pci/msix.h" #include "hw/pci/pci_device.h" -#include "hw/vfio/vfio-container.h" +#include "hw/vfio/vfio-container-legacy.h" #include "qemu/error-report.h" #include CONFIG_DEVICES /* CONFIG_VFIO_PCI */ =20 diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c index 938a5511713dade46740dca79a8c4c738799a1ce..7760780aff7ae18034d8cbbb77c= 4d41ea95a6be5 100644 --- a/hw/s390x/s390-pci-vfio.c +++ b/hw/s390x/s390-pci-vfio.c @@ -20,7 +20,7 @@ #include "hw/s390x/s390-pci-clp.h" #include "hw/s390x/s390-pci-vfio.h" #include "hw/vfio/pci.h" -#include "hw/vfio/vfio-container.h" +#include "hw/vfio/vfio-container-legacy.h" #include "hw/vfio/vfio-helpers.h" =20 /* diff --git a/hw/vfio/container.c b/hw/vfio/container.c index dc8425efb1f68eb80b17ec2ba4baa8f7cb258d36..c0f87f774a00805cab4a8f3b338= 6ddd99c3d9111 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -34,7 +34,7 @@ #include "migration/cpr.h" #include "migration/blocker.h" #include "pci.h" -#include "hw/vfio/vfio-container.h" +#include "hw/vfio/vfio-container-legacy.h" #include "vfio-helpers.h" #include "vfio-listener.h" =20 diff --git a/hw/vfio/cpr-legacy.c b/hw/vfio/cpr-legacy.c index bd3f6fc3d3936e7798df6a3c9f3b893e428ec771..bbf7a0d35f0ba2b78fd40a60b6e= 47337665dcbb9 100644 --- a/hw/vfio/cpr-legacy.c +++ b/hw/vfio/cpr-legacy.c @@ -7,7 +7,7 @@ #include #include #include "qemu/osdep.h" -#include "hw/vfio/vfio-container.h" +#include "hw/vfio/vfio-container-legacy.h" #include "hw/vfio/vfio-device.h" #include "hw/vfio/vfio-listener.h" #include "migration/blocker.h" diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index 6d462aa13caecb3e91de503ca4bb2bc60c9d262a..acaa9c141916f127a87440d239f= acf285f9e34e0 100644 --- a/hw/vfio/spapr.c +++ b/hw/vfio/spapr.c @@ -15,7 +15,7 @@ #include "system/hostmem.h" #include "system/address-spaces.h" =20 -#include "hw/vfio/vfio-container.h" +#include "hw/vfio/vfio-container-legacy.h" #include "hw/hw.h" #include "system/ram_addr.h" #include "qemu/error-report.h" --=20 2.51.0