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 662348B842 for ; Mon, 24 Oct 2022 16:22:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 459561A433 for ; Mon, 24 Oct 2022 16:22:14 +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 for ; Mon, 24 Oct 2022 16:22:13 +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 242DD44B74; Mon, 24 Oct 2022 16:22:13 +0200 (CEST) Message-ID: Date: Mon, 24 Oct 2022 16:22:11 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:107.0) Gecko/20100101 Thunderbird/107.0 Content-Language: en-US To: Proxmox VE development discussion , Markus Frank References: <20220921090748.47445-1-m.frank@proxmox.com> <20220921090748.47445-5-m.frank@proxmox.com> From: Dominik Csapak In-Reply-To: <20220921090748.47445-5-m.frank@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.067 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [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: Mon, 24 Oct 2022 14:22:44 -0000 comments inline: On 9/21/22 11:07, Markus Frank wrote: > Added a Checkbox to enable viommu, if q35 is selected. > Otherwise (i440fx) the checkbox is disabled. > > The UI also needs to parse the new machine parameter as PropertyString. > > Signed-off-by: Markus Frank > --- > www/manager6/qemu/MachineEdit.js | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/www/manager6/qemu/MachineEdit.js b/www/manager6/qemu/MachineEdit.js > index f928c80c..25661106 100644 > --- a/www/manager6/qemu/MachineEdit.js > +++ b/www/manager6/qemu/MachineEdit.js > @@ -17,6 +17,12 @@ Ext.define('PVE.qemu.MachineInputPanel', { > let type = value === 'q35' ? 'q35' : 'i440fx'; > store.clearFilter(); > store.addFilter(val => val.data.id === 'latest' || val.data.type === type); > + if (type === 'i440fx') { > + me.lookup('viommu').setValue(false); > + me.lookup('viommu').setDisabled(true); > + } else { > + me.lookup('viommu').setDisabled(false); > + } > if (!me.getView().isWindows) { > version.setValue('latest'); > } else { > @@ -40,12 +46,17 @@ Ext.define('PVE.qemu.MachineInputPanel', { > delete values.delete; > } > delete values.version; > + if (values.viommu) values.machine += ",viommu=1"; not really our style. we want {} and multiline if statements, see https://pve.proxmox.com/wiki/Javascript_Style_Guide > + 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 +65,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 +123,12 @@ Ext.define('PVE.qemu.MachineInputPanel', { > }, > }, > }, > + { > + xtype: 'proxmoxcheckbox', > + fieldLabel: gettext('vIOMMU'), > + name: 'viommu', > + reference: 'viommu', > + }, > { > xtype: 'displayfield', > fieldLabel: gettext('Note'),