From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 13 Sep 2017 15:26:07 +0000 (+0200)
Subject: qemu: Pass virArch * to virQEMUCapsCPUFilterFeatures
X-Git-Tag: v3.8.0-rc1~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0b5c9c620bbd6ca806ba39a67516a2d48854132;p=thirdparty%2Flibvirt.git

qemu: Pass virArch * to virQEMUCapsCPUFilterFeatures

The filter only needs to know the CPU architecture. Passing
virQEMUCapsPtr as opaque is a bit overkill.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c690cb3498..52d63f44ec 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3320,9 +3320,9 @@ static bool
 virQEMUCapsCPUFilterFeatures(const char *name,
                              void *opaque)
 {
-    virQEMUCapsPtr qemuCaps = opaque;
+    virArch *arch = opaque;
 
-    if (!ARCH_IS_X86(qemuCaps->arch))
+    if (!ARCH_IS_X86(*arch))
         return true;
 
     if (STREQ(name, "cmt") ||
@@ -3534,7 +3534,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
         if (!hostCPU ||
             virCPUDefCopyModelFilter(cpu, hostCPU, true,
                                      virQEMUCapsCPUFilterFeatures,
-                                     qemuCaps) < 0)
+                                     &qemuCaps->arch) < 0)
             goto error;
     } else if (type == VIR_DOMAIN_VIRT_KVM &&
                virCPUGetHostIsSupported(qemuCaps->arch)) {