|
 |
404507 |
From b200b9cbb5c6c7d3d3b1bb4f745a7371cc35a429 Mon Sep 17 00:00:00 2001
|
|
|
404507 |
Message-Id: <b200b9cbb5c6c7d3d3b1bb4f745a7371cc35a429@dist-git>
|
|
|
4cd28d |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
4cd28d |
Date: Wed, 13 Dec 2017 22:30:31 +0100
|
|
|
4cd28d |
Subject: [PATCH] cpu_x86: Rename virCPUx86MapInitialize
|
|
|
4cd28d |
|
|
|
4cd28d |
The function will be used to initialize internal data of the x86 CPU
|
|
|
4cd28d |
driver (including the CPU map).
|
|
|
4cd28d |
|
|
|
4cd28d |
CVE-2017-5715
|
|
|
4cd28d |
|
|
|
4cd28d |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
4cd28d |
---
|
|
|
4cd28d |
src/cpu/cpu_x86.c | 8 ++++----
|
|
|
4cd28d |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
4cd28d |
|
|
|
4cd28d |
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
|
|
|
404507 |
index a6cbd45766..693e571a3d 100644
|
|
|
4cd28d |
--- a/src/cpu/cpu_x86.c
|
|
|
4cd28d |
+++ b/src/cpu/cpu_x86.c
|
|
|
4cd28d |
@@ -153,8 +153,8 @@ struct _virCPUx86Map {
|
|
|
4cd28d |
};
|
|
|
4cd28d |
|
|
|
4cd28d |
static virCPUx86MapPtr cpuMap;
|
|
|
4cd28d |
-int virCPUx86MapOnceInit(void);
|
|
|
4cd28d |
-VIR_ONCE_GLOBAL_INIT(virCPUx86Map);
|
|
|
4cd28d |
+int virCPUx86DriverOnceInit(void);
|
|
|
4cd28d |
+VIR_ONCE_GLOBAL_INIT(virCPUx86Driver);
|
|
|
4cd28d |
|
|
|
4cd28d |
|
|
|
4cd28d |
typedef enum {
|
|
|
404507 |
@@ -1404,7 +1404,7 @@ virCPUx86LoadMap(void)
|
|
|
4cd28d |
|
|
|
4cd28d |
|
|
|
4cd28d |
int
|
|
|
4cd28d |
-virCPUx86MapOnceInit(void)
|
|
|
4cd28d |
+virCPUx86DriverOnceInit(void)
|
|
|
4cd28d |
{
|
|
|
4cd28d |
if (!(cpuMap = virCPUx86LoadMap()))
|
|
|
4cd28d |
return -1;
|
|
|
404507 |
@@ -1416,7 +1416,7 @@ virCPUx86MapOnceInit(void)
|
|
|
4cd28d |
static virCPUx86MapPtr
|
|
|
4cd28d |
virCPUx86GetMap(void)
|
|
|
4cd28d |
{
|
|
|
4cd28d |
- if (virCPUx86MapInitialize() < 0)
|
|
|
4cd28d |
+ if (virCPUx86DriverInitialize() < 0)
|
|
|
4cd28d |
return NULL;
|
|
|
4cd28d |
|
|
|
4cd28d |
return cpuMap;
|
|
|
4cd28d |
--
|
|
|
4cd28d |
2.15.1
|
|
|
4cd28d |
|