From nobody Mon Feb 9 12:45:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1634037223; cv=none; d=zohomail.com; s=zohoarc; b=gYC4zTjUivy+ZicktIGc1Bx494Q0qhqCtlWHxkQvMaXMAcamC8Y8i09uVYuFR9vHq04jZXGiVmoDpYBlXhIMgC/VgdadaYBMWIzEi6lPTQhg0ssixvZ05yJvjzeoPyARMFEZmBzRQU3cMX56VS2USRt7HoSi2IryvSrGoeqgs/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634037223; 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=GlpA1FBHGk90cljSIV9Q8UP/q0ysy1jW9gK554jNL6M=; b=GcBWipl39COXIPcsMLW2FO7m6eurd1gDCiLnlm4vYZQUSpNFMXVeYzzOyPQQ/Gz8ebFB7EGXdxxcZVEEcqz4HCoLF28vNYhJjBJpec9mAWheJ+8iioihgA7mkDGrp36dupzWKWBHxu/X64QZPGF4VYzKkhJrs8QRMuiUBkKiOkw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1634037223473531.2514685313105; Tue, 12 Oct 2021 04:13:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-319-kbHbDLvvMZyAr7SS5s_Y2A-1; Tue, 12 Oct 2021 07:13:39 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E729D801E72; Tue, 12 Oct 2021 11:13:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C27891972D; Tue, 12 Oct 2021 11:13:33 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 912D04EA37; Tue, 12 Oct 2021 11:13:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19CBDWjN008679 for ; Tue, 12 Oct 2021 07:13:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4A9DCADCD; Tue, 12 Oct 2021 11:13:32 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFC315E7A2 for ; Tue, 12 Oct 2021 11:13:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634037222; 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=GlpA1FBHGk90cljSIV9Q8UP/q0ysy1jW9gK554jNL6M=; b=Qo86laMGA7tlVYu/duo7H/7LYnUP+VEaiQqef1v0hRhLlIHXVMaaINadMBBquRB2cdq91D hL8MfpDNXcHy8eTzn6pK9s28Xti83DhnnF2yaAnKrTENJSQyN7E3cpF0fRCDaTutXdZrrx V+Y0LHh5JRjk6rf/gb29maY6D7jTqHs= X-MC-Unique: kbHbDLvvMZyAr7SS5s_Y2A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/14] qemuBuildIOMMUCommandLine: Generate via JSON Date: Tue, 12 Oct 2021 13:12:17 +0200 Message-Id: <1254e1d92d946d63b581635aa39746f5c7485612.1634037045.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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: 1634037225387100001 Content-Type: text/plain; charset="utf-8" QEMU declares the following types for fields we control: intremap=3D - on/off/auto (default: "auto") caching-mode=3D - (default: false) eim=3D - on/off/auto (default: "auto") device-iotlb=3D - (default: false) aw-bits=3D - (default: 39) Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 42 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 56bf17b6b4..8913110b00 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6486,7 +6486,8 @@ qemuBuildBootCommandLine(virCommand *cmd, static int qemuBuildIOMMUCommandLine(virCommand *cmd, - const virDomainDef *def) + const virDomainDef *def, + virQEMUCaps *qemuCaps) { const virDomainIOMMUDef *iommu =3D def->iommu; @@ -6495,31 +6496,22 @@ qemuBuildIOMMUCommandLine(virCommand *cmd, switch (iommu->model) { case VIR_DOMAIN_IOMMU_MODEL_INTEL: { - g_auto(virBuffer) opts =3D VIR_BUFFER_INITIALIZER; + g_autoptr(virJSONValue) props =3D NULL; - virBufferAddLit(&opts, "intel-iommu"); - if (iommu->intremap !=3D VIR_TRISTATE_SWITCH_ABSENT) { - virBufferAsprintf(&opts, ",intremap=3D%s", - virTristateSwitchTypeToString(iommu->intrema= p)); - } - if (iommu->caching_mode !=3D VIR_TRISTATE_SWITCH_ABSENT) { - virBufferAsprintf(&opts, ",caching-mode=3D%s", - virTristateSwitchTypeToString(iommu->caching= _mode)); - } - if (iommu->eim !=3D VIR_TRISTATE_SWITCH_ABSENT) { - virBufferAsprintf(&opts, ",eim=3D%s", - virTristateSwitchTypeToString(iommu->eim)); - } - if (iommu->iotlb !=3D VIR_TRISTATE_SWITCH_ABSENT) { - virBufferAsprintf(&opts, ",device-iotlb=3D%s", - virTristateSwitchTypeToString(iommu->iotlb)); - } - if (iommu->aw_bits > 0) - virBufferAsprintf(&opts, ",aw-bits=3D%d", iommu->aw_bits); + if (virJSONValueObjectCreate(&props, + "s:driver", "intel-iommu", + "S:intremap", qemuOnOffAuto(iommu->in= tremap), + "T:caching-mode", iommu->caching_mode, + "S:eim", qemuOnOffAuto(iommu->eim), + "T:device-iotlb", iommu->iotlb, + "z:aw-bits", iommu->aw_bits, + NULL) < 0) + return -1; - virCommandAddArg(cmd, "-device"); - virCommandAddArgBuffer(cmd, &opts); - break; + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0) + return -1; + + return 0; } case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: @@ -10705,7 +10697,7 @@ qemuBuildCommandLine(virQEMUDriver *driver, if (qemuBuildBootCommandLine(cmd, def) < 0) return NULL; - if (qemuBuildIOMMUCommandLine(cmd, def) < 0) + if (qemuBuildIOMMUCommandLine(cmd, def, qemuCaps) < 0) return NULL; if (qemuBuildGlobalControllerCommandLine(cmd, def) < 0) --=20 2.31.1