|
 |
43fe83 |
From 7b128f96ee56a69a12bd00c16f8bce218a31daf7 Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <7b128f96ee56a69a12bd00c16f8bce218a31daf7.1383922566.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
43fe83 |
Date: Fri, 8 Nov 2013 12:33:22 +0100
|
|
|
43fe83 |
Subject: [PATCH] cpu: x86: Rename x86MakeCPUData as virCPUx86MakeData
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=1008989
|
|
|
43fe83 |
|
|
|
43fe83 |
(cherry picked from commit 4a530268c03b5596532de3ff0b9e036d8e20e5c5)
|
|
|
43fe83 |
|
|
|
43fe83 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
43fe83 |
---
|
|
|
43fe83 |
src/cpu/cpu_x86.c | 20 ++++++++++----------
|
|
|
43fe83 |
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
|
|
|
43fe83 |
index e8e1990..a857559 100644
|
|
|
43fe83 |
--- a/src/cpu/cpu_x86.c
|
|
|
43fe83 |
+++ b/src/cpu/cpu_x86.c
|
|
|
43fe83 |
@@ -216,7 +216,7 @@ virCPUx86DataFree(virCPUx86Data *data)
|
|
|
43fe83 |
|
|
|
43fe83 |
|
|
|
43fe83 |
static virCPUDataPtr
|
|
|
43fe83 |
-x86MakeCPUData(virArch arch, virCPUx86Data **data)
|
|
|
43fe83 |
+virCPUx86MakeData(virArch arch, virCPUx86Data **data)
|
|
|
43fe83 |
{
|
|
|
43fe83 |
virCPUDataPtr cpuData;
|
|
|
43fe83 |
|
|
|
43fe83 |
@@ -1204,7 +1204,7 @@ x86CPUDataParse(const char *xmlStr)
|
|
|
43fe83 |
goto cleanup;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
|
|
|
43fe83 |
- cpuData = x86MakeCPUData(VIR_ARCH_X86_64, &data);
|
|
|
43fe83 |
+ cpuData = virCPUx86MakeData(VIR_ARCH_X86_64, &data);
|
|
|
43fe83 |
|
|
|
43fe83 |
cleanup:
|
|
|
43fe83 |
VIR_FREE(nodes);
|
|
|
43fe83 |
@@ -1367,7 +1367,7 @@ x86Compute(virCPUDefPtr host,
|
|
|
43fe83 |
x86DataSubtract(guest_model->data, cpu_disable->data);
|
|
|
43fe83 |
|
|
|
43fe83 |
if (!(guestData = x86DataCopy(guest_model->data)) ||
|
|
|
43fe83 |
- !(*guest = x86MakeCPUData(arch, &guestData))) {
|
|
|
43fe83 |
+ !(*guest = virCPUx86MakeData(arch, &guestData))) {
|
|
|
43fe83 |
virCPUx86DataFree(guestData);
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
@@ -1624,22 +1624,22 @@ x86Encode(virArch arch,
|
|
|
43fe83 |
}
|
|
|
43fe83 |
|
|
|
43fe83 |
if (forced &&
|
|
|
43fe83 |
- !(*forced = x86MakeCPUData(arch, &data_forced)))
|
|
|
43fe83 |
+ !(*forced = virCPUx86MakeData(arch, &data_forced)))
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
if (required &&
|
|
|
43fe83 |
- !(*required = x86MakeCPUData(arch, &data_required)))
|
|
|
43fe83 |
+ !(*required = virCPUx86MakeData(arch, &data_required)))
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
if (optional &&
|
|
|
43fe83 |
- !(*optional = x86MakeCPUData(arch, &data_optional)))
|
|
|
43fe83 |
+ !(*optional = virCPUx86MakeData(arch, &data_optional)))
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
if (disabled &&
|
|
|
43fe83 |
- !(*disabled = x86MakeCPUData(arch, &data_disabled)))
|
|
|
43fe83 |
+ !(*disabled = virCPUx86MakeData(arch, &data_disabled)))
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
if (forbidden &&
|
|
|
43fe83 |
- !(*forbidden = x86MakeCPUData(arch, &data_forbidden)))
|
|
|
43fe83 |
+ !(*forbidden = virCPUx86MakeData(arch, &data_forbidden)))
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
if (vendor &&
|
|
|
43fe83 |
- !(*vendor = x86MakeCPUData(arch, &data_vendor)))
|
|
|
43fe83 |
+ !(*vendor = virCPUx86MakeData(arch, &data_vendor)))
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
|
|
|
43fe83 |
ret = 0;
|
|
|
43fe83 |
@@ -1748,7 +1748,7 @@ x86NodeData(virArch arch)
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
data->extended_len = ret;
|
|
|
43fe83 |
|
|
|
43fe83 |
- if (!(cpuData = x86MakeCPUData(arch, &data)))
|
|
|
43fe83 |
+ if (!(cpuData = virCPUx86MakeData(arch, &data)))
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
|
|
|
43fe83 |
return cpuData;
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.4.2
|
|
|
43fe83 |
|