From db9bc36fa1fe8d999514304a67992f78a298dcd7 Mon Sep 17 00:00:00 2001
Message-Id: <db9bc36fa1fe8d999514304a67992f78a298dcd7.1383922566.git.jdenemar@redhat.com>
From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 8 Nov 2013 12:33:20 +0100
Subject: [PATCH] cpu: x86: Rename x86DataFree() as virCPUx86DataFree()

https://bugzilla.redhat.com/show_bug.cgi?id=1008989

(cherry picked from commit a3e224e2d9945832473d8993d2c7c3fbded7fd0c)

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/cpu/cpu_x86.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 94ba7a4..083cfee 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -204,7 +204,7 @@ x86DataCpuid(const virCPUx86Data *data,
 
 
 static void
-x86DataFree(virCPUx86Data *data)
+virCPUx86DataFree(virCPUx86Data *data)
 {
     if (data == NULL)
         return;
@@ -236,7 +236,7 @@ x86FreeCPUData(virCPUDataPtr data)
     if (!data)
         return;
 
-    x86DataFree(data->data.x86);
+    virCPUx86DataFree(data->data.x86);
     VIR_FREE(data);
 }
 
@@ -250,7 +250,7 @@ x86DataCopy(const virCPUx86Data *data)
     if (VIR_ALLOC(copy) < 0
         || VIR_ALLOC_N(copy->basic, data->basic_len) < 0
         || VIR_ALLOC_N(copy->extended, data->extended_len) < 0) {
-        x86DataFree(copy);
+        virCPUx86DataFree(copy);
         return NULL;
     }
 
@@ -489,8 +489,8 @@ x86DataToCPU(const virCPUx86Data *data,
         goto error;
 
 cleanup:
-    x86DataFree(modelData);
-    x86DataFree(copy);
+    virCPUx86DataFree(modelData);
+    virCPUx86DataFree(copy);
     return cpu;
 
 error:
@@ -614,7 +614,7 @@ x86FeatureFree(struct x86_feature *feature)
         return;
 
     VIR_FREE(feature->name);
-    x86DataFree(feature->data);
+    virCPUx86DataFree(feature->data);
     VIR_FREE(feature);
 }
 
@@ -784,7 +784,7 @@ x86ModelFree(struct x86_model *model)
         return;
 
     VIR_FREE(model->name);
-    x86DataFree(model->data);
+    virCPUx86DataFree(model->data);
     VIR_FREE(model);
 }
 
@@ -997,7 +997,7 @@ x86ModelLoad(xmlXPathContextPtr ctxt,
         VIR_FREE(name);
 
         model->vendor = ancestor->vendor;
-        x86DataFree(model->data);
+        virCPUx86DataFree(model->data);
         if (!(model->data = x86DataCopy(ancestor->data)))
             goto error;
     }
@@ -1210,7 +1210,7 @@ cleanup:
     VIR_FREE(nodes);
     xmlXPathFreeContext(ctxt);
     xmlFreeDoc(xml);
-    x86DataFree(data);
+    virCPUx86DataFree(data);
     return cpuData;
 }
 
@@ -1368,7 +1368,7 @@ x86Compute(virCPUDefPtr host,
 
         if (!(guestData = x86DataCopy(guest_model->data)) ||
             !(*guest = x86MakeCPUData(arch, &guestData))) {
-            x86DataFree(guestData);
+            virCPUx86DataFree(guestData);
             goto error;
         }
     }
@@ -1650,12 +1650,12 @@ cleanup:
     return ret;
 
 error:
-    x86DataFree(data_forced);
-    x86DataFree(data_required);
-    x86DataFree(data_optional);
-    x86DataFree(data_disabled);
-    x86DataFree(data_forbidden);
-    x86DataFree(data_vendor);
+    virCPUx86DataFree(data_forced);
+    virCPUx86DataFree(data_required);
+    virCPUx86DataFree(data_optional);
+    virCPUx86DataFree(data_disabled);
+    virCPUx86DataFree(data_forbidden);
+    virCPUx86DataFree(data_vendor);
     if (forced)
         x86FreeCPUData(*forced);
     if (required)
@@ -1754,7 +1754,7 @@ x86NodeData(void)
     return cpuData;
 
 error:
-    x86DataFree(data);
+    virCPUx86DataFree(data);
 
     return NULL;
 }
-- 
1.8.4.2