From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 18 Jan 2017 13:05:26 +0000 (+0100)
Subject: qemu: Skip virQEMUCapsCPUFilterFeatures on non-x86 CPUs
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5c6fc9d641252525d65374a25f00a0e6f6e7c8cd;p=libvirt.git

qemu: Skip virQEMUCapsCPUFilterFeatures on non-x86 CPUs

All features the function is currently supposed to filter out are
specific to x86_64. We should avoid removing them on other
architectures. It seems to be quite unlikely other achitectures would
use the same names, but one can never be sure.

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

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index e851eec7a7..a8bca74d8c 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3032,8 +3032,13 @@ virQEMUCapsProbeQMPGICCapabilities(virQEMUCapsPtr qemuCaps,
 
 static bool
 virQEMUCapsCPUFilterFeatures(const char *name,
-                             void *opaque ATTRIBUTE_UNUSED)
+                             void *opaque)
 {
+    virQEMUCapsPtr qemuCaps = opaque;
+
+    if (!ARCH_IS_X86(qemuCaps->arch))
+        return true;
+
     if (STREQ(name, "cmt") ||
         STREQ(name, "mbm_total") ||
         STREQ(name, "mbm_local"))
@@ -3109,7 +3114,8 @@ virQEMUCapsCopyCPUModelFromHost(virQEMUCapsPtr qemuCaps,
         cpu->match = VIR_CPU_MATCH_EXACT;
 
         if (virCPUDefCopyModelFilter(cpu, caps->host.cpu, true,
-                                     virQEMUCapsCPUFilterFeatures, NULL) < 0)
+                                     virQEMUCapsCPUFilterFeatures,
+                                     qemuCaps) < 0)
             goto error;
     }