xen_common: Change xenConfigGetString to use virConfGetValueString

This change actually changes the behaviour of xenConfigGetString() as
now it returns a newly-allocated string.

Unfortunately, there's not much that can be done in order to avoid that
and all the callers have to be changed in order to avoid leaking the
return value.

Also, as a side-effect of the change above, the function now takes a
"char **" argument instead of a "const char **" one.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 587bab2b191a2d0357fa4770dfdad644abd64330..25fd432bde724d14c2f45a88ace899a6a5863664 100644 (file)
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -228,26 +228,23 @@ xenConfigGetUUID(virConfPtr conf, const char *name, unsigned char *uuid)
 int
 xenConfigGetString(virConfPtr conf,
                    const char *name,
-                   const char **value,
+                   char **value,
                    const char *def)
 {
-    virConfValuePtr val;
+    char *string = NULL;
+    int rc;
 
     *value = NULL;
-    if (!(val = virConfGetValue(conf, name))) {
-        *value = def;
-        return 0;
-    }
-
-    if (val->type != VIR_CONF_STRING) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("config value %s was malformed"), name);
+    if ((rc = virConfGetValueString(conf, name, &string)) < 0)
         return -1;
+
+    if (rc == 0 || !string) {
+        if (VIR_STRDUP(*value, def) < 0)
+            return -1;
+    } else {
+        *value = string;
     }
-    if (!val->str)
-        *value = def;
-    else
-        *value = val->str;
+
     return 0;
 }
 
@@ -345,32 +342,34 @@ xenParseTimeOffset(virConfPtr conf, virDomainDefPtr def)
 static int
 xenParseEventsActions(virConfPtr conf, virDomainDefPtr def)
 {
-    const char *str = NULL;
+    VIR_AUTOFREE(char *) on_poweroff = NULL;
+    VIR_AUTOFREE(char *) on_reboot = NULL;
+    VIR_AUTOFREE(char *) on_crash = NULL;
 
-    if (xenConfigGetString(conf, "on_poweroff", &str, "destroy") < 0)
+    if (xenConfigGetString(conf, "on_poweroff", &on_poweroff, "destroy") < 0)
         return -1;
 
-    if ((def->onPoweroff = virDomainLifecycleActionTypeFromString(str)) < 0) {
+    if ((def->onPoweroff = virDomainLifecycleActionTypeFromString(on_poweroff)) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("unexpected value %s for on_poweroff"), str);
+                       _("unexpected value %s for on_poweroff"), on_poweroff);
         return -1;
     }
 
-    if (xenConfigGetString(conf, "on_reboot", &str, "restart") < 0)
+    if (xenConfigGetString(conf, "on_reboot", &on_reboot, "restart") < 0)
         return -1;
 
-    if ((def->onReboot = virDomainLifecycleActionTypeFromString(str)) < 0) {
+    if ((def->onReboot = virDomainLifecycleActionTypeFromString(on_reboot)) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("unexpected value %s for on_reboot"), str);
+                       _("unexpected value %s for on_reboot"), on_reboot);
         return -1;
     }
 
-    if (xenConfigGetString(conf, "on_crash", &str, "restart") < 0)
+    if (xenConfigGetString(conf, "on_crash", &on_crash, "restart") < 0)
         return -1;
 
-    if ((def->onCrash = virDomainLifecycleActionTypeFromString(str)) < 0) {
+    if ((def->onCrash = virDomainLifecycleActionTypeFromString(on_crash)) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("unexpected value %s for on_crash"), str);
+                       _("unexpected value %s for on_crash"), on_crash);
         return -1;
     }
 
