From nobody Thu Apr 3 11:59:56 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=1742975922; cv=none; d=zohomail.com; s=zohoarc; b=Ia6/bIsTMga3VhT/piq3xii0J8YyrCd5vkqSl99B1axG0RD4cfA4Z4L27ZsPh2oXkwlV5zRJHVYlhjy4PUK9P5IMxbgucpCUysbPjSBm/zfQeJeHnVzcYkDDAaVRnY7ADkHS5SIibKRa8Kx3Xgr7h4/7qVW8osjBDOPPdXhSUYw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742975922; 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=86Fv6SIivrK4hLdhpJhlEsO46bB0TTxWzzy9ieH/WSk=; b=GsjkDDI8Sfm0ITZnHjYFhgC0AnrQgszuChCU/fho1UsbuuGCpoD1axLolBwqAsvQUA3e/T/2jE6UolZYWjhal8RYEMkEWrOrX3+9rP9V+pmGc2hFEGBH0aZkGl6UitcDY20XBAbQSnJBs3Xd4Dj1UDG+JfwqJqclj4OLrCvZy8c= 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 1742975922887512.0888942866592; Wed, 26 Mar 2025 00:58:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txLak-000390-TC; Wed, 26 Mar 2025 03:54:27 -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 1txLZm-0001l8-5b for qemu-devel@nongnu.org; Wed, 26 Mar 2025 03:53:28 -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 1txLZk-0006MH-F1 for qemu-devel@nongnu.org; Wed, 26 Mar 2025 03:53:25 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-683-WnZq3LZcM7KlakNv1U6U9A-1; Wed, 26 Mar 2025 03:53:18 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8DF6C1800265; Wed, 26 Mar 2025 07:53:17 +0000 (UTC) Received: from corto.redhat.com (unknown [10.45.226.180]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B38E919560AB; Wed, 26 Mar 2025 07:53:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742975603; 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=86Fv6SIivrK4hLdhpJhlEsO46bB0TTxWzzy9ieH/WSk=; b=CjbjsshLyZNJeKWVNr+/ak/T2TGaQJlVrN9kWf0ltKNnHlw9eYUKeMGD03vFjGcVbXf6Fh wJzrIuzgmaK6L2JVb5Fggc3dzSwXkvEfhH5tiTukC4bxg+GLJHnfhxRSq90fs+AVydjRr2 j4X5F3Mnqzg6Or3RKKhJo3ogtOsHPr0= X-MC-Unique: WnZq3LZcM7KlakNv1U6U9A-1 X-Mimecast-MFC-AGG-ID: WnZq3LZcM7KlakNv1U6U9A_1742975597 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-devel@nongnu.org, Alex Williamson Cc: Avihai Horon , Eric Auger , Zhenzhong Duan , John Levon , Joao Martins , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH for-10.1 v2 28/37] vfio: Make vfio_container_query_dirty_bitmap() static Date: Wed, 26 Mar 2025 08:51:13 +0100 Message-ID: <20250326075122.1299361-29-clg@redhat.com> In-Reply-To: <20250326075122.1299361-1-clg@redhat.com> References: <20250326075122.1299361-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.0 on 10.30.177.40 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: -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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=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: 1742975923700019000 vfio_container_query_dirty_bitmap() is only used in "container-base.c". Also, rename to vfio_container_vioc_query_dirty_bitmap() to reflect it is using the VFIO IOMMU backend device ->query_dirty_bitmap() handler. Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: John Levon --- include/hw/vfio/vfio-container-base.h | 2 -- hw/vfio/container-base.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/include/hw/vfio/vfio-container-base.h b/include/hw/vfio/vfio-c= ontainer-base.h index 1227771dd896b5917366ef578109b0ad92da2375..04c87fe48bed75aa281a13f75a3= 6e345036a9163 100644 --- a/include/hw/vfio/vfio-container-base.h +++ b/include/hw/vfio/vfio-container-base.h @@ -89,8 +89,6 @@ void vfio_container_del_section_window(VFIOContainerBase = *bcontainer, MemoryRegionSection *section); int vfio_container_set_dirty_page_tracking(VFIOContainerBase *bcontainer, bool start, Error **errp); -int vfio_container_query_dirty_bitmap(const VFIOContainerBase *bcontainer, - VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **er= rp); bool vfio_devices_all_dirty_tracking_started(const VFIOContainerBase *bcon= tainer); bool vfio_devices_all_device_dirty_tracking(const VFIOContainerBase *bcont= ainer); int vfio_get_dirty_bitmap(const VFIOContainerBase *bcontainer, uint64_t io= va, diff --git a/hw/vfio/container-base.c b/hw/vfio/container-base.c index 4edbd39185375dee42ee6e6410da7b94635b5ab8..7f11aad339e713ea09123f36142= 5370d87762950 100644 --- a/hw/vfio/container-base.c +++ b/hw/vfio/container-base.c @@ -141,16 +141,6 @@ int vfio_container_set_dirty_page_tracking(VFIOContain= erBase *bcontainer, return ret; } =20 -int vfio_container_query_dirty_bitmap(const VFIOContainerBase *bcontainer, - VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **er= rp) -{ - VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); - - g_assert(vioc->query_dirty_bitmap); - return vioc->query_dirty_bitmap(bcontainer, vbmap, iova, size, - errp); -} - static bool vfio_devices_all_device_dirty_tracking_started( const VFIOContainerBase *bcontainer) { @@ -214,6 +204,16 @@ static int vfio_device_dma_logging_report(VFIODevice *= vbasedev, hwaddr iova, return 0; } =20 +static int vfio_container_vioc_query_dirty_bitmap(const VFIOContainerBase = *bcontainer, + VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **er= rp) +{ + VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); + + g_assert(vioc->query_dirty_bitmap); + return vioc->query_dirty_bitmap(bcontainer, vbmap, iova, size, + errp); +} + static int vfio_container_devices_query_dirty_bitmap(const VFIOContainerBa= se *bcontainer, VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp) { @@ -263,8 +263,8 @@ int vfio_get_dirty_bitmap(const VFIOContainerBase *bcon= tainer, uint64_t iova, ret =3D vfio_container_devices_query_dirty_bitmap(bcontainer, &vbm= ap, iova, size, errp); } else { - ret =3D vfio_container_query_dirty_bitmap(bcontainer, &vbmap, iova= , size, - errp); + ret =3D vfio_container_vioc_query_dirty_bitmap(bcontainer, &vbmap,= iova, size, + errp); } =20 if (ret) { --=20 2.49.0