From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Thu, 10 Nov 2022 08:43:32 +0000 (+0100)
Subject: Merge branch 'taskset' into taskset-merged
X-Git-Url: https://git.proxmox.com/?p=pve-manager.git;a=commitdiff_plain;h=310f32b7a95d2f4c90ac5a98f2ec9a1908a0b673

Merge branch 'taskset' into taskset-merged
---

310f32b7a95d2f4c90ac5a98f2ec9a1908a0b673
diff --cc www/manager6/qemu/ProcessorEdit.js
index 2edfc65c,42c919f2..fe67c7f5
--- a/www/manager6/qemu/ProcessorEdit.js
+++ b/www/manager6/qemu/ProcessorEdit.js
@@@ -27,8 -27,19 +27,19 @@@ Ext.define('PVE.qemu.ProcessorInputPane
  	    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', 0);
 -	PVE.Utils.delete_if_default(values, 'cpuunits', '1024', 0);
 +	PVE.Utils.delete_if_default(values, 'cpulimit', '0', me.insideWizard);
 +	PVE.Utils.delete_if_default(values, 'cpuunits', '1024', me.insideWizard);
  
  	// build the cpu options:
  	me.cpu.cputype = values.cputype;