2:03 a.m.
---
src/cpu/cpu.c | 8 ++++----
src/cpu/cpu_generic.c | 6 +++---
src/cpu/cpu_map.c | 6 +++---
src/cpu/cpu_powerpc.c | 20 ++++++++++----------
src/cpu/cpu_x86.c | 50 +++++++++++++++++++++++++-------------------------
5 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 1994383..e91f5bb 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -103,7 +103,7 @@ cpuCompareXML(virCPUDefPtr host,
ret = cpuCompare(host, cpu);
-cleanup:
+ cleanup:
virCPUDefFree(cpu);
xmlXPathFreeContext(ctxt);
xmlFreeDoc(doc);
@@ -335,7 +335,7 @@ cpuBaselineXML(const char **xmlCPUs,
cpustr = virCPUDefFormat(cpu, 0);
-cleanup:
+ cleanup:
if (cpus) {
for (i = 0; i < ncpus; i++)
virCPUDefFree(cpus[i]);
@@ -347,7 +347,7 @@ cleanup:
return cpustr;
-error:
+ error:
cpustr = NULL;
goto cleanup;
}
@@ -577,7 +577,7 @@ cpuGetModels(const char *archName, char ***models)
return data.len - 1;
-error:
+ error:
virStringFreeList(data.data);
return -1;
}
diff --git a/src/cpu/cpu_generic.c b/src/cpu/cpu_generic.c
index 1264da4..314d1e1 100644
--- a/src/cpu/cpu_generic.c
+++ b/src/cpu/cpu_generic.c
@@ -103,7 +103,7 @@ genericCompare(virCPUDefPtr host,
else
ret = VIR_CPU_COMPARE_IDENTICAL;
-cleanup:
+ cleanup:
virHashFree(hash);
return ret;
}
@@ -188,12 +188,12 @@ genericBaseline(virCPUDefPtr *cpus,
goto error;
}
-cleanup:
+ cleanup:
VIR_FREE(features);
return cpu;
-error:
+ error:
virCPUDefFree(cpu);
cpu = NULL;
goto cleanup;
diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c
index 5a01d7b..fca306e 100644
--- a/src/cpu/cpu_map.c
+++ b/src/cpu/cpu_map.c
@@ -70,7 +70,7 @@ static int load(xmlXPathContextPtr ctxt,
ret = 0;
-cleanup:
+ cleanup:
ctxt->node = ctxt_node;
return ret;
@@ -137,14 +137,14 @@ int cpuMapLoad(const char *arch,
ret = 0;
-cleanup:
+ cleanup:
xmlXPathFreeContext(ctxt);
xmlFreeDoc(xml);
VIR_FREE(xpath);
return ret;
-no_memory:
+ no_memory:
virReportOOMError();
goto cleanup;
}
diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
index 36f4f25..3b868bb 100644
--- a/src/cpu/cpu_powerpc.c
+++ b/src/cpu/cpu_powerpc.c
@@ -163,7 +163,7 @@ ppcModelFromCPU(const virCPUDef *cpu,
return model;
-error:
+ error:
ppcModelFree(model);
return NULL;
}
@@ -198,10 +198,10 @@ ppcVendorLoad(xmlXPathContextPtr ctxt,
map->vendors = vendor;
}
-cleanup:
+ cleanup:
return 0;
-ignore:
+ ignore:
ppcVendorFree(vendor);
goto cleanup;
}
@@ -263,11 +263,11 @@ ppcModelLoad(xmlXPathContextPtr ctxt,
map->models = model;
}
-cleanup:
+ cleanup:
VIR_FREE(vendor);
return 0;
-ignore:
+ ignore:
ppcModelFree(model);
goto cleanup;
}
@@ -326,7 +326,7 @@ ppcLoadMap(void)
return map;
-error:
+ error:
ppcMapFree(map);
return NULL;
}
@@ -431,7 +431,7 @@ ppcCompute(virCPUDefPtr host,
ret = VIR_CPU_COMPARE_IDENTICAL;
-cleanup:
+ cleanup:
ppcMapFree(map);
ppcModelFree(host_model);
ppcModelFree(guest_model);
@@ -487,7 +487,7 @@ ppcDecode(virCPUDefPtr cpu,
ret = 0;
-cleanup:
+ cleanup:
ppcMapFree(map);
return ret;
@@ -632,12 +632,12 @@ ppcBaseline(virCPUDefPtr *cpus,
cpu->type = VIR_CPU_TYPE_GUEST;
cpu->match = VIR_CPU_MATCH_EXACT;
-cleanup:
+ cleanup:
ppcMapFree(map);
return cpu;
-error:
+ error:
virCPUDefFree(cpu);
cpu = NULL;
goto cleanup;
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 423bcc1..7328582 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -459,12 +459,12 @@ x86DataToCPU(const virCPUx86Data *data,
x86DataToCPUFeatures(cpu, VIR_CPU_FEATURE_DISABLE, modelData, map))
goto error;
-cleanup:
+ cleanup:
virCPUx86DataFree(modelData);
virCPUx86DataFree(copy);
return cpu;
-error:
+ error:
virCPUDefFree(cpu);
cpu = NULL;
goto cleanup;
@@ -549,14 +549,14 @@ x86VendorLoad(xmlXPathContextPtr ctxt,
map->vendors = vendor;
}
-out:
+ out:
VIR_FREE(string);
return ret;
-error:
+ error:
ret = -1;
-ignore:
+ ignore:
x86VendorFree(vendor);
goto out;
}
@@ -717,16 +717,16 @@ x86FeatureLoad(xmlXPathContextPtr ctxt,
map->features = feature;
}
-out:
+ out:
ctxt->node = ctxt_node;
VIR_FREE(nodes);
return ret;
-error:
+ error:
ret = -1;
-ignore:
+ ignore:
x86FeatureFree(feature);
goto out;
}
@@ -756,7 +756,7 @@ x86DataFromCPUFeatures(virCPUDefPtr cpu,
return data;
-error:
+ error:
virCPUx86DataFree(data);
return NULL;
}
@@ -869,7 +869,7 @@ x86ModelFromCPU(const virCPUDef *cpu,
return model;
-error:
+ error:
x86ModelFree(model);
return NULL;
}
@@ -1055,15 +1055,15 @@ x86ModelLoad(xmlXPathContextPtr ctxt,
map->models = model;
}
-out:
+ out:
VIR_FREE(vendor);
VIR_FREE(nodes);
return ret;
-error:
+ error:
ret = -1;
-ignore:
+ ignore:
x86ModelFree(model);
goto out;
}
@@ -1155,7 +1155,7 @@ x86MapLoadInternalFeatures(struct x86_map *map)
return 0;
-error:
+ error:
x86FeatureFree(feature);
return -1;
}
@@ -1177,7 +1177,7 @@ virCPUx86LoadMap(void)
return map;
-error:
+ error:
x86MapFree(map);
return NULL;
}
@@ -1273,7 +1273,7 @@ x86CPUDataParse(const char *xmlStr)
cpuData = virCPUx86MakeData(VIR_ARCH_X86_64, &data);
-cleanup:
+ cleanup:
VIR_FREE(nodes);
xmlXPathFreeContext(ctxt);
xmlFreeDoc(xml);
@@ -1442,7 +1442,7 @@ x86Compute(virCPUDefPtr host,
}
}
-cleanup:
+ cleanup:
x86ModelFree(host_model);
x86ModelFree(diff);
x86ModelFree(cpu_force);
@@ -1454,7 +1454,7 @@ cleanup:
return ret;
-error:
+ error:
ret = VIR_CPU_COMPARE_ERROR;
goto cleanup;
}
@@ -1593,7 +1593,7 @@ x86Decode(virCPUDefPtr cpu,
ret = 0;
-out:
+ out:
virCPUDefFree(cpuModel);
virCPUx86DataFree(copy);
virCPUx86DataFree(features);
@@ -1732,7 +1732,7 @@ x86Encode(virArch arch,
return 0;
-error:
+ error:
virCPUx86DataFree(data_forced);
virCPUx86DataFree(data_required);
virCPUx86DataFree(data_optional);
@@ -1831,7 +1831,7 @@ x86NodeData(virArch arch)
return cpuData;
-error:
+ error:
virCPUx86DataFree(data);
return NULL;
@@ -1948,12 +1948,12 @@ x86Baseline(virCPUDefPtr *cpus,
cpu->arch = VIR_ARCH_NONE;
-cleanup:
+ cleanup:
x86ModelFree(base_model);
return cpu;
-error:
+ error:
x86ModelFree(model);
virCPUDefFree(cpu);
cpu = NULL;
@@ -2001,7 +2001,7 @@ x86UpdateCustom(virCPUDefPtr guest,
ret = 0;
-cleanup:
+ cleanup:
x86ModelFree(host_model);
return ret;
}
@@ -2083,7 +2083,7 @@ x86HasFeature(const virCPUData *data,
ret = x86DataIsSubset(data->data.x86, feature->data) ? 1 : 0;
-cleanup:
+ cleanup:
return ret;
}
--
1.8.3.2