|
 |
43fe83 |
From db9bc36fa1fe8d999514304a67992f78a298dcd7 Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <db9bc36fa1fe8d999514304a67992f78a298dcd7.1383922566.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
43fe83 |
Date: Fri, 8 Nov 2013 12:33:20 +0100
|
|
|
43fe83 |
Subject: [PATCH] cpu: x86: Rename x86DataFree() as virCPUx86DataFree()
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=1008989
|
|
|
43fe83 |
|
|
|
43fe83 |
(cherry picked from commit a3e224e2d9945832473d8993d2c7c3fbded7fd0c)
|
|
|
43fe83 |
|
|
|
43fe83 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
43fe83 |
---
|
|
|
43fe83 |
src/cpu/cpu_x86.c | 34 +++++++++++++++++-----------------
|
|
|
43fe83 |
1 file changed, 17 insertions(+), 17 deletions(-)
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
|
|
|
43fe83 |
index 94ba7a4..083cfee 100644
|
|
|
43fe83 |
--- a/src/cpu/cpu_x86.c
|
|
|
43fe83 |
+++ b/src/cpu/cpu_x86.c
|
|
|
43fe83 |
@@ -204,7 +204,7 @@ x86DataCpuid(const virCPUx86Data *data,
|
|
|
43fe83 |
|
|
|
43fe83 |
|
|
|
43fe83 |
static void
|
|
|
43fe83 |
-x86DataFree(virCPUx86Data *data)
|
|
|
43fe83 |
+virCPUx86DataFree(virCPUx86Data *data)
|
|
|
43fe83 |
{
|
|
|
43fe83 |
if (data == NULL)
|
|
|
43fe83 |
return;
|
|
|
43fe83 |
@@ -236,7 +236,7 @@ x86FreeCPUData(virCPUDataPtr data)
|
|
|
43fe83 |
if (!data)
|
|
|
43fe83 |
return;
|
|
|
43fe83 |
|
|
|
43fe83 |
- x86DataFree(data->data.x86);
|
|
|
43fe83 |
+ virCPUx86DataFree(data->data.x86);
|
|
|
43fe83 |
VIR_FREE(data);
|
|
|
43fe83 |
}
|
|
|
43fe83 |
|
|
|
43fe83 |
@@ -250,7 +250,7 @@ x86DataCopy(const virCPUx86Data *data)
|
|
|
43fe83 |
if (VIR_ALLOC(copy) < 0
|
|
|
43fe83 |
|| VIR_ALLOC_N(copy->basic, data->basic_len) < 0
|
|
|
43fe83 |
|| VIR_ALLOC_N(copy->extended, data->extended_len) < 0) {
|
|
|
43fe83 |
- x86DataFree(copy);
|
|
|
43fe83 |
+ virCPUx86DataFree(copy);
|
|
|
43fe83 |
return NULL;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
|
|
|
43fe83 |
@@ -489,8 +489,8 @@ x86DataToCPU(const virCPUx86Data *data,
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
|
|
|
43fe83 |
cleanup:
|
|
|
43fe83 |
- x86DataFree(modelData);
|
|
|
43fe83 |
- x86DataFree(copy);
|
|
|
43fe83 |
+ virCPUx86DataFree(modelData);
|
|
|
43fe83 |
+ virCPUx86DataFree(copy);
|
|
|
43fe83 |
return cpu;
|
|
|
43fe83 |
|
|
|
43fe83 |
error:
|
|
|
43fe83 |
@@ -614,7 +614,7 @@ x86FeatureFree(struct x86_feature *feature)
|
|
|
43fe83 |
return;
|
|
|
43fe83 |
|
|
|
43fe83 |
VIR_FREE(feature->name);
|
|
|
43fe83 |
- x86DataFree(feature->data);
|
|
|
43fe83 |
+ virCPUx86DataFree(feature->data);
|
|
|
43fe83 |
VIR_FREE(feature);
|
|
|
43fe83 |
}
|
|
|
43fe83 |
|
|
|
43fe83 |
@@ -784,7 +784,7 @@ x86ModelFree(struct x86_model *model)
|
|
|
43fe83 |
return;
|
|
|
43fe83 |
|
|
|
43fe83 |
VIR_FREE(model->name);
|
|
|
43fe83 |
- x86DataFree(model->data);
|
|
|
43fe83 |
+ virCPUx86DataFree(model->data);
|
|
|
43fe83 |
VIR_FREE(model);
|
|
|
43fe83 |
}
|
|
|
43fe83 |
|
|
|
43fe83 |
@@ -997,7 +997,7 @@ x86ModelLoad(xmlXPathContextPtr ctxt,
|
|
|
43fe83 |
VIR_FREE(name);
|
|
|
43fe83 |
|
|
|
43fe83 |
model->vendor = ancestor->vendor;
|
|
|
43fe83 |
- x86DataFree(model->data);
|
|
|
43fe83 |
+ virCPUx86DataFree(model->data);
|
|
|
43fe83 |
if (!(model->data = x86DataCopy(ancestor->data)))
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
@@ -1210,7 +1210,7 @@ cleanup:
|
|
|
43fe83 |
VIR_FREE(nodes);
|
|
|
43fe83 |
xmlXPathFreeContext(ctxt);
|
|
|
43fe83 |
xmlFreeDoc(xml);
|
|
|
43fe83 |
- x86DataFree(data);
|
|
|
43fe83 |
+ virCPUx86DataFree(data);
|
|
|
43fe83 |
return cpuData;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
|
|
|
43fe83 |
@@ -1368,7 +1368,7 @@ x86Compute(virCPUDefPtr host,
|
|
|
43fe83 |
|
|
|
43fe83 |
if (!(guestData = x86DataCopy(guest_model->data)) ||
|
|
|
43fe83 |
!(*guest = x86MakeCPUData(arch, &guestData))) {
|
|
|
43fe83 |
- x86DataFree(guestData);
|
|
|
43fe83 |
+ virCPUx86DataFree(guestData);
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
}
|
|
|
43fe83 |
@@ -1650,12 +1650,12 @@ cleanup:
|
|
|
43fe83 |
return ret;
|
|
|
43fe83 |
|
|
|
43fe83 |
error:
|
|
|
43fe83 |
- x86DataFree(data_forced);
|
|
|
43fe83 |
- x86DataFree(data_required);
|
|
|
43fe83 |
- x86DataFree(data_optional);
|
|
|
43fe83 |
- x86DataFree(data_disabled);
|
|
|
43fe83 |
- x86DataFree(data_forbidden);
|
|
|
43fe83 |
- x86DataFree(data_vendor);
|
|
|
43fe83 |
+ virCPUx86DataFree(data_forced);
|
|
|
43fe83 |
+ virCPUx86DataFree(data_required);
|
|
|
43fe83 |
+ virCPUx86DataFree(data_optional);
|
|
|
43fe83 |
+ virCPUx86DataFree(data_disabled);
|
|
|
43fe83 |
+ virCPUx86DataFree(data_forbidden);
|
|
|
43fe83 |
+ virCPUx86DataFree(data_vendor);
|
|
|
43fe83 |
if (forced)
|
|
|
43fe83 |
x86FreeCPUData(*forced);
|
|
|
43fe83 |
if (required)
|
|
|
43fe83 |
@@ -1754,7 +1754,7 @@ x86NodeData(void)
|
|
|
43fe83 |
return cpuData;
|
|
|
43fe83 |
|
|
|
43fe83 |
error:
|
|
|
43fe83 |
- x86DataFree(data);
|
|
|
43fe83 |
+ virCPUx86DataFree(data);
|
|
|
43fe83 |
|
|
|
43fe83 |
return NULL;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.4.2
|
|
|
43fe83 |
|