From nobody Sun Sep 28 17:00:05 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; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1758800090; cv=pass; d=zohomail.com; s=zohoarc; b=IJDKmVFSXmqUER/YNsXqu5jpUlPBjv2LRpaLl2CeSxaCw/Bzqtp9YJmz+9qHiycZGpyBftQz/RF5PnblyGTq0vzcCspn+IMLbeDP1sJDR+2tryACa69HBf54orojbriZ5XBPBZZOtMFavGITXF1AziTzkBuGXXh9ZdKgPS3LIrI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758800090; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=7TqRKBIjupQaDGWLaSaDKKTtfFPIOQvGW3UzHp68gqU=; b=K4z5oizkmZoNMEhCLAFkpPp18DTxHqxk3Mn6sS/o1JGCYe1q9DgaRo1m9eB3oSor8z9KB25unXLs25IjfjBbHmsQyeL2nlQsKCWt3elhAsdOrfkJwN490I44MlMLDQGiRWIGFS/qS5mp19vSarwVfsrFvNMRu5RSzjPG+Fu4+Cg= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); 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 1758800089985707.9485960507233; Thu, 25 Sep 2025 04:34:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v1kEB-0006eL-Ip; Thu, 25 Sep 2025 07:33: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 1v1kDO-0006TL-JM; Thu, 25 Sep 2025 07:32:46 -0400 Received: from mx0a-002c1b01.pphosted.com ([148.163.151.68]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v1kD4-0008I6-Qh; Thu, 25 Sep 2025 07:32:44 -0400 Received: from pps.filterd (m0127839.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 58P9nB5u1809605; Thu, 25 Sep 2025 04:32:12 -0700 Received: from ph7pr06cu001.outbound.protection.outlook.com (mail-westus3azon11020085.outbound.protection.outlook.com [52.101.201.85]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 49cgtjauav-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 25 Sep 2025 04:32:12 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA0PR02MB9532.namprd02.prod.outlook.com (2603:10b6:208:40a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.20; Thu, 25 Sep 2025 11:32:10 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.9160.010; Thu, 25 Sep 2025 11:32:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=7TqRKBIjupQaDGWLaSaDKKTtfFPIOQvGW3UzHp68g qU=; b=HYR6tyq562bPK3BCzYiRvsLc5P+N50NII8cON27hkMhA5iFWropZgYs+k fVZk3cRH9wNTxuRjR6tdAK+dA3dBXhPMEFdcPI2hmiftw5B/G/v+9D7RkLE0RhqO UJJBdi8VMu3ZvHLTNAr+Tg7oWeEEp918eZynFUfzk3QRTpKffrFDqRVVW8J3N3TT tkTLE/6V76i+yHFzfCATc9e5e0U2vjr+VZ8pauoHcHy5QEUQFEFwuIy3T3QDu1gC Fnstyx0ktrUyNUiuTAq8wG++xufrxHgvX9s5CDqlism1CZAW+icuO6AwgLggQfsS hZijvQcfeGH4eu/j6U1SApOheb+uw== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dVDbeEiwCKMBl83lwV2fkCF9arBk2XFn8F1YUYgPW8rTlI9M9N2bWuvwHWIW+2X8v4v7kpFCccBtK77ysIt+vaq4Uh6grmyGkmNn79R9y25MksT67hBLT0xiGE9+BVmMq5IVLvDwffwTr6UErLV9W5U1+OaHFmUMSRPyP0QTcfceTv7tEnvgvThWtOsKHIJ52mOXuC6zbJ5oS+idGyAAEQAQOGsPKv4Sk4JuMh82vyrFjEHDLsVkPvaswJOlur8Ao+eCwTpq2vonv1aZeb+bUm4fkWjTr1ujeQC58Eg/JKi9c3ejM2N7CH4/I5tDPnT4P7aSNkumGkQBnWleqwmDgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7TqRKBIjupQaDGWLaSaDKKTtfFPIOQvGW3UzHp68gqU=; b=lSSnCtBut1G/Ivp0Zoo6NFtfu9lp3xvuit3rBkJvD/gG6HC7Tua8kmhLMWNORdr+mlRlSQsmaK2PCoAa+yOBAvvGFK7zgQGajOrUgTk5VmLR0NGMc+fJsOEYQEhvKCtkWpxOID3McAvPzydU1LuWn8IL5hh5vgWgpSoaNa7507Cq7OsR7UhEguN48Mes9k4uql0EtTfvKAoU0/4saXSZfiahNyelNSKBIugNRn+4iTQeascLg8WJBSeVUVIaFqO5cMh7pMTWAomL25A5oVv7Yu3kN4YLmJ420JY17Pb2eWvvJUvci5vUsiCXJtHi8WsqG1guXE0quykGj1jgwHMMUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7TqRKBIjupQaDGWLaSaDKKTtfFPIOQvGW3UzHp68gqU=; b=IuUMSyAKOET5aEgBxE+3osl6XpO27QD5SqMudaaLLDVJ+ihuB4aewY63Xy3HjCEuEJ/mAhv23jZo8ph/7db7C+GawQLaKuPZTw0a1Z9hEAE3fVtXNFK6RZEHeqfLPXAKHiQLr+Bjt3VDkI/WvUl3wbj6UF7rIxQxsKpRb7fiBSjRqL0bF6Il/tzo1yeKxWjPJyUXHV9CKW3NNHRNJaiP0OU54a+Ed1KoutfcUrz/3zUlJu2aV5f+T9yUcjr8a92b9ClPWFjfOBw2KwjOQzP0LFkUbbEXDXZoDTkKLJFBsSnmZdgu1Db5sg2fHefYEmKxVRuNpfgOSIU5Va/6+K0N5g== From: Mark Cave-Ayland To: npiggin@gmail.com, harshpb@linux.ibm.com, mjrosato@linux.ibm.com, farman@linux.ibm.com, pasic@linux.ibm.com, borntraeger@linux.ibm.com, thuth@redhat.com, richard.henderson@linaro.org, david@redhat.com, iii@linux.ibm.com, john.levon@nutanix.com, thanos.makatos@nutanix.com, clg@redhat.com, alex.williamson@redhat.com, steven.sistare@oracle.com, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 02/28] include/hw/vfio/vfio-container-base.h: rename VFIOContainerBase to VFIOContainer Date: Thu, 25 Sep 2025 12:31:10 +0100 Message-ID: <20250925113159.1760317-3-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250925113159.1760317-1-mark.caveayland@nutanix.com> References: <20250925113159.1760317-1-mark.caveayland@nutanix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO2P265CA0262.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:8a::34) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA0PR02MB9532:EE_ X-MS-Office365-Filtering-Correlation-Id: 11afa933-dc9c-4abb-d1e9-08ddfc2729fb x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|10070799003|1800799024|376014|7416014|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?dkowZWltUS9DRDJNalQrQjdQcStBZkZUZUpOSDJOTFJqRlhNdEtHTDl4cFk4?= =?utf-8?B?UmkvVzBZYTlEeXBFWHhQS2YyeXhMOGRRT1VjRXFWWHVRS1Z1ZjlWbFdldEhC?= =?utf-8?B?RjQzUFZhQS9wampVQllMV1pJTWVlbUNjRCtmeWtub3BOUFJFaUtNblpTRHI4?= =?utf-8?B?UG5uUUl0VlpHREZ6dEQxbVJacGEwdG42SEdVcnczV0xiZDNwalh5ZVo2RTlZ?= =?utf-8?B?UVI2SFdWc1p2dXZqTmxibkxGb1J2MHk3cjJPb0ZnOE5MWHVkN0lhelVneDVo?= =?utf-8?B?eWYvYzBweHNTSVJRQWEzeFFsZFMwMExNUk83aDk2QlhrOGNCOWVPMTRnUWFy?= =?utf-8?B?WnhMNGpSRkdiQW5rMjd2ZEpxQUxVUk84a3JWK25KZXhmbUtMK1pBcmVmRG1r?= =?utf-8?B?ZE5rNzJVbGdhR0RyTGhLRGREMllGeFdjTUxuRDd5OFFucHdNQlhpczFWRDhs?= =?utf-8?B?TjErUmE2dWp2eXU1QTJCNFB3T3VjUndOUjdmTTFiRUxnbi8vK2o1WHpteFQr?= =?utf-8?B?OTdHdG5wQVB4YjRuSmdBSnlabmplNlg1VHM3WDhGNjdBNmdtMjl6WFdrOExZ?= =?utf-8?B?V3I3MTlKcVFOSEVxNDNzZjRzOWEzS1pmWDlZSXpHQlpaQUdSbjk3UWNmck0z?= =?utf-8?B?bS80N0svNVRTY3BTQ2VZTFRRckFXZE1mamxzSGJyRm1CR3BVVXZRWTQwVFNv?= =?utf-8?B?eFp6RnNSZDZMR0MybjlpdEd3WFJqTnV2RnR4eXdEY2JLQTMzVkRtWkNwZWdK?= =?utf-8?B?bHNKcGM3a2wwTmEzTGZlTVY0MG94dGlBMVJUOS9HdU9MWmtEYzg2MUhmSVBq?= =?utf-8?B?MFhBUnE1Wi9CUXF5RElCbkJuemNRZmY3Q1M0UUtpcjNWY0JlZ0ZaOUt5bmw4?= =?utf-8?B?MHlIa0xUcE1iWk5wNjdrVFp1T0dQTDVsZ1lLTWRocVNNTVlzOFdSSTFOdHdy?= =?utf-8?B?U1dmczhWd2w0Q09KRkgrRFJzYzBhbVl1Wk11UUdXdDVYdTFQSzhHbXlEamJH?= =?utf-8?B?M0NVUVBTdi82TW5tcnlHajdSK3ZjanFVbVNPZHI3Nm16K2pwV2lwTUJaTnBZ?= =?utf-8?B?bENLcXl5dG5zQnkxdU1LaE5lVE9yT1NGM0d2Z0ltTGloOEx0SHhRYjJEZWVK?= =?utf-8?B?dDdWbUttT2NGWXp2MmRZaCtEcGdQRlM1RytzYXE3TEY5ZGhRSXZ0NFVxQzJV?= =?utf-8?B?VHM3cEViSThPY2kzcmNRSjFkUE5HWWhoUUVmbTNDRnFuaGV0QVVFMXFRVlRX?= =?utf-8?B?REZucjFLSHFDSkkzdENUYWluVGExZmJzL3FRbzhOM3c5eGl5VEhFWTRBRTdR?= =?utf-8?B?UnBjRGZETUJKT0dYUFVCTFFWZ3plaDZ5OVUyRVd4NlBWcERva2FldC9rMEQr?= =?utf-8?B?MnNsZ0hhU1laK09MWU9qRE5QNjFRY2o4aWVrWUFWdEl6SUZiVzNtYTROZ0Qv?= =?utf-8?B?cm5JOWUzSk1BeDhqaC85WExJemRqSzFEM2hrZWF1VDJlRVVpU3BRMHJFUnpK?= =?utf-8?B?UWdiYjhiVVVMWmUrMDlSdTQvcndTN1dxaTBPMDYvanRNQW12dGRCc0sxV0dD?= =?utf-8?B?Y0pCYW9HRENRZ3dPQU5JWU5SV3RkZjN1a2VIQlV3S2ExN1VWeEJTY0JxUi9E?= =?utf-8?B?RmVvYXVzblpFZmdkUWo2TVZjZzcySnJ4aXVGWTNDSEVBSExjdStNL2RyOFE5?= =?utf-8?B?Yk9OSHlON2xYc0dweWdSUWFLSUE1eUx1L0l2ZEJNOTZlNnNyUWNLbWVWVEwy?= =?utf-8?B?anFVWStsMlhkTmpZS0pMV3NIbTVuTmVIaVNselVCZWR0OU1aN2tvN0lWUXc0?= =?utf-8?B?RTBKaHE3K0RTQVJpdzMwWmpCTEtaM1FGd1UzMzI0Q2xHeGl0dEJlTjJObE1E?= =?utf-8?B?d2lZRWlCUy91TVdaUzBXOTdzc2swcUVoVTRjRnRZVW1xUFpXMWFFSUFtbDhy?= =?utf-8?Q?xZToOmp1i+j2EwMTrgmMhVDhJBJR7tys?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(10070799003)(1800799024)(376014)(7416014)(366016)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b29hdHgrazQzbEVBZzVsd1RRR2toa2hPRHVFUzhzYXo2VXBIQlQ2aDhQZHBv?= =?utf-8?B?MjNPOFdVMUJyTyt2akMvM2tDQ1hySG5ZYXFOSnRjMU4zaThjYXBpcXViMTF5?= =?utf-8?B?dUpRYUNCSHl5M1RkdDExOUY3elFxVG9kTGE5WTBqVEJKeTBZd0ErNmRKL25t?= =?utf-8?B?ZUNQcDI0S0lRVlZRMzBXSk1KUlBNbWtnOG92YlFHQmFCb2x5Y3IwWUFOdDc0?= =?utf-8?B?SHdDamhteVpiVUZSZ3FCN0Zka2luYm82ODg5YmVYR0ZDMHUzZ09FVC8reitC?= =?utf-8?B?cEdmMXFHV3RQTUViem4wT1ZjOWsrd2crL2lzWHV0ZFZuS1RKS1E3bTZsRWlF?= =?utf-8?B?QlpRcmt6ZUlEM3lPbGF0RU5LV1JkQUxlZjYrWU9sL1hMbFoxdWZMNHphdnQr?= =?utf-8?B?K2tpeEZ3aFM1NHdKT1EzMmxOYStoakhOeUVoMXZBTU0xM0JTTWFQcThGTTVa?= =?utf-8?B?TldQbGJ0d1k4S2lseHFyMEY1MEttbkgxeVZja3pYTkhWQmhkTEVGZDN4VkZP?= =?utf-8?B?ZkFsU2tzdjFXQU1XaEVQcE5iNVhoaGsyeFQ3anV5eTY3NDU5UDRuT0c4WVdn?= =?utf-8?B?MkhvVWdBQ01GU3dyMDVVZ3g3UVZXVlpOZ3BZVWpyOGs5dDdidUIwb29hS3A2?= =?utf-8?B?d2FXOWozYkhzTWlsOFc4VUlKVFhxSU1RYzRjUXpDa2d0YnNpQm1QcEdOVzlE?= =?utf-8?B?T0FCTk5zc3JEL3Ura25VNTVveTZWMTA4NjdaR3MwOHRnYUhydzhxTkNIMEUr?= =?utf-8?B?ODZiVVZLdFdKQzc4bTd0WThuTjZlNmoxRW9peWlLYkZ2dDM3dXJaaUpVTHR4?= =?utf-8?B?VmR0eHFCOXhkckZpazZUSkMyck13SWIrOWZrQ0ZRWTdITmJBRWxOZERZWGdx?= =?utf-8?B?TEtkS0V0N0g5Q0cwZnp2RkhtQzlqZlNZRzJCbFV4d0ltd2J1WGc5c1ZYaWRt?= =?utf-8?B?cjlraGM5b0J1TTlNN2g0a1R2NWhhWHV2b1l1UEhMK3g4Q0RhS3ZlQjN2QWdT?= =?utf-8?B?cyszZTZKOU1Lb09SK0dTV1l6UHhUc2Jjcm5NanYvV1JEQzJGeU5SMnJEVXJv?= =?utf-8?B?a3VGMFA3dmlRM2k3Y3BtNHNHVXFlaCtxOVp0d1JwdFJMUXFDdVVyWUZqWkp5?= =?utf-8?B?UkU3aTVnYnlHM2tFcXZ3UlE4SWg0UE45L2ZvbTBVa0EvUjB4SVBUUUtPYjNu?= =?utf-8?B?eG54b01hT3BQR3Z4dUk3SGpWSXorbFIyTmVrck5vSVBSTDZkNlJVV09VejJZ?= =?utf-8?B?SlJuaXJkY21lazMwdzMzOXZVR1BGb3ZaUy9aQWZZMHFXSjFCSjBNNGF5V2NG?= =?utf-8?B?TTJUU0JQN2xHWnZwTUxyV1dGblA4eEUrSGxMbmV3d1I2dVdSTXA5OEpmalRj?= =?utf-8?B?TkVPRTV4a1lpNFN0K0YzdDV1VSs4VldSRjg3N2V2d25pQ1laTG9oUWhKUlI0?= =?utf-8?B?QWxuVmxVR2NwM21qaHQ2SVoyakwyVGI1OEJReWhuTkd4azJWOXZJS1JxKzIw?= =?utf-8?B?US82ZGFzUXVEM3BUNjlHSEZyZHQxeTVYWWlvVy9ObGVUemdRYWJ1OEFhSi9P?= =?utf-8?B?czV5L1NvTTNWMG9rMy9BYzdBUzZ5akpsVm5ZYndLTUlVMUZOQXlYTUs2alJk?= =?utf-8?B?M0NDUWc3SFJ4U3VLUDhJeCtjQmdYUlpyYms2NWRXT3NqNDF4STFpYkpsa2lX?= =?utf-8?B?UmlSQ05qemF4Q3pwRGlNd0hHOFk0RWJYek04U3FXUkRWZGt2R251eU1KS0lS?= =?utf-8?B?OFZ1S0QydUU5UEhLck8zZ0prWk5pMm1BS2FEWVlGblpEWlI0anYvcjE2UEZ0?= =?utf-8?B?Vzc4c3pqQmJaQzdjWlRxR1NMemt2eEViMkh0bU16SllwRXc0dTNQMk1KRkZE?= =?utf-8?B?aC8wOE5ORXI5OG9kMjFUTXNXaTN5Qm5rN3NXVEhvdU43RFNyaTdWeC9zNjM5?= =?utf-8?B?dVdTVTVFWHBzRlBneFlRYTdSaVF6Znk4QjFUeUt3MGRCK2M1bXMydksyUjhx?= =?utf-8?B?cjF0NEZTa2VTcU5qRFZBMUJ3TmtBbjdVOGZPeUkrdUxIOTNHSkRETWp1Nk1x?= =?utf-8?B?WWZPNEZ6QXNRU0VLa2l1OGxmNVU1Y0VxakVqWGxhQnVQRHNoVHdqMGNKelRn?= =?utf-8?B?bUlzVzd0cDdCdmw4V0kwcWVTS0xKcFhFUFJqRUN3ZmlrL0Z2ZjIreFF5MlR0?= =?utf-8?B?bm8xVW96U1FDMk53b0NJMUVJbUxsRkVTTkhMOWRGb05sRm5Rb2FmZmFDdUJP?= =?utf-8?B?OGlET3JCQW9aTCtpZVBoWkhWdGpRPT0=?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11afa933-dc9c-4abb-d1e9-08ddfc2729fb X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2025 11:32:09.9399 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lri7lh613QrTeRjDxhvkDgCJLVoRANvncPvyb2X2cDl3IkVDZpLmfpqHQiZDBGjBcKmau9XYBVB+mP9mG3cjV8uleUfD63tT2UQZhxWLPNg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR02MB9532 X-Proofpoint-GUID: UXB3sGr0HEqIuFBiFfnTe2y4wo8jJ_u7 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTI1MDEwOCBTYWx0ZWRfX9BVbMCLRGluV VrfSE0jNczltJCQMJs4qJsy2ZN2nxrWC7BnyLy/xRiTu7T/DqHpjWbeTRSPHkvXAQSl0lwyV6S1 EdkGhSJzl7EUCO8cFyYo0kV77RbhlOY5qpoaRBOeYX7EIzlPIRA9b2FhGKmDA2i5FIHMzD6DxeE HPOIhjdGiq+GthBRvyHFzADuYQQ49I3V93XVIE7xlwexkIkNlLyxphzLkv2DA130SgWnk+bCjoO ojIHKELbxsLRjZOvxvbaI0A3Fg3WBgwtL2G5s8lIP3wgY1gBJK1Gn1US0cprDam0JEzT/8GUtk3 s68Hf7rr42Ij7dvjfkc04CvRGc6jw6qgfjOklbkAGNr7Knar5mHGjzuplcnApI= X-Proofpoint-ORIG-GUID: UXB3sGr0HEqIuFBiFfnTe2y4wo8jJ_u7 X-Authority-Analysis: v=2.4 cv=MoVS63ae c=1 sm=1 tr=0 ts=68d5283c cx=c_pps a=H3Na7JgWheL2EZIWx/c7UQ==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=20KFwNOVAAAA:8 a=UTgBz3937xvyIfwAd7oA:9 a=Ic9C2ulgoIgTBxjZ:21 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-25_01,2025-09-24_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe 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=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 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_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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 @nutanix.com) X-ZM-MESSAGEID: 1758800092251116600 Now that the VFIOContainer struct name is available, rename VFIOContainerBa= se to VFIOContainer to better indicate that it is the superclass of other VFIOFooContainer structs. Signed-off-by: Mark Cave-Ayland Reviewed-by: C=C3=A9dric Le Goater --- hw/vfio-user/container.h | 2 +- hw/vfio/vfio-iommufd.h | 2 +- hw/vfio/vfio-listener.h | 4 +- include/hw/vfio/vfio-container-base.h | 76 +++++++++++++-------------- include/hw/vfio/vfio-container.h | 2 +- include/hw/vfio/vfio-cpr.h | 8 +-- include/hw/vfio/vfio-device.h | 4 +- hw/ppc/spapr_pci_vfio.c | 2 +- hw/vfio-user/container.c | 18 +++---- hw/vfio/container-base.c | 41 ++++++++------- hw/vfio/container.c | 22 ++++---- hw/vfio/cpr-iommufd.c | 4 +- hw/vfio/cpr-legacy.c | 14 ++--- hw/vfio/device.c | 2 +- hw/vfio/iommufd.c | 18 +++---- hw/vfio/listener.c | 74 +++++++++++++------------- hw/vfio/spapr.c | 12 ++--- 17 files changed, 154 insertions(+), 151 deletions(-) diff --git a/hw/vfio-user/container.h b/hw/vfio-user/container.h index 96aa6785d9..241863ef97 100644 --- a/hw/vfio-user/container.h +++ b/hw/vfio-user/container.h @@ -14,7 +14,7 @@ =20 /* MMU container sub-class for vfio-user. */ struct VFIOUserContainer { - VFIOContainerBase parent_obj; + VFIOContainer parent_obj; =20 VFIOUserProxy *proxy; }; diff --git a/hw/vfio/vfio-iommufd.h b/hw/vfio/vfio-iommufd.h index 07ea0f4304..6c049d9257 100644 --- a/hw/vfio/vfio-iommufd.h +++ b/hw/vfio/vfio-iommufd.h @@ -23,7 +23,7 @@ typedef struct VFIOIOASHwpt { typedef struct IOMMUFDBackend IOMMUFDBackend; =20 typedef struct VFIOIOMMUFDContainer { - VFIOContainerBase bcontainer; + VFIOContainer bcontainer; IOMMUFDBackend *be; uint32_t ioas_id; QLIST_HEAD(, VFIOIOASHwpt) hwpt_list; diff --git a/hw/vfio/vfio-listener.h b/hw/vfio/vfio-listener.h index eb69ddd374..a90674ca96 100644 --- a/hw/vfio/vfio-listener.h +++ b/hw/vfio/vfio-listener.h @@ -9,7 +9,7 @@ #ifndef HW_VFIO_VFIO_LISTENER_H #define HW_VFIO_VFIO_LISTENER_H =20 -bool vfio_listener_register(VFIOContainerBase *bcontainer, Error **errp); -void vfio_listener_unregister(VFIOContainerBase *bcontainer); +bool vfio_listener_register(VFIOContainer *bcontainer, Error **errp); +void vfio_listener_unregister(VFIOContainer *bcontainer); =20 #endif /* HW_VFIO_VFIO_LISTENER_H */ diff --git a/include/hw/vfio/vfio-container-base.h b/include/hw/vfio/vfio-c= ontainer-base.h index acbd48a18a..b580f4a02d 100644 --- a/include/hw/vfio/vfio-container-base.h +++ b/include/hw/vfio/vfio-container-base.h @@ -26,14 +26,14 @@ typedef struct { =20 typedef struct VFIOAddressSpace { AddressSpace *as; - QLIST_HEAD(, VFIOContainerBase) containers; + QLIST_HEAD(, VFIOContainer) containers; QLIST_ENTRY(VFIOAddressSpace) list; } VFIOAddressSpace; =20 /* * This is the base object for vfio container backends */ -struct VFIOContainerBase { +struct VFIOContainer { Object parent_obj; =20 VFIOAddressSpace *space; @@ -48,17 +48,17 @@ struct VFIOContainerBase { bool dirty_pages_started; /* Protected by BQL */ QLIST_HEAD(, VFIOGuestIOMMU) giommu_list; QLIST_HEAD(, VFIORamDiscardListener) vrdl_list; - QLIST_ENTRY(VFIOContainerBase) next; + QLIST_ENTRY(VFIOContainer) next; QLIST_HEAD(, VFIODevice) device_list; GList *iova_ranges; NotifierWithReturn cpr_reboot_notifier; }; =20 #define TYPE_VFIO_IOMMU "vfio-iommu" -OBJECT_DECLARE_TYPE(VFIOContainerBase, VFIOIOMMUClass, VFIO_IOMMU) +OBJECT_DECLARE_TYPE(VFIOContainer, VFIOIOMMUClass, VFIO_IOMMU) =20 typedef struct VFIOGuestIOMMU { - VFIOContainerBase *bcontainer; + VFIOContainer *bcontainer; IOMMUMemoryRegion *iommu_mr; hwaddr iommu_offset; IOMMUNotifier n; @@ -66,7 +66,7 @@ typedef struct VFIOGuestIOMMU { } VFIOGuestIOMMU; =20 typedef struct VFIORamDiscardListener { - VFIOContainerBase *bcontainer; + VFIOContainer *bcontainer; MemoryRegion *mr; hwaddr offset_within_address_space; hwaddr size; @@ -78,32 +78,32 @@ typedef struct VFIORamDiscardListener { VFIOAddressSpace *vfio_address_space_get(AddressSpace *as); void vfio_address_space_put(VFIOAddressSpace *space); void vfio_address_space_insert(VFIOAddressSpace *space, - VFIOContainerBase *bcontainer); + VFIOContainer *bcontainer); =20 -int vfio_container_dma_map(VFIOContainerBase *bcontainer, +int vfio_container_dma_map(VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, void *vaddr, bool readonly, MemoryRegion *mr); -int vfio_container_dma_unmap(VFIOContainerBase *bcontainer, +int vfio_container_dma_unmap(VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, IOMMUTLBEntry *iotlb, bool unmap_all); -bool vfio_container_add_section_window(VFIOContainerBase *bcontainer, +bool vfio_container_add_section_window(VFIOContainer *bcontainer, MemoryRegionSection *section, Error **errp); -void vfio_container_del_section_window(VFIOContainerBase *bcontainer, +void vfio_container_del_section_window(VFIOContainer *bcontainer, MemoryRegionSection *section); -int vfio_container_set_dirty_page_tracking(VFIOContainerBase *bcontainer, +int vfio_container_set_dirty_page_tracking(VFIOContainer *bcontainer, bool start, Error **errp); bool vfio_container_dirty_tracking_is_started( - const VFIOContainerBase *bcontainer); + const VFIOContainer *bcontainer); bool vfio_container_devices_dirty_tracking_is_supported( - const VFIOContainerBase *bcontainer); -int vfio_container_query_dirty_bitmap(const VFIOContainerBase *bcontainer, + 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); =20 -GList *vfio_container_get_iova_ranges(const VFIOContainerBase *bcontainer); +GList *vfio_container_get_iova_ranges(const VFIOContainer *bcontainer); =20 static inline uint64_t -vfio_container_get_page_size_mask(const VFIOContainerBase *bcontainer) +vfio_container_get_page_size_mask(const VFIOContainer *bcontainer) { assert(bcontainer); return bcontainer->pgsizes; @@ -123,12 +123,12 @@ struct VFIOIOMMUClass { * Perform basic setup of the container, including configuring IOMMU * capabilities, IOVA ranges, supported page sizes, etc. * - * @bcontainer: #VFIOContainerBase + * @bcontainer: #VFIOContainer * @errp: pointer to Error*, to store an error if it happens. * * Returns true to indicate success and false for error. */ - bool (*setup)(VFIOContainerBase *bcontainer, Error **errp); + bool (*setup)(VFIOContainer *bcontainer, Error **errp); =20 /** * @listener_begin @@ -136,9 +136,9 @@ struct VFIOIOMMUClass { * Called at the beginning of an address space update transaction. * See #MemoryListener. * - * @bcontainer: #VFIOContainerBase + * @bcontainer: #VFIOContainer */ - void (*listener_begin)(VFIOContainerBase *bcontainer); + void (*listener_begin)(VFIOContainer *bcontainer); =20 /** * @listener_commit @@ -146,9 +146,9 @@ struct VFIOIOMMUClass { * Called at the end of an address space update transaction, * See #MemoryListener. * - * @bcontainer: #VFIOContainerBase + * @bcontainer: #VFIOContainer */ - void (*listener_commit)(VFIOContainerBase *bcontainer); + void (*listener_commit)(VFIOContainer *bcontainer); =20 /** * @dma_map @@ -156,7 +156,7 @@ struct VFIOIOMMUClass { * Map an address range into the container. Note that the memory regio= n is * referenced within an RCU read lock region across this call. * - * @bcontainer: #VFIOContainerBase to use + * @bcontainer: #VFIOContainer to use * @iova: start address to map * @size: size of the range to map * @vaddr: process virtual address of mapping @@ -165,7 +165,7 @@ struct VFIOIOMMUClass { * * Returns 0 to indicate success and -errno otherwise. */ - int (*dma_map)(const VFIOContainerBase *bcontainer, + int (*dma_map)(const VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, void *vaddr, bool readonly, MemoryRegion *mr); /** @@ -173,14 +173,14 @@ struct VFIOIOMMUClass { * * Map a file range for the container. * - * @bcontainer: #VFIOContainerBase to use for map + * @bcontainer: #VFIOContainer to use for map * @iova: start address to map * @size: size of the range to map * @fd: descriptor of the file to map * @start: starting file offset of the range to map * @readonly: map read only if true */ - int (*dma_map_file)(const VFIOContainerBase *bcontainer, + int (*dma_map_file)(const VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, int fd, unsigned long start, bool readonly); /** @@ -188,7 +188,7 @@ struct VFIOIOMMUClass { * * Unmap an address range from the container. * - * @bcontainer: #VFIOContainerBase to use for unmap + * @bcontainer: #VFIOContainer to use for unmap * @iova: start address to unmap * @size: size of the range to unmap * @iotlb: The IOMMU TLB mapping entry (or NULL) @@ -196,7 +196,7 @@ struct VFIOIOMMUClass { * * Returns 0 to indicate success and -errno otherwise. */ - int (*dma_unmap)(const VFIOContainerBase *bcontainer, + int (*dma_unmap)(const VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, IOMMUTLBEntry *iotlb, bool unmap_all); =20 @@ -234,21 +234,21 @@ struct VFIOIOMMUClass { * * Start or stop dirty pages tracking on VFIO container * - * @bcontainer: #VFIOContainerBase on which to de/activate dirty + * @bcontainer: #VFIOContainer on which to de/activate dirty * page tracking * @start: indicates whether to start or stop dirty pages tracking * @errp: pointer to Error*, to store an error if it happens. * * Returns zero to indicate success and negative for error. */ - int (*set_dirty_page_tracking)(const VFIOContainerBase *bcontainer, + int (*set_dirty_page_tracking)(const VFIOContainer *bcontainer, bool start, Error **errp); /** * @query_dirty_bitmap * * Get bitmap of dirty pages from container * - * @bcontainer: #VFIOContainerBase from which to get dirty pages + * @bcontainer: #VFIOContainer from which to get dirty pages * @vbmap: #VFIOBitmap internal bitmap structure * @iova: iova base address * @size: size of iova range @@ -256,24 +256,24 @@ struct VFIOIOMMUClass { * * Returns zero to indicate success and negative for error. */ - int (*query_dirty_bitmap)(const VFIOContainerBase *bcontainer, + int (*query_dirty_bitmap)(const VFIOContainer *bcontainer, VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp); /* PCI specific */ int (*pci_hot_reset)(VFIODevice *vbasedev, bool single); =20 /* SPAPR specific */ - bool (*add_window)(VFIOContainerBase *bcontainer, + bool (*add_window)(VFIOContainer *bcontainer, MemoryRegionSection *section, Error **errp); - void (*del_window)(VFIOContainerBase *bcontainer, + void (*del_window)(VFIOContainer *bcontainer, MemoryRegionSection *section); - void (*release)(VFIOContainerBase *bcontainer); + void (*release)(VFIOContainer *bcontainer); }; =20 VFIORamDiscardListener *vfio_find_ram_discard_listener( - VFIOContainerBase *bcontainer, MemoryRegionSection *section); + VFIOContainer *bcontainer, MemoryRegionSection *section); =20 -void vfio_container_region_add(VFIOContainerBase *bcontainer, +void vfio_container_region_add(VFIOContainer *bcontainer, MemoryRegionSection *section, bool cpr_rema= p); =20 #endif /* HW_VFIO_VFIO_CONTAINER_BASE_H */ diff --git a/include/hw/vfio/vfio-container.h b/include/hw/vfio/vfio-contai= ner.h index 712a691400..a84dfb0dee 100644 --- a/include/hw/vfio/vfio-container.h +++ b/include/hw/vfio/vfio-container.h @@ -26,7 +26,7 @@ typedef struct VFIOGroup { } VFIOGroup; =20 struct VFIOLegacyContainer { - VFIOContainerBase parent_obj; + VFIOContainer parent_obj; =20 int fd; /* /dev/vfio/vfio, empowered by the attached groups */ unsigned iommu_type; diff --git a/include/hw/vfio/vfio-cpr.h b/include/hw/vfio/vfio-cpr.h index 04e9872587..26ee0c4fe1 100644 --- a/include/hw/vfio/vfio-cpr.h +++ b/include/hw/vfio/vfio-cpr.h @@ -13,14 +13,14 @@ #include "system/memory.h" =20 struct VFIOLegacyContainer; -struct VFIOContainerBase; +struct VFIOContainer; struct VFIOGroup; struct VFIODevice; struct VFIOPCIDevice; struct VFIOIOMMUFDContainer; struct IOMMUFDBackend; =20 -typedef int (*dma_map_fn)(const struct VFIOContainerBase *bcontainer, +typedef int (*dma_map_fn)(const struct VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, void *vaddr, bool readonly, MemoryRegion *mr); =20 @@ -65,11 +65,11 @@ int vfio_cpr_group_get_device_fd(int d, const char *nam= e); bool vfio_cpr_container_match(struct VFIOLegacyContainer *container, struct VFIOGroup *group, int fd); =20 -void vfio_cpr_giommu_remap(struct VFIOContainerBase *bcontainer, +void vfio_cpr_giommu_remap(struct VFIOContainer *bcontainer, MemoryRegionSection *section); =20 bool vfio_cpr_ram_discard_register_listener( - struct VFIOContainerBase *bcontainer, MemoryRegionSection *section); + struct VFIOContainer *bcontainer, MemoryRegionSection *section); =20 void vfio_cpr_save_vector_fd(struct VFIOPCIDevice *vdev, const char *name, int nr, int fd); diff --git a/include/hw/vfio/vfio-device.h b/include/hw/vfio/vfio-device.h index e7e6243e2d..67b9fcdd2c 100644 --- a/include/hw/vfio/vfio-device.h +++ b/include/hw/vfio/vfio-device.h @@ -54,7 +54,7 @@ typedef struct VFIODevice { QLIST_ENTRY(VFIODevice) container_next; QLIST_ENTRY(VFIODevice) global_next; struct VFIOGroup *group; - VFIOContainerBase *bcontainer; + VFIOContainer *bcontainer; char *sysfsdev; char *name; DeviceState *dev; @@ -252,7 +252,7 @@ struct VFIODeviceIOOps { void *data, bool post); }; =20 -void vfio_device_prepare(VFIODevice *vbasedev, VFIOContainerBase *bcontain= er, +void vfio_device_prepare(VFIODevice *vbasedev, VFIOContainer *bcontainer, struct vfio_device_info *info); =20 void vfio_device_unprepare(VFIODevice *vbasedev); diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index faa3ab3fe1..c8175dd8a8 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -86,7 +86,7 @@ static int vfio_eeh_container_op(VFIOLegacyContainer *con= tainer, uint32_t op) static VFIOLegacyContainer *vfio_eeh_as_container(AddressSpace *as) { VFIOAddressSpace *space =3D vfio_address_space_get(as); - VFIOContainerBase *bcontainer =3D NULL; + VFIOContainer *bcontainer =3D NULL; =20 if (QLIST_EMPTY(&space->containers)) { /* No containers to act on */ diff --git a/hw/vfio-user/container.c b/hw/vfio-user/container.c index 3cdbd44c1a..411eb7b28b 100644 --- a/hw/vfio-user/container.c +++ b/hw/vfio-user/container.c @@ -22,14 +22,14 @@ * will fire during memory update transactions. These depend on BQL being= held, * so do any resulting map/demap ops async while keeping BQL. */ -static void vfio_user_listener_begin(VFIOContainerBase *bcontainer) +static void vfio_user_listener_begin(VFIOContainer *bcontainer) { VFIOUserContainer *container =3D VFIO_IOMMU_USER(bcontainer); =20 container->proxy->async_ops =3D true; } =20 -static void vfio_user_listener_commit(VFIOContainerBase *bcontainer) +static void vfio_user_listener_commit(VFIOContainer *bcontainer) { VFIOUserContainer *container =3D VFIO_IOMMU_USER(bcontainer); =20 @@ -38,7 +38,7 @@ static void vfio_user_listener_commit(VFIOContainerBase *= bcontainer) vfio_user_wait_reqs(container->proxy); } =20 -static int vfio_user_dma_unmap(const VFIOContainerBase *bcontainer, +static int vfio_user_dma_unmap(const VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, IOMMUTLBEntry *iotlb, bool unmap_all) { @@ -80,7 +80,7 @@ static int vfio_user_dma_unmap(const VFIOContainerBase *b= container, return ret; } =20 -static int vfio_user_dma_map(const VFIOContainerBase *bcontainer, hwaddr i= ova, +static int vfio_user_dma_map(const VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, void *vaddr, bool readonly, MemoryRegion *mrp) { @@ -154,14 +154,14 @@ static int vfio_user_dma_map(const VFIOContainerBase = *bcontainer, hwaddr iova, } =20 static int -vfio_user_set_dirty_page_tracking(const VFIOContainerBase *bcontainer, +vfio_user_set_dirty_page_tracking(const VFIOContainer *bcontainer, bool start, Error **errp) { error_setg_errno(errp, ENOTSUP, "Not supported"); return -ENOTSUP; } =20 -static int vfio_user_query_dirty_bitmap(const VFIOContainerBase *bcontaine= r, +static int vfio_user_query_dirty_bitmap(const VFIOContainer *bcontainer, VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp) { @@ -169,7 +169,7 @@ static int vfio_user_query_dirty_bitmap(const VFIOConta= inerBase *bcontainer, return -ENOTSUP; } =20 -static bool vfio_user_setup(VFIOContainerBase *bcontainer, Error **errp) +static bool vfio_user_setup(VFIOContainer *bcontainer, Error **errp) { VFIOUserContainer *container =3D VFIO_IOMMU_USER(bcontainer); =20 @@ -202,7 +202,7 @@ static VFIOUserContainer * vfio_user_container_connect(AddressSpace *as, VFIODevice *vbasedev, Error **errp) { - VFIOContainerBase *bcontainer; + VFIOContainer *bcontainer; VFIOUserContainer *container; VFIOAddressSpace *space; VFIOIOMMUClass *vioc; @@ -260,7 +260,7 @@ put_space_exit: =20 static void vfio_user_container_disconnect(VFIOUserContainer *container) { - VFIOContainerBase *bcontainer =3D VFIO_IOMMU(container); + VFIOContainer *bcontainer =3D VFIO_IOMMU(container); VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); VFIOAddressSpace *space =3D bcontainer->space; =20 diff --git a/hw/vfio/container-base.c b/hw/vfio/container-base.c index 56304978e1..98c5198e50 100644 --- a/hw/vfio/container-base.c +++ b/hw/vfio/container-base.c @@ -67,13 +67,13 @@ void vfio_address_space_put(VFIOAddressSpace *space) } =20 void vfio_address_space_insert(VFIOAddressSpace *space, - VFIOContainerBase *bcontainer) + VFIOContainer *bcontainer) { QLIST_INSERT_HEAD(&space->containers, bcontainer, next); bcontainer->space =3D space; } =20 -int vfio_container_dma_map(VFIOContainerBase *bcontainer, +int vfio_container_dma_map(VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, void *vaddr, bool readonly, MemoryRegion *mr) { @@ -92,7 +92,7 @@ int vfio_container_dma_map(VFIOContainerBase *bcontainer, return vioc->dma_map(bcontainer, iova, size, vaddr, readonly, mr); } =20 -int vfio_container_dma_unmap(VFIOContainerBase *bcontainer, +int vfio_container_dma_unmap(VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, IOMMUTLBEntry *iotlb, bool unmap_all) { @@ -102,7 +102,7 @@ int vfio_container_dma_unmap(VFIOContainerBase *bcontai= ner, return vioc->dma_unmap(bcontainer, iova, size, iotlb, unmap_all); } =20 -bool vfio_container_add_section_window(VFIOContainerBase *bcontainer, +bool vfio_container_add_section_window(VFIOContainer *bcontainer, MemoryRegionSection *section, Error **errp) { @@ -115,7 +115,7 @@ bool vfio_container_add_section_window(VFIOContainerBas= e *bcontainer, return vioc->add_window(bcontainer, section, errp); } =20 -void vfio_container_del_section_window(VFIOContainerBase *bcontainer, +void vfio_container_del_section_window(VFIOContainer *bcontainer, MemoryRegionSection *section) { VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); @@ -127,7 +127,7 @@ void vfio_container_del_section_window(VFIOContainerBas= e *bcontainer, return vioc->del_window(bcontainer, section); } =20 -int vfio_container_set_dirty_page_tracking(VFIOContainerBase *bcontainer, +int vfio_container_set_dirty_page_tracking(VFIOContainer *bcontainer, bool start, Error **errp) { VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); @@ -151,7 +151,7 @@ int vfio_container_set_dirty_page_tracking(VFIOContaine= rBase *bcontainer, } =20 static bool vfio_container_devices_dirty_tracking_is_started( - const VFIOContainerBase *bcontainer) + const VFIOContainer *bcontainer) { VFIODevice *vbasedev; =20 @@ -165,14 +165,14 @@ static bool vfio_container_devices_dirty_tracking_is_= started( } =20 bool vfio_container_dirty_tracking_is_started( - const VFIOContainerBase *bcontainer) + const VFIOContainer *bcontainer) { return vfio_container_devices_dirty_tracking_is_started(bcontainer) || bcontainer->dirty_pages_started; } =20 bool vfio_container_devices_dirty_tracking_is_supported( - const VFIOContainerBase *bcontainer) + const VFIOContainer *bcontainer) { VFIODevice *vbasedev; =20 @@ -210,8 +210,9 @@ static int vfio_device_dma_logging_report(VFIODevice *v= basedev, hwaddr iova, return vbasedev->io_ops->device_feature(vbasedev, feature); } =20 -static int vfio_container_iommu_query_dirty_bitmap(const VFIOContainerBase= *bcontainer, - VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **er= rp) +static int vfio_container_iommu_query_dirty_bitmap( + const VFIOContainer *bcontainer, VFIOBitmap *vbmap, hwaddr iova, + hwaddr size, Error **errp) { VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); =20 @@ -220,8 +221,9 @@ static int vfio_container_iommu_query_dirty_bitmap(cons= t VFIOContainerBase *bcon errp); } =20 -static int vfio_container_devices_query_dirty_bitmap(const VFIOContainerBa= se *bcontainer, - VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp) +static int vfio_container_devices_query_dirty_bitmap( + const VFIOContainer *bcontainer, VFIOBitmap *vbmap, hwaddr iova, + hwaddr size, Error **errp) { VFIODevice *vbasedev; int ret; @@ -242,8 +244,9 @@ static int vfio_container_devices_query_dirty_bitmap(co= nst VFIOContainerBase *bc return 0; } =20 -int vfio_container_query_dirty_bitmap(const VFIOContainerBase *bcontainer,= uint64_t iova, - uint64_t size, ram_addr_t ram_addr, Error **errp) +int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer, + uint64_t iova, uint64_t size, + ram_addr_t ram_addr, Error **errp) { bool all_device_dirty_tracking =3D vfio_container_devices_dirty_tracking_is_supported(bcontainer); @@ -297,7 +300,7 @@ static gpointer copy_iova_range(gconstpointer src, gpoi= nter data) return dest; } =20 -GList *vfio_container_get_iova_ranges(const VFIOContainerBase *bcontainer) +GList *vfio_container_get_iova_ranges(const VFIOContainer *bcontainer) { assert(bcontainer); return g_list_copy_deep(bcontainer->iova_ranges, copy_iova_range, NULL= ); @@ -305,7 +308,7 @@ GList *vfio_container_get_iova_ranges(const VFIOContain= erBase *bcontainer) =20 static void vfio_container_instance_finalize(Object *obj) { - VFIOContainerBase *bcontainer =3D VFIO_IOMMU(obj); + VFIOContainer *bcontainer =3D VFIO_IOMMU(obj); VFIOGuestIOMMU *giommu, *tmp; =20 QLIST_SAFE_REMOVE(bcontainer, next); @@ -322,7 +325,7 @@ static void vfio_container_instance_finalize(Object *ob= j) =20 static void vfio_container_instance_init(Object *obj) { - VFIOContainerBase *bcontainer =3D VFIO_IOMMU(obj); + VFIOContainer *bcontainer =3D VFIO_IOMMU(obj); =20 bcontainer->error =3D NULL; bcontainer->dirty_pages_supported =3D false; @@ -338,7 +341,7 @@ static const TypeInfo types[] =3D { .parent =3D TYPE_OBJECT, .instance_init =3D vfio_container_instance_init, .instance_finalize =3D vfio_container_instance_finalize, - .instance_size =3D sizeof(VFIOContainerBase), + .instance_size =3D sizeof(VFIOContainer), .class_size =3D sizeof(VFIOIOMMUClass), .abstract =3D true, }, diff --git a/hw/vfio/container.c b/hw/vfio/container.c index bdf415b3d6..dc8425efb1 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -72,7 +72,7 @@ static int vfio_dma_unmap_bitmap(const VFIOLegacyContaine= r *container, hwaddr iova, ram_addr_t size, IOMMUTLBEntry *iotlb) { - const VFIOContainerBase *bcontainer =3D VFIO_IOMMU(container); + const VFIOContainer *bcontainer =3D VFIO_IOMMU(container); struct vfio_iommu_type1_dma_unmap *unmap; struct vfio_bitmap *bitmap; VFIOBitmap vbmap; @@ -121,7 +121,7 @@ unmap_exit: return ret; } =20 -static int vfio_legacy_dma_unmap_one(const VFIOContainerBase *bcontainer, +static int vfio_legacy_dma_unmap_one(const VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, IOMMUTLBEntry *iotlb) { @@ -184,7 +184,7 @@ static int vfio_legacy_dma_unmap_one(const VFIOContaine= rBase *bcontainer, /* * DMA - Mapping and unmapping for the "type1" IOMMU interface used on x86 */ -static int vfio_legacy_dma_unmap(const VFIOContainerBase *bcontainer, +static int vfio_legacy_dma_unmap(const VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, IOMMUTLBEntry *iotlb, bool unmap_all) { @@ -209,7 +209,7 @@ static int vfio_legacy_dma_unmap(const VFIOContainerBas= e *bcontainer, return ret; } =20 -static int vfio_legacy_dma_map(const VFIOContainerBase *bcontainer, hwaddr= iova, +static int vfio_legacy_dma_map(const VFIOContainer *bcontainer, hwaddr iov= a, ram_addr_t size, void *vaddr, bool readonly, MemoryRegion *mr) { @@ -242,7 +242,7 @@ static int vfio_legacy_dma_map(const VFIOContainerBase = *bcontainer, hwaddr iova, } =20 static int -vfio_legacy_set_dirty_page_tracking(const VFIOContainerBase *bcontainer, +vfio_legacy_set_dirty_page_tracking(const VFIOContainer *bcontainer, bool start, Error **errp) { const VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); @@ -267,7 +267,7 @@ vfio_legacy_set_dirty_page_tracking(const VFIOContainer= Base *bcontainer, return ret; } =20 -static int vfio_legacy_query_dirty_bitmap(const VFIOContainerBase *bcontai= ner, +static int vfio_legacy_query_dirty_bitmap(const VFIOContainer *bcontainer, VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error *= *errp) { const VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); @@ -307,7 +307,7 @@ static int vfio_legacy_query_dirty_bitmap(const VFIOCon= tainerBase *bcontainer, } =20 static bool vfio_get_info_iova_range(struct vfio_iommu_type1_info *info, - VFIOContainerBase *bcontainer) + VFIOContainer *bcontainer) { struct vfio_info_cap_header *hdr; struct vfio_iommu_type1_info_cap_iova_range *cap; @@ -492,7 +492,7 @@ static void vfio_get_iommu_info_migration(VFIOLegacyCon= tainer *container, { struct vfio_info_cap_header *hdr; struct vfio_iommu_type1_info_cap_migration *cap_mig; - VFIOContainerBase *bcontainer =3D VFIO_IOMMU(container); + VFIOContainer *bcontainer =3D VFIO_IOMMU(container); =20 hdr =3D vfio_get_iommu_info_cap(info, VFIO_IOMMU_TYPE1_INFO_CAP_MIGRAT= ION); if (!hdr) { @@ -513,7 +513,7 @@ static void vfio_get_iommu_info_migration(VFIOLegacyCon= tainer *container, } } =20 -static bool vfio_legacy_setup(VFIOContainerBase *bcontainer, Error **errp) +static bool vfio_legacy_setup(VFIOContainer *bcontainer, Error **errp) { VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); g_autofree struct vfio_iommu_type1_info *info =3D NULL; @@ -619,7 +619,7 @@ static bool vfio_container_connect(VFIOGroup *group, Ad= dressSpace *as, Error **errp) { VFIOLegacyContainer *container; - VFIOContainerBase *bcontainer; + VFIOContainer *bcontainer; int ret, fd =3D -1; VFIOAddressSpace *space; VFIOIOMMUClass *vioc =3D NULL; @@ -732,7 +732,7 @@ fail: static void vfio_container_disconnect(VFIOGroup *group) { VFIOLegacyContainer *container =3D group->container; - VFIOContainerBase *bcontainer =3D VFIO_IOMMU(container); + VFIOContainer *bcontainer =3D VFIO_IOMMU(container); VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); =20 QLIST_REMOVE(group, container_next); diff --git a/hw/vfio/cpr-iommufd.c b/hw/vfio/cpr-iommufd.c index 148a06d552..6aaf6f77a2 100644 --- a/hw/vfio/cpr-iommufd.c +++ b/hw/vfio/cpr-iommufd.c @@ -176,7 +176,7 @@ void vfio_iommufd_cpr_unregister_iommufd(IOMMUFDBackend= *be) bool vfio_iommufd_cpr_register_container(VFIOIOMMUFDContainer *container, Error **errp) { - VFIOContainerBase *bcontainer =3D &container->bcontainer; + VFIOContainer *bcontainer =3D &container->bcontainer; =20 migration_add_notifier_mode(&bcontainer->cpr_reboot_notifier, vfio_cpr_reboot_notifier, @@ -189,7 +189,7 @@ bool vfio_iommufd_cpr_register_container(VFIOIOMMUFDCon= tainer *container, =20 void vfio_iommufd_cpr_unregister_container(VFIOIOMMUFDContainer *container) { - VFIOContainerBase *bcontainer =3D &container->bcontainer; + VFIOContainer *bcontainer =3D &container->bcontainer; =20 migration_remove_notifier(&bcontainer->cpr_reboot_notifier); } diff --git a/hw/vfio/cpr-legacy.c b/hw/vfio/cpr-legacy.c index 12bf920a7d..bd3f6fc3d3 100644 --- a/hw/vfio/cpr-legacy.c +++ b/hw/vfio/cpr-legacy.c @@ -38,7 +38,7 @@ static bool vfio_dma_unmap_vaddr_all(VFIOLegacyContainer = *container, * Set the new @vaddr for any mappings registered during cpr load. * The incoming state is cleared thereafter. */ -static int vfio_legacy_cpr_dma_map(const VFIOContainerBase *bcontainer, +static int vfio_legacy_cpr_dma_map(const VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, void *vad= dr, bool readonly, MemoryRegion *mr) { @@ -100,7 +100,7 @@ static int vfio_container_pre_save(void *opaque) static int vfio_container_post_load(void *opaque, int version_id) { VFIOLegacyContainer *container =3D opaque; - VFIOContainerBase *bcontainer =3D VFIO_IOMMU(container); + VFIOContainer *bcontainer =3D VFIO_IOMMU(container); VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); dma_map_fn saved_dma_map =3D vioc->dma_map; Error *local_err =3D NULL; @@ -137,7 +137,7 @@ static int vfio_cpr_fail_notifier(NotifierWithReturn *n= otifier, { VFIOLegacyContainer *container =3D container_of(notifier, VFIOLegacyContainer, cpr.transfer_notifier); - VFIOContainerBase *bcontainer =3D VFIO_IOMMU(container); + VFIOContainer *bcontainer =3D VFIO_IOMMU(container); =20 if (e->type !=3D MIG_EVENT_PRECOPY_FAILED) { return 0; @@ -170,7 +170,7 @@ static int vfio_cpr_fail_notifier(NotifierWithReturn *n= otifier, bool vfio_legacy_cpr_register_container(VFIOLegacyContainer *container, Error **errp) { - VFIOContainerBase *bcontainer =3D VFIO_IOMMU(container); + VFIOContainer *bcontainer =3D VFIO_IOMMU(container); Error **cpr_blocker =3D &container->cpr.blocker; =20 migration_add_notifier_mode(&bcontainer->cpr_reboot_notifier, @@ -194,7 +194,7 @@ bool vfio_legacy_cpr_register_container(VFIOLegacyConta= iner *container, =20 void vfio_legacy_cpr_unregister_container(VFIOLegacyContainer *container) { - VFIOContainerBase *bcontainer =3D VFIO_IOMMU(container); + VFIOContainer *bcontainer =3D VFIO_IOMMU(container); =20 migration_remove_notifier(&bcontainer->cpr_reboot_notifier); migrate_del_blocker(&container->cpr.blocker); @@ -210,7 +210,7 @@ void vfio_legacy_cpr_unregister_container(VFIOLegacyCon= tainer *container) * The giommu already exists. Find it and replay it, which calls * vfio_legacy_cpr_dma_map further down the stack. */ -void vfio_cpr_giommu_remap(VFIOContainerBase *bcontainer, +void vfio_cpr_giommu_remap(VFIOContainer *bcontainer, MemoryRegionSection *section) { VFIOGuestIOMMU *giommu =3D NULL; @@ -235,7 +235,7 @@ void vfio_cpr_giommu_remap(VFIOContainerBase *bcontaine= r, * The ram discard listener already exists. Call its populate function * directly, which calls vfio_legacy_cpr_dma_map. */ -bool vfio_cpr_ram_discard_register_listener(VFIOContainerBase *bcontainer, +bool vfio_cpr_ram_discard_register_listener(VFIOContainer *bcontainer, MemoryRegionSection *section) { VFIORamDiscardListener *vrdl =3D diff --git a/hw/vfio/device.c b/hw/vfio/device.c index 08f12ac31f..963cefc053 100644 --- a/hw/vfio/device.c +++ b/hw/vfio/device.c @@ -460,7 +460,7 @@ void vfio_device_detach(VFIODevice *vbasedev) VFIO_IOMMU_GET_CLASS(vbasedev->bcontainer)->detach_device(vbasedev); } =20 -void vfio_device_prepare(VFIODevice *vbasedev, VFIOContainerBase *bcontain= er, +void vfio_device_prepare(VFIODevice *vbasedev, VFIOContainer *bcontainer, struct vfio_device_info *info) { int i; diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index 8c27222f75..7f2243d9d1 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -34,7 +34,7 @@ #define TYPE_HOST_IOMMU_DEVICE_IOMMUFD_VFIO \ TYPE_HOST_IOMMU_DEVICE_IOMMUFD "-vfio" =20 -static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr io= va, +static int iommufd_cdev_map(const VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, void *vaddr, bool readonly, MemoryRegion *mr) { @@ -46,7 +46,7 @@ static int iommufd_cdev_map(const VFIOContainerBase *bcon= tainer, hwaddr iova, iova, size, vaddr, readonly); } =20 -static int iommufd_cdev_map_file(const VFIOContainerBase *bcontainer, +static int iommufd_cdev_map_file(const VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, int fd, unsigned long start, bool readonl= y) { @@ -58,7 +58,7 @@ static int iommufd_cdev_map_file(const VFIOContainerBase = *bcontainer, iova, size, fd, start, readonly); } =20 -static int iommufd_cdev_unmap(const VFIOContainerBase *bcontainer, +static int iommufd_cdev_unmap(const VFIOContainer *bcontainer, hwaddr iova, ram_addr_t size, IOMMUTLBEntry *iotlb, bool unmap_all) { @@ -159,7 +159,7 @@ static bool iommufd_hwpt_dirty_tracking(VFIOIOASHwpt *h= wpt) return hwpt && hwpt->hwpt_flags & IOMMU_HWPT_ALLOC_DIRTY_TRACKING; } =20 -static int iommufd_set_dirty_page_tracking(const VFIOContainerBase *bconta= iner, +static int iommufd_set_dirty_page_tracking(const VFIOContainer *bcontainer, bool start, Error **errp) { const VFIOIOMMUFDContainer *container =3D @@ -190,7 +190,7 @@ err: return -EINVAL; } =20 -static int iommufd_query_dirty_bitmap(const VFIOContainerBase *bcontainer, +static int iommufd_query_dirty_bitmap(const VFIOContainer *bcontainer, VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp) { @@ -464,7 +464,7 @@ static void iommufd_cdev_detach_container(VFIODevice *v= basedev, =20 static void iommufd_cdev_container_destroy(VFIOIOMMUFDContainer *container) { - VFIOContainerBase *bcontainer =3D &container->bcontainer; + VFIOContainer *bcontainer =3D &container->bcontainer; =20 if (!QLIST_EMPTY(&bcontainer->device_list)) { return; @@ -486,7 +486,7 @@ static int iommufd_cdev_ram_block_discard_disable(bool = state) static bool iommufd_cdev_get_info_iova_range(VFIOIOMMUFDContainer *contain= er, uint32_t ioas_id, Error **err= p) { - VFIOContainerBase *bcontainer =3D &container->bcontainer; + VFIOContainer *bcontainer =3D &container->bcontainer; g_autofree struct iommu_ioas_iova_ranges *info =3D NULL; struct iommu_iova_range *iova_ranges; int sz, fd =3D container->be->fd; @@ -528,7 +528,7 @@ error: static bool iommufd_cdev_attach(const char *name, VFIODevice *vbasedev, AddressSpace *as, Error **errp) { - VFIOContainerBase *bcontainer; + VFIOContainer *bcontainer; VFIOIOMMUFDContainer *container; VFIOAddressSpace *space; struct vfio_device_info dev_info =3D { .argsz =3D sizeof(dev_info) }; @@ -687,7 +687,7 @@ err_connect_bind: =20 static void iommufd_cdev_detach(VFIODevice *vbasedev) { - VFIOContainerBase *bcontainer =3D vbasedev->bcontainer; + VFIOContainer *bcontainer =3D vbasedev->bcontainer; VFIOAddressSpace *space =3D bcontainer->space; VFIOIOMMUFDContainer *container =3D container_of(bcontainer, VFIOIOMMUFDContainer, diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c index e093833165..3b6f17f0c3 100644 --- a/hw/vfio/listener.c +++ b/hw/vfio/listener.c @@ -52,7 +52,7 @@ */ =20 =20 -static bool vfio_log_sync_needed(const VFIOContainerBase *bcontainer) +static bool vfio_log_sync_needed(const VFIOContainer *bcontainer) { VFIODevice *vbasedev; =20 @@ -125,7 +125,7 @@ static MemoryRegion *vfio_translate_iotlb(IOMMUTLBEntry= *iotlb, hwaddr *xlat_p, static void vfio_iommu_map_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb) { VFIOGuestIOMMU *giommu =3D container_of(n, VFIOGuestIOMMU, n); - VFIOContainerBase *bcontainer =3D giommu->bcontainer; + VFIOContainer *bcontainer =3D giommu->bcontainer; hwaddr iova =3D iotlb->iova + giommu->iommu_offset; MemoryRegion *mr; hwaddr xlat; @@ -202,7 +202,7 @@ static void vfio_ram_discard_notify_discard(RamDiscardL= istener *rdl, { VFIORamDiscardListener *vrdl =3D container_of(rdl, VFIORamDiscardListe= ner, listener); - VFIOContainerBase *bcontainer =3D vrdl->bcontainer; + VFIOContainer *bcontainer =3D vrdl->bcontainer; const hwaddr size =3D int128_get64(section->size); const hwaddr iova =3D section->offset_within_address_space; int ret; @@ -220,7 +220,7 @@ static int vfio_ram_discard_notify_populate(RamDiscardL= istener *rdl, { VFIORamDiscardListener *vrdl =3D container_of(rdl, VFIORamDiscardListe= ner, listener); - VFIOContainerBase *bcontainer =3D vrdl->bcontainer; + VFIOContainer *bcontainer =3D vrdl->bcontainer; const hwaddr end =3D section->offset_within_region + int128_get64(section->size); hwaddr start, next, iova; @@ -250,7 +250,7 @@ static int vfio_ram_discard_notify_populate(RamDiscardL= istener *rdl, return 0; } =20 -static bool vfio_ram_discard_register_listener(VFIOContainerBase *bcontain= er, +static bool vfio_ram_discard_register_listener(VFIOContainer *bcontainer, MemoryRegionSection *sectio= n, Error **errp) { @@ -328,7 +328,7 @@ static bool vfio_ram_discard_register_listener(VFIOCont= ainerBase *bcontainer, return true; } =20 -static void vfio_ram_discard_unregister_listener(VFIOContainerBase *bconta= iner, +static void vfio_ram_discard_unregister_listener(VFIOContainer *bcontainer, MemoryRegionSection *sect= ion) { RamDiscardManager *rdm =3D memory_region_get_ram_discard_manager(secti= on->mr); @@ -396,7 +396,7 @@ static bool vfio_listener_valid_section(MemoryRegionSec= tion *section, return true; } =20 -static bool vfio_get_section_iova_range(VFIOContainerBase *bcontainer, +static bool vfio_get_section_iova_range(VFIOContainer *bcontainer, MemoryRegionSection *section, hwaddr *out_iova, hwaddr *out_end, Int128 *out_llend) @@ -423,9 +423,9 @@ static bool vfio_get_section_iova_range(VFIOContainerBa= se *bcontainer, =20 static void vfio_listener_begin(MemoryListener *listener) { - VFIOContainerBase *bcontainer =3D container_of(listener, VFIOContainer= Base, - listener); - void (*listener_begin)(VFIOContainerBase *bcontainer); + VFIOContainer *bcontainer =3D container_of(listener, VFIOContainer, + listener); + void (*listener_begin)(VFIOContainer *bcontainer); =20 listener_begin =3D VFIO_IOMMU_GET_CLASS(bcontainer)->listener_begin; =20 @@ -436,9 +436,9 @@ static void vfio_listener_begin(MemoryListener *listene= r) =20 static void vfio_listener_commit(MemoryListener *listener) { - VFIOContainerBase *bcontainer =3D container_of(listener, VFIOContainer= Base, - listener); - void (*listener_commit)(VFIOContainerBase *bcontainer); + VFIOContainer *bcontainer =3D container_of(listener, VFIOContainer, + listener); + void (*listener_commit)(VFIOContainer *bcontainer); =20 listener_commit =3D VFIO_IOMMU_GET_CLASS(bcontainer)->listener_commit; =20 @@ -460,7 +460,7 @@ static void vfio_device_error_append(VFIODevice *vbased= ev, Error **errp) } =20 VFIORamDiscardListener *vfio_find_ram_discard_listener( - VFIOContainerBase *bcontainer, MemoryRegionSection *section) + VFIOContainer *bcontainer, MemoryRegionSection *section) { VFIORamDiscardListener *vrdl =3D NULL; =20 @@ -482,12 +482,12 @@ VFIORamDiscardListener *vfio_find_ram_discard_listene= r( static void vfio_listener_region_add(MemoryListener *listener, MemoryRegionSection *section) { - VFIOContainerBase *bcontainer =3D container_of(listener, VFIOContainer= Base, - listener); + VFIOContainer *bcontainer =3D container_of(listener, VFIOContainer, + listener); vfio_container_region_add(bcontainer, section, false); } =20 -void vfio_container_region_add(VFIOContainerBase *bcontainer, +void vfio_container_region_add(VFIOContainer *bcontainer, MemoryRegionSection *section, bool cpr_remap) { @@ -656,8 +656,8 @@ fail: static void vfio_listener_region_del(MemoryListener *listener, MemoryRegionSection *section) { - VFIOContainerBase *bcontainer =3D container_of(listener, VFIOContainer= Base, - listener); + VFIOContainer *bcontainer =3D container_of(listener, VFIOContainer, + listener); hwaddr iova, end; Int128 llend, llsize; int ret; @@ -744,13 +744,13 @@ typedef struct VFIODirtyRanges { } VFIODirtyRanges; =20 typedef struct VFIODirtyRangesListener { - VFIOContainerBase *bcontainer; + VFIOContainer *bcontainer; VFIODirtyRanges ranges; MemoryListener listener; } VFIODirtyRangesListener; =20 static bool vfio_section_is_vfio_pci(MemoryRegionSection *section, - VFIOContainerBase *bcontainer) + VFIOContainer *bcontainer) { VFIOPCIDevice *pcidev; VFIODevice *vbasedev; @@ -835,7 +835,7 @@ static const MemoryListener vfio_dirty_tracking_listene= r =3D { .region_add =3D vfio_dirty_tracking_update, }; =20 -static void vfio_dirty_tracking_init(VFIOContainerBase *bcontainer, +static void vfio_dirty_tracking_init(VFIOContainer *bcontainer, VFIODirtyRanges *ranges) { VFIODirtyRangesListener dirty; @@ -860,7 +860,7 @@ static void vfio_dirty_tracking_init(VFIOContainerBase = *bcontainer, memory_listener_unregister(&dirty.listener); } =20 -static void vfio_devices_dma_logging_stop(VFIOContainerBase *bcontainer) +static void vfio_devices_dma_logging_stop(VFIOContainer *bcontainer) { uint64_t buf[DIV_ROUND_UP(sizeof(struct vfio_device_feature), sizeof(uint64_t))] =3D {}; @@ -889,7 +889,7 @@ static void vfio_devices_dma_logging_stop(VFIOContainer= Base *bcontainer) } =20 static struct vfio_device_feature * -vfio_device_feature_dma_logging_start_create(VFIOContainerBase *bcontainer, +vfio_device_feature_dma_logging_start_create(VFIOContainer *bcontainer, VFIODirtyRanges *tracking) { struct vfio_device_feature *feature; @@ -962,7 +962,7 @@ static void vfio_device_feature_dma_logging_start_destr= oy( g_free(feature); } =20 -static bool vfio_devices_dma_logging_start(VFIOContainerBase *bcontainer, +static bool vfio_devices_dma_logging_start(VFIOContainer *bcontainer, Error **errp) { struct vfio_device_feature *feature; @@ -1006,8 +1006,8 @@ static bool vfio_listener_log_global_start(MemoryList= ener *listener, Error **errp) { ERRP_GUARD(); - VFIOContainerBase *bcontainer =3D container_of(listener, VFIOContainer= Base, - listener); + VFIOContainer *bcontainer =3D container_of(listener, VFIOContainer, + listener); bool ret; =20 if (vfio_container_devices_dirty_tracking_is_supported(bcontainer)) { @@ -1024,8 +1024,8 @@ static bool vfio_listener_log_global_start(MemoryList= ener *listener, =20 static void vfio_listener_log_global_stop(MemoryListener *listener) { - VFIOContainerBase *bcontainer =3D container_of(listener, VFIOContainer= Base, - listener); + VFIOContainer *bcontainer =3D container_of(listener, VFIOContainer, + listener); Error *local_err =3D NULL; int ret =3D 0; =20 @@ -1057,7 +1057,7 @@ static void vfio_iommu_map_dirty_notify(IOMMUNotifier= *n, IOMMUTLBEntry *iotlb) vfio_giommu_dirty_notifier *gdn =3D container_of(n, vfio_giommu_dirty_notifier= , n); VFIOGuestIOMMU *giommu =3D gdn->giommu; - VFIOContainerBase *bcontainer =3D giommu->bcontainer; + VFIOContainer *bcontainer =3D giommu->bcontainer; hwaddr iova =3D iotlb->iova + giommu->iommu_offset; ram_addr_t translated_addr; Error *local_err =3D NULL; @@ -1127,7 +1127,7 @@ static int vfio_ram_discard_query_dirty_bitmap(Memory= RegionSection *section, } =20 static int -vfio_sync_ram_discard_listener_dirty_bitmap(VFIOContainerBase *bcontainer, +vfio_sync_ram_discard_listener_dirty_bitmap(VFIOContainer *bcontainer, MemoryRegionSection *section) { RamDiscardManager *rdm =3D memory_region_get_ram_discard_manager(secti= on->mr); @@ -1143,7 +1143,7 @@ vfio_sync_ram_discard_listener_dirty_bitmap(VFIOConta= inerBase *bcontainer, &vrdl); } =20 -static int vfio_sync_iommu_dirty_bitmap(VFIOContainerBase *bcontainer, +static int vfio_sync_iommu_dirty_bitmap(VFIOContainer *bcontainer, MemoryRegionSection *section) { VFIOGuestIOMMU *giommu; @@ -1180,7 +1180,7 @@ static int vfio_sync_iommu_dirty_bitmap(VFIOContainer= Base *bcontainer, return 0; } =20 -static int vfio_sync_dirty_bitmap(VFIOContainerBase *bcontainer, +static int vfio_sync_dirty_bitmap(VFIOContainer *bcontainer, MemoryRegionSection *section, Error **er= rp) { ram_addr_t ram_addr; @@ -1209,8 +1209,8 @@ static int vfio_sync_dirty_bitmap(VFIOContainerBase *= bcontainer, static void vfio_listener_log_sync(MemoryListener *listener, MemoryRegionSection *section) { - VFIOContainerBase *bcontainer =3D container_of(listener, VFIOContainer= Base, - listener); + VFIOContainer *bcontainer =3D container_of(listener, VFIOContainer, + listener); int ret; Error *local_err =3D NULL; =20 @@ -1241,7 +1241,7 @@ static const MemoryListener vfio_memory_listener =3D { .log_sync =3D vfio_listener_log_sync, }; =20 -bool vfio_listener_register(VFIOContainerBase *bcontainer, Error **errp) +bool vfio_listener_register(VFIOContainer *bcontainer, Error **errp) { bcontainer->listener =3D vfio_memory_listener; memory_listener_register(&bcontainer->listener, bcontainer->space->as); @@ -1255,7 +1255,7 @@ bool vfio_listener_register(VFIOContainerBase *bconta= iner, Error **errp) return true; } =20 -void vfio_listener_unregister(VFIOContainerBase *bcontainer) +void vfio_listener_unregister(VFIOContainer *bcontainer) { memory_listener_unregister(&bcontainer->listener); } diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index b8bade90d7..6d462aa13c 100644 --- a/hw/vfio/spapr.c +++ b/hw/vfio/spapr.c @@ -62,7 +62,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; - VFIOContainerBase *bcontainer =3D VFIO_IOMMU(container); + VFIOContainer *bcontainer =3D VFIO_IOMMU(container); const hwaddr gpa =3D section->offset_within_address_space; hwaddr end; int ret; @@ -244,7 +244,7 @@ static bool vfio_spapr_create_window(VFIOLegacyContaine= r *container, hwaddr *pgsize, Error **errp) { int ret =3D 0; - VFIOContainerBase *bcontainer =3D VFIO_IOMMU(container); + VFIOContainer *bcontainer =3D VFIO_IOMMU(container); VFIOSpaprContainer *scontainer =3D container_of(container, VFIOSpaprCo= ntainer, container); IOMMUMemoryRegion *iommu_mr =3D IOMMU_MEMORY_REGION(section->mr); @@ -348,7 +348,7 @@ static bool vfio_spapr_create_window(VFIOLegacyContaine= r *container, } =20 static bool -vfio_spapr_container_add_section_window(VFIOContainerBase *bcontainer, +vfio_spapr_container_add_section_window(VFIOContainer *bcontainer, MemoryRegionSection *section, Error **errp) { @@ -439,7 +439,7 @@ vfio_spapr_container_add_section_window(VFIOContainerBa= se *bcontainer, } =20 static void -vfio_spapr_container_del_section_window(VFIOContainerBase *bcontainer, +vfio_spapr_container_del_section_window(VFIOContainer *bcontainer, MemoryRegionSection *section) { VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); @@ -461,7 +461,7 @@ vfio_spapr_container_del_section_window(VFIOContainerBa= se *bcontainer, } } =20 -static void vfio_spapr_container_release(VFIOContainerBase *bcontainer) +static void vfio_spapr_container_release(VFIOContainer *bcontainer) { VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); VFIOSpaprContainer *scontainer =3D container_of(container, VFIOSpaprCo= ntainer, @@ -478,7 +478,7 @@ static void vfio_spapr_container_release(VFIOContainerB= ase *bcontainer) } } =20 -static bool vfio_spapr_container_setup(VFIOContainerBase *bcontainer, +static bool vfio_spapr_container_setup(VFIOContainer *bcontainer, Error **errp) { VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); --=20 2.43.0