From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 38A461FF13A for ; Wed, 01 Apr 2026 10:03:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2AB0D130A7; Wed, 1 Apr 2026 10:01:37 +0200 (CEST) From: Arthur Bied-Charreton To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager v2 13/17] ui: VMCPUFlagSelector: Add CPU flag editor for custom models Date: Wed, 1 Apr 2026 10:00:24 +0200 Message-ID: <20260401080028.62513-14-a.bied-charreton@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260401080028.62513-1-a.bied-charreton@proxmox.com> References: <20260401080028.62513-1-a.bied-charreton@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.112 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Message-ID-Hash: K7FWXFBPWQZBDKMMY56GPV4XR42GNBER X-Message-ID-Hash: K7FWXFBPWQZBDKMMY56GPV4XR42GNBER X-MailFrom: abied-charreton@jett.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: Add CPU flag editor to the CPUTypeEdit component by extending the VMCPUFlagSelector also used in the VM creation flow. This adds config fields allowing to differentiate whether the component is being used in the VM creation wizard, processor edit window, or for a custom CPU model. For each flag in the selector, also display which node(s) it is available on, and add a radio group allowing to select which acceleration type flag availability should be checked for. In the VM processor edit window, pre-select the acceleration type based on the value of `kvm` in the VM's config (`kvm` for `kvm: 1`, otherwise `tcg`). In the VM creation wizard, show VM-specific flags, allowing the user to filter by acceleration type themselves. In the custom CPU model creation/edit window, show all flags available cluster-wide, allowing the user to filter by acceleration type. Show unknown flags, i.e. flags that either the currently selected acceleration type does not support or that do not exist, at the top of the list to encourage users to reconsider whether they should be set at all. Based on & adapted from patch by Stefan Reiter: https://lore.proxmox.com/pve-devel/20211028114150.3245864-10-s.reiter@proxmox.com Signed-off-by: Arthur Bied-Charreton --- www/css/ext6-pve.css | 4 + www/manager6/dc/CPUTypeEdit.js | 10 ++ www/manager6/form/CPUModelSelector.js | 1 + www/manager6/form/VMCPUFlagSelector.js | 211 ++++++++++++++++++++++--- www/manager6/qemu/ProcessorEdit.js | 6 + 5 files changed, 206 insertions(+), 26 deletions(-) diff --git a/www/css/ext6-pve.css b/www/css/ext6-pve.css index 27742a74..98f5e6ed 100644 --- a/www/css/ext6-pve.css +++ b/www/css/ext6-pve.css @@ -655,6 +655,10 @@ table.osds td:first-of-type { opacity: 0.3; } +.x-toolbar .x-form-item-default.x-item-disabled { + opacity: 0.8; +} + .pmx-action-hidden:before { opacity: 0; cursor: default; diff --git a/www/manager6/dc/CPUTypeEdit.js b/www/manager6/dc/CPUTypeEdit.js index 1b250462..b2a81811 100644 --- a/www/manager6/dc/CPUTypeEdit.js +++ b/www/manager6/dc/CPUTypeEdit.js @@ -88,6 +88,16 @@ Ext.define('PVE.dc.CPUTypeEdit', { name: 'phys-bits', }, ], + columnB: [ + { + xtype: 'vmcpuflagselector', + fieldLabel: gettext('Extra CPU flags'), + name: 'flags', + restrictToVMFlags: false, + height: 380, + hideHeaders: false, + }, + ], }, ], }); diff --git a/www/manager6/form/CPUModelSelector.js b/www/manager6/form/CPUModelSelector.js index 890a7cb1..c091a82d 100644 --- a/www/manager6/form/CPUModelSelector.js +++ b/www/manager6/form/CPUModelSelector.js @@ -17,6 +17,7 @@ Ext.define('PVE.form.CPUModelSelector', { anyMatch: true, forceSelection: true, autoSelect: false, + triggerAction: 'query', deleteEmpty: true, config: { diff --git a/www/manager6/form/VMCPUFlagSelector.js b/www/manager6/form/VMCPUFlagSelector.js index 922fcfa6..b857c134 100644 --- a/www/manager6/form/VMCPUFlagSelector.js +++ b/www/manager6/form/VMCPUFlagSelector.js @@ -6,6 +6,14 @@ Ext.define('PVE.form.VMCPUFlagSelector', { field: 'Ext.form.field.Field', }, + config: { + // Show only the flags that may be set for a specific VM. + restrictToVMFlags: true, + // Acceleration type of the VM, 'kvm' or 'tcg', only used if + // restrictToVMFlags === true. + accel: null, + }, + disableSelection: true, columnLines: false, selectable: false, @@ -14,12 +22,15 @@ Ext.define('PVE.form.VMCPUFlagSelector', { scrollable: 'y', height: 200, - unkownFlags: [], - store: { - type: 'store', - fields: ['name', { name: 'state', defaultValue: '=' }, 'description'], - autoLoad: true, + fields: [ + 'name', + { name: 'state', defaultValue: '=' }, + 'description', + 'supported-on', + 'unknown', + ], + autoLoad: false, proxy: { type: 'proxmox', url: '/api2/json/nodes/localhost/capabilities/qemu/cpu-flags', @@ -28,16 +39,23 @@ Ext.define('PVE.form.VMCPUFlagSelector', { update: function () { this.commitChanges(); }, - refresh: function (store, eOpts) { - let me = this; - let view = me.view; - - if (store.adjustedForValue !== view.value) { - view.adjustStoreForValue(); - } - }, }, - adjustedForValue: undefined, + filters: [ + { + id: 'supported-filter', + filterFn: (rec) => { + let state = rec.get('state'); + if (state && state !== '=') { + return true; + } + if (rec.get('unknown')) { + return true; + } + let s = rec.get('supported-on'); + return Array.isArray(s) && s.length > 0; + }, + }, + ], }, getValue: function () { @@ -62,21 +80,39 @@ Ext.define('PVE.form.VMCPUFlagSelector', { } }); - flags += me.unkownFlags.join(';'); - return flags; }, - // Adjusts the store for the current value and determines the unkown flags based on what the - // store does not know. + // Adjusts the store for the current value. Flags not known to the API are added to the store + // as 'unknown' records so they stay visible and can be edited. adjustStoreForValue: function () { let me = this; let store = me.getStore(); let value = me.value; - me.unkownFlags = []; + // Clear any previously added unknown records. + let unknownRecords = []; + store.getData().each((rec) => { + if (rec.get('unknown')) { + unknownRecords.push(rec); + } else { + rec.set('state', '='); + } + }); + store.remove(unknownRecords); - store.getData().each((rec) => rec.set('state', '=')); + let newUnknownFlags = []; + let addUnknownFlag = function (flag, sign) { + newUnknownFlags.push({ + name: flag, + state: sign, + // A TCG-only flag will be flagged as unknown when `accel` is set to `kvm` and vice-versa, hence the very general wording. + description: gettext( + 'This flag is not available for the selected acceleration type and/or not supported by any node in the cluster. It is very likely to lead to VM startup failure. You can remove it by setting it to "Default".', + ), + unknown: true, + }); + }; let flags = value ? value.split(';') : []; flags.forEach(function (flag) { @@ -85,15 +121,32 @@ Ext.define('PVE.form.VMCPUFlagSelector', { let rec = store.findRecord('name', flag, 0, false, true, true); if (rec !== null) { - rec.set('state', sign); + let supported = rec.get('supported-on'); + // Treat flags that are set in the config but not supported anywhere as unknown + if (Array.isArray(supported) && supported.length === 0 && sign !== '=') { + store.remove(rec); + addUnknownFlag(flag, sign); + } else { + rec.set('state', sign); + rec.commit(); + } } else { - me.unkownFlags.push(flag); + addUnknownFlag(flag, sign); } }); - store.adjustedForValue = value; - }, + // Make sure unknown flags are displayed at the top of the list + // so users reconsider them. + if (newUnknownFlags.length > 0) { + store.insert(0, newUnknownFlags); + } + me.getView().refresh(); + }, + isDirty: function () { + let me = this; + return me.originalValue !== me.getValue(); + }, setValue: function (value) { let me = this; @@ -109,6 +162,7 @@ Ext.define('PVE.form.VMCPUFlagSelector', { }, columns: [ { + text: gettext('State'), dataIndex: 'state', renderer: function (v) { switch (v) { @@ -125,6 +179,7 @@ Ext.define('PVE.form.VMCPUFlagSelector', { width: 65, }, { + text: gettext('Value'), xtype: 'widgetcolumn', dataIndex: 'state', width: 95, @@ -171,22 +226,126 @@ Ext.define('PVE.form.VMCPUFlagSelector', { }, }, { + text: gettext('Flag'), dataIndex: 'name', width: 100, }, { + text: gettext('Description'), dataIndex: 'description', + sortable: false, + cellWrap: true, + flex: 3, + }, + { + text: gettext('Supported On'), + dataIndex: 'supported-on', cellWrap: true, flex: 1, + renderer: (v) => (Array.isArray(v) ? v.join(', ') : ''), }, ], - + updateAccel: function (accel) { + let me = this; + if (!me.initialized) { + return; + } + me.getStore().getProxy().setExtraParam('accel', accel); + me.getStore().load(); + }, + lockAccel: function (accel) { + let me = this; + let toolbar = me.down('toolbar[dock=top]'); + let radiogroup = toolbar.down('radiogroup'); + radiogroup.setValue({ accel }); + radiogroup.setDisabled(true); + toolbar + .down('tbtext') + .getEl() + .set({ + 'data-qtip': gettext( + "The acceleration type is determined by the VM's KVM setting and cannot be changed here.", + ), + }); + }, initComponent: function () { let me = this; me.value = me.originalValue = ''; - me.store.view = me; + + me.dockedItems = [ + { + xtype: 'toolbar', + dock: 'top', + hidden: false, + items: [ + { + xtype: 'tbtext', + text: gettext('Acceleration:'), + autoEl: { + tag: 'span', + 'data-qtip': gettext( + 'A custom CPU model using acceleration-specific flags can only be assigned to VMs configured with the matching acceleration type, i.e., "kvm: 1" for KVM, or "kvm: 0" for TCG.', + ), + }, + }, + { + xtype: 'radiogroup', + layout: 'hbox', + validateOnChange: false, + items: [ + { + boxLabel: 'KVM', + inputValue: 'kvm', + name: 'accel', + checked: true, + isFormField: false, + }, + { + boxLabel: 'TCG', + inputValue: 'tcg', + name: 'accel', + margin: '0 0 0 10', + isFormField: false, + }, + ], + listeners: { + change: function (_, value) { + let view = this.up('grid'); + let proxy = view.getStore().getProxy(); + let accel = value.accel; + if (accel) { + proxy.setExtraParam('accel', accel); + } else { + delete proxy.extraParams.accel; + } + view.getStore().load(); + }, + }, + }, + ], + }, + ]; me.callParent(arguments); + + me.initialized = true; + + me.getStore().on('load', function (store, _, success) { + if (success) { + me.adjustStoreForValue(); + me.checkDirty(); + } + }); + + if (!me.restrictToVMFlags) { + me.getStore().getProxy().setUrl('/api2/json/cluster/qemu/cpu-flags'); + me.getStore().load(); + } else { + me.getStore() + .getProxy() + .setExtraParam('accel', me.accel ?? 'kvm'); + me.getStore().load(); + } }, }); diff --git a/www/manager6/qemu/ProcessorEdit.js b/www/manager6/qemu/ProcessorEdit.js index ffaf014e..3235f567 100644 --- a/www/manager6/qemu/ProcessorEdit.js +++ b/www/manager6/qemu/ProcessorEdit.js @@ -18,6 +18,7 @@ Ext.define('PVE.qemu.ProcessorInputPanel', { cpuunitsDefault: (get) => (get('cgroupMode') === 1 ? 1024 : 100), cpuunitsMin: (get) => (get('cgroupMode') === 1 ? 2 : 1), cpuunitsMax: (get) => (get('cgroupMode') === 1 ? 262144 : 10000), + accel: (get) => (get('kvm') ? 'kvm' : 'tcg'), }, }, @@ -241,6 +242,9 @@ Ext.define('PVE.qemu.ProcessorInputPanel', { { xtype: 'vmcpuflagselector', name: 'flags', + bind: { + accel: '{accel}', + }, }, ], }); @@ -288,6 +292,8 @@ Ext.define('PVE.qemu.ProcessorEdit', { vm.set('showCustomModelPermWarning', true); } } + let accel = data.kvm === 0 ? 'tcg' : 'kvm'; + ipanel.down('vmcpuflagselector').lockAccel(accel); me.setValues(data); }, }); -- 2.47.3