From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 3353FC50C for ; Tue, 3 May 2022 13:19:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 277F85A4 for ; Tue, 3 May 2022 13:19:17 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 0B898599 for ; Tue, 3 May 2022 13:19:16 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D76C34310D for ; Tue, 3 May 2022 13:19:15 +0200 (CEST) From: Markus Frank To: pve-devel@lists.proxmox.com Date: Tue, 3 May 2022 13:19:01 +0200 Message-Id: <20220503111901.126976-4-m.frank@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220503111901.126976-1-m.frank@proxmox.com> References: <20220503111901.126976-1-m.frank@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.056 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [data.id] Subject: [pve-devel] [PATCH manager] ui: MachineEdit with viommu checkbox X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 May 2022 11:19:47 -0000 Added a Checkbox to enable viommu, if q35 is selected. Otherwise (i440fx) the checkbox is disabled. The GUI also needs to parse the new machine parameter as PropertyString. Signed-off-by: Markus Frank --- www/manager6/qemu/MachineEdit.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/www/manager6/qemu/MachineEdit.js b/www/manager6/qemu/MachineEdit.js index f928c80c..41c4dd93 100644 --- a/www/manager6/qemu/MachineEdit.js +++ b/www/manager6/qemu/MachineEdit.js @@ -17,6 +17,13 @@ Ext.define('PVE.qemu.MachineInputPanel', { let type = value === 'q35' ? 'q35' : 'i440fx'; store.clearFilter(); store.addFilter(val => val.data.id === 'latest' || val.data.type === type); + let viommuButton = me.lookup('viommu'); + if (type === 'i440fx') { + viommuButton.setValue(false); + viommuButton.setDisabled(true); + } else { + viommuButton.setDisabled(false); + } if (!me.getView().isWindows) { version.setValue('latest'); } else { @@ -40,12 +47,17 @@ Ext.define('PVE.qemu.MachineInputPanel', { delete values.delete; } delete values.version; + if (values.viommu) values.machine += ",viommu=1"; + delete values.viommu; return values; }, setValues: function(values) { let me = this; + let machine_conf = PVE.Parser.parsePropertyString(values.machine, "type"); + values.machine = machine_conf.type; + me.isWindows = values.isWindows; if (values.machine === 'pc') { values.machine = '__default__'; @@ -54,10 +66,14 @@ Ext.define('PVE.qemu.MachineInputPanel', { if (me.isWindows) { if (values.machine === '__default__') { values.version = 'pc-i440fx-5.1'; + values.viommu = false; } else if (values.machine === 'q35') { values.version = 'pc-q35-5.1'; } } + + values.viommu = machine_conf.viommu === "1"; + if (values.machine !== '__default__' && values.machine !== 'q35') { values.version = values.machine; values.machine = values.version.match(/q35/) ? 'q35' : '__default__'; @@ -108,6 +124,12 @@ Ext.define('PVE.qemu.MachineInputPanel', { }, }, }, + { + xtype: 'proxmoxcheckbox', + fieldLabel: gettext('vIOMMU'), + name: 'viommu', + reference: 'viommu', + }, { xtype: 'displayfield', fieldLabel: gettext('Note'), -- 2.30.2