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 2063D6AFC7 for ; Mon, 8 Mar 2021 11:02:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1D2ED1CBD8 for ; Mon, 8 Mar 2021 11:02:03 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 67C701CBB1 for ; Mon, 8 Mar 2021 11:02:01 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2F01440AE6 for ; Mon, 8 Mar 2021 11:02:01 +0100 (CET) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Mon, 8 Mar 2021 11:01:48 +0100 Message-Id: <20210308100151.7886-2-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210308100151.7886-1-s.reiter@proxmox.com> References: <20210308100151.7886-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.024 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager 2/5] ui/machine: fix Windows pinning and detect "pc" as non-pinned 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, 08 Mar 2021 10:02:03 -0000 We need to detect "isWindows" before splitting a pinned version into .version/.machine, otherwise .machine will always be "pc" or "q35", and the check in "isWindows" will succeed even for pinned versions. This resulted in "5.1" being shown even if a different version has been set for a Windows machine. Also alias "pc" directly to "__default__", as they have the same meaning, but "pc" is not a valid entry in the "machine" combobox, leading to an invalid state when editing the (valid) configuration of "machine: pc" on a VM. Signed-off-by: Stefan Reiter --- www/manager6/qemu/MachineEdit.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/www/manager6/qemu/MachineEdit.js b/www/manager6/qemu/MachineEdit.js index ec391513..9dcdb012 100644 --- a/www/manager6/qemu/MachineEdit.js +++ b/www/manager6/qemu/MachineEdit.js @@ -47,7 +47,17 @@ Ext.define('PVE.qemu.MachineInputPanel', { let me = this; me.isWindows = values.isWindows; + if (values.machine === 'pc') { + values.machine = '__default__'; + } + if (me.isWindows) { + if (values.machine === '__default__') { + values.version = 'pc-i440fx-5.1'; + } else if (values.machine === 'q35') { + values.version = 'pc-q35-5.1'; + } + } if (values.machine !== '__default__' && values.machine !== 'q35') { values.version = values.machine; values.machine = values.version.match(/q35/) ? 'q35' : '__default__'; @@ -55,13 +65,6 @@ Ext.define('PVE.qemu.MachineInputPanel', { // avoid hiding a pinned version me.setAdvancedVisible(true); } - if (me.isWindows) { - if (values.machine === '__default__' || values.machine === 'pc') { - values.version = 'pc-i440fx-5.1'; - } else if (values.machine === 'q35') { - values.version = 'pc-q35-5.1'; - } - } this.callParent(arguments); }, -- 2.20.1