From nobody Mon May 6 10:43:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658395962; cv=none; d=zohomail.com; s=zohoarc; b=a/SwiU9fZa9aBJX2R2ZbLVwUk7HbJcKsooGUp72f7CD+8BReo/Vajs9p2AkKOw98hqwbq0ZtN606jyg7BOBfmsafFXBnhbORVbv9RmOI+AKXH9D7Ty6WQH+PUlOIOvVRKbQ0IeQquM5s/ys4IjkbCgB2aXEHwKOPQJNvqGr5Y+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658395962; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=m3d9Ki3eiR3KqIEgBJVGqg7AZdTTB34kHiWKLCiqumI=; b=fZhvHdfC2hWQennEngCDfxbDu8nChMHVdLX5SKvHWjyJYDl+VDVeVz/HYj1rSys2iMfRbJT6XWvpjYzyAHu4kkhWEWzMloaFb9CAKQYK+2Qyo8rUGo40IY4Sr/fGFYI7unO/PjPab5OX3MM9AvmC5u/2NzqyO+wbbTGxBuq8otk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1658395962911473.5668579879605; Thu, 21 Jul 2022 02:32:42 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-668-RhbzuRqRNBm6gqgmPmtDWQ-1; Thu, 21 Jul 2022 05:32:36 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5A7AD2808508; Thu, 21 Jul 2022 09:32:34 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46495492C3B; Thu, 21 Jul 2022 09:32:34 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 08ADE1947048; Thu, 21 Jul 2022 09:32:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9358E1947043 for ; Thu, 21 Jul 2022 09:32:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6129C18ECB; Thu, 21 Jul 2022 09:32:32 +0000 (UTC) Received: from harajuku.redhat.com (unknown [10.40.193.90]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E697E909FF for ; Thu, 21 Jul 2022 09:32:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658395961; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=m3d9Ki3eiR3KqIEgBJVGqg7AZdTTB34kHiWKLCiqumI=; b=BPOukdSoe3wNnR0OROPHIg0kRMPsXSf5qJdZ1ggOG8c8iqcZT8bJYbCyxptjSLW+FE9pf2 WRhyNwbvLuRGDRyTOljOtxjPMTR12zOjsLMkM7+8EggZF4KKhqK7EA8JP1Ts042XVd/e0M JDMpO9H+AsXqlrIfbWtoB/5h2Qod0ro= X-MC-Unique: RhbzuRqRNBm6gqgmPmtDWQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] schema: Allow IOMMU devices to have aliases Date: Thu, 21 Jul 2022 11:32:27 +0200 Message-Id: <20220721093229.91273-2-abologna@redhat.com> In-Reply-To: <20220721093229.91273-1-abologna@redhat.com> References: <20220721093229.91273-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658395963704100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- src/conf/schemas/domaincommon.rng | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index 2f07c25430..d15dd33f47 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -5658,6 +5658,9 @@ + + + --=20 2.35.3 From nobody Mon May 6 10:43:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658396049; cv=none; d=zohomail.com; s=zohoarc; b=hY7OXhmo2xtZM6cBo6P67CgpAPGTFJOBc/V6gnNedKBwImYRl24lb4iCTsd5pMNml5sgm14soCDIIJDqPjiB5TUsTCyxJq2HIHFyMvzPM6oH1WVN1B7Z2py0NOZroewtOmNTDFnG1hSH/ECzNKAozlAREdOU6gQRoxpErwv42v8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658396049; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Aht12p+PyTd2Da7eq8PAyxSH6B9e8hCYSZhXKg6IkdE=; b=T8x4HLx9K3jUO5eXn+9J30Y2r0ot7Iw6sXZmILI3IN0AGhIuvf8pf/AUAzzKdZhOrUTsZoYRJ/i2LbCLLcsJg120tm83tnF23UHp1TGY2atUO0MpwPC2NFezJNtHEUks08dAdS258UC6Mpz/VG7p3bGR6ftelWn+9QT4RD+OCCc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1658396049282692.7121344108959; Thu, 21 Jul 2022 02:34:09 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-479-RaP1a7BEP3i8k-Tkll9eBg-1; Thu, 21 Jul 2022 05:32:38 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0656F1C006CB; Thu, 21 Jul 2022 09:32:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DCAE7492C3B; Thu, 21 Jul 2022 09:32:34 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5322D1947BBE; Thu, 21 Jul 2022 09:32:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 43DB71947B80 for ; Thu, 21 Jul 2022 09:32:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 22F9290A00; Thu, 21 Jul 2022 09:32:33 +0000 (UTC) Received: from harajuku.redhat.com (unknown [10.40.193.90]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A8EDB18ECB for ; Thu, 21 Jul 2022 09:32:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658396047; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Aht12p+PyTd2Da7eq8PAyxSH6B9e8hCYSZhXKg6IkdE=; b=De7zanP1Z0Hou2Eq/nzsJ5Z/otQAQ4w6rDttv4AuZocr1SCF0CV0z4U/jlkAR539P6KI/8 BON7jG3D1VoNHmkhig8VGebakW9wHg+BmO+CxpjONgc/lcoYZqfTWlxvuQk3E3fdc9mL/8 IOSdj4yyKJduTgt5cKVqxi/A5Cyofbk= X-MC-Unique: RaP1a7BEP3i8k-Tkll9eBg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/3] qemu: Assign default alias to IOMMU devices Date: Thu, 21 Jul 2022 11:32:28 +0200 Message-Id: <20220721093229.91273-3-abologna@redhat.com> In-Reply-To: <20220721093229.91273-1-abologna@redhat.com> References: <20220721093229.91273-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658396049845100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- src/qemu/qemu_alias.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 7efd91051e..7b91fe3141 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -597,6 +597,14 @@ qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock) } =20 =20 +static void +qemuAssignDeviceIOMMUAlias(virDomainIOMMUDef *iommu) +{ + if (!iommu->info.alias) + iommu->info.alias =3D g_strdup("iommu0"); +} + + int qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps) { @@ -681,6 +689,8 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps = *qemuCaps) if (def->vsock) { qemuAssignDeviceVsockAlias(def->vsock); } + if (def->iommu) + qemuAssignDeviceIOMMUAlias(def->iommu); =20 return 0; } --=20 2.35.3 From nobody Mon May 6 10:43:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658395965; cv=none; d=zohomail.com; s=zohoarc; b=RtwBRaCoZuIw/VglWMltxiIGlFVnHWm0BQI7FhxJSHAMOXYsJIw+fRLSHWlPIyuARrGmqJg9XqX94wFTsAkiTpil6uQyisR8EAVWtZLRjuTG4ZSvaQli/nvclX41FecvrnYfBg1YjhBzWfgr3WvGANUraWvjJ04h9lCKPzIHCS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658395965; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+JXg7zp2GBYcodr/+oS0j0j5+Bo4HCfMTuo6e9N5SMw=; b=C/G4ZmVgLW2bdZlkDHuD3EsxPKPdVJ/I3vMsnyk4CbMgZMJYKh3+ssuyFIQyQD/lzzUalrO2GCKJx/FOSOJg3dhNpc4+VfEW2EC/CSEGVbe7GzVSvdT2gfvC9zmBXOgj538tkfpb/xEIYH+PgLN26+6EzaakFN43kpERBZZTqY0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1658395965490375.2871844402165; Thu, 21 Jul 2022 02:32:45 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-593-g2WNlZDPNj6Oo-CgxXrAiA-1; Thu, 21 Jul 2022 05:32:41 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C0267811E7A; Thu, 21 Jul 2022 09:32:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE281492C3B; Thu, 21 Jul 2022 09:32:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 66CD61947047; Thu, 21 Jul 2022 09:32:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0CEEA1947049 for ; Thu, 21 Jul 2022 09:32:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DA2A790A11; Thu, 21 Jul 2022 09:32:33 +0000 (UTC) Received: from harajuku.redhat.com (unknown [10.40.193.90]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6B17118ECB for ; Thu, 21 Jul 2022 09:32:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658395964; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=+JXg7zp2GBYcodr/+oS0j0j5+Bo4HCfMTuo6e9N5SMw=; b=DrtVqkbzJlA+eFhEytKqTCWmXGX03yh2CqOpx1AMJZTvUxoT+lGHDWHn196APvlULI091A qXYiXMdRc4XxgVS5vBetLpjTqJdPQu4TkDwwFahjILd0BfxzvlJPmkMeNSLH4qOQnZuFyC LuTkTrATWSq+beALqKIj1Ck796GCesw= X-MC-Unique: g2WNlZDPNj6Oo-CgxXrAiA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 3/3] qemu: Add IOMMU device alias to command line Date: Thu, 21 Jul 2022 11:32:29 +0200 Message-Id: <20220721093229.91273-4-abologna@redhat.com> In-Reply-To: <20220721093229.91273-1-abologna@redhat.com> References: <20220721093229.91273-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658395967464100001 Content-Type: text/plain; charset="utf-8" Note that we can only do this for intel-iommu and virtio-iommu, which are configured using -device; smmuv3 is configured using a machine type property, so there's no room on the command line for an alias in that case. https://bugzilla.redhat.com/show_bug.cgi?id=3D2108483 Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 2 ++ tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args | 2 +- .../intel-iommu-caching-mode.x86_64-latest.args | 2 +- .../intel-iommu-device-iotlb.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 262fffe5fe..30c9bbbf2e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6441,6 +6441,7 @@ qemuBuildIOMMUCommandLine(virCommand *cmd, 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), @@ -6457,6 +6458,7 @@ qemuBuildIOMMUCommandLine(virCommand *cmd, case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: if (virJSONValueObjectAdd(&props, "s:driver", "virtio-iommu", + "s:id", iommu->info.alias, NULL) < 0) { return -1; } diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args = b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args index f61ff3f8ff..df11e3ddab 100644 --- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"intel-iommu","intremap":"on","aw-bits":48}' \ +-device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","aw-bits":4= 8}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.= args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args index 083c6bfe4b..47976fa6a7 100644 --- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"intel-iommu","intremap":"on","caching-mode":true}' \ +-device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","caching-mo= de":true}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.= args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args index fc06e15191..af36c45292 100644 --- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"intel-iommu","intremap":"on","device-iotlb":true}' \ +-device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","device-iot= lb":true}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/te= sts/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args index c8dd31c5fe..8e2b54d1f9 100644 --- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"intel-iommu","intremap":"on","eim":"on"}' \ +-device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","eim":"on"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args b/tests/= qemuxml2argvdata/intel-iommu.x86_64-latest.args index db69543298..c99efd229b 100644 --- a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"intel-iommu"}' \ +-device '{"driver":"intel-iommu","id":"iommu0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.arg= s b/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args index 9c1de8ae9b..54f069c350 100644 --- a/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"virtio-iommu","bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"virtio-iommu","id":"iommu0","bus":"pcie.0","addr":"0x1= "}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args index 7e0aa7192d..744367c6c0 100644 --- a/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"virtio-iommu","bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"virtio-iommu","id":"iommu0","bus":"pcie.0","addr":"0x1= "}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don --=20 2.35.3