|
 |
0f4c8a |
From cd16dea68be92cb8675d0fdd329be2cceb49b580 Mon Sep 17 00:00:00 2001
|
|
|
0f4c8a |
Message-Id: <cd16dea68be92cb8675d0fdd329be2cceb49b580@dist-git>
|
|
|
0f4c8a |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
0f4c8a |
Date: Wed, 13 Sep 2017 17:26:07 +0200
|
|
|
0f4c8a |
Subject: [PATCH] qemu: Pass virArch * to virQEMUCapsCPUFilterFeatures
|
|
|
0f4c8a |
|
|
|
0f4c8a |
The filter only needs to know the CPU architecture. Passing
|
|
|
0f4c8a |
virQEMUCapsPtr as opaque is a bit overkill.
|
|
|
0f4c8a |
|
|
|
0f4c8a |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
0f4c8a |
(cherry picked from commit b0b5c9c620bbd6ca806ba39a67516a2d48854132)
|
|
|
0f4c8a |
|
|
|
0f4c8a |
https://bugzilla.redhat.com/show_bug.cgi?id=1508549
|
|
|
0f4c8a |
|
|
|
0f4c8a |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
0f4c8a |
---
|
|
|
0f4c8a |
src/qemu/qemu_capabilities.c | 6 +++---
|
|
|
0f4c8a |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
0f4c8a |
|
|
|
0f4c8a |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
0f4c8a |
index 6f8b1ac735..3be56462d9 100644
|
|
|
0f4c8a |
--- a/src/qemu/qemu_capabilities.c
|
|
|
0f4c8a |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
0f4c8a |
@@ -3239,9 +3239,9 @@ static bool
|
|
|
0f4c8a |
virQEMUCapsCPUFilterFeatures(const char *name,
|
|
|
0f4c8a |
void *opaque)
|
|
|
0f4c8a |
{
|
|
|
0f4c8a |
- virQEMUCapsPtr qemuCaps = opaque;
|
|
|
0f4c8a |
+ virArch *arch = opaque;
|
|
|
0f4c8a |
|
|
|
0f4c8a |
- if (!ARCH_IS_X86(qemuCaps->arch))
|
|
|
0f4c8a |
+ if (!ARCH_IS_X86(*arch))
|
|
|
0f4c8a |
return true;
|
|
|
0f4c8a |
|
|
|
0f4c8a |
if (STREQ(name, "cmt") ||
|
|
|
0f4c8a |
@@ -3453,7 +3453,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
|
|
|
0f4c8a |
if (!hostCPU ||
|
|
|
0f4c8a |
virCPUDefCopyModelFilter(cpu, hostCPU, true,
|
|
|
0f4c8a |
virQEMUCapsCPUFilterFeatures,
|
|
|
0f4c8a |
- qemuCaps) < 0)
|
|
|
0f4c8a |
+ &qemuCaps->arch) < 0)
|
|
|
0f4c8a |
goto error;
|
|
|
0f4c8a |
} else if (type == VIR_DOMAIN_VIRT_KVM &&
|
|
|
0f4c8a |
virCPUGetHostIsSupported(qemuCaps->arch)) {
|
|
|
0f4c8a |
--
|
|
|
0f4c8a |
2.15.0
|
|
|
0f4c8a |
|