Adapt to VIR_ALLOC and virAsprintf in src/cpu/*

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 68125a540e27544a8efd77dd3e1280d6bce25b22..33d91f531e838797e60a6ebdfb56582124541e41 100644 (file)
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -308,7 +308,7 @@ cpuBaselineXML(const char **xmlCPUs,
     }
 
     if (VIR_ALLOC_N(cpus, ncpus))
-        goto no_memory;
+        goto error;
 
     for (i = 0; i < ncpus; i++) {
         if (!(doc = virXMLParseStringCtxt(xmlCPUs[i], _("(CPU_definition)"), &ctxt)))
@@ -341,8 +341,6 @@ cleanup:
 
     return cpustr;
 
-no_memory:
-    virReportOOMError();
 error:
     cpustr = NULL;
     goto cleanup;

diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
index cfe1a236cafdadcc9cc346ca46a8eb2d400892fb..0748267150f97ce5a947cb48abad83eca9bde357 100644 (file)
--- a/src/cpu/cpu_arm.c
+++ b/src/cpu/cpu_arm.c
@@ -35,11 +35,7 @@ ArmNodeData(void)
 {
     union cpuData *data;
 
-    if (VIR_ALLOC(data) < 0) {
-        virReportOOMError();
-        return NULL;
-    }
-
+    ignore_value(VIR_ALLOC(data));
     return data;
 }
 

diff --git a/src/cpu/cpu_generic.c b/src/cpu/cpu_generic.c
index 7e3eda28aeb0d49ea03cb39dd71d613ac9a3e253..0d99901450bb6f8048383d629110c314ee3ec13f 100644 (file)
--- a/src/cpu/cpu_generic.c
+++ b/src/cpu/cpu_generic.c
@@ -69,10 +69,8 @@ genericCompare(virCPUDefPtr host,
         STRNEQ(host->model, cpu->model))
         return VIR_CPU_COMPARE_INCOMPATIBLE;
 
-    if ((hash = genericHashFeatures(host)) == NULL) {
-        virReportOOMError();
+    if ((hash = genericHashFeatures(host)) == NULL)
         goto cleanup;
-    }
 
     reqfeatures = 0;
     for (i = 0; i < cpu->nfeatures; i++) {
@@ -133,7 +131,7 @@ genericBaseline(virCPUDefPtr *cpus,
     if (VIR_ALLOC(cpu) < 0 ||
         VIR_STRDUP(cpu->model, cpus[0]->model) < 0 ||
         VIR_ALLOC_N(features, cpus[0]->nfeatures) < 0)
-        goto no_memory;
+        goto error;
 
     cpu->arch = cpus[0]->arch;
     cpu->type = VIR_CPU_TYPE_HOST;
@@ -161,7 +159,7 @@ genericBaseline(virCPUDefPtr *cpus,
         }
 
         if (!(hash = genericHashFeatures(cpus[i])))
-            goto no_memory;
+            goto error;
 
         for (j = 0; j < nfeatures; j++) {
             if (features[j].name &&
@@ -175,7 +173,7 @@ genericBaseline(virCPUDefPtr *cpus,
     }
 
     if (VIR_ALLOC_N(cpu->features, count) < 0)
-        goto no_memory;
+        goto error;
     cpu->nfeatures = count;
 
     j = 0;
@@ -192,8 +190,6 @@ cleanup:
 
     return cpu;
 
-no_memory:
-    virReportOOMError();
 error:
     virCPUDefFree(cpu);
     cpu = NULL;

diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
index d17f9ca58ff3a94f90496960a7ac1ef52edcc90a..c0e257b1bfe3773169f79922c4b512d39eafab54 100644 (file)
--- a/src/cpu/cpu_powerpc.c
+++ b/src/cpu/cpu_powerpc.c
@@ -132,10 +132,8 @@ ppcVendorLoad(xmlXPathContextPtr ctxt,
 {
     struct ppc_vendor *vendor = NULL;
 
-    if (VIR_ALLOC(vendor) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC(vendor) < 0)
         return -1;
-    }
 
     vendor->name = virXPathString("string(@name)", ctxt);
     if (!vendor->name) {
@@ -173,10 +171,8 @@ ppcModelLoad(xmlXPathContextPtr ctxt,
     char *vendor = NULL;
     unsigned long pvr;
 
-    if (VIR_ALLOC(model) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC(model) < 0)
         return -1;
-    }
 
     model->name = virXPathString("string(@name)", ctxt);
     if (!model->name) {
@@ -279,10 +275,8 @@ ppcLoadMap(void)
 {
     struct ppc_map *map;
 
-    if (VIR_ALLOC(map) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC(map) < 0)
         return NULL;
-    }
 
     if (cpuMapLoad("ppc64", ppcMapLoadCallback, map) < 0)
         goto error;
@@ -362,10 +356,8 @@ ppcNodeData(void)
 {
     union cpuData *data;
 
-    if (VIR_ALLOC(data) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC(data) < 0)
         return NULL;
-    }
 
     asm("mfpvr %0"
         : "=r" (data->ppc.pvr));
@@ -449,7 +441,7 @@ ppcBaseline(virCPUDefPtr *cpus,
 
     if (VIR_ALLOC(cpu) < 0 ||
         VIR_STRDUP(cpu->model, model->name) < 0)
-        goto no_memory;
+        goto error;
 
     if (vendor && VIR_STRDUP(cpu->vendor, vendor->name) < 0)
         goto error;
@@ -462,8 +454,6 @@ cleanup:
 
     return cpu;
 
-no_memory:
-    virReportOOMError();
 error:
     virCPUDefFree(cpu);
     cpu = NULL;

diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c
index 998197c9049176d36cf44f5eddf8833201bcc9a4..0d578a492f5bab2b023da932ed8fffabe37a946c 100644 (file)
--- a/src/cpu/cpu_s390.c
+++ b/src/cpu/cpu_s390.c
@@ -36,10 +36,8 @@ s390NodeData(void)
 {
     union cpuData *data;
 
-    if (VIR_ALLOC(data) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC(data) < 0)
         return NULL;
-    }
 
     return data;
 }

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 5d479c284a7a936094763f94c4f14bf56fc1620c..79a244ee7aa8b3b6addf032234bc01ff471564b7 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -252,7 +252,7 @@ x86DataExpand(union cpuData *data,
     if (basic_by > 0) {
         size_t len = data->x86.basic_len;
         if (VIR_EXPAND_N(data->x86.basic, data->x86.basic_len, basic_by) < 0)
-            goto no_memory;
+            return -1;
 
         for (i = 0; i < basic_by; i++)
             data->x86.basic[len + i].function = len + i;
@@ -261,17 +261,13 @@ x86DataExpand(union cpuData *data,
     if (extended_by > 0) {
         size_t len = data->x86.extended_len;
         if (VIR_EXPAND_N(data->x86.extended, data->x86.extended_len, extended_by) < 0)
-            goto no_memory;
+            return -1;
 
         for (i = 0; i < extended_by; i++)
             data->x86.extended[len + i].function = len + i + CPUX86_EXTENDED;
     }
 
     return 0;
-
-no_memory:
-    virReportOOMError();
-    return -1;
 }
 
 
@@ -452,11 +448,11 @@ x86DataToCPU(const union cpuData *data,
         VIR_STRDUP(cpu->model, model->name) < 0 ||
         !(copy = x86DataCopy(data)) ||
         !(modelData = x86DataCopy(model->data)))
-        goto no_memory;
+        goto error;
 
     if ((vendor = x86DataToVendor(copy, map)) &&
         VIR_STRDUP(cpu->vendor, vendor->name) < 0)
-        goto no_memory;
+        goto error;
 
     x86DataSubtract(copy, modelData);
     x86DataSubtract(modelData, data);
@@ -473,8 +469,6 @@ cleanup:
     x86DataFree(copy);
     return cpu;
 
-no_memory:
-    virReportOOMError();
 error:
     virCPUDefFree(cpu);
     cpu = NULL;
@@ -520,7 +514,7 @@ x86VendorLoad(xmlXPathContextPtr ctxt,
     int ret = 0;
 
     if (VIR_ALLOC(vendor) < 0)
-        goto no_memory;
+        goto error;
 
     vendor->name = virXPathString("string(@name)", ctxt);
     if (!vendor->name) {
@@ -564,8 +558,7 @@ out:
 
     return ret;
 
-no_memory:
-    virReportOOMError();
+error:
     ret = -1;
 ignore:
     x86VendorFree(vendor);
@@ -660,7 +653,7 @@ x86FeatureLoad(xmlXPathContextPtr ctxt,
     int n;
 
     if (!(feature = x86FeatureNew()))
-        goto no_memory;
+        goto error;
 
     feature->name = virXPathString("string(@name)", ctxt);
     if (feature->name == NULL) {
@@ -706,7 +699,7 @@ x86FeatureLoad(xmlXPathContextPtr ctxt,
         cpuid.edx = edx;
 
         if (x86DataAddCpuid(feature->data, &cpuid))
-            goto no_memory;
+            goto error;
     }
 
     if (map->features == NULL)
@@ -722,8 +715,7 @@ out:
 
     return ret;
 
-no_memory:
-    virReportOOMError();
+error:
     ret = -1;
 
 ignore:
@@ -813,9 +805,9 @@ x86ModelFromCPU(const virCPUDefPtr cpu,
         }
 
         if ((model = x86ModelCopy(model)) == NULL)
-            goto no_memory;
+            goto error;
     } else if (!(model = x86ModelNew())) {
-        goto no_memory;
+        goto error;
     } else if (cpu->type == VIR_CPU_TYPE_HOST) {
         return model;
     }
@@ -834,14 +826,11 @@ x86ModelFromCPU(const virCPUDefPtr cpu,
         }
 
         if (x86DataAdd(model->data, feature->data))
-            goto no_memory;
+            goto error;
     }
 
     return model;
 
-no_memory:
-    virReportOOMError();
-
 error:
     x86ModelFree(model);
     return NULL;
@@ -940,7 +929,7 @@ x86ModelLoad(xmlXPathContextPtr ctxt,
     int n;
 
     if (!(model = x86ModelNew()))
-        goto no_memory;
+        goto error;
 
     model->name = virXPathString("string(@name)", ctxt);
     if (model->name == NULL) {
@@ -974,7 +963,7 @@ x86ModelLoad(xmlXPathContextPtr ctxt,
         model->vendor = ancestor->vendor;
         x86DataFree(model->data);
         if (!(model->data = x86DataCopy(ancestor->data)))
-            goto no_memory;
+            goto error;
     }
 
     if (virXPathBoolean("boolean(./vendor)", ctxt)) {
@@ -1018,7 +1007,7 @@ x86ModelLoad(xmlXPathContextPtr ctxt,
         VIR_FREE(name);
 
         if (x86DataAdd(model->data, feature->data))
-            goto no_memory;
+            goto error;
     }
 
     if (map->models == NULL)
@@ -1033,8 +1022,7 @@ out:
     VIR_FREE(nodes);
     return ret;
 
-no_memory:
-    virReportOOMError();
+error:
     ret = -1;
 
 ignore:
@@ -1098,10 +1086,8 @@ x86LoadMap(void)
 {
     struct x86_map *map;
 
-    if (VIR_ALLOC(map) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC(map) < 0)
         return NULL;
-    }
 
     if (cpuMapLoad("x86", x86MapLoadCallback, map) < 0)
         goto error;
@@ -1125,12 +1111,14 @@ error:
 #define virX86CpuIncompatible(MSG, CPU_DEF)                             \
         do {                                                            \
             char *flagsStr = NULL;                                      \
-            if (!(flagsStr = x86FeatureNames(map, ", ", (CPU_DEF))))    \
-                goto no_memory;                                         \
+            if (!(flagsStr = x86FeatureNames(map, ", ", (CPU_DEF)))) {  \
+                virReportOOMError();                                    \
+                goto error;                                             \
+            }                                                           \
             if (message &&                                              \
                 virAsprintf(message, "%s: %s", _(MSG), flagsStr) < 0) { \
                 VIR_FREE(flagsStr);                                     \
-                goto no_memory;                                         \
+                goto error;                                             \
             }                                                           \
             VIR_DEBUG("%s: %s", MSG, flagsStr);                         \
             VIR_FREE(flagsStr);                                         \
@@ -1173,7 +1161,7 @@ x86Compute(virCPUDefPtr host,
                 virAsprintf(message,
                             _("CPU arch %s does not match host arch"),
                             virArchToString(cpu->arch)) < 0)
-                goto no_memory;
+                goto error;
             return VIR_CPU_COMPARE_INCOMPATIBLE;
         }
     }
@@ -1187,7 +1175,7 @@ x86Compute(virCPUDefPtr host,
                         _("host CPU vendor does not match required "
                           "CPU vendor %s"),
                         cpu->vendor) < 0)
-            goto no_memory;
+            goto error;
         return VIR_CPU_COMPARE_INCOMPATIBLE;
     }
 
@@ -1220,7 +1208,7 @@ x86Compute(virCPUDefPtr host,
     ret = VIR_CPU_COMPARE_IDENTICAL;
 
     if ((diff = x86ModelCopy(host_model)) == NULL)
-        goto no_memory;
+        goto error;
 
     x86DataSubtract(diff->data, cpu_optional->data);
     x86DataSubtract(diff->data, cpu_require->data);
@@ -1241,19 +1229,19 @@ x86Compute(virCPUDefPtr host,
 
     if (guest != NULL) {
         if ((guest_model = x86ModelCopy(host_model)) == NULL)
-            goto no_memory;
+            goto error;
 
         if (cpu->type == VIR_CPU_TYPE_GUEST
             && cpu->match == VIR_CPU_MATCH_EXACT)
             x86DataSubtract(guest_model->data, diff->data);
 
         if (x86DataAdd(guest_model->data, cpu_force->data))
-            goto no_memory;
+            goto error;
 
         x86DataSubtract(guest_model->data, cpu_disable->data);
 
         if ((*guest = x86DataCopy(guest_model->data)) == NULL)
-            goto no_memory;
+            goto error;
     }
 
 out:
@@ -1269,9 +1257,6 @@ out:
 
     return ret;
 
-no_memory:
-    virReportOOMError();
-
 error:
     ret = VIR_CPU_COMPARE_ERROR;
     goto out;
@@ -1481,7 +1466,6 @@ x86Encode(const virCPUDefPtr cpu,
         if (v &&
             (VIR_ALLOC(data_vendor) < 0 ||
              x86DataAddCpuid(data_vendor, &v->cpuid) < 0)) {
-            virReportOOMError();
             goto error;
         }
     }
@@ -1562,10 +1546,8 @@ cpuidSet(uint32_t base, struct cpuX86cpuid **set)
     cpuidCall(&cpuid);
     max = cpuid.eax - base;
 
-    if (VIR_ALLOC_N(*set, max + 1) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC_N(*set, max + 1) < 0)
         return -1;
-    }
 
     for (i = 0; i <= max; i++) {
         cpuid.function = base | i;
@@ -1583,10 +1565,8 @@ x86NodeData(void)
     union cpuData *data;
     int ret;
 
-    if (VIR_ALLOC(data) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC(data) < 0)
         return NULL;
-    }
 
     if ((ret = cpuidSet(CPUX86_BASIC, &data->x86.basic)) < 0)
         goto error;
@@ -1627,7 +1607,7 @@ x86Baseline(virCPUDefPtr *cpus,
         goto error;
 
     if (VIR_ALLOC(cpu) < 0)
-        goto no_memory;
+        goto error;
 
     cpu->arch = cpus[0]->arch;
     cpu->type = VIR_CPU_TYPE_GUEST;
@@ -1689,7 +1669,7 @@ x86Baseline(virCPUDefPtr *cpus,
     }
 
     if (vendor && x86DataAddCpuid(base_model->data, &vendor->cpuid) < 0)
-        goto no_memory;
+        goto error;
 
     if (x86Decode(cpu, base_model->data, models, nmodels, NULL) < 0)
         goto error;
@@ -1705,8 +1685,6 @@ cleanup:
 
     return cpu;
 
-no_memory:
-    virReportOOMError();
 error:
     x86ModelFree(model);
     virCPUDefFree(cpu);