Merge branch 'taskset' into taskset-merged

This commit is contained in:
Wolfgang Bumiller 2022-11-10 09:43:32 +01:00
commit 310f32b7a9

View File

@ -27,6 +27,17 @@ Ext.define('PVE.qemu.ProcessorInputPanel', {
values.delete = values.delete.join(','); values.delete = values.delete.join(',');
} }
if (values.affinity === undefined ||
values.affinity === null ||
values.affinity === '') {
if (values.delete.length > 0) {
values.delete = values.delete + ",affinity";
} else {
values.delete = "affinity";
}
delete values.affinity;
}
PVE.Utils.delete_if_default(values, 'cpulimit', '0', me.insideWizard); PVE.Utils.delete_if_default(values, 'cpulimit', '0', me.insideWizard);
PVE.Utils.delete_if_default(values, 'cpuunits', '1024', me.insideWizard); PVE.Utils.delete_if_default(values, 'cpuunits', '1024', me.insideWizard);
@ -180,6 +191,18 @@ Ext.define('PVE.qemu.ProcessorInputPanel', {
allowBlank: true, allowBlank: true,
emptyText: gettext('unlimited'), emptyText: gettext('unlimited'),
}, },
{
xtype: 'textfield',
name: 'affinity',
vtype: 'CpuSet',
value: '',
fieldLabel: gettext('CPU affinity'),
allowBlank: true,
emptyText: gettext("all cores"),
bind: {
value: '{affinity}',
},
},
], ],
advancedColumn2: [ advancedColumn2: [