From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com&gt; This patch makes changes on model/vms.py to support the hotplug of new CPUs in a running VM. For CPU Hot unplug in Power hypervisors there is a need for guest software to be installed: * guest must have packages: powerpc-utils, ppc64-diag, librtas * guest must have service rtas_err.service running Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com&gt; --- model/vms.py | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index bff7ed2..cc9cd4c 100644 --- a/model/vms.py +++ b/model/vms.py @@ -82,7 +82,8 @@ DOM_STATE_MAP = {0: 'nostate', 7: 'pmsuspended'} # update parameters which are updatable when the VM is online -VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users'] +VM_ONLINE_UPDATE_PARAMS = ['cpu_info', 'graphics', 'groups', + 'memory', 'users'] # update parameters which are updatable when the VM is offline VM_OFFLINE_UPDATE_PARAMS = ['cpu_info', 'graphics', 'groups', 'memory', @@ -1028,6 +1029,15 @@ class VMModel(object): unit='Kib')) return ET.tostring(root, encoding="utf-8") + def get_vm_cpu_cores(self, vm_xml): + return xpath_get_text(vm_xml, XPATH_TOPOLOGY + '/@cores')[0] + + def get_vm_cpu_sockets(self, vm_xml): + return xpath_get_text(vm_xml, XPATH_TOPOLOGY + '/@sockets')[0] + + def get_vm_cpu_threads(self, vm_xml): + return xpath_get_text(vm_xml, XPATH_TOPOLOGY + '/@threads')[0] + def _update_cpu_info(self, new_xml, dom, new_info): topology = {} if self.has_topology(dom): @@ -1064,6 +1074,44 @@ class VMModel(object): if (('memory' in params) and ('current' in params['memory'])): self._update_memory_live(dom, params) + if 'vcpus' in params.get('cpu_info', {}): + self.cpu_hotplug_precheck(dom, params) + vcpus = params['cpu_info'].get('vcpus') + self.update_cpu_live(dom, vcpus) + + def cpu_hotplug_precheck(self, dom, params): + + if (('maxvcpus' in params['cpu_info']) or + ('topology' in params['cpu_info'])): + raise InvalidParameter('KCHCPUHOTP0001E') + + vcpus = params['cpu_info'].get('vcpus') + if vcpus > dom.maxVcpus(): + raise InvalidParameter( + 'KCHCPUHOTP0002E', + {'vm': dom.name(), 'cpus': dom.maxVcpus()} + ) + + if self.has_topology(dom): + sockets = int(self.get_vm_cpu_sockets(dom.XMLDesc(0))) + cores = int(self.get_vm_cpu_cores(dom.XMLDesc(0))) + threads = int(self.get_vm_cpu_threads(dom.XMLDesc(0))) + + if vcpus % threads != 0: + raise InvalidParameter( + 'KCHCPUHOTP0003E', + {'sockets': str(sockets), 'cores': str(cores), + 'threads': str(threads)} + ) + + def update_cpu_live(self, dom, vcpus): + flags = libvirt.VIR_DOMAIN_AFFECT_LIVE | \ + libvirt.VIR_DOMAIN_AFFECT_CONFIG + try: + dom.setVcpusFlags(vcpus, flags) + except libvirt.libvirtError as e: + raise OperationFailed('KCHCPUHOTP0004E', {'err': e.message}) + def _get_mem_dev_total_size(self, xml): root = ET.fromstring(xml) totMemDevs = 0 -- 2.7.4

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com&gt; This patch enables the CPU field for hotplug/unplug operations and adds information text below CPU field about guest cpu hotplug/unplug support if guest is running. Changes in guests.dita were made to add information about the guest support for this feature. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com&gt; --- ui/js/src/kimchi.guest_edit_main.js | 12 +++++------- ui/pages/guest-edit.html.tmpl | 1 + ui/pages/help/en_US/guests.dita | 8 ++++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9669d08..558325a 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -981,16 +981,14 @@ kimchi.guest_edit_main = function() { wok.window.open('plugins/kimchi/guest-storage-add.html', 'extendCreateStorage'); }); if ((kimchi.thisVMState === "running") || (kimchi.thisVMState === "paused")) { + $("#form-guest-edit-general input").not("#guest-edit-cores-textbox").prop("disabled", true); + $("#guest-edit-cores-hotplug-unsupported").removeClass('hidden'); if (kimchi.capabilities.mem_hotplug_support) { - $("#form-guest-edit-general input").not("#guest-edit-memory-textbox").prop("disabled", true); + $("#guest-edit-memory-textbox").prop("disabled", false); } else { - $("#form-guest-edit-general input").prop("disabled", true); + $("#guest-edit-memory-hotplug-unsupported").removeClass('hidden'); } } - if (! kimchi.capabilities.mem_hotplug_support) { - $("#guest-edit-max-memory-textbox").prop("disabled", true); - $("#guest-edit-memory-hotplug-unsupported").removeClass('hidden'); - } $('#guest-show-max-memory').on('click', function(e) { e.preventDefault; @@ -1071,7 +1069,7 @@ kimchi.guest_edit_main = function() { // 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') { - continue; + data['cpu_info']['maxvcpus'] = org.cpu_info.maxvcpus; } if (key === 'memory') { // Replace valueFromUI of max mem with one from original as otherwise the value is undefined diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 7e0e3d3..f88dbf6 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -49,6 +49,7 @@ <div id="guest-processor"> <input id="guest-edit-cores-textbox" class="form-control" name="vcpus" type="number" min="1" /> <button id="guest-show-max-processor" class="btn btn-primary" type="button"><i class="fa fa-plus-circle"></i> <span class="cputext">$_("More")</span></button> + <p id="guest-edit-cores-hotplug-unsupported" class="help-block hidden"><i class="fa fa-info-circle"></i> $_("Guest must support CPU hotplug. Check Help page for details.")</p> </div> </div> <div id="guest-max-processor-panel" class="form-group"> diff --git a/ui/pages/help/en_US/guests.dita b/ui/pages/help/en_US/guests.dita index 45cf7da..5c71694 100644 --- a/ui/pages/help/en_US/guests.dita +++ b/ui/pages/help/en_US/guests.dita @@ -77,6 +77,14 @@ create a template.</li> can be edited only while guest is stopped. Others will take effect in next boot.</shortdesc> <csbody> +<ol><li><uicontrol>If guest is off: </uicontrol>CPU and Memory new values +takes effect after next boot.</li> +<li><uicontrol>If guest is running: </uicontrol>Guest must support +hotplug/hotunplug of CPU and Memory devices, otherwise changes in these fields will not take effect. For Power systems, the guest must have:<ul> +<li>Latest versions of packages <uicontrol>powerpc-utils, ppc64-diag</uicontrol> and <uicontrol>librtas</uicontrol> +must be installed.</li> +<li>Service <uicontrol>rtas_err</uicontrol> must be running.</li></ul> +</li></ol> <dl><dlentry> <dt>General</dt> <dd>Displays information about your guest, including name, CPUs, memory, -- 2.7.4

On 11/08/2016 11:33 AM, dhbarboza82(a)gmail.com wrote: Can't we use check_cpu_info() to do all the verification ? It would be better to have a single place where we can do the checks for CPU.