From nobody Tue Oct 28 08:18:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; arc=fail (Bad Signature); dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1761089887255388.1799175988533; Tue, 21 Oct 2025 16:38:07 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3D46343DDF; Tue, 21 Oct 2025 19:38:02 -0400 (EDT) Received: from [172.19.199.20] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 837AE43E5F; Tue, 21 Oct 2025 19:35:46 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id E43F541988; Tue, 21 Oct 2025 19:33:17 -0400 (EDT) Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011044.outbound.protection.outlook.com [52.101.62.44]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id CCE6F41988 for ; Tue, 21 Oct 2025 19:33:15 -0400 (EDT) Received: from SJ0PR12MB6855.namprd12.prod.outlook.com (2603:10b6:a03:47e::6) by MW4PR12MB7030.namprd12.prod.outlook.com (2603:10b6:303:20a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9253.12; Tue, 21 Oct 2025 23:33:11 +0000 Received: from SJ0PR12MB6855.namprd12.prod.outlook.com ([fe80::1924:8e6f:c8f3:83c2]) by SJ0PR12MB6855.namprd12.prod.outlook.com ([fe80::1924:8e6f:c8f3:83c2%3]) with mapi id 15.20.9253.011; Tue, 21 Oct 2025 23:33:11 +0000 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ARC_SIGNED,ARC_VALID, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=F4edSjen41SQkh+FWdTfsYY76bqzq4fxjNkDyAkiVL4nrh4Qtw9Sn9PjIOVt2xMJtpQ60wlohMARAjpqy6YkUkcWwwGfeozulPGpl8yTsrnluUk+fy35fYy2RhJIZL7Sl3MlvIXrG3qM5y1++f0Vqm5wjllpHjRzZLeCTyu53S7FyGX5tHytIdktTS+GplIVT6DUU5Me88T3nIORqZWDSdU8aTu8DzSauN1Y3IF1YCJu+hKovl0Ur5FwmkgIkOEwrLN6HopNZXOMBbDkHNcys86Y3nRu4zEf8/bWeGieH1lwiPko0uSpV1jTXslnZl0Zgc9ju56Up5J0jvpXCdE8AA== 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=5DkzgEQ70D3JM3IdfmNQY+p2ks93eWx9xpe4PLxR83U=; b=YwuIFZJj+X3iWzgS+OWf+FivnsSZ2QUqee4hgEQKEKR2LVk8efqheTBzd4KoI3VS6UBml6PoJgK/B+TCFY/GoNO8TWPKYqtCmkfJas3TetwtxOKNBp5Ar+zLkzdGTSYk1TvXoPmSu3/e4y1xrrnArswwzuJs3zzZKLTIdCDW3nDMpipH0l053938NFHbGyZ/QOe5vd7rp1jfu64fqoWHOxBjBuDVTQuoTHQ+2cNg17D2on9L20OMsHka1ihID3YrNJDPQ/YzQY9KHIFr6FsDKHAeOifVC2+uiFX4NImiHvg3ypqphMCkn2Gva95/p5wPMVGEpc78epITVhkxuauQ5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5DkzgEQ70D3JM3IdfmNQY+p2ks93eWx9xpe4PLxR83U=; b=L1CO7E+aMF57GR8iZtQDGWLJYRg7ohPWeONKIXbFrL2/z5xfsvge9PjYBjyYmkmr7j+a/tpqEy/kLXMZfaOPfJwPyy4sA+JpEleriYPfYbDEcwQ0mWrmcr9ocV6TdkXST14Dj0A+FAzQH1vc9psWr1efcrJ/0nZe2t+sJO9Cqv9QwC5d7ZvIH/27vdjMlWtfRCm+PQ1PlVh8pio83zQnPRFyUwoxq10Audv2+j2DKUSKY764U3wZb3fR/5Z38bn9mGVULSx0C+QVr6HIzQ9yNqJHWpuCpmsevM39eT7UAMRjmHBYmr0zkT5kxy3QSDt1u1HwVNGu4vHK5ibByWVjlg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; To: devel@lists.libvirt.org Subject: [PATCH v3 1/3] conf: Support multiple device-pluggable smmuv3 IOMMUs Date: Tue, 21 Oct 2025 16:32:53 -0700 Message-ID: <20251021233255.3474571-2-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251021233255.3474571-1-nathanc@nvidia.com> References: <20251021233255.3474571-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR03CA0257.namprd03.prod.outlook.com (2603:10b6:a03:3a0::22) To SJ0PR12MB6855.namprd12.prod.outlook.com (2603:10b6:a03:47e::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR12MB6855:EE_|MW4PR12MB7030:EE_ X-MS-Office365-Filtering-Correlation-Id: 263f07bb-2a19-42f4-d3dc-08de10fa32b2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?QFqPAwFkV8NZGvxNHD7PT0TvW6ncKuebnhoS7yYGcZUdDIi6ZmrnrKdMHQ6V?= =?us-ascii?Q?bNtLpUcGkO7bDA/HRdc63HcWN4ZlhpfknsrvC2ms2ljNyqgozr3kI+RaSuVo?= =?us-ascii?Q?dlTj6vkGuPhfsLrLpcsIw/DFt8479Wc7CETlqUKMGXYYTpzCNjyBJcAwYh7T?= =?us-ascii?Q?/ii7Lyhy3L0ZaiI4pgOHPHg16eUw3jtdGahZ4/2msupOehMXBamB5fTc7Elw?= =?us-ascii?Q?nzPwkqkg54GlZF/OFBdZt0wNsa4YImTxieSeAettun27bybXWbC+JfrQCIIr?= =?us-ascii?Q?1tmpc8CWsULqA29j3M5/FGmdbJW8v00R6MpFYQ6mXr2BkyAbdDD4VeZf7ggX?= =?us-ascii?Q?MPvsOGCO8PTqXnMoQcNIDFoyp/MzyW99siDT+3InZyqRglhAZYmtphZw/QA+?= =?us-ascii?Q?y+Y5TYk70SID5pQMr2QbmTOe0Y6JgMJRbsHVJr7GwyMWEcZuyJDe1d5Y3vw5?= =?us-ascii?Q?PgrPLlofNYtJZjhhnU3CGZaZCDP7VsZk/nui90ZYR9pIAg6QtY9WYAMt94xg?= =?us-ascii?Q?vE44dyRO+UbI6rYzNihIf5uc/Eo8LJl+PEvI6IOadWdptbh2WffxqWEZR06u?= =?us-ascii?Q?+PyY3o0uw465lM2J/knEJLkuaFfKeSlsa2qMNYJ515Wo4nWoFXG/2oEYEUgY?= =?us-ascii?Q?hIrqviWZykN3UpEALZhMIEnbULnYSRHWj4Bz9n3XFWEx9Dos6PNjsF3MyKDd?= =?us-ascii?Q?cPtcPYDiBeyR8jvZNJ3IpWZJM55CIKYZidFtyu4dSq6jYGth9rH++8ISnJ0Z?= =?us-ascii?Q?jAavTDpR0BVNcpXtuLi/fdHDBf5sgZwVb8UYA9RonNMCKWv9NDSITpcZhYV2?= =?us-ascii?Q?mbeTbUyG89PhepTbLTiTufElN3uuYkeqIODs+HtzsfvGcxIbpqQvMrQZWa9s?= =?us-ascii?Q?LQZ3aL4lYglFlOUBcqKPvg2+u7SrvEMlWI7iapTGVsH5B2aNrsXC2mIFsmcZ?= =?us-ascii?Q?hLpmg1A/4MvXCttH1UdkdUzW/k5Wt+HLYJK318lynRIiIOSphw4345vQ9X6B?= =?us-ascii?Q?/sWTnpzLqfnUZqDv5N3cWdVPkq/rw5fauuYU3P/orj3wQf2QVZvb4F7MG2B2?= =?us-ascii?Q?KH4SW8WUTUqFLsp4nqx33wq6c81ajEcvB1BpjS8MiGpesSY3hPV08UJBizTl?= =?us-ascii?Q?wU+IhGyhoafczGDkKXaaAtL4RIOJehOm/jdK02Iu8USTD4OhowAAAxsc/dbs?= =?us-ascii?Q?jYrfJTJQ5gUVIy6Bp40LNZcFpOqXLuq9dkOLNPQ2IxQ90oJm+nPnT9mYdbTb?= =?us-ascii?Q?uwfRegNZk+1OsVh9Y9LQGYatBbkqC3B1iXQR85p5ETGGzv89zmi3CQTJVrLv?= =?us-ascii?Q?13OL67lxs8DWAHpE+ZID5QJ6SxIA4JfEPFAYmiLpkRHlhnUwLyDWm+NYZIOt?= =?us-ascii?Q?b3OZM7cQjmPgspXKYsrnozzuo8N1/VPNzqth+PWzhu8977EnAcMuJn1IcreP?= =?us-ascii?Q?r7ku9PU/NXHeARLpSRCWs+eLGr8QkVQw?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR12MB6855.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sX6siXdopkcLRVcgozEwtGc1Qn/AdwiaP+Zama61SWnWLyci021U2pg2Mweh?= =?us-ascii?Q?afr47msS9P/u1MI+333FE7Y+zuLgsPgem+bClDZCdlrjLkNUrtYeXD5dzJvJ?= =?us-ascii?Q?HrbFR0oyYZIMdvNPcFKl7ljBIGvuFCYQo6LtEN1+tnciZfr8P130HKr6zZQc?= =?us-ascii?Q?/+vbipeyv08DWaDwempvEhWzqLwHyIicmkTVjsCEKfHUaLGSg1RPCmeLZ4GJ?= =?us-ascii?Q?Zd3QAcGfr95Jiy+ki7r6lm4q6AgA/M2LGe/aSxkaVZGLD1/rF7coGFctX1RP?= =?us-ascii?Q?LC5kALm7g8diLLnFQY6KZODl/XXk98CTRmIgj18c0Gq3Hwew0DwLl9SZvC4r?= =?us-ascii?Q?nN4j0H1mmOxrKM6GzBXa5d3Rjf4K1dC+SjMWkNjlN+O8beowNqvaN/9prmVx?= =?us-ascii?Q?oPFBsyr/wQJqoqFPO/djkHro1i7byFNNNNOILHnJYT2HfpKMoh+7+ITjf6IX?= =?us-ascii?Q?J1S1kmqN8gP50vdVd3mtPtmgDYdEb0CRTstDzf00x0Md9WEm23h4Uw7pQ9E2?= =?us-ascii?Q?06EuPxmr1AP8D7vKTwRbXr7eHUyfd9hD6aRQhChjWKHhwrwatY/BGID8Ut8j?= =?us-ascii?Q?zefSdHd6e2uiMHQcydUIoUqve/nWaPOG+RRn3YLWAh4KUj/TNr+v5kuqnzgh?= =?us-ascii?Q?iouOlK0/YJZdkzzyi7wb/6UrwmZmPqN6aeyRbjU4TLLQd2xNa1V4smXZmgyj?= =?us-ascii?Q?/qXsr00Ksc59ZzWVaSM52Pfy0/p1mjn2lU+cDMqgBr0GRX9/oMZoP1tdSmPk?= =?us-ascii?Q?WoPekFJDq0O6jXF0zutnMvdMkuHxcGWCQMzdX83IbhR8e0b/xrGx+uh8wuAi?= =?us-ascii?Q?HcnWdx02Tk/9Q2ZBdstiVHiyVyRGCjLTU/QwabhsSTQhjoRjgIFY6I/lMxT6?= =?us-ascii?Q?Udkj7BcCkRXM/Iz5ZfkPKG8+0RM11ppRqrYiONsJ8EdjTJUgdK/f+ZDRNZfK?= =?us-ascii?Q?rXLxVzUuR7VjwaetvjJshkabE0HP/znLp6hUhlCbYuQLU3uqjACYLoKq1LOH?= =?us-ascii?Q?G+hpm+8T3CGRv1EbJHh3MEDwxzV5iEdVAG6xEh4bT0Y9YzNUzLfNEnhjiBDo?= =?us-ascii?Q?bgsAo+zvRa28T/K3NWssDhuj4Gv5yjdMVTtbJNW2/rsBgkYSO8jk/2mgw5L7?= =?us-ascii?Q?QCCNuIagx+M81yaYTJAEBrRD187ahU/89BGcIhhi+hCM5K+TYuWfceaJqq6f?= =?us-ascii?Q?iXqUSXiSgTQC/JainiptJa/aB3VKczIJKMxY+gQg3+i42l4YFL0rMvNYCDY1?= =?us-ascii?Q?PNGmlgGuJLi0M0mNOOpreeWU2OxW+9RK7Js45TH3s6M/OGpEajkij+Q0dfWd?= =?us-ascii?Q?1YunIRBYdTPI5d1amAHyItuxTS3m2MDU4HoB9/LHppBwG+wvBkEaReTYKTzY?= =?us-ascii?Q?JT3K7Q0zpd23F0WdarBeGZ55NtyLKGzecW2JbEio1U37YULHgywbkzvZpTPV?= =?us-ascii?Q?uwvmULnZm7/iJSdsqailSzlAUsak+SJqmtK9l9beYjgTCNmz8FxZfOdgYIfL?= =?us-ascii?Q?XnszwkisT/zrQRIW6aX/TAIRZEA/9hoEXjNnzTW+I4oBng+DMVFfnIlkVRv5?= =?us-ascii?Q?W+FP8D6idhiFoa4lccbiHDP0so8n9VHVQsyCiyX+?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 263f07bb-2a19-42f4-d3dc-08de10fa32b2 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR12MB6855.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2025 23:33:11.2923 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ZvHzAfTDgReX6u8kOpq+/7ikyzn/PbBwzY3YDGbmv+ZN7StSOPT97+qnnimj0NLgr9oxNbEAWaDYNpL94uzh0w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7030 Message-ID-Hash: 32AGU54AENCHEO5IXQS5XV4AM3VQZTI2 X-Message-ID-Hash: 32AGU54AENCHEO5IXQS5XV4AM3VQZTI2 X-MailFrom: nathanc@nvidia.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: skolothumtho@nvidia.com, nicolinc@nvidia.com, nathanc@nvidia.com, mochs@nvidia.com X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Nathan Chen via Devel Reply-To: Nathan Chen X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1761089889154158500 Content-Type: text/plain; charset="utf-8" Add support for parsing multiple IOMMU devices from the VM definition when "smmuv3" is the IOMMU model. Signed-off-by: Nathan Chen --- src/conf/domain_conf.c | 84 +++++++++++++++----- src/conf/domain_conf.h | 9 ++- src/conf/domain_validate.c | 33 +++++--- src/conf/schemas/domaincommon.rng | 4 +- src/libvirt_private.syms | 2 + src/qemu/qemu_alias.c | 15 ++-- src/qemu/qemu_command.c | 127 +++++++++++++++--------------- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 5 +- src/qemu/qemu_driver.c | 8 +- src/qemu/qemu_postparse.c | 11 +-- src/qemu/qemu_validate.c | 2 +- 12 files changed, 184 insertions(+), 118 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4737594487..6e320713bb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4139,7 +4139,9 @@ void virDomainDefFree(virDomainDef *def) virDomainCryptoDefFree(def->cryptos[i]); g_free(def->cryptos); =20 - virDomainIOMMUDefFree(def->iommu); + for (i =3D 0; i < def->niommus; i++) + virDomainIOMMUDefFree(def->iommus[i]); + g_free(def->iommus); =20 virDomainPstoreDefFree(def->pstore); =20 @@ -5011,9 +5013,9 @@ virDomainDeviceInfoIterateFlags(virDomainDef *def, } =20 device.type =3D VIR_DOMAIN_DEVICE_IOMMU; - if (def->iommu) { - device.data.iommu =3D def->iommu; - if ((rc =3D cb(def, &device, &def->iommu->info, opaque)) !=3D 0) + for (i =3D 0; i < def->niommus; i++) { + device.data.iommu =3D def->iommus[i]; + if ((rc =3D cb(def, &device, &def->iommus[i]->info, opaque)) !=3D = 0) return rc; } =20 @@ -16488,6 +16490,42 @@ virDomainInputDefFind(const virDomainDef *def, } =20 =20 +bool +virDomainIOMMUDefEquals(const virDomainIOMMUDef *a, + const virDomainIOMMUDef *b) +{ + if (a->model !=3D b->model || + a->intremap !=3D b->intremap || + a->caching_mode !=3D b->caching_mode || + a->eim !=3D b->eim || + a->iotlb !=3D b->iotlb || + a->aw_bits !=3D b->aw_bits || + a->dma_translation !=3D b->dma_translation) + return false; + + if (a->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + !virDomainDeviceInfoAddressIsEqual(&a->info, &b->info)) + return false; + + return true; +} + + +ssize_t +virDomainIOMMUDefFind(const virDomainDef *def, + const virDomainIOMMUDef *iommu) +{ + size_t i; + + for (i =3D 0; i < def->niommus; i++) { + if (virDomainIOMMUDefEquals(iommu, def->iommus[i])) + return i; + } + + return -1; +} + + bool virDomainVsockDefEquals(const virDomainVsockDef *a, const virDomainVsockDef *b) @@ -20156,19 +20194,22 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt, } VIR_FREE(nodes); =20 + /* Parsing iommu device definitions */ if ((n =3D virXPathNodeSet("./devices/iommu", ctxt, &nodes)) < 0) return NULL; =20 - if (n > 1) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("only a single IOMMU device is supported")); - return NULL; - } + if (n > 0) + def->iommus =3D g_new0(virDomainIOMMUDef *, n); =20 - if (n > 0) { - if (!(def->iommu =3D virDomainIOMMUDefParseXML(xmlopt, nodes[0], - ctxt, flags))) + for (i =3D 0; i < n; i++) { + virDomainIOMMUDef *iommu; + + iommu =3D virDomainIOMMUDefParseXML(xmlopt, nodes[i], ctxt, flags); + + if (!iommu) return NULL; + + def->iommus[def->niommus++] =3D iommu; } VIR_FREE(nodes); =20 @@ -22615,15 +22656,17 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *= src, goto error; } =20 - if (!!src->iommu !=3D !!dst->iommu) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Target domain IOMMU device count does not match = source")); + if (src->niommus !=3D dst->niommus) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain IOMMU device count %1$zu does not = match source %2$zu"), + dst->niommus, src->niommus); goto error; } =20 - if (src->iommu && - !virDomainIOMMUDefCheckABIStability(src->iommu, dst->iommu)) - goto error; + for (i =3D 0; i < src->niommus; i++) { + if (!virDomainIOMMUDefCheckABIStability(src->iommus[i], dst->iommu= s[i])) + goto error; + } =20 if (!!src->vsock !=3D !!dst->vsock) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -29467,8 +29510,9 @@ virDomainDefFormatInternalSetRootName(virDomainDef = *def, for (n =3D 0; n < def->ncryptos; n++) { virDomainCryptoDefFormat(buf, def->cryptos[n], flags); } - if (def->iommu) - virDomainIOMMUDefFormat(buf, def->iommu); + + for (n =3D 0; n < def->niommus; n++) + virDomainIOMMUDefFormat(buf, def->iommus[n]); =20 if (def->vsock) virDomainVsockDefFormat(buf, def->vsock); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a63d922853..139bcdc1af 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3299,6 +3299,9 @@ struct _virDomainDef { size_t nwatchdogs; virDomainWatchdogDef **watchdogs; =20 + size_t niommus; + virDomainIOMMUDef **iommus; + /* At maximum 2 TPMs on the domain if a TPM Proxy is present. */ size_t ntpms; virDomainTPMDef **tpms; @@ -3308,7 +3311,6 @@ struct _virDomainDef { virDomainNVRAMDef *nvram; virCPUDef *cpu; virDomainRedirFilterDef *redirfilter; - virDomainIOMMUDef *iommu; virDomainVsockDef *vsock; virDomainPstoreDef *pstore; =20 @@ -4313,6 +4315,11 @@ virDomainShmemDef *virDomainShmemDefRemove(virDomain= Def *def, size_t idx) ssize_t virDomainInputDefFind(const virDomainDef *def, const virDomainInputDef *input) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; +bool virDomainIOMMUDefEquals(const virDomainIOMMUDef *a, + const virDomainIOMMUDef *b); +ssize_t virDomainIOMMUDefFind(const virDomainDef *def, + const virDomainIOMMUDef *iommu) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; bool virDomainVsockDefEquals(const virDomainVsockDef *a, const virDomainVsockDef *b) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 93a2bc9b01..dd1b491dfe 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1851,21 +1851,28 @@ virDomainDefCputuneValidate(const virDomainDef *def) static int virDomainDefIOMMUValidate(const virDomainDef *def) { - if (!def->iommu) - return 0; + size_t i; =20 - if (def->iommu->intremap =3D=3D VIR_TRISTATE_SWITCH_ON && - def->features[VIR_DOMAIN_FEATURE_IOAPIC] !=3D VIR_DOMAIN_IOAPIC_QE= MU) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("IOMMU interrupt remapping requires split I/O API= C (ioapic driver=3D'qemu')")); - return -1; - } + for (i =3D 0; i < def->niommus; i++) { + virDomainIOMMUDef *iommu =3D def->iommus[i]; + if (def->niommus > 1 && iommu->model !=3D VIR_DOMAIN_IOMMU_MODEL_S= MMUV3) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("IOMMU model smmuv3 must be specified for mul= tiple IOMMU definitions")); + } =20 - if (def->iommu->eim =3D=3D VIR_TRISTATE_SWITCH_ON && - def->iommu->intremap !=3D VIR_TRISTATE_SWITCH_ON) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("IOMMU eim requires interrupt remapping to be ena= bled")); - return -1; + if (iommu->intremap =3D=3D VIR_TRISTATE_SWITCH_ON && + def->features[VIR_DOMAIN_FEATURE_IOAPIC] !=3D VIR_DOMAIN_IOAPI= C_QEMU) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("IOMMU interrupt remapping requires split I/O= APIC (ioapic driver=3D'qemu')")); + return -1; + } + + if (iommu->eim =3D=3D VIR_TRISTATE_SWITCH_ON && + iommu->intremap !=3D VIR_TRISTATE_SWITCH_ON) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("IOMMU eim requires interrupt remapping to be= enabled")); + return -1; + } } =20 return 0; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index ace74fee08..98596d4cea 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6953,9 +6953,9 @@ - + - + diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 26776dff2a..d9a5335003 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -494,6 +494,8 @@ virDomainInputSourceGrabToggleTypeToString; virDomainInputSourceGrabTypeFromString; virDomainInputSourceGrabTypeToString; virDomainInputTypeToString; +virDomainIOMMUDefEquals; +virDomainIOMMUDefFind; virDomainIOMMUDefFree; virDomainIOMMUDefNew; virDomainIOMMUModelTypeFromString; diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index b0bc057bd1..400ce73283 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -650,10 +650,14 @@ qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock) =20 =20 static void -qemuAssignDeviceIOMMUAlias(virDomainIOMMUDef *iommu) +qemuAssignDeviceIOMMUAlias(virDomainDef *def, + virDomainIOMMUDef **iommu) { - if (!iommu->info.alias) - iommu->info.alias =3D g_strdup("iommu0"); + size_t i; + for (i =3D 0; i < def->niommus; i++) { + if (!iommu[i]->info.alias) + iommu[i]->info.alias =3D g_strdup_printf("iommu%zu", i); + } } =20 =20 @@ -769,8 +773,9 @@ qemuAssignDeviceAliases(virDomainDef *def) if (def->vsock) { qemuAssignDeviceVsockAlias(def->vsock); } - if (def->iommu) - qemuAssignDeviceIOMMUAlias(def->iommu); + if (def->niommus > 0) { + qemuAssignDeviceIOMMUAlias(def, def->iommus); + } for (i =3D 0; i < def->ncryptos; i++) { qemuAssignDeviceCryptoAlias(def, def->cryptos[i]); } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fcf5fc1935..61457c4f7a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6227,84 +6227,85 @@ qemuBuildIOMMUCommandLine(virCommand *cmd, const virDomainDef *def, virQEMUCaps *qemuCaps) { + size_t i; g_autoptr(virJSONValue) props =3D NULL; g_autoptr(virJSONValue) wrapperProps =3D NULL; - const virDomainIOMMUDef *iommu =3D def->iommu; =20 - if (!iommu) + if (def->niommus =3D=3D 0) return 0; =20 - switch (iommu->model) { - case VIR_DOMAIN_IOMMU_MODEL_INTEL: - if (virJSONValueObjectAdd(&props, - "s:driver", "intel-iommu", - "s:id", iommu->info.alias, - "S:intremap", qemuOnOffAuto(iommu->intre= map), - "T:caching-mode", iommu->caching_mode, - "S:eim", qemuOnOffAuto(iommu->eim), - "T:device-iotlb", iommu->iotlb, - "z:aw-bits", iommu->aw_bits, - "T:dma-translation", iommu->dma_translat= ion, - NULL) < 0) - return -1; + for (i =3D 0; i < def->niommus; i++) { + virDomainIOMMUDef *iommu =3D def->iommus[i]; + switch (iommu->model) { + case VIR_DOMAIN_IOMMU_MODEL_INTEL: + if (virJSONValueObjectAdd(&props, + "s:driver", "intel-iommu", + "s:id", iommu->info.alias, + "S:intremap", qemuOnOffAuto(iommu->i= ntremap), + "T:caching-mode", iommu->caching_mod= e, + "S:eim", qemuOnOffAuto(iommu->eim), + "T:device-iotlb", iommu->iotlb, + "z:aw-bits", iommu->aw_bits, + "T:dma-translation", iommu->dma_tran= slation, + NULL) < 0) + return -1; =20 - if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCaps) = < 0) - return -1; + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCa= ps) < 0) + return -1; =20 - return 0; + return 0; + case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: + if (virJSONValueObjectAdd(&props, + "s:driver", "virtio-iommu", + "s:id", iommu->info.alias, + NULL) < 0) { + return -1; + } =20 - case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: - if (virJSONValueObjectAdd(&props, - "s:driver", "virtio-iommu", - "s:id", iommu->info.alias, - NULL) < 0) { - return -1; - } + if (qemuBuildDeviceAddressProps(props, def, &iommu->info) < 0) + return -1; =20 - if (qemuBuildDeviceAddressProps(props, def, &iommu->info) < 0) - return -1; + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCa= ps) < 0) + return -1; =20 - if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCaps) = < 0) - return -1; + return 0; + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: + /* There is no -device for SMMUv3, so nothing to be done here = */ + return 0; =20 - return 0; + case VIR_DOMAIN_IOMMU_MODEL_AMD: + if (virJSONValueObjectAdd(&wrapperProps, + "s:driver", "AMDVI-PCI", + "s:id", iommu->info.alias, + NULL) < 0) + return -1; =20 - case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: - /* There is no -device for SMMUv3, so nothing to be done here */ - return 0; + if (qemuBuildDeviceAddressProps(wrapperProps, def, &iommu->inf= o) < 0) + return -1; =20 - case VIR_DOMAIN_IOMMU_MODEL_AMD: - if (virJSONValueObjectAdd(&wrapperProps, - "s:driver", "AMDVI-PCI", - "s:id", iommu->info.alias, - NULL) < 0) - return -1; + if (qemuBuildDeviceCommandlineFromJSON(cmd, wrapperProps, def,= qemuCaps) < 0) + return -1; =20 - if (qemuBuildDeviceAddressProps(wrapperProps, def, &iommu->info) <= 0) - return -1; + if (virJSONValueObjectAdd(&props, + "s:driver", "amd-iommu", + "s:pci-id", iommu->info.alias, + "S:intremap", qemuOnOffAuto(iommu->i= ntremap), + "T:pt", iommu->pt, + "T:xtsup", iommu->xtsup, + "T:device-iotlb", iommu->iotlb, + NULL) < 0) + return -1; =20 - if (qemuBuildDeviceCommandlineFromJSON(cmd, wrapperProps, def, qem= uCaps) < 0) - return -1; + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCa= ps) < 0) + return -1; =20 - if (virJSONValueObjectAdd(&props, - "s:driver", "amd-iommu", - "s:pci-id", iommu->info.alias, - "S:intremap", qemuOnOffAuto(iommu->intre= map), - "T:pt", iommu->pt, - "T:xtsup", iommu->xtsup, - "T:device-iotlb", iommu->iotlb, - NULL) < 0) - return -1; + return 0; =20 - if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCaps) = < 0) + case VIR_DOMAIN_IOMMU_MODEL_LAST: + default: + virReportEnumRangeError(virDomainIOMMUModel, iommu->model); return -1; - - return 0; - - case VIR_DOMAIN_IOMMU_MODEL_LAST: - default: - virReportEnumRangeError(virDomainIOMMUModel, iommu->model); - return -1; + } } =20 return 0; @@ -7141,8 +7142,8 @@ qemuBuildMachineCommandLine(virCommand *cmd, if (qemuAppendDomainFeaturesMachineParam(&buf, def, qemuCaps) < 0) return -1; =20 - if (def->iommu) { - switch (def->iommu->model) { + if (def->niommus =3D=3D 1) { + switch (def->iommus[0]->model) { case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: virBufferAddLit(&buf, ",iommu=3Dsmmuv3"); break; @@ -7155,7 +7156,7 @@ qemuBuildMachineCommandLine(virCommand *cmd, =20 case VIR_DOMAIN_IOMMU_MODEL_LAST: default: - virReportEnumRangeError(virDomainIOMMUModel, def->iommu->model= ); + virReportEnumRangeError(virDomainIOMMUModel, def->iommus[0]->m= odel); return -1; } } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 375e0e441a..9598d754df 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8372,7 +8372,7 @@ qemuDomainGetMemLockLimitBytes(virDomainDef *def) int factor =3D nvdpa + nnvme; =20 if (nvfio) { - if (def->iommu) + if (def->niommus > 0) factor +=3D nvfio; else factor +=3D 1; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 774541ca06..cb0ee0f655 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2413,9 +2413,8 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def, /* Nada - none are PCI based (yet) */ } =20 - if (def->iommu) { - virDomainIOMMUDef *iommu =3D def->iommu; - + for (i =3D 0; i < def->niommus; i++) { + virDomainIOMMUDef *iommu =3D def->iommus[i]; switch (iommu->model) { case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: case VIR_DOMAIN_IOMMU_MODEL_AMD: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b0eff443aa..8fb1967b71 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6894,12 +6894,12 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, break; =20 case VIR_DOMAIN_DEVICE_IOMMU: - if (vmdef->iommu) { + if (vmdef->niommus > 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain already has an iommu device")); return -1; } - vmdef->iommu =3D g_steal_pointer(&dev->data.iommu); + VIR_APPEND_ELEMENT(vmdef->iommus, vmdef->niommus, dev->data.iommu); break; =20 case VIR_DOMAIN_DEVICE_VIDEO: @@ -7113,12 +7113,12 @@ qemuDomainDetachDeviceConfig(virDomainDef *vmdef, break; =20 case VIR_DOMAIN_DEVICE_IOMMU: - if (!vmdef->iommu) { + if ((idx =3D virDomainIOMMUDefFind(vmdef, dev->data.iommu)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("matching iommu device not found")); return -1; } - g_clear_pointer(&vmdef->iommu, virDomainIOMMUDefFree); + VIR_DELETE_ELEMENT(vmdef->iommus, idx, vmdef->niommus); break; =20 case VIR_DOMAIN_DEVICE_VIDEO: diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index fd27f8be27..3b417ea5d0 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1470,7 +1470,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, } } =20 - if (addIOMMU && !def->iommu && + if (addIOMMU && !def->iommus && def->niommus =3D=3D 0 && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_INTEL_IOMMU) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOMMU_INTREMAP) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOMMU_EIM)) { @@ -1482,7 +1482,8 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, iommu->intremap =3D VIR_TRISTATE_SWITCH_ON; iommu->eim =3D VIR_TRISTATE_SWITCH_ON; =20 - def->iommu =3D g_steal_pointer(&iommu); + def->iommus =3D g_new0(virDomainIOMMUDef *, 1); + def->iommus[def->niommus++] =3D g_steal_pointer(&iommu); } =20 if (qemuDomainDefAddDefaultAudioBackend(driver, def) < 0) @@ -1558,9 +1559,9 @@ qemuDomainDefEnableDefaultFeatures(virDomainDef *def, * domain already has IOMMU without inremap. This will be fixed in * qemuDomainIOMMUDefPostParse() but there domain definition can't be * modified so change it now. */ - if (def->iommu && - (def->iommu->intremap =3D=3D VIR_TRISTATE_SWITCH_ON || - qemuDomainNeedsIOMMUWithEIM(def)) && + if (def->iommus && def->niommus =3D=3D 1 && + (def->iommus[0]->intremap =3D=3D VIR_TRISTATE_SWITCH_ON || + qemuDomainNeedsIOMMUWithEIM(def)) && def->features[VIR_DOMAIN_FEATURE_IOAPIC] =3D=3D VIR_DOMAIN_IOAPIC_= NONE) { def->features[VIR_DOMAIN_FEATURE_IOAPIC] =3D VIR_DOMAIN_IOAPIC_QEM= U; } diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 3e8fdb2268..b36ea8a3b1 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -907,7 +907,7 @@ qemuValidateDomainVCpuTopology(const virDomainDef *def,= virQEMUCaps *qemuCaps) QEMU_MAX_VCPUS_WITHOUT_EIM); return -1; } - if (!def->iommu || def->iommu->eim !=3D VIR_TRISTATE_SWITCH_ON) { + if (!def->iommus || def->iommus[0]->eim !=3D VIR_TRISTATE_SWITCH_O= N) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("more than %1$d vCPUs require extended interr= upt mode enabled on the iommu device"), QEMU_MAX_VCPUS_WITHOUT_EIM); --=20 2.43.0 From nobody Tue Oct 28 08:18:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; arc=fail (Bad Signature); dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1761089957593995.484662784324; Tue, 21 Oct 2025 16:39:17 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id C0E6D41CAE; Tue, 21 Oct 2025 19:39:16 -0400 (EDT) Received: from [172.19.199.20] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 87FCD43E1D; Tue, 21 Oct 2025 19:37:24 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id A784241986; Tue, 21 Oct 2025 19:33:18 -0400 (EDT) Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011046.outbound.protection.outlook.com [52.101.62.46]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (3072 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E0338418D0 for ; Tue, 21 Oct 2025 19:33:16 -0400 (EDT) Received: from SJ0PR12MB6855.namprd12.prod.outlook.com (2603:10b6:a03:47e::6) by MW4PR12MB7030.namprd12.prod.outlook.com (2603:10b6:303:20a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9253.12; Tue, 21 Oct 2025 23:33:14 +0000 Received: from SJ0PR12MB6855.namprd12.prod.outlook.com ([fe80::1924:8e6f:c8f3:83c2]) by SJ0PR12MB6855.namprd12.prod.outlook.com ([fe80::1924:8e6f:c8f3:83c2%3]) with mapi id 15.20.9253.011; Tue, 21 Oct 2025 23:33:14 +0000 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ARC_SIGNED,ARC_VALID, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kUTmyCr/0+gPWa0I5M+19KzQ5U7KFv3gNFL27WH/GEnljJxcMusSF1LqiB6uPJSzYEqiqmFanoyr8jYbDIZeiU1JFFfUqjndr7TDbwjvO7qQj00II0DKdpaNCafseleFBG5t+yAGgPiAdlaUK2gF1DbV1QDBPosp8NoKUGPtRs6OXI/RuI89ieprPQDnBED2wYKouBlkVwDn3Wg9u2xJWBnEiPAjN0xIdMvPjdzfSC2Rtl/wizOeXNHepboMdBrsTSomwZWsxACud0zrmbgAIiiGCw5FojOV0pGViiv/1D48I2tzF9MJ0HUZfOKoQQzHvX32EauAkX52wwRJGVhl6w== 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=aCO0MgvWT12SHP4xPe1lHoqQh+EQeYWjOYw0qH74fKA=; b=t1A/sTeoGE0S5ZqXwzWx/1aAnvOHcXp1pHWRXDiOAbJUjM+N2AWCOdgIYPrnvz9qZ52INLHYufWrkF4HJXiMcd/eKnEUcg7QzoiGrwhv+BxA13fs/5++SGuyxVfGH8XIPbrptQNUvaAnAVhLzqZD7pjAIA01QtHgDIIqJM3F7nT9YRSXOK0eFOK4w+i1TFcN61/i1qDGmb2Ce1kCj1jukkMuCHcw6PcvsfI6QkvJW8PbseSqW5c9+O9ASSyZC4VgH3QMZ9D2/5+E3KIIl26IqVKocfX7vXRGp4Zr6sLYdTuMEfFclH+W2eRuFcprrILYE1quQ4FOUvfFtCFccDVJRg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aCO0MgvWT12SHP4xPe1lHoqQh+EQeYWjOYw0qH74fKA=; b=URnLgjUYupvezdMjHmED41Ec5kgScV6IyceTp2zAHJjYpA5pKJmiewSo3wLWFVQ5DzzdDbNKNPbcwPJOo7CTwXqWPYzXVVJmpdebIYs3jaG/07l6zrJVZM+ZAGS58f0dG7U38Mnc8uErNeJk3CWZqiwoIJQUaBpbEEu4mz91GDCcpag7LnYvLQilz+IDBiiZUqU7bjoibi7uHL89mcWPQWjnTXNj80sI5jqDKkDNtgm17dPgDf7zzTwdPEGPMCyNFmYFUa0jDBmP9Dv4p19fm/BnIumZLd+rellEux6kuJJ2EJx+WIKc/CG6Tm4EgU4M+7BHM0sTXpowAPOhGZbszw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; To: devel@lists.libvirt.org Subject: [PATCH v3 2/3] qemu: Implement pluggable-device smmuv3 Date: Tue, 21 Oct 2025 16:32:54 -0700 Message-ID: <20251021233255.3474571-3-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251021233255.3474571-1-nathanc@nvidia.com> References: <20251021233255.3474571-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR03CA0255.namprd03.prod.outlook.com (2603:10b6:a03:3a0::20) To SJ0PR12MB6855.namprd12.prod.outlook.com (2603:10b6:a03:47e::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR12MB6855:EE_|MW4PR12MB7030:EE_ X-MS-Office365-Filtering-Correlation-Id: 108e4a1d-b6a4-4ca4-b15a-08de10fa3459 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?2S0aUkvj/rGeSeSQfjrcHkZGWIsua+TOt9hwepb+eq9Hh2W0GdkVULd4nu4A?= =?us-ascii?Q?x37EwhIEN5QLNMLf47sQQSuN6cPz8MWwWniVOyFb7X9cFzljNKHYDN8c0gVc?= =?us-ascii?Q?zAFrs81WNmf6hCpVpSiueVjOcMk9VTLdTThQdrOid4cRs48ktpukwxJqELQ1?= =?us-ascii?Q?HCf7Z46JTly1RrpKuLh0NmnM1tEuJaG7EU7BZewMGmvrFOLF86q26cn0fAM5?= =?us-ascii?Q?/TGjseGW7Fc19uJbX+iR/Htm7cgLzpyH23niGR5bcBEKasxgoQR/4lTUIFV4?= =?us-ascii?Q?ESlGSG8JlVvokBG58+GnvlRtH3MSEAZ9PuftlLWKyXAoROVz/Z7SYPWMybJs?= =?us-ascii?Q?2//eqUhNiFspMZCh6wiAGJdgm3rSb5kr51RbnmNkLfn7T4w8rjeLDzloLpq/?= =?us-ascii?Q?EY/D30OzeiM4AcaUNxDQvrJtlD1cuk5CEn8P1DaSh9tWKFcJKUqwDmFj4+kq?= =?us-ascii?Q?OYVmc1r9ZdoLQaUCbOFJfcWenVEZZYRiJaMnsWa++n4WYay/fNgF47fL8zUH?= =?us-ascii?Q?oDf5Wk76pn7U6TXXXgWFvSJsHN/tMjn2diwknJqd00ebcYlck8leD5bqbuAr?= =?us-ascii?Q?uCtyYQsjADtdM8CjSp4Wf+8i91QDEUS0mXg8oLvaqkZ6eW6KOkMIsMX4V+bZ?= =?us-ascii?Q?C/w265u6vRtxoeWkYZg5oO5KxgBj4oDxtMPxmWklAyxIET/4LMX8Xs/aTWH3?= =?us-ascii?Q?mEgYpHlOFwIWIeaSDsL4x2FsZNoSDpijg2R845nSD8rBUuN9kCqh88Ei6utb?= =?us-ascii?Q?hOgHYkbiNx4LsAUe7MCANhiw0SRyFfDLberM1cqrJJvsno5d4EHiBePgNMGp?= =?us-ascii?Q?fMuNOuNKwweWDXMsNe8xR90nUehW0W94EkwiNb/QdKZ2A2tT9D8Ub3rcg3Vo?= =?us-ascii?Q?KU+CfOS92y4iljmzB0bX+hlq9SLUn/UI8iStu215HTR6YnSiGpAB/M4Z+0L9?= =?us-ascii?Q?R+asCTcTIdeSBB04NrrBINTkXtqjon7/6CbqN9FU3RYOesev3U8WBa604r5J?= =?us-ascii?Q?bBtaErblSPqJh89Aq01DEm1UzldC5q3+K9HRPwaYuoBJdpyJpPWQ2VRZJ5zZ?= =?us-ascii?Q?LKzQsU1gq1F7cQ3jgavGJDkO+dxhuhk5Lrlk5ipXCOI9ZyDSlTDEiwb9n6Re?= =?us-ascii?Q?4G76dQvx8I4mUNUQG79Ax0AJymO3P+TBittvfoJdslo+D15ZIk3poZJOdyzS?= =?us-ascii?Q?raQQ9V0pgCX67mYEhUoWbR2h/s9ZD0S3ZchilG3g7SDmrGkKGlBg27wWbOte?= =?us-ascii?Q?pmJi0iBZ689WfZmuv1iiUKtXXXzJFPv7hy170R985Xw52sGzAp4ULMvLmVHZ?= =?us-ascii?Q?11yk11JQO2S2dmtaDuwxf4Z1wjclFRs34ydoMceaL5OI/rActIE7bIjByNJb?= =?us-ascii?Q?H4pbX7Oy85Iu+9CeE4OnhWkUgo6sGUZlHMqpUsRevtKbDWNhzAhCrOBFWgGA?= =?us-ascii?Q?PdGu5IWsoP4A9Lqkg5viqNPBwEtvfz3+?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR12MB6855.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zgZOlPcyxmlYbzRJGKpUOZsbBsHIhBP9oVgh4VZqRRXPcxMjaEEBNGkXn8pe?= =?us-ascii?Q?E46zAoYY397HRNa17g8fO4ffstlAxebkeTLpRhBB9edt5qJSaRWja+5o8fi4?= =?us-ascii?Q?fVOF40Urpj6BqZlhejvhbLRMnOkNYjRFBY6fH1JDjsWTy6InTstF0SeZ1Srd?= =?us-ascii?Q?Wsghme3q5+eVE/TPxi+4rc98rl2NVXGtJ7cAmZ1Fdwc6iNYgGMRfMvb6DStj?= =?us-ascii?Q?Z2cWDBLZn97zOU1YjttiEU3SWpmeg8pEgolZUomIYJ4hcunYO8aLm0Q+XlJW?= =?us-ascii?Q?xAQVz9OI6NbBbU5fFsw+wXfUIg0eJfctCzEZ8X+yWajCAAHhDW1zFbWaLfyR?= =?us-ascii?Q?gVhDrsigooXdvifFJGBEWscFsW12oBIOJX1k/1tLo3t11o6DO1+JcDhiwYPR?= =?us-ascii?Q?hczXIHrveUDSYTVFGKXmB9kWlWg4WzKI5d6FG45qepBzoaNaYlnzIliTqqpY?= =?us-ascii?Q?m6w00P/G0nG7T4jdw+o999OM2MS1wU8G0wkXj0OTTyfHRbD8mOeDi9K6tNuB?= =?us-ascii?Q?3UGYn+1HgZLM0hw7hEFbIvy4IUGpXC9LsezthoLsRi4kzKWjqojnx7nrYs0M?= =?us-ascii?Q?/YxKh5ee6khKnaNIG04RedPTLpcBgFAtUHV30AbrjadMU8CQq+ltgAdXs6HX?= =?us-ascii?Q?lNmNjUZhoWxQZLKsuSgugRWExGL/CxkZP/8Y/pEfTLVr34lwJI4FJjUgNj5u?= =?us-ascii?Q?KexIpo+T+IyQIIMtSccqsTSLZ/qlLqDXcaZNRxa6HK7OKkdwOpe2iZ1lDDKP?= =?us-ascii?Q?6dHx9jMcCH/wQY9y0f3R56okbKQ+xUIukJKdi67+YF7Of0R+OSX4ZX5/JqWq?= =?us-ascii?Q?/mTX4EkQ7TnYsKrnN9xc7ekQDHztsL7s4G+d/DQymtm+trma15ujpz6qodVe?= =?us-ascii?Q?F2vecXUEgDIWqU5rzUIOW7qO3+uYdG7DDEHeZy7LUG0w4+5HwOhMT29eIhhM?= =?us-ascii?Q?DCuKz+ksI1JWOcdSpU+U7geS/DwxsB6gKSaf3H23mqkqLBUk9relO08WObDp?= =?us-ascii?Q?MjTvXZpCkq1z/I4hZpV57NsheZhO0l7e9wjrsPN6WxuIBlOkpzIZIvnAA3z8?= =?us-ascii?Q?HriREgabsz3SHDoIJvnck9OJ1PFfzKDb57cQveRe+Q8+/Mmkj2krvKrVlrAf?= =?us-ascii?Q?uuLekl/wXda/g74tonPZIvdN51f8MgwFcqJ3pzsCC+OdCdbIXTHF2CBDr62E?= =?us-ascii?Q?amvcbF4pWE0SunTK9idf5nnKlrdWy8NXVWJMQ2WNoM8tXMrnSts5BHfJNuAI?= =?us-ascii?Q?gYlJSsReAK2IeKMvcQ9UavYXjzQNEur1mhDre+ImVQKFU3rH8sRjHTcSAmHk?= =?us-ascii?Q?Rt6MxKSL/fVIY612+QJ/P7NxVMKVFJM4uti2mfs5AtzKn1Mov4/2Mx8HOxse?= =?us-ascii?Q?RluUJ/EbQhb1cb40zAVByqpnJNI+VkTWk8hOFUoX9AQgBzx+tw9WPGv6/6Hh?= =?us-ascii?Q?xAS5Hgpe9TeRb1xroEh78Vbwx0P3x/wHVinRhlCdQhG9nrxUm6t/BWnV/Q+c?= =?us-ascii?Q?H+6/byB0Gr4fG5GQfXv11KRA++XPU06yqbm1MbxmVGFDY20Dlxh7o5FOxgP/?= =?us-ascii?Q?GpH1F6vqjFFS5dN09XIVBJD2epbYtz90oMfuqFXH?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 108e4a1d-b6a4-4ca4-b15a-08de10fa3459 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR12MB6855.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2025 23:33:14.0499 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Z/Y6PHzt6FiaYIBM3xthFest3ik+DeVRZqT7y4dagUOelUPiLlVHD8xafThlXxmJznlbosMD1GmKVIl8A61oJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7030 Message-ID-Hash: YZUXKNVRVG5VQIOMFUWPNPIZX4IV4KP6 X-Message-ID-Hash: YZUXKNVRVG5VQIOMFUWPNPIZX4IV4KP6 X-MailFrom: nathanc@nvidia.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: skolothumtho@nvidia.com, nicolinc@nvidia.com, nathanc@nvidia.com, mochs@nvidia.com X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Nathan Chen via Devel Reply-To: Nathan Chen X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1761089962713154100 Content-Type: text/plain; charset="utf-8" Introduce support for "pciBus" driver attribute for "smmuv3" IOMMU model. The "pciBus" attribute indicates the index of the controller that a smmuv3 IOMMU device is attached to, and differentiates the device-pluggable arm-smmuv3 model from the virt-machine-associated smmuv3 model. Signed-off-by: Nathan Chen --- docs/formatdomain.rst | 4 ++ src/conf/domain_conf.c | 16 +++++++ src/conf/domain_conf.h | 1 + src/conf/domain_validate.c | 28 ++++++++++-- src/conf/schemas/domaincommon.rng | 5 ++ src/qemu/qemu_command.c | 76 ++++++++++++++++++++++++++++--- 6 files changed, 121 insertions(+), 9 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 39bdecf9a1..4fa9e1dd2f 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -9218,6 +9218,10 @@ Example: Enable x2APIC mode. Useful for higher number of guest CPUs. :since:`Since 11.5.0` (QEMU/KVM and ``amd`` model only) =20 + ``pciBus`` + The ``pciBus`` attribute notes the index of the controller that an + IOMMU device is attached to. (QEMU/KVM and ``smmuv3`` model only) + The ``virtio`` IOMMU devices can further have ``address`` element as descr= ibed in `Device addresses`_ (address has to by type of ``pci``). =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6e320713bb..a91989a277 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2814,6 +2814,8 @@ virDomainIOMMUDefNew(void) =20 iommu =3D g_new0(virDomainIOMMUDef, 1); =20 + iommu->pci_bus =3D -1; + return g_steal_pointer(&iommu); } =20 @@ -14449,6 +14451,10 @@ virDomainIOMMUDefParseXML(virDomainXMLOption *xmlo= pt, if (virXMLPropTristateSwitch(driver, "passthrough", VIR_XML_PROP_N= ONE, &iommu->pt) < 0) return NULL; + + if (virXMLPropInt(driver, "pciBus", 10, VIR_XML_PROP_NONE, + &iommu->pci_bus, -1) < 0) + return NULL; } =20 if (virDomainDeviceInfoParseXML(xmlopt, node, ctxt, @@ -22142,6 +22148,12 @@ virDomainIOMMUDefCheckABIStability(virDomainIOMMUD= ef *src, dst->aw_bits, src->aw_bits); return false; } + if (src->pci_bus !=3D dst->pci_bus) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain IOMMU device pci_bus value '%1$d' = does not match source '%2$d'"), + dst->pci_bus, src->pci_bus); + return false; + } if (src->dma_translation !=3D dst->dma_translation) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain IOMMU device dma translation '%1$s= ' does not match source '%2$s'"), @@ -28461,6 +28473,10 @@ virDomainIOMMUDefFormat(virBuffer *buf, virBufferAsprintf(&driverAttrBuf, " xtsup=3D'%s'", virTristateSwitchTypeToString(iommu->xtsup)); } + if (iommu->pci_bus >=3D 0) { + virBufferAsprintf(&driverAttrBuf, " pciBus=3D'%d'", + iommu->pci_bus); + } =20 virXMLFormatElement(&childBuf, "driver", &driverAttrBuf, NULL); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 139bcdc1af..1463dc83c4 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3051,6 +3051,7 @@ struct _virDomainIOMMUDef { virTristateSwitch eim; virTristateSwitch iotlb; unsigned int aw_bits; + int pci_bus; virDomainDeviceInfo info; virTristateSwitch dma_translation; virTristateSwitch xtsup; diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index dd1b491dfe..99b6ac7f7b 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1860,6 +1860,11 @@ virDomainDefIOMMUValidate(const virDomainDef *def) _("IOMMU model smmuv3 must be specified for mul= tiple IOMMU definitions")); } =20 + if (def->niommus > 1 && iommu->pci_bus < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("device-pluggable IOMMU with pciBus attribute= must be specified for multiple IOMMU definitions")); + } + if (iommu->intremap =3D=3D VIR_TRISTATE_SWITCH_ON && def->features[VIR_DOMAIN_FEATURE_IOAPIC] !=3D VIR_DOMAIN_IOAPI= C_QEMU) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -3109,13 +3114,28 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *= iommu) { switch (iommu->model) { case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: + if (iommu->intremap !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->caching_mode !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->eim !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->iotlb !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->aw_bits !=3D 0 || + iommu->dma_translation !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->xtsup !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->pt !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virReportError(VIR_ERR_XML_ERROR, + _("iommu model '%1$s' doesn't support some addi= tional attributes"), + virDomainIOMMUModelTypeToString(iommu->model)); + return -1; + } + break; case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: if (iommu->intremap !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->caching_mode !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->eim !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->iotlb !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->aw_bits !=3D 0 || - iommu->dma_translation !=3D VIR_TRISTATE_SWITCH_ABSENT) { + iommu->dma_translation !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->pci_bus >=3D 0) { virReportError(VIR_ERR_XML_ERROR, _("iommu model '%1$s' doesn't support additiona= l attributes"), virDomainIOMMUModelTypeToString(iommu->model)); @@ -3127,7 +3147,8 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *io= mmu) if (iommu->caching_mode !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->eim !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->aw_bits !=3D 0 || - iommu->dma_translation !=3D VIR_TRISTATE_SWITCH_ABSENT) { + iommu->dma_translation !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->pci_bus >=3D 0) { virReportError(VIR_ERR_XML_ERROR, _("iommu model '%1$s' doesn't support some addi= tional attributes"), virDomainIOMMUModelTypeToString(iommu->model)); @@ -3137,7 +3158,8 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *io= mmu) =20 case VIR_DOMAIN_IOMMU_MODEL_INTEL: if (iommu->pt !=3D VIR_TRISTATE_SWITCH_ABSENT || - iommu->xtsup !=3D VIR_TRISTATE_SWITCH_ABSENT) { + iommu->xtsup !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->pci_bus >=3D 0) { virReportError(VIR_ERR_XML_ERROR, _("iommu model '%1$s' doesn't support some addi= tional attributes"), virDomainIOMMUModelTypeToString(iommu->model)); diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index 98596d4cea..69cc9ab13c 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6311,6 +6311,11 @@ + + + + + diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 61457c4f7a..014c27e695 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6222,6 +6222,62 @@ qemuBuildBootCommandLine(virCommand *cmd, } =20 =20 +static virJSONValue * +qemuBuildPCINestedSmmuv3DevProps(const virDomainDef *def, + const virDomainIOMMUDef *iommu, + size_t id) +{ + g_autoptr(virJSONValue) props =3D NULL; + g_autofree char *bus =3D NULL; + g_autofree char *smmuv3_id =3D NULL; + size_t i; + + for (i =3D 0; i < def->ncontrollers; i++) { + virDomainControllerDef *cont =3D def->controllers[i]; + if (cont->idx =3D=3D iommu->pci_bus) { + if (cont->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) { + const char *alias =3D cont->info.alias; + + if (!alias) + return NULL; + + if (virDomainDeviceAliasIsUserAlias(alias)) { + if (cont->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCI= _ROOT && + iommu->pci_bus =3D=3D 0) { + if (qemuDomainSupportsPCIMultibus(def)) + bus =3D g_strdup("pci.0"); + else + bus =3D g_strdup("pci"); + } else if (cont->model =3D=3D VIR_DOMAIN_CONTROLLER_MO= DEL_PCIE_ROOT) { + bus =3D g_strdup("pcie.0"); + } + } else { + bus =3D g_strdup(alias); + } + break; + } + } + } + + if (!bus) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find a suitable controller for smmuv3= .")); + return NULL; + } + + smmuv3_id =3D g_strdup_printf("smmuv3.%zu", id); + + if (virJSONValueObjectAdd(&props, + "s:driver", "arm-smmuv3", + "s:primary-bus", bus, + "s:id", smmuv3_id, + NULL) < 0) + return NULL; + + return g_steal_pointer(&props); +} + + static int qemuBuildIOMMUCommandLine(virCommand *cmd, const virDomainDef *def, @@ -6269,9 +6325,6 @@ qemuBuildIOMMUCommandLine(virCommand *cmd, return -1; =20 return 0; - case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: - /* There is no -device for SMMUv3, so nothing to be done here = */ - return 0; =20 case VIR_DOMAIN_IOMMU_MODEL_AMD: if (virJSONValueObjectAdd(&wrapperProps, @@ -6301,6 +6354,17 @@ qemuBuildIOMMUCommandLine(virCommand *cmd, =20 return 0; =20 + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: + if (iommu->pci_bus >=3D 0) { + if (!(props =3D qemuBuildPCINestedSmmuv3DevProps(def, iomm= u, i))) + return -1; + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qe= muCaps) < 0) + return -1; + break; + } else { + return 0; + } + case VIR_DOMAIN_IOMMU_MODEL_LAST: default: virReportEnumRangeError(virDomainIOMMUModel, iommu->model); @@ -10805,15 +10869,15 @@ qemuBuildCommandLine(virDomainObj *vm, if (qemuBuildBootCommandLine(cmd, def) < 0) return NULL; =20 - if (qemuBuildIOMMUCommandLine(cmd, def, qemuCaps) < 0) - return NULL; - if (qemuBuildGlobalControllerCommandLine(cmd, def) < 0) return NULL; =20 if (qemuBuildControllersCommandLine(cmd, def, qemuCaps) < 0) return NULL; =20 + if (qemuBuildIOMMUCommandLine(cmd, def, qemuCaps) < 0) + return NULL; + if (qemuBuildMemoryDeviceCommandLine(cmd, cfg, def, priv) < 0) return NULL; =20 --=20 2.43.0 From nobody Tue Oct 28 08:18:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; arc=fail (Bad Signature); dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1761090023262545.8051017073233; Tue, 21 Oct 2025 16:40:23 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 9ED0041990; Tue, 21 Oct 2025 19:40:22 -0400 (EDT) Received: from [172.19.199.20] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0131043F07; Tue, 21 Oct 2025 19:37:33 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id A9A8E418D0; Tue, 21 Oct 2025 19:33:19 -0400 (EDT) Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011004.outbound.protection.outlook.com [52.101.62.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C7ABD41B9E for ; Tue, 21 Oct 2025 19:33:17 -0400 (EDT) Received: from SJ0PR12MB6855.namprd12.prod.outlook.com (2603:10b6:a03:47e::6) by MW4PR12MB7030.namprd12.prod.outlook.com (2603:10b6:303:20a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9253.12; Tue, 21 Oct 2025 23:33:15 +0000 Received: from SJ0PR12MB6855.namprd12.prod.outlook.com ([fe80::1924:8e6f:c8f3:83c2]) by SJ0PR12MB6855.namprd12.prod.outlook.com ([fe80::1924:8e6f:c8f3:83c2%3]) with mapi id 15.20.9253.011; Tue, 21 Oct 2025 23:33:15 +0000 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ARC_SIGNED,ARC_VALID, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nw8vPLQqYE8mzRfi7xXVD3nmDLwQrvFp1iptUDbIgcmXVksZ0FPlgNIP3dm9cui8frcYiC/MXdbm3DWg4fpdDw+DqON7r5Aib5fnDujPK2CQzYiaO7sw4YOhbkK+PIWqHkojI/oBeDiYTiaT73KJZfoJALhiPO6YBwHQMeeCMC8esslfdkmtbf6B1L0Wwxacfjx5qs1U/vJn+ZjIxmK5VgT5QJ18AwHxptdTJxlys1OU/UKHfE0Ll2XY6WGJCJyAeRFysLR6c1tPgOBCRtNsE3FTpezEnSwXj2WcQtQwRfT6UOgsL3t/QQHRzt7YislO7zMJMvJDKf+nWdp/Ra3nCA== 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=u31P9TR8rciw4+WL1hOaykgf5QLvHQJrTaeVRaOnMik=; b=QQjAPXPzRENE2EZ+IYPeZYELK1Y1T2KjsmuDzVtvJnG2v3AsfbMHdIIssa6ZAOsg9o6CJOuDVVa03neF9QiN8ZyccVuV5uLWluJ+5Ay3eci5RzKf6lm+R4kXyanJgmvcxXbkORucbVTEeFfxiuWBZM3ND53fzHk9kgPlAEPAFFDPPaZ8fIi5xCFPMJMgtCeu6cXvnFy1rBanjrayyW2njzm7mRvanqR1vqLMKQWWHC2aYy/NxhFskRxwR/t6thsxsG+YYxxS0zBu2427Q8klDMjCmSwyxN54EbaFK9901dy6U/nEwV6sDyNv33AOTVpvA1ufbFn5jc8KV2+Pv/XNiQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=u31P9TR8rciw4+WL1hOaykgf5QLvHQJrTaeVRaOnMik=; b=Kn5yn+aOpO8/LQSzeXgAuWVymYVk2o2tdrlzw9hjy4YTWOmM4epFd0ZU+O6gCgnz2BE3aQQwIteqGXy8gevk1ih0NGLkAv4qZIXcDOTi8YSviVWAgafV37/rLFb/pecJTNrWL1zLa7J7uKBVdBxUpLgVNT0KXBW9MWg03S4YsDiN0fnpITrk9bYfVtFY+ysJraFcdrTUJLJyVxD93cFB5nRNvUUMn5/bvS0GfqIzfp4ckRnIzbBmO8p/cqj+ubr3pIGZpLyyaRidBjC8dTt+mk01X/07pEIasFM1/2NDE+bRrCKL3p7QduB6WkQ+Fut8mizSSJuTsfZzUKUP2isgzQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; To: devel@lists.libvirt.org Subject: [PATCH v3 3/3] tests: qemuxmlconfdata: provide device-pluggable smmuv3 sample XML and CLI args Date: Tue, 21 Oct 2025 16:32:55 -0700 Message-ID: <20251021233255.3474571-4-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251021233255.3474571-1-nathanc@nvidia.com> References: <20251021233255.3474571-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR03CA0260.namprd03.prod.outlook.com (2603:10b6:a03:3a0::25) To SJ0PR12MB6855.namprd12.prod.outlook.com (2603:10b6:a03:47e::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR12MB6855:EE_|MW4PR12MB7030:EE_ X-MS-Office365-Filtering-Correlation-Id: 3aec69de-97b7-4f8f-ecc3-08de10fa3531 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?JBe3WU2JU31WoUqousm75fURYp+4UTbK9SShuJZn4StkSCLodDeKNexHJBmp?= =?us-ascii?Q?uGO3tBI6cjll8hv53g423xpW4rBqhfGH1dh7RxuaY9UkO9RtaJTdDBffWy0A?= =?us-ascii?Q?hH2wwfVg1/E3JrPOpsUq94UG2je0NxUkb43jqtKCB/L77pBcTmmN9pCLafiL?= =?us-ascii?Q?os4lje2//haNKkvIQgeL1qVK4zlNhFAD1yd2+H6ZG//kmP1EzZ7DdW/LPaeA?= =?us-ascii?Q?tuNfcZS7ceyEikpYMSNdgvae/4JOX58+5h+LrGqFnIFjvl7k+F43MH9UOk7S?= =?us-ascii?Q?KGQPN8V34sNZkw1ps/agGaTFASQN0b/3qndZpLohodBC/ZsIur+MrT8S6cEM?= =?us-ascii?Q?7G/QZ6cxTt0CDJHa60DcobJptzaBOpcAB8ULIWsJPTmdZ6HZogrmk1HmL1Po?= =?us-ascii?Q?2GMOC65EnG1nqWxjDt+AUkp50pa4+GHDIq+R978/DXR0x6NjD3219nyccCew?= =?us-ascii?Q?5VE5AMui2Pg9xCEeMv0SGLvjxMpJVOh3JMUWx/kWLLYP4x6FVp12vek4Y4jC?= =?us-ascii?Q?MBYyeWapjgnkzKK3qgfi+DEBeycGj9zSBBtX1BMfC5hjd1CcBPAfdDFei8PY?= =?us-ascii?Q?zforYm/Ag35Eiz44oKhhTEWFSzOKtjgYDnS5I/t6HGQNAnSxXOkl4QGQqRvJ?= =?us-ascii?Q?VMb46JtfcNgOpEcqumliiEjmeKCMHemxd6oGV9mRF3xYTczP6Cp+geGwSkSK?= =?us-ascii?Q?lTJqb/Za/d0yp6Vzn9kvRisJYVmd4eHrsyejetgBE41CMGKL9bpR6a2NORLz?= =?us-ascii?Q?7OkyyGK0svsB2a3bCWMqU9oAndic5l/PMP00d4UHZrNVsr2VkT3AjBLb+ce2?= =?us-ascii?Q?aHU8CMwkxeGrZtatbSdZPcatSw9DCf5uoSSwqlT/bMZaXfWNvaU3XQ8ovbG7?= =?us-ascii?Q?i78HXhntOm8r0lVCu7DytAwc6VfZ8rED0GKxaszaUx3BrRGswgSYpGfEvIHB?= =?us-ascii?Q?alFAuhIWdpEJPky72VpA0/AH73K5BvwCa/RLFwGZoucLwD6A3+7yeF2jN9YP?= =?us-ascii?Q?ks6/CGQIQnfyBnE33+0EK3ns+NhndZnRfiUjoONSSa1plguaSQCE19/4bG+L?= =?us-ascii?Q?Us2sM0fEb1WDUw8phVdPjwVjswx3NT5Q3NN6dyci2btFkf689/GdXA4b8Di6?= =?us-ascii?Q?iklo6lw1OTQRBVbmVYvkPH0TMspZjGgG3vj4M0MM2gxlkm9gQkGmaIwMOo7L?= =?us-ascii?Q?GBAI6jEGct7OUC2ubVWdkZJ2Pm4UuYdUdTK8RGiqfjq52ahiHxGg3f8ezaSp?= =?us-ascii?Q?UCJLUwnyxwIXqCI6g6cRWa44x2gjWmjXz2lUeEwbr9ggX/8l71rIWaRYfOor?= =?us-ascii?Q?2as8sT+tNmAqDo1bG7QLRh+yG25mLw6ruKUpmaPqwgwUoiIGo7Ut62H58ktS?= =?us-ascii?Q?BvdttVuABnaHVj2FJmVCTdshYZLhw8UY2dUzc2KfkvMYszN+Aj35lAuAgnrV?= =?us-ascii?Q?9IHcI0k2uvYRoPVREJ9CW/KqW4Wefr3U?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR12MB6855.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ws7SkF/NNEWWSlRMc4TMMGOXab+Q54YEbn0zNgDDC14rMRzkprhRFUnu+a1e?= =?us-ascii?Q?ocy8S0qT4n+IbOmmU6YFLMxHB5WZ4nb/joiT+B2cXAUIETr7KWTpRGpfOuEA?= =?us-ascii?Q?JCnjncYkdI+vI3QhAaL8acijRS4Abr/k+xJlG0RIIdqkb76vokixtkvhGumh?= =?us-ascii?Q?sL+EEwOXGTZ7ejoZGCQ8pGvcQFtZnR6KB+fLd2HPZb9cYlhLKPhTsnJ+UUJN?= =?us-ascii?Q?23xdiHk+kNlok4U/dklsSNyDQRQTtUgVJwdTR7c/sGz2wIR+rMNKMkMFcycZ?= =?us-ascii?Q?tQrKsDuuYqsmMYvZ+pttdkWgfOHZ2Uf+1yU7Pz7hR6hxAsA368Tad41R43Bc?= =?us-ascii?Q?Zxm6VRoywJwXfwabxiapf3hP5URUOS0BiN20Y2YISii/Rq8Iji52sAqANstH?= =?us-ascii?Q?0ewwpCa2qMcHbxLU0ugtk2A0HgkTvTv/l+QnvzUK2r9KPmP1DCVE5oHfCUgp?= =?us-ascii?Q?hS2tYaEQcC/gUMCk1SxxDLac/IPHSJNL0OwTaiNSARUa5SsOwGLzA+F0yX6X?= =?us-ascii?Q?BgduBTIzh/oTSIZuMGM5k//Jd7v/I6+vN00jkBUF2CcfznkIIPIHGhaLRQGI?= =?us-ascii?Q?qb0razylocdg0bMi9rbi9N2FW6LhsMb9vrOdQvpIrYQGoH2LUmB84U4W0HSW?= =?us-ascii?Q?LKl8ixxmDvjY+8aP3XkVtWL9t7FBXLpO8Cuf6mEsySMOA3Oo8uCRPTqYrF6Q?= =?us-ascii?Q?mFx1sRElXu+7BzMF+TXMZBrWSpnBGmvwHL3S3P6BQzOmXgRRTO98DqHETICk?= =?us-ascii?Q?uCFs9y+hlBOFn7VzKAwjJNeGTK3jUyCLF9vH43PtIq8KqnCdbltwDE+qOdeP?= =?us-ascii?Q?3/hxesUk2a5auBSkZu3oBw7LwEVsLiJgEXDZYP73qQDiSdgLR2HdMVNUE97b?= =?us-ascii?Q?z8JAhi1DHcCNYq9pyMs34ZMUscOZ4k3MMbGJp72WGgyyXuT8J2CQe5JdWBHz?= =?us-ascii?Q?U4z3qIDKu3+P/fg2l5QxrQg/pYQ0U8ny84J9BnJfzeGl0CGGEzcxUJVHAcl0?= =?us-ascii?Q?VUrqCgGjiI7vr5AIoq1UL4xQMjvAQ81LlT3tVFo7/fHmzJlTdxB7P4Ljk2SH?= =?us-ascii?Q?Fh/V+Forkd4YzER2fvSfWt4bLZtIix8Ah6lrTz1E8tL2ooPoGZq6qWZfn5/P?= =?us-ascii?Q?uLo6Ex+BUSn+JXMZhmfcjLY8ubjcLvmCeHGnLEFOBWdxf2k57D7Kf/tHfO8f?= =?us-ascii?Q?TstnKVKuZkrtT4kyHeiX2Zm/0isU9r+vsXhjUo0KZ8OAe5YPlUdgAE6y7c6I?= =?us-ascii?Q?NF+Qdp6kamzVW2rcaNj4bAIgQj2YZH6rtqU8FNC1viQSUCObHZnIzcPSOgNK?= =?us-ascii?Q?dkT2FSEPJ46kRzp9k/VT36KuphmTME5bNXVywhkR1hXc7NbDKJ1NjGk5VVsH?= =?us-ascii?Q?dXSbeuY8/reoKUdH84m4jTA1FP79CL+pDgNMF/fxYJQWpt2RLtOxfyRvVwkc?= =?us-ascii?Q?SoeAaMqrPhNEmaNe62dybqWnBO5e4NWiMKS8xzT/GFY6etUnXXJ6hkSJ/IuK?= =?us-ascii?Q?sQg6fGgXxOmvyP931muHXgzPGgO39vTSkL1yNXJz+Bh1NT7FWheXPR64wg1O?= =?us-ascii?Q?NcmavY9GCx+4qj4HaB2B+LchNt4o4BvT+2KvDE1L?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3aec69de-97b7-4f8f-ecc3-08de10fa3531 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR12MB6855.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2025 23:33:15.4544 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HKgIBLYPFEGpxNnh8b5HCvlcm+lsiVb+/sKJ07sywTEFaXT9TcfEQP9dZBea0dY3UtYHcPAEMaQisYJYrcsSyQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7030 Message-ID-Hash: 2WFBOFEWHKRQ7QWJUZGE4455AQZEKAVU X-Message-ID-Hash: 2WFBOFEWHKRQ7QWJUZGE4455AQZEKAVU X-MailFrom: nathanc@nvidia.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: skolothumtho@nvidia.com, nicolinc@nvidia.com, nathanc@nvidia.com, mochs@nvidia.com X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Nathan Chen via Devel Reply-To: Nathan Chen X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1761090024515154100 Content-Type: text/plain; charset="utf-8" Provide sample XML and CLI args for the device-pluggable smmuv3 XML schema for virt machine type. Signed-off-by: Nathan Chen --- .../iommu-smmuv3-pci-bus.aarch64-latest.args | 41 ++++++++++++ .../iommu-smmuv3-pci-bus.aarch64-latest.xml | 62 +++++++++++++++++++ .../qemuxmlconfdata/iommu-smmuv3-pci-bus.xml | 49 +++++++++++++++ tests/qemuxmlconftest.c | 1 + 4 files changed, 153 insertions(+) create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-late= st.args create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-late= st.xml create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.xml diff --git a/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.args= b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.args new file mode 100644 index 0000000000..092fcf4623 --- /dev/null +++ b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.args @@ -0,0 +1,41 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram,acpi=3Doff \ +-accel tcg \ +-cpu cortex-a15 \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device '{"driver":"pxb-pcie","bus_nr":252,"id":"pci.1","bus":"pcie.0","ad= dr":"0x1"}' \ +-device '{"driver":"pxb-pcie","bus_nr":248,"id":"pci.2","bus":"pcie.0","ad= dr":"0x2"}' \ +-device '{"driver":"pcie-root-port","port":0,"chassis":21,"id":"pci.3","bu= s":"pci.1","addr":"0x0"}' \ +-device '{"driver":"pcie-root-port","port":168,"chassis":22,"id":"pci.4","= bus":"pci.2","addr":"0x0"}' \ +-device '{"driver":"arm-smmuv3","primary-bus":"pci.1","id":"smmuv3.0"}' \ +-device '{"driver":"arm-smmuv3","primary-bus":"pci.2","id":"smmuv3.1"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .3","addr":"0x0"}' \ +-object '{"qom-type":"rng-random","id":"objrng1","filename":"/dev/urandom"= }' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng1","id":"rng1","bus":"pci= .4","addr":"0x0"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.xml = b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.xml new file mode 100644 index 0000000000..c0618c02ab --- /dev/null +++ b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.xml @@ -0,0 +1,62 @@ + + guest + 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 + 1048576 + 1048576 + 1 + + hvm + + + + + + + cortex-a15 + + + destroy + restart + destroy + + /usr/bin/qemu-system-aarch64 + + + + + +
+ + + + +
+ + + + +
+ + + + +
+ +