From nobody Fri Nov 14 23:31:35 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759223819; cv=none; d=zohomail.com; s=zohoarc; b=RTelk1LkxYUucrgaLyt/0Uzp186kGNsNA4GimcAKOMvf2oYnTMV/ny8B/Gf1O1tSZ/8R3KN6rVlfXHX+USK7tIlZjEogWJBcqk5N8ymve9KBegCkRY4vETLj/84oyjuiSbin8dwBZM72aZt1LFtYFLH3EM434Z1wp/wSP7WsyXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759223819; 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=opf5AG1XfLO8GoawGiZhJ2gSkTioavJ7xaDVzcsz0jU=; b=HJMtOfrYy/srNKplvm6eHO9qIRbjWoc426KN0VSe9EoUsHeOrLL5e/QefC0sT+VQANuONCa0ngHcLNHH3JPi7Vtlcp2eXnSS2prw3avp2BKRZeRp0k7E++d59qbKw4D8bksbFt1eWoB3hx4NKUc9v/hyUk5rlJusCOWpI3dghsk= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759223819914260.8761983933048; Tue, 30 Sep 2025 02:16:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3WSU-0004z6-75; Tue, 30 Sep 2025 05:15:42 -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 1v3WSF-0004sz-6T for qemu-devel@nongnu.org; Tue, 30 Sep 2025 05:15:27 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3WS0-000158-9L for qemu-devel@nongnu.org; Tue, 30 Sep 2025 05:15:26 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-46e4f2696bdso32327075e9.0 for ; Tue, 30 Sep 2025 02:15:06 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e56f658ffsm46991525e9.14.2025.09.30.02.15.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 30 Sep 2025 02:15:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759223703; x=1759828503; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=opf5AG1XfLO8GoawGiZhJ2gSkTioavJ7xaDVzcsz0jU=; b=GQoIIdQzqu5DD7+jhB1o3qUYvRgYxDQsgKWWzKDP9La/KpCZwKvKcW+q/8ju79Kn5h U3BvmInCeHGu5tgFff3htEhg/VSlfDomMPcfDyqK3qzRLFVJ+HUvF0LqZin+tqLs0HDH Mf/CHH4v0YaCaFJX559rT880gWe0ws7Y/miRyH62oa4hnZ3MPSOqbdqeoPcMYHqNVccj +DRTUGhzkkjcMqkiXe8ec9n+kjT3Cj2NCE8drZCrbP3EjUBTxKnJWohUvnMFliiN+j3o JO3air9NHbZHvLG9PxVIGk49Scp2XMOQ7KuLeBgzdKbi1us4gB54Y0OEFD4EKSuxVyZ0 RbUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759223703; x=1759828503; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=opf5AG1XfLO8GoawGiZhJ2gSkTioavJ7xaDVzcsz0jU=; b=gHGXeMG+Vh62AdB3+0KOEax9pq5widO3NxdZ17HS/32IsH8o6/7bKr0mvMHE67vy+M g5qbjDbw5ecOrETCIvJ37wyFS6o3inmWvX1OREjHQRf12hhM5ugY+uTAYHhXlN735q8R yRlNrFkw/eS+Kp/jdVYw1G/0TmZrIes7WxHvCHLbsRwv/uqoKeHrkqR8awBH5vue2Kkt JB2EtfpRIuzlPehesmspvQerEDONX4xb5xPCMGWl2ZHSq0tx/4Z3KnT+SHa1YZBXCJUd zBeABJdqv8QssopsdyLsLrJoAPWelJChN+4pvRsD0Pc6thlyQPQLj9LervNC7ou5rXWw ia+A== X-Gm-Message-State: AOJu0YyBc128bdvOav0Jez7SVcDbIUDsHBAukLi8M0iMAbEM89/s0A7K jwIFBCNYt0VRVywD41Mw0VA+42FKKxECJM/jeL82LePCMFsbfKw9gazOv1wK0ryRgg5qUJ0CuDO ixEtDFZ64gg== X-Gm-Gg: ASbGncvE74t+0KyD5A+ino7/Tv82WF4dPM3k3frGgukCH+7FlYKx+6//+AhZ2njPb16 whko85c3g7tUayyTNtG+q0IdsWcOAumyHOMBGgEi0WSj6M15ohlu34fhl8Pj6E/ueOPWnCUqlq8 8UrMPSZnfa7J+gqVtBPVoVJLFizqXIs3yepzUyo3GDHyMEwByv2FTwlBT7XIaxizb/uXZxEd4P4 NuYSbCLkooNuiXO4U7ED/QcosAPIQ370uF6KyBRSS29C/7XKixsKKedJNbwzIRbYRxEb0AdbRpy lMFhVsUp2yMIX4W0BWGasEd6dzn8yGciTbFkAO8prYUax0SFxb2wg3Rkjwi1DmzZoTUQgitzAg8 MmuR8ndYm3IZz5P1KcMb+lqKphjXyolnv7zWfFHGba95cHdn+WySBMMAAb6mFdqBvAb7cVCK7O9 mvLiRQsYV6ENSydfFJC9Pf X-Google-Smtp-Source: AGHT+IEf9rd3VZUVXAYGO08YVjzMyeAzyQnihGQTi1xUWrRMzGiz7w9Xd0jwx+tTmfL+idCDd2uXGg== X-Received: by 2002:a05:600c:4e50:b0:46e:3d5a:d15d with SMTP id 5b1f17b1804b1-46e3d5ad285mr148491415e9.26.1759223703003; Tue, 30 Sep 2025 02:15:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thanos Makatos , Steve Sistare , Zhenzhong Duan , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Eric Auger , Alex Williamson , Yi Liu , John Levon , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/3] system/iommufd: Use uint64_t type for IOVA mapping size Date: Tue, 30 Sep 2025 11:14:54 +0200 Message-ID: <20250930091456.34524-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930091456.34524-1-philmd@linaro.org> References: <20250930091456.34524-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 @linaro.org) X-ZM-MESSAGEID: 1759223820626116600 The 'ram_addr_t' type is described as: a QEMU internal address space that maps guest RAM physical addresses into an intermediate address space that can map to host virtual address spaces. This doesn't represent well an IOVA mapping size. Simply use the uint64_t type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater --- include/system/iommufd.h | 6 +++--- backends/iommufd.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/system/iommufd.h b/include/system/iommufd.h index c9c72ffc450..a659f36a20f 100644 --- a/include/system/iommufd.h +++ b/include/system/iommufd.h @@ -45,12 +45,12 @@ bool iommufd_backend_alloc_ioas(IOMMUFDBackend *be, uin= t32_t *ioas_id, Error **errp); void iommufd_backend_free_id(IOMMUFDBackend *be, uint32_t id); int iommufd_backend_map_file_dma(IOMMUFDBackend *be, uint32_t ioas_id, - hwaddr iova, ram_addr_t size, int fd, + hwaddr iova, uint64_t size, int fd, unsigned long start, bool readonly); int iommufd_backend_map_dma(IOMMUFDBackend *be, uint32_t ioas_id, hwaddr i= ova, - ram_addr_t size, void *vaddr, bool readonly); + uint64_t size, void *vaddr, bool readonly); int iommufd_backend_unmap_dma(IOMMUFDBackend *be, uint32_t ioas_id, - hwaddr iova, ram_addr_t size); + hwaddr iova, uint64_t size); bool iommufd_backend_get_device_info(IOMMUFDBackend *be, uint32_t devid, uint32_t *type, void *data, uint32_t = len, uint64_t *caps, Error **errp); diff --git a/backends/iommufd.c b/backends/iommufd.c index 2a33c7ab0bc..fdfb7c9d671 100644 --- a/backends/iommufd.c +++ b/backends/iommufd.c @@ -197,7 +197,7 @@ void iommufd_backend_free_id(IOMMUFDBackend *be, uint32= _t id) } =20 int iommufd_backend_map_dma(IOMMUFDBackend *be, uint32_t ioas_id, hwaddr i= ova, - ram_addr_t size, void *vaddr, bool readonly) + uint64_t size, void *vaddr, bool readonly) { int ret, fd =3D be->fd; struct iommu_ioas_map map =3D { @@ -230,7 +230,7 @@ int iommufd_backend_map_dma(IOMMUFDBackend *be, uint32_= t ioas_id, hwaddr iova, } =20 int iommufd_backend_map_file_dma(IOMMUFDBackend *be, uint32_t ioas_id, - hwaddr iova, ram_addr_t size, + hwaddr iova, uint64_t size, int mfd, unsigned long start, bool readon= ly) { int ret, fd =3D be->fd; @@ -268,7 +268,7 @@ int iommufd_backend_map_file_dma(IOMMUFDBackend *be, ui= nt32_t ioas_id, } =20 int iommufd_backend_unmap_dma(IOMMUFDBackend *be, uint32_t ioas_id, - hwaddr iova, ram_addr_t size) + hwaddr iova, uint64_t size) { int ret, fd =3D be->fd; struct iommu_ioas_unmap unmap =3D { --=20 2.51.0 From nobody Fri Nov 14 23:31:35 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759223819; cv=none; d=zohomail.com; s=zohoarc; b=OtST9qULSTotMXgvV07IEXJWjRvHc2wzYgrBq3FZHxyUQqyC2DwnLEv90W1clYHXbKDTbs+UYBn5yBLx0xTyDgqFhxaZ23g1EzE6EYfjyLhML230jlHjpfjFJbSt3uGHnbDyfu+d5GrNZnvuejdFa8TIl46JsOQGkm2bxSUe/zg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759223819; 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=9WFpW9ypRp+isif0eE27JaFFn5D2+mWBML36ZQI1h6A=; b=Tqi5VZ6dmrarPTGxjOlBrfPeXTqzbF3BgB3qV30cUMuqe4bf5o+uFkOa5YHhHUcK6HweD5afSezktVPCbcqBYOlUkmc9/S3V5sg1D+6lcNs+bUYm4xcsJZAq1e7n/4R/iEOVNuI5N3M+Z34VTJ3WUeoi2sg6h7bjB12SRF7x4HE= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759223819137374.32019734074174; Tue, 30 Sep 2025 02:16:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3WSN-0004xO-VU; Tue, 30 Sep 2025 05:15:37 -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 1v3WSF-0004sx-5N for qemu-devel@nongnu.org; Tue, 30 Sep 2025 05:15:27 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3WS3-00017Y-9S for qemu-devel@nongnu.org; Tue, 30 Sep 2025 05:15:24 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3f0134ccc0cso3886239f8f.1 for ; Tue, 30 Sep 2025 02:15:11 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-41f00aebdb7sm9073250f8f.57.2025.09.30.02.15.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 30 Sep 2025 02:15:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759223708; x=1759828508; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9WFpW9ypRp+isif0eE27JaFFn5D2+mWBML36ZQI1h6A=; b=CTi2yeuwHnV2vz9QF9g7xGar/lU5B+Pl7IMfLF53IozlBOZKIYDWkc2Hiu1rhBfDiZ Vpgdfukyza+ZG2Fv8utc4jbQk1jXBZ0oIyamjzFqlST9vvwYpZCwM+wXKfC2IIfUxr+G 3T7Zlt5+X59I97L1sUtI474IxWNClGt98NIThoXJvBDIgbOk54idjo9WufaWeTd8+ng9 grxGg+7AfLH1c8FTCHfl9VCz5zWM9sUqg/TnqQC2AzUzdmaumu6B28gX8RDqpML2G4XG lh6mX24swSK3UMnB1SHrBDnVa6lBAxDlcDdQXBO3LAKI7rJ/LKOfqb1HPMYLwqDnbn5c KU6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759223708; x=1759828508; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9WFpW9ypRp+isif0eE27JaFFn5D2+mWBML36ZQI1h6A=; b=F3yqDLmFgwg+K6nrIZqR926Mej02EPkcC/rdKLN5Hrk7HHSd8dkMdO4Y87iWv5BcW4 do/6d26On0YJ6fSRHYgU3P15VBdF/nAtiyvngZZDWo8PSUC3lF+VXCnf95s/Z2wIxbcP 6HRoejkPb094j2j8IS0wgy8UZpysqCdOJGIPVjxo0x8u5pi4cuH9DAcXtCaVV0CkO/fV XnoDjzK+uDE+IAiOGGR3oJSgSoPcI5i52hbjN3Cwei1Bt41Ku5mh97fPYZkMwefNZxUZ 22WyNyFlnnCKnfO+xgNGAo/hihVIjv2vGrp9/K2Crti/UDe3cv3tkYbGuc6RFO+g1/fj UbWg== X-Gm-Message-State: AOJu0YwKCRoNmS/rwh67OvRRCWm0xsyKVseZJBKYet0Bna+vE3mf7ZBN LoLxeYKHrXK7lGu6/b/UJkg7ctBnbrtcFcGqB7qh7t3o6SJXdmSM9rerKtl2loNm1GisLeiqRjg An4DPm3I7CA== X-Gm-Gg: ASbGncuGNZbPfFPdEfwkvQmb82112nE9mQTaEIxcaRfZH7Pbz42CH996UfHX+Rn1ujw 5jvtFedEQqHbHutaJNkSwvfvFKcGLv0FztW4I1DAdrgef+dnmHOJT5RpE/XwkqlHCLKNZEQY0ti xwpaTyUp4YrpF9GSloGHcV2Bdbj0Oys9Uw/zTgCVOOI+UJEKF1cA1plZ/NDylizTR6HJrmtRUX6 b0J+qnVjOs3X3mp3X9PRrt2SREIaGjwowHUF0f5ENmyoMttiLeZmCnmnIA8P54uTgzMyDHGwkfB kdRyoPn8wjadKXQU9QmYAWNLNsiekXFvRUz1dBg3s3RCPB2I2GycaTcrpkQtzB4MkxvQ9Sv206U +h+8is83g6nFXapJGvqZcCNsMZHU2fjC9TUZLPwaYD442r+EvfWok3Zb03JgWAJ7NwCNxqFl81g wg8ySKaJ+vT5Us6GL1BGDg4IFrYCZrGK8= X-Google-Smtp-Source: AGHT+IH9rK3GzgXLjxZvYt9xiU1DMXIbzMT3q6OC7g2eMAZBYQUcBbaIwuSBzcfSkocqMTULK+xfng== X-Received: by 2002:a05:6000:25c3:b0:3ec:6259:5096 with SMTP id ffacd0b85a97d-40e45b8770fmr15917620f8f.21.1759223707849; Tue, 30 Sep 2025 02:15:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thanos Makatos , Steve Sistare , Zhenzhong Duan , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Eric Auger , Alex Williamson , Yi Liu , John Levon , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/3] hw/vfio: Avoid ram_addr_t in vfio_container_query_dirty_bitmap() Date: Tue, 30 Sep 2025 11:14:55 +0200 Message-ID: <20250930091456.34524-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930091456.34524-1-philmd@linaro.org> References: <20250930091456.34524-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 @linaro.org) X-ZM-MESSAGEID: 1759223820752116600 The 'ram_addr_t' type is described as: a QEMU internal address space that maps guest RAM physical addresses into an intermediate address space that can map to host virtual address spaces. vfio_container_query_dirty_bitmap() doesn't expect such QEMU intermediate address, but a guest physical addresses. Use the appropriate 'hwaddr' type, rename as @translated_addr for clarity. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater --- include/hw/vfio/vfio-container.h | 3 ++- hw/vfio/container.c | 11 ++++++----- hw/vfio/listener.c | 12 ++++++------ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/include/hw/vfio/vfio-container.h b/include/hw/vfio/vfio-contai= ner.h index b8fb2b8b5d7..093c360f0ee 100644 --- a/include/hw/vfio/vfio-container.h +++ b/include/hw/vfio/vfio-container.h @@ -98,7 +98,8 @@ bool vfio_container_dirty_tracking_is_started( bool vfio_container_devices_dirty_tracking_is_supported( const VFIOContainer *bcontainer); int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer, - uint64_t iova, uint64_t size, ram_addr_t ram_addr, Error **errp); + uint64_t iova, uint64_t size, + hwaddr translated_addr, Error **errp= ); =20 GList *vfio_container_get_iova_ranges(const VFIOContainer *bcontainer); =20 diff --git a/hw/vfio/container.c b/hw/vfio/container.c index 250b20f4245..9d694393714 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -246,7 +246,7 @@ static int vfio_container_devices_query_dirty_bitmap( =20 int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer, uint64_t iova, uint64_t size, - ram_addr_t ram_addr, Error **errp) + hwaddr translated_addr, Error **errp) { bool all_device_dirty_tracking =3D vfio_container_devices_dirty_tracking_is_supported(bcontainer); @@ -255,7 +255,7 @@ int vfio_container_query_dirty_bitmap(const VFIOContain= er *bcontainer, int ret; =20 if (!bcontainer->dirty_pages_supported && !all_device_dirty_tracking) { - cpu_physical_memory_set_dirty_range(ram_addr, size, + cpu_physical_memory_set_dirty_range(translated_addr, size, tcg_enabled() ? DIRTY_CLIENTS_= ALL : DIRTY_CLIENTS_NOCODE); return 0; @@ -280,11 +280,12 @@ int vfio_container_query_dirty_bitmap(const VFIOConta= iner *bcontainer, goto out; } =20 - dirty_pages =3D cpu_physical_memory_set_dirty_lebitmap(vbmap.bitmap, r= am_addr, + dirty_pages =3D cpu_physical_memory_set_dirty_lebitmap(vbmap.bitmap, + translated_addr, vbmap.pages); =20 - trace_vfio_container_query_dirty_bitmap(iova, size, vbmap.size, ram_ad= dr, - dirty_pages); + trace_vfio_container_query_dirty_bitmap(iova, size, vbmap.size, + translated_addr, dirty_pages); out: g_free(vbmap.bitmap); =20 diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c index 3b6f17f0c3a..4e2565905e0 100644 --- a/hw/vfio/listener.c +++ b/hw/vfio/listener.c @@ -1059,7 +1059,7 @@ static void vfio_iommu_map_dirty_notify(IOMMUNotifier= *n, IOMMUTLBEntry *iotlb) VFIOGuestIOMMU *giommu =3D gdn->giommu; VFIOContainer *bcontainer =3D giommu->bcontainer; hwaddr iova =3D iotlb->iova + giommu->iommu_offset; - ram_addr_t translated_addr; + hwaddr translated_addr; Error *local_err =3D NULL; int ret =3D -EINVAL; MemoryRegion *mr; @@ -1108,7 +1108,7 @@ static int vfio_ram_discard_query_dirty_bitmap(Memory= RegionSection *section, { const hwaddr size =3D int128_get64(section->size); const hwaddr iova =3D section->offset_within_address_space; - const ram_addr_t ram_addr =3D memory_region_get_ram_addr(section->mr) + + const hwaddr addr =3D memory_region_get_ram_addr(section->mr) + section->offset_within_region; VFIORamDiscardListener *vrdl =3D opaque; Error *local_err =3D NULL; @@ -1118,7 +1118,7 @@ static int vfio_ram_discard_query_dirty_bitmap(Memory= RegionSection *section, * Sync the whole mapped region (spanning multiple individual mappings) * in one go. */ - ret =3D vfio_container_query_dirty_bitmap(vrdl->bcontainer, iova, size= , ram_addr, + ret =3D vfio_container_query_dirty_bitmap(vrdl->bcontainer, iova, size= , addr, &local_err); if (ret) { error_report_err(local_err); @@ -1183,7 +1183,7 @@ static int vfio_sync_iommu_dirty_bitmap(VFIOContainer= *bcontainer, static int vfio_sync_dirty_bitmap(VFIOContainer *bcontainer, MemoryRegionSection *section, Error **er= rp) { - ram_addr_t ram_addr; + hwaddr addr; =20 if (memory_region_is_iommu(section->mr)) { return vfio_sync_iommu_dirty_bitmap(bcontainer, section); @@ -1198,12 +1198,12 @@ static int vfio_sync_dirty_bitmap(VFIOContainer *bc= ontainer, return ret; } =20 - ram_addr =3D memory_region_get_ram_addr(section->mr) + + addr =3D memory_region_get_ram_addr(section->mr) + section->offset_within_region; =20 return vfio_container_query_dirty_bitmap(bcontainer, REAL_HOST_PAGE_ALIGN(section->offset_within_address_spa= ce), - int128_get64(section->size), ram_addr, er= rp); + int128_get64(section->size), addr, errp); } =20 static void vfio_listener_log_sync(MemoryListener *listener, --=20 2.51.0 From nobody Fri Nov 14 23:31:35 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759223813; cv=none; d=zohomail.com; s=zohoarc; b=Z540HclGU4ibWjj1KHAmJu9cTdRI0NwTwQx+H0GSDcaeFMFK4Y5xgOew579zkHZXpdsniBJFf1UKBibTEgBh8A4fai6d5Y/gF3Ye/e1A0SwtPXXey7+CD6pqu1nb70nTB+ujDT+YgS+Xu2IitPKC/86KL75E+KHXDAbYhHfe6so= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759223813; 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=jyfUsjfODVQJYQKbba0puUbRexP7Udvd0C0uJa768IQ=; b=Ay0/VQQfhVHsxQZo2odOLnUX9YoQ4CDPczC0aCUUyKaHBMqOxJo+QUyzNlYeiYjHoBUlWDEEEKKZPHd5Q764Hq3AXp5HOlHxkASOHVDdgghCrtl+hklBg3Cj6mkXzoamp1uKmSpDomaYwFkz2UP4fsy5F3UmbvZQ3pddBN74qpM= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759223813225415.1977627631114; Tue, 30 Sep 2025 02:16:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3WSM-0004wr-8o; Tue, 30 Sep 2025 05:15:35 -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 1v3WSF-0004sy-53 for qemu-devel@nongnu.org; Tue, 30 Sep 2025 05:15:27 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3WS6-000191-OT for qemu-devel@nongnu.org; Tue, 30 Sep 2025 05:15:26 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-46e34bd8eb2so10668045e9.3 for ; Tue, 30 Sep 2025 02:15:16 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-40fb74e46bcsm22011810f8f.8.2025.09.30.02.15.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 30 Sep 2025 02:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759223713; x=1759828513; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jyfUsjfODVQJYQKbba0puUbRexP7Udvd0C0uJa768IQ=; b=EMJo+ZS+AqsG7m1i+RN6muyArAx2TWxJa8egozEDHHQ3jPTa/jIfyjnWuIKgswdSDw JaQjkxz9/JHBIA3lII69mGpS9DSv5Aa8enONgLSHrx3GPusLOoWd0/Z3Xg6EwGMKs1PE Xv0uuHA2uZg6Wv29Zx+7YyOdtJERW43TFEM3f1vkCE4UuXRyn7heozkbCHMMTPgnSaBU JkRJkzCb05BL7GanLzUvN+KqCxbZ2wRyuOTzVBrN5pXKtncQOOy/dQ5/I8mibFTdJbwV MmtE9bm4vENdc0pU8Ic6dEi/L6K/lKsxFI3VWd3VMmgNItVt53fJmAj7J07F22N4Vawk aaXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759223713; x=1759828513; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jyfUsjfODVQJYQKbba0puUbRexP7Udvd0C0uJa768IQ=; b=koXk+I8IMHnGs3AkBGCpe+R4yjX2DqQUTqA0w4VWrFNb5cF8DsJ/AoA/lIkmHkwwgH waS4hc9QmEvbXO/aq1VfudNnyusUd6RnGCfS2l75FmY/WAoZP5aoQNo/OFYAGiKYGV/8 +qs8DjOi9YPzj00CXFm0w7M2rxGUwjMvtL3UPW5ZpbPpY3KCWkR3/qOU4DdK307+8YjU mK+T4p4VAgPGm6975Qi9F0ikSvEDTYQwT8nke/hgpuOBX4rKIPcZ2f42vj5F/8Y4OC8z hPNwUvfRCWDSyz7t7SldjKVcaRuIajdUE66NbSPdSKtXB+U2p3GsKrXXSrj0KddmZRMc Jkxw== X-Gm-Message-State: AOJu0YzQeSvQ7xn/N41TYetWuSomvED7lq9Y9YLYrqcZs3SgW3HA2lOd 8btnrMqDqMCRBj63NO7r56wfczm71817fyj9hoAzrjOUziIJ+U8blc6IWIJcjR5h2jM6jn1Co2G H8jVNLRIKMQ== X-Gm-Gg: ASbGncvC6zPel4tRXRkH9vosBiYnVU0sVEYk1LcIGjKY36ihN8wpB2fTw27cd1nbBkX okDyUME0paiFB4/PkGMELiGlvCbzzyGmB/rP5X9VNJVBPoYgd+vg5Wu/llJI24G+2U7cWQ3dmH3 zwGWAC0DzZ4vb49SSs6TJbLHakAJVJiwYtcGP53UwNrjnweO2g2DYBy5yGZoOgnkF4lQzfti9Nk jTal47zpGPieXJhixniJN0tQMwkhxmhMj+dZkOMdcntf6JwP/khFeHgWrh+s19f+00M0McKltXT uMlWq3Rlul8u6t5NNZfoxQxsJb36GiWLa1+glhjp3GKGrS/GYuJEYgx8GEThVjShu0ggI8Sta+b ZMsL+Q+oYnOVbvy4JBcogShCgnc+dHLw5wNQBqKb0KG1NOd0azktk4ct5xChU5PjMixgIcVBBZS 308Qn8q+gKowZxeSoSCiKS X-Google-Smtp-Source: AGHT+IHrJ1AOAIg3tX8s3cG29OdXc6+pUMYGelwaFUNI33VZputogZi6W5363Py7mIXbHlAe9FVEJA== X-Received: by 2002:a05:6000:2410:b0:3ee:13ba:e133 with SMTP id ffacd0b85a97d-40e4354d631mr17350108f8f.1.1759223712906; Tue, 30 Sep 2025 02:15:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thanos Makatos , Steve Sistare , Zhenzhong Duan , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Eric Auger , Alex Williamson , Yi Liu , John Levon , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/3] hw/vfio: Use uint64_t for IOVA mapping size in vfio_container_dma_*map Date: Tue, 30 Sep 2025 11:14:56 +0200 Message-ID: <20250930091456.34524-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930091456.34524-1-philmd@linaro.org> References: <20250930091456.34524-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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 @linaro.org) X-ZM-MESSAGEID: 1759223814956116600 The 'ram_addr_t' type is described as: a QEMU internal address space that maps guest RAM physical addresses into an intermediate address space that can map to host virtual address spaces. This doesn't represent well an IOVA mapping size. Simply use the uint64_t type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater --- include/hw/vfio/vfio-container.h | 10 +++++----- include/hw/vfio/vfio-cpr.h | 2 +- hw/vfio-user/container.c | 4 ++-- hw/vfio/container-legacy.c | 8 ++++---- hw/vfio/container.c | 4 ++-- hw/vfio/cpr-legacy.c | 2 +- hw/vfio/iommufd.c | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/hw/vfio/vfio-container.h b/include/hw/vfio/vfio-contai= ner.h index 093c360f0ee..c4b58d664b7 100644 --- a/include/hw/vfio/vfio-container.h +++ b/include/hw/vfio/vfio-container.h @@ -81,10 +81,10 @@ void vfio_address_space_insert(VFIOAddressSpace *space, VFIOContainer *bcontainer); =20 int vfio_container_dma_map(VFIOContainer *bcontainer, - hwaddr iova, ram_addr_t size, + hwaddr iova, uint64_t size, void *vaddr, bool readonly, MemoryRegion *mr); int vfio_container_dma_unmap(VFIOContainer *bcontainer, - hwaddr iova, ram_addr_t size, + hwaddr iova, uint64_t size, IOMMUTLBEntry *iotlb, bool unmap_all); bool vfio_container_add_section_window(VFIOContainer *bcontainer, MemoryRegionSection *section, @@ -167,7 +167,7 @@ struct VFIOIOMMUClass { * Returns 0 to indicate success and -errno otherwise. */ int (*dma_map)(const VFIOContainer *bcontainer, - hwaddr iova, ram_addr_t size, + hwaddr iova, uint64_t size, void *vaddr, bool readonly, MemoryRegion *mr); /** * @dma_map_file @@ -182,7 +182,7 @@ struct VFIOIOMMUClass { * @readonly: map read only if true */ int (*dma_map_file)(const VFIOContainer *bcontainer, - hwaddr iova, ram_addr_t size, + hwaddr iova, uint64_t size, int fd, unsigned long start, bool readonly); /** * @dma_unmap @@ -198,7 +198,7 @@ struct VFIOIOMMUClass { * Returns 0 to indicate success and -errno otherwise. */ int (*dma_unmap)(const VFIOContainer *bcontainer, - hwaddr iova, ram_addr_t size, + hwaddr iova, uint64_t size, IOMMUTLBEntry *iotlb, bool unmap_all); =20 =20 diff --git a/include/hw/vfio/vfio-cpr.h b/include/hw/vfio/vfio-cpr.h index 26ee0c4fe15..81f4e24e229 100644 --- a/include/hw/vfio/vfio-cpr.h +++ b/include/hw/vfio/vfio-cpr.h @@ -21,7 +21,7 @@ struct VFIOIOMMUFDContainer; struct IOMMUFDBackend; =20 typedef int (*dma_map_fn)(const struct VFIOContainer *bcontainer, - hwaddr iova, ram_addr_t size, void *vaddr, + hwaddr iova, uint64_t size, void *vaddr, bool readonly, MemoryRegion *mr); =20 typedef struct VFIOContainerCPR { diff --git a/hw/vfio-user/container.c b/hw/vfio-user/container.c index 411eb7b28b7..e45192fef65 100644 --- a/hw/vfio-user/container.c +++ b/hw/vfio-user/container.c @@ -39,7 +39,7 @@ static void vfio_user_listener_commit(VFIOContainer *bcon= tainer) } =20 static int vfio_user_dma_unmap(const VFIOContainer *bcontainer, - hwaddr iova, ram_addr_t size, + hwaddr iova, uint64_t size, IOMMUTLBEntry *iotlb, bool unmap_all) { VFIOUserContainer *container =3D VFIO_IOMMU_USER(bcontainer); @@ -81,7 +81,7 @@ static int vfio_user_dma_unmap(const VFIOContainer *bcont= ainer, } =20 static int vfio_user_dma_map(const VFIOContainer *bcontainer, hwaddr iova, - ram_addr_t size, void *vaddr, bool readonly, + uint64_t size, void *vaddr, bool readonly, MemoryRegion *mrp) { VFIOUserContainer *container =3D VFIO_IOMMU_USER(bcontainer); diff --git a/hw/vfio/container-legacy.c b/hw/vfio/container-legacy.c index c0f87f774a0..3a710d8265c 100644 --- a/hw/vfio/container-legacy.c +++ b/hw/vfio/container-legacy.c @@ -69,7 +69,7 @@ static int vfio_ram_block_discard_disable(VFIOLegacyConta= iner *container, } =20 static int vfio_dma_unmap_bitmap(const VFIOLegacyContainer *container, - hwaddr iova, ram_addr_t size, + hwaddr iova, uint64_t size, IOMMUTLBEntry *iotlb) { const VFIOContainer *bcontainer =3D VFIO_IOMMU(container); @@ -122,7 +122,7 @@ unmap_exit: } =20 static int vfio_legacy_dma_unmap_one(const VFIOContainer *bcontainer, - hwaddr iova, ram_addr_t size, + hwaddr iova, uint64_t size, IOMMUTLBEntry *iotlb) { const VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); @@ -185,7 +185,7 @@ static int vfio_legacy_dma_unmap_one(const VFIOContaine= r *bcontainer, * DMA - Mapping and unmapping for the "type1" IOMMU interface used on x86 */ static int vfio_legacy_dma_unmap(const VFIOContainer *bcontainer, - hwaddr iova, ram_addr_t size, + hwaddr iova, uint64_t size, IOMMUTLBEntry *iotlb, bool unmap_all) { int ret; @@ -210,7 +210,7 @@ static int vfio_legacy_dma_unmap(const VFIOContainer *b= container, } =20 static int vfio_legacy_dma_map(const VFIOContainer *bcontainer, hwaddr iov= a, - ram_addr_t size, void *vaddr, bool readonly, + uint64_t size, void *vaddr, bool readonly, MemoryRegion *mr) { const VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); diff --git a/hw/vfio/container.c b/hw/vfio/container.c index 9d694393714..41de3439246 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -74,7 +74,7 @@ void vfio_address_space_insert(VFIOAddressSpace *space, } =20 int vfio_container_dma_map(VFIOContainer *bcontainer, - hwaddr iova, ram_addr_t size, + hwaddr iova, uint64_t size, void *vaddr, bool readonly, MemoryRegion *mr) { VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); @@ -93,7 +93,7 @@ int vfio_container_dma_map(VFIOContainer *bcontainer, } =20 int vfio_container_dma_unmap(VFIOContainer *bcontainer, - hwaddr iova, ram_addr_t size, + hwaddr iova, uint64_t size, IOMMUTLBEntry *iotlb, bool unmap_all) { VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); diff --git a/hw/vfio/cpr-legacy.c b/hw/vfio/cpr-legacy.c index bbf7a0d35f0..3a1d126556e 100644 --- a/hw/vfio/cpr-legacy.c +++ b/hw/vfio/cpr-legacy.c @@ -39,7 +39,7 @@ static bool vfio_dma_unmap_vaddr_all(VFIOLegacyContainer = *container, * The incoming state is cleared thereafter. */ static int vfio_legacy_cpr_dma_map(const VFIOContainer *bcontainer, - hwaddr iova, ram_addr_t size, void *vad= dr, + hwaddr iova, uint64_t size, void *vaddr, bool readonly, MemoryRegion *mr) { const VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index f0ffe235919..68470d552ec 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -35,7 +35,7 @@ TYPE_HOST_IOMMU_DEVICE_IOMMUFD "-vfio" =20 static int iommufd_cdev_map(const VFIOContainer *bcontainer, hwaddr iova, - ram_addr_t size, void *vaddr, bool readonly, + uint64_t size, void *vaddr, bool readonly, MemoryRegion *mr) { const VFIOIOMMUFDContainer *container =3D VFIO_IOMMU_IOMMUFD(bcontaine= r); @@ -46,7 +46,7 @@ static int iommufd_cdev_map(const VFIOContainer *bcontain= er, hwaddr iova, } =20 static int iommufd_cdev_map_file(const VFIOContainer *bcontainer, - hwaddr iova, ram_addr_t size, + hwaddr iova, uint64_t size, int fd, unsigned long start, bool readonl= y) { const VFIOIOMMUFDContainer *container =3D VFIO_IOMMU_IOMMUFD(bcontaine= r); @@ -57,7 +57,7 @@ static int iommufd_cdev_map_file(const VFIOContainer *bco= ntainer, } =20 static int iommufd_cdev_unmap(const VFIOContainer *bcontainer, - hwaddr iova, ram_addr_t size, + hwaddr iova, uint64_t size, IOMMUTLBEntry *iotlb, bool unmap_all) { const VFIOIOMMUFDContainer *container =3D VFIO_IOMMU_IOMMUFD(bcontaine= r); --=20 2.51.0