Merge branch 'taskset' into taskset-merged

diff --cc www/manager6/qemu/ProcessorEdit.js
index 2edfc65ccb7162c8c575d43ba5a17859783b0343,42c919f21611c28eb596b762b28542bd8a7dfe8b..fe67c7f5b7a1a7763568f155415169b7811a95f1
--- 1/www/manager6/qemu/ProcessorEdit.js
--- 2/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(',');
        }
  
 -      PVE.Utils.delete_if_default(values, 'cpulimit', '0', 0);
 -      PVE.Utils.delete_if_default(values, 'cpuunits', '1024', 0);
+       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, 'cpuunits', '1024', me.insideWizard);
  
        // build the cpu options:
        me.cpu.cputype = values.cputype;