[PATCH] [Kimchi] Revert "Fix frontend vcpu hotplug"

This reverts commit 7cc96b592191b521effac1a6bb98a2b4dbf29474, this commit must be available only in HostOS repository for now. --- ui/js/src/kimchi.guest_edit_main.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9b6eab6..dcaafb8 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -815,13 +815,12 @@ kimchi.guest_edit_main = function() { for (var key in data) { valueFromUI = data[key]; if (valueFromUI instanceof Object) { - // Compare if Objects of original and data are identical. - // Handle special case when key is memory and guest is - // running as valueFromUI will return a null for max mem - // since it is disabled. + // Compare if Objects of original and data are identical + // Handle special case when key is memory and guest is running as valueFromUI will return a null for max mem + // since it is disabled; for cpu_info, when guest is running, just skip it since no processing is required if (kimchi.thisVMState === 'running' || kimchi.thisVMState === 'paused') { if (key === 'cpu_info') { - data['cpu_info']['maxvcpus'] = org.cpu_info.maxvcpus; + continue; } if (key === 'memory') { // Replace valueFromUI of max mem with one from original as otherwise the value is undefined -- 2.7.4

Reviewed-by: Socorro Stoppler <socorro@linux.vnet.ibm.com> Tested-by: Socorro Stoppler <socorro@linux.vnet.ibm.com> On 08/24/2016 09:05 AM, Jose Ricardo Ziviani wrote:
This reverts commit 7cc96b592191b521effac1a6bb98a2b4dbf29474, this commit must be available only in HostOS repository for now. --- ui/js/src/kimchi.guest_edit_main.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9b6eab6..dcaafb8 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -815,13 +815,12 @@ kimchi.guest_edit_main = function() { for (var key in data) { valueFromUI = data[key]; if (valueFromUI instanceof Object) { - // Compare if Objects of original and data are identical. - // Handle special case when key is memory and guest is - // running as valueFromUI will return a null for max mem - // since it is disabled. + // Compare if Objects of original and data are identical + // Handle special case when key is memory and guest is running as valueFromUI will return a null for max mem + // since it is disabled; for cpu_info, when guest is running, just skip it since no processing is required if (kimchi.thisVMState === 'running' || kimchi.thisVMState === 'paused') { if (key === 'cpu_info') { - data['cpu_info']['maxvcpus'] = org.cpu_info.maxvcpus; + continue; } if (key === 'memory') { // Replace valueFromUI of max mem with one from original as otherwise the value is undefined

Applied. Thanks. Regards, Aline Manera
participants (3)
-
Aline Manera
-
Jose Ricardo Ziviani
-
Socorro Stoppler