From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 16 Oct 2015 13:38:48 +0000 (+0200)
Subject: xenapi: Refactor extraction of vcpu count
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8e104ef011e25d1d9b5e5d6b0da63e87a1b7c235;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

xenapi: Refactor extraction of vcpu count

To simplify further refactors change the way the vcpu count is extracted
to use a temp variable rather than juggling with def->maxvcpus.
---

diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 3045c5ac5..e503974c2 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -1403,6 +1403,7 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
     char *val = NULL;
     struct xen_vif_set *vif_set = NULL;
     char *xml;
+    unsigned int vcpus;
 
     /* Flags checked by virDomainDefFormat */
 
@@ -1498,7 +1499,12 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
     } else {
         defPtr->mem.cur_balloon = memory;
     }
-    defPtr->maxvcpus = defPtr->vcpus = xenapiDomainGetMaxVcpus(dom);
+
+    vcpus = xenapiDomainGetMaxVcpus(dom);
+
+    defPtr->maxvcpus = vcpus;
+    defPtr->vcpus = vcpus;
+
     enum xen_on_normal_exit action;
     if (xen_vm_get_actions_after_shutdown(session, &action, vm))
         defPtr->onPoweroff = xenapiNormalExitEnum2virDomainLifecycle(action);