From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 5CDDD1FF0B7 for ; Fri, 13 Nov 2026 15:40:57 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id EE8DD217B4; Fri, 13 Nov 2026 15:40:07 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager v4 14/14] ui: qemu machine: don't lose pci options on edit cycle Date: Fri, 13 Nov 2026 15:39:30 +0100 Message-ID: <20261113143939.3012964-15-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261113143939.3012964-1-d.csapak@proxmox.com> References: <20261113143939.3012964-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.306 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) 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 Message-ID-Hash: CVZET5ASNISR6VB7AMLAHSBXBMHQK4L5 X-Message-ID-Hash: CVZET5ASNISR6VB7AMLAHSBXBMHQK4L5 X-MailFrom: d.csapak@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: While we don't want to directly expose the options on the UI for now, those shouldn't be lost when editing the other options. To keep them, use hidden fields for them that keep their original values that get submitted beside the other options. Signed-off-by: Dominik Csapak --- www/manager6/qemu/MachineEdit.js | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/www/manager6/qemu/MachineEdit.js b/www/manager6/qemu/MachineEdit.js index cd759703..79fed45e 100644 --- a/www/manager6/qemu/MachineEdit.js +++ b/www/manager6/qemu/MachineEdit.js @@ -72,17 +72,22 @@ Ext.define('PVE.qemu.MachineInputPanel', { // arch is a hidden field used only for the machine-default lookup; do not submit it. let arch = values.arch; delete values.arch; - if (values.delete === 'machine' && values.viommu) { - delete values.delete; - values.machine = PVE.qemu.Architecture.defaultMachines[arch]; + + if (values.delete === 'machine') { + // only delete if no other relevant value is set + let keep = ['viommu', 'pci-layout', 'pci-topology'].some((prop) => !!values[prop]); + if (keep) { + delete values.delete; + values.machine = PVE.qemu.Architecture.defaultMachines[arch]; + } } if (values.version && values.version !== 'latest') { values.machine = values.version; delete values.delete; } delete values.version; - if (values.delete === 'machine' && !values.viommu) { - return values; + if (values.delete === 'machine') { + return { delete: 'machine' }; } let ret = {}; ret.machine = PVE.Parser.printPropertyString(values, 'machine'); @@ -94,6 +99,12 @@ Ext.define('PVE.qemu.MachineInputPanel', { let machineConf = PVE.Parser.parsePropertyString(values.machine, 'type'); values.machine = machineConf.type; + // don't lose those on an edit cycle, each needs a hidden field for this + ['pci-layout', 'pci-topology'].forEach((prop) => { + if (machineConf[prop] !== undefined) { + values[prop] = machineConf[prop]; + } + }); let defaultMachine = PVE.qemu.Architecture.defaultMachines[values.arch]; me.isWindows = values.isWindows; @@ -148,6 +159,14 @@ Ext.define('PVE.qemu.MachineInputPanel', { reference: 'arch', bind: '{arch}', }, + { + xtype: 'hidden', + name: 'pci-layout', + }, + { + xtype: 'hidden', + name: 'pci-topology', + }, ], advancedItems: [ -- 2.47.3