From: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
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 [thread overview]
Message-ID: <20260401080028.62513-14-a.bied-charreton@proxmox.com> (raw)
In-Reply-To: <20260401080028.62513-1-a.bied-charreton@proxmox.com>
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 <a.bied-charreton@proxmox.com>
---
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
next prev parent reply other threads:[~2026-04-01 8:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-01 8:00 [PATCH docs/manager/qemu-server v2 00/17] Add API and UI for custom CPU models Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH pve-docs v2 01/17] qm: Add anchor to "CPU Type" section Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH qemu-server v2 02/17] cpu config: Rename CPU models config path variable Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH qemu-server v2 03/17] cpu flags: Create CPUFlags module Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH qemu-server v2 04/17] cpu flags: Add query_available_cpu_flags helper Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH qemu-server v2 05/17] cpu config: Add helpers to lock and write config Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH qemu-server v2 06/17] cpu: Register standard option for CPU format Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH qemu-server v2 07/17] cpu config: Set 'type' field before writing Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH qemu-server v2 08/17] cpu flags: Improve flags list returned by endpoint Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH pve-manager v2 09/17] api: Add endpoint querying available CPU flags cluster-wide Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH pve-manager v2 10/17] api: Add CRUD handlers for custom CPU models Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH pve-manager v2 11/17] ui: CPUModelSelector: Allow filtering out custom models Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH pve-manager v2 12/17] ui: Add basic custom CPU model editor Arthur Bied-Charreton
2026-04-01 8:00 ` Arthur Bied-Charreton [this message]
2026-04-01 8:00 ` [PATCH pve-manager v2 14/17] ui: VMCPUFlagSelector: Fix buffered rendering error Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH pve-manager v2 15/17] ui: VMCPUFlagSelector: Allow filtering out flags supported on 0 nodes Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH pve-manager v2 16/17] ui: VMCPUFlagSelector: Add search bar for large lists of flags Arthur Bied-Charreton
2026-04-01 8:00 ` [PATCH pve-manager v2 17/17] RFC: ui: Group custom CPU with resource mappings Arthur Bied-Charreton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260401080028.62513-14-a.bied-charreton@proxmox.com \
--to=a.bied-charreton@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox