[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH V3 14/24] src/xenxs:Refactor code formating general VM config



From: Kiarie Kahurani <davidkiarie4 gmail com>

introduce function
  xenFormatXMGeneralMeta(virConfPtr conf,......);
which parses uuid and name instead

signed-off-by:David Kiarie<davidkiarie4 gmail com>
---
 src/xenxs/xen_xm.c | 53 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index aa943ca..08d26e5 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -1322,8 +1322,8 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
 }
 
 
-static
-int xenXMConfigSetInt(virConfPtr conf, const char *setting, long long l)
+static int
+xenXMConfigSetInt(virConfPtr conf, const char *setting, long long l)
 {
     virConfValuePtr value = NULL;
 
@@ -1445,8 +1445,10 @@ xenFormatXMDisk(virConfValuePtr list,
     return -1;
 }
 
-static int xenFormatXMSerial(virConfValuePtr list,
-                             virDomainChrDefPtr serial)
+
+static int
+xenFormatXMSerial(virConfValuePtr list,
+                  virDomainChrDefPtr serial)
 {
     virBuffer buf = VIR_BUFFER_INITIALIZER;
     virConfValuePtr val, tmp;
@@ -1482,10 +1484,12 @@ static int xenFormatXMSerial(virConfValuePtr list,
     return -1;
 }
 
-static int xenFormatXMNet(virConnectPtr conn,
-                                      virConfValuePtr list,
-                                      virDomainNetDefPtr net,
-                                      int hvm, int xendConfigVersion)
+
+static int
+xenFormatXMNet(virConnectPtr conn,
+               virConfValuePtr list,
+               virDomainNetDefPtr net,
+               int hvm, int xendConfigVersion)
 {
     virBuffer buf = VIR_BUFFER_INITIALIZER;
     virConfValuePtr val, tmp;
@@ -1587,10 +1591,8 @@ static int xenFormatXMNet(virConnectPtr conn,
 }
 
 
-
 static int
-xenFormatXMPCI(virConfPtr conf,
-                           virDomainDefPtr def)
+xenFormatXMPCI(virConfPtr conf, virDomainDefPtr def)
 {
 
     virConfValuePtr pciVal = NULL;
@@ -1656,32 +1658,41 @@ xenFormatXMPCI(virConfPtr conf,
 }
 
 
+static int
+xenFormatXMGeneralMeta(virConfPtr conf, virDomainDefPtr def)
+{
+    char uuid[VIR_UUID_STRING_BUFLEN];
+
+    if (xenXMConfigSetString(conf, "name", def->name) < 0)
+        return -1;
+
+    virUUIDFormat(def->uuid, uuid);
+    if (xenXMConfigSetString(conf, "uuid", uuid) < 0)
+        return -1;
+
+    return 0;
+}
 /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is
    either 32, or 64 on a platform where long is big enough.  */
 verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT);
 
-virConfPtr xenFormatXM(virConnectPtr conn,
-                                   virDomainDefPtr def,
-                                   int xendConfigVersion)
+virConfPtr
+xenFormatXM(virConnectPtr conn,
+            virDomainDefPtr def,
+            int xendConfigVersion)
 {
     virConfPtr conf = NULL;
     int hvm = 0, vmlocaltime = 0;
     size_t i;
     char *cpus = NULL;
     const char *lifecycle;
-    char uuid[VIR_UUID_STRING_BUFLEN];
     virConfValuePtr diskVal = NULL;
     virConfValuePtr netVal = NULL;
 
     if (!(conf = virConfNew()))
         goto cleanup;
 
-
-    if (xenXMConfigSetString(conf, "name", def->name) < 0)
-        goto cleanup;
-
-    virUUIDFormat(def->uuid, uuid);
-    if (xenXMConfigSetString(conf, "uuid", uuid) < 0)
+    if (xenFormatXMGeneralMeta(conf, def) < 0)
         goto cleanup;
 
     if (xenXMConfigSetInt(conf, "maxmem",
-- 
1.8.4.5


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]