[libvirt] [PATCH 02/34] openvz: Refactor extraction of vcpu count

[Peter Krempa]

To simplify further refactors change the way the vcpu count is extracted
to use a temp variable rather than juggling with def->maxvcpus.
---
 src/openvz/openvz_conf.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index db0a9a7..c0f65c9 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -522,6 +522,7 @@ int openvzLoadDomains(struct openvz_driver *driver)
     char *outbuf = NULL;
     char *line;
     virCommandPtr cmd = NULL;
+    unsigned int vcpus = 0;

     if (openvzAssignUUIDs() < 0)
         return -1;
@@ -575,12 +576,14 @@ int openvzLoadDomains(struct openvz_driver *driver)
                            veid);
             goto cleanup;
         } else if (ret > 0) {
-            def->maxvcpus = strtoI(temp);
+            vcpus = strtoI(temp);
         }

-        if (ret == 0 || def->maxvcpus == 0)
-            def->maxvcpus = openvzGetNodeCPUs();
-        def->vcpus = def->maxvcpus;
+        if (ret == 0 || vcpus == 0)
+            vcpus = openvzGetNodeCPUs();
+
+        def->maxvcpus = vcpus;
+        def->vcpus = vcpus;

         /* XXX load rest of VM config data .... */

-- 
2.6.2