@@ -488,7 +487,8 @@ xenParseCPUFeatures(virConfPtr conf,
                     virDomainXMLOptionPtr xmlopt)
 {
     unsigned long count = 0;
-    const char *str = NULL;
+    VIR_AUTOFREE(char *) cpus = NULL;
+    VIR_AUTOFREE(char *) tsc_mode = NULL;
     int val = 0;
     virDomainTimerDefPtr timer;
 
@@ -509,16 +509,16 @@ xenParseCPUFeatures(virConfPtr conf,
             return -1;
     }
 
-    if (xenConfigGetString(conf, "cpus", &str, NULL) < 0)
+    if (xenConfigGetString(conf, "cpus", &cpus, NULL) < 0)
         return -1;
 
-    if (str && (virBitmapParse(str, &def->cpumask, 4096) < 0))
+    if (cpus && (virBitmapParse(cpus, &def->cpumask, 4096) < 0))
         return -1;
 
-    if (xenConfigGetString(conf, "tsc_mode", &str, NULL) < 0)
+    if (xenConfigGetString(conf, "tsc_mode", &tsc_mode, NULL) < 0)
         return -1;
 
-    if (str) {
+    if (tsc_mode) {
         if (VIR_EXPAND_N(def->clock.timers, def->clock.ntimers, 1) < 0 ||
             VIR_ALLOC(timer) < 0)
             return -1;
@@ -528,11 +528,11 @@ xenParseCPUFeatures(virConfPtr conf,
         timer->tickpolicy = -1;
         timer->mode = VIR_DOMAIN_TIMER_MODE_AUTO;
         timer->track = -1;
-        if (STREQ_NULLABLE(str, "always_emulate"))
+        if (STREQ_NULLABLE(tsc_mode, "always_emulate"))
             timer->mode = VIR_DOMAIN_TIMER_MODE_EMULATE;
-        else if (STREQ_NULLABLE(str, "native"))
+        else if (STREQ_NULLABLE(tsc_mode, "native"))
             timer->mode = VIR_DOMAIN_TIMER_MODE_NATIVE;
-        else if (STREQ_NULLABLE(str, "native_paravirt"))
+        else if (STREQ_NULLABLE(tsc_mode, "native_paravirt"))
             timer->mode = VIR_DOMAIN_TIMER_MODE_PARAVIRT;
 
         def->clock.timers[def->clock.ntimers - 1] = timer;
@@ -746,15 +746,15 @@ xenParseVfb(virConfPtr conf, virDomainDefPtr def)
 static int
 xenParseCharDev(virConfPtr conf, virDomainDefPtr def, const char *nativeFormat)
 {
-    const char *str;
     virConfValuePtr value = NULL;
     virDomainChrDefPtr chr = NULL;
 
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
-        if (xenConfigGetString(conf, "parallel", &str, NULL) < 0)
+        VIR_AUTOFREE(char *) parallel = NULL;
+        if (xenConfigGetString(conf, "parallel", &parallel, NULL) < 0)
             goto cleanup;
-        if (str && STRNEQ(str, "none") &&
-            !(chr = xenParseSxprChar(str, NULL)))
+        if (parallel && STRNEQ(parallel, "none") &&
+            !(chr = xenParseSxprChar(parallel, NULL)))
             goto cleanup;
         if (chr) {
             if (VIR_ALLOC_N(def->parallels, 1) < 0)
@@ -801,11 +801,12 @@ xenParseCharDev(virConfPtr conf, virDomainDefPtr def, const char *nativeFormat)
                 value = value->next;
             }
         } else {
+            VIR_AUTOFREE(char *) serial = NULL;
             /* If domain is not using multiple serial ports we parse data old way */
-            if (xenConfigGetString(conf, "serial", &str, NULL) < 0)
+            if (xenConfigGetString(conf, "serial", &serial, NULL) < 0)
                 goto cleanup;
-            if (str && STRNEQ(str, "none") &&
-                !(chr = xenParseSxprChar(str, NULL)))
+            if (serial && STRNEQ(serial, "none") &&
+                !(chr = xenParseSxprChar(serial, NULL)))
                 goto cleanup;
             if (chr) {
                 if (VIR_ALLOC_N(def->serials, 1) < 0)
@@ -1049,7 +1050,7 @@ xenParseVifList(virConfPtr conf, virDomainDefPtr def, const char *vif_typename)
 static int
 xenParseEmulatedDevices(virConfPtr conf, virDomainDefPtr def)
 {
-    const char *str;
+    VIR_AUTOFREE(char *) str = NULL;
 
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
         if (xenConfigGetString(conf, "soundhw", &str, NULL) < 0)
@@ -1068,7 +1069,7 @@ static int
 xenParseGeneralMeta(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps)
 {
     virCapsDomainDataPtr capsdata = NULL;
-    const char *str;
+    VIR_AUTOFREE(char *) str = NULL;
     int hvm = 0, ret = -1;
 
     if (xenConfigCopyString(conf, "name", &def->name) < 0)

diff --git a/src/xenconfig/xen_common.h b/src/xenconfig/xen_common.h
index 3b7a5db4f3b1c86d2fbe4431760ca2c319ac00d8..a26c9e60c49118eb9ff9a6acf5751644f9322f73 100644 (file)
--- a/src/xenconfig/xen_common.h
+++ b/src/xenconfig/xen_common.h
@@ -33,7 +33,7 @@
 
 int xenConfigGetString(virConfPtr conf,
                        const char *name,
-                       const char **value,
+                       char **value,
                        const char *def);
 
 int xenConfigGetBool(virConfPtr conf, const char *name, int *value, int def);

diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c
index 19b6604e0522a92ceeef1c7d17d45b242fc622f2..7250e5735defea696958330d13549a9c9250b556 100644 (file)
--- a/src/xenconfig/xen_xl.c
+++ b/src/xenconfig/xen_xl.c
@@ -65,7 +65,9 @@ extern int xlu_disk_parse(XLU_Config *cfg,
 static int xenParseCmdline(virConfPtr conf, char **r_cmdline)
 {
     char *cmdline = NULL;
-    const char *root, *extra, *buf;
+    VIR_AUTOFREE(char *) root = NULL;
+    VIR_AUTOFREE(char *) extra = NULL;
+    VIR_AUTOFREE(char *) buf = NULL;
 
     if (xenConfigGetString(conf, "cmdline", &buf, NULL) < 0)
         return -1;
@@ -104,8 +106,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps)
     size_t i;
 
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
-        const char *bios;
-        const char *boot;
+        VIR_AUTOFREE(char *) bios = NULL;
+        VIR_AUTOFREE(char *) boot = NULL;
         int val = 0;
 
         if (xenConfigGetString(conf, "bios", &bios, NULL) < 0)
@@ -255,7 +257,7 @@ xenTranslateCPUFeature(const char *feature_name, bool from_libxl)
 static int
 xenParseXLCPUID(virConfPtr conf, virDomainDefPtr def)
 {
-    const char *cpuid_str = NULL;
+    VIR_AUTOFREE(char *) cpuid_str = NULL;
     char **cpuid_pairs = NULL;
     char **name_and_value = NULL;
     size_t i;

diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c
index 7b60f25ec1c21612f3347ecfb1ed50ff24011267..909e8fad40612a17628f1bbd1773d142876382b6 100644 (file)
--- a/src/xenconfig/xen_xm.c
+++ b/src/xenconfig/xen_xm.c
@@ -44,7 +44,7 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def)
     size_t i;
 
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
-        const char *boot;
+        VIR_AUTOFREE(char *) boot = NULL;
 
         if (VIR_ALLOC(def->os.loader) < 0 ||
             xenConfigCopyString(conf, "kernel", &def->os.loader->path) < 0)
@@ -72,7 +72,8 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def)
             def->os.nBootDevs++;
         }
     } else {
-        const char *extra, *root;
+        VIR_AUTOFREE(char *) extra = NULL;
+        VIR_AUTOFREE(char *) root = NULL;
 
         if (xenConfigCopyStringOpt(conf, "bootloader", &def->os.bootloader) < 0)
             return -1;
@@ -417,7 +418,7 @@ xenFormatXMDisks(virConfPtr conf, virDomainDefPtr def)
 static int
 xenParseXMInputDevs(virConfPtr conf, virDomainDefPtr def)
 {
-    const char *str;
+    VIR_AUTOFREE(char *) str = NULL;
 
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
         if (xenConfigGetString(conf, "usbdevice", &str, NULL) < 0)