From 7ff2ecfcd684bcf4865ceac786f1c6809d84d0aa Mon Sep 17 00:00:00 2001

Message-Id: <7ff2ecfcd684bcf4865ceac786f1c6809d84d0aa@dist-git>

From: Michal Privoznik <mprivozn@redhat.com>

Date: Fri, 21 Jun 2019 09:25:44 +0200

Subject: [PATCH] virhostcpu: Make virHostCPUGetMSR() work only on x86

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Model specific registers are a thing only on x86. Also, the

/dev/cpu/0/msr path exists only on Linux and the fallback

mechanism (asking KVM) exists on Linux and FreeBSD only.

Therefore, move the function within #ifdef that checks all

aforementioned constraints and provide a dummy stub for all

other cases.

This fixes the build on my arm box, mingw-* builds, etc.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

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

(cherry picked from commit ae3d812b006b84c6d06605868d19554ea0156392)

https://bugzilla.redhat.com/show_bug.cgi?id=1697627

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

Message-Id: <0f234c69059ad57462bb71d42983cdaedea26e78.1561068591.git.jdenemar@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 src/util/virhostcpu.c | 32 ++++++++++++++++++--------------

 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c

index d0c47faa18..aafa84c8e5 100644

--- a/src/util/virhostcpu.c

+++ b/src/util/virhostcpu.c

@@ -1269,7 +1269,9 @@ virHostCPUGetMicrocodeVersion(void)

 #endif /* __linux__ */

-#if HAVE_LINUX_KVM_H && defined(KVM_GET_MSRS)

+#if HAVE_LINUX_KVM_H && defined(KVM_GET_MSRS) && \

+    (defined(__i386__) || defined(__x86_64__)) && \

+    (defined(__linux__) || defined(__FreeBSD__))

 static int

 virHostCPUGetMSRFromKVM(unsigned long index,

                         uint64_t *result)

@@ -1297,19 +1299,6 @@ virHostCPUGetMSRFromKVM(unsigned long index,

     return 0;

 }

-#else

-

-static int

-virHostCPUGetMSRFromKVM(unsigned long index ATTRIBUTE_UNUSED,

-                        uint64_t *result ATTRIBUTE_UNUSED)

-{

-    virReportSystemError(ENOSYS, "%s",

-                         _("Reading MSRs via KVM is not supported on this platform"));

-    return -1;

-}

-#endif /* HAVE_LINUX_KVM_H && defined(KVM_GET_MSRS) */

-

-

 /*

  * Returns 0 on success,

  *         1 when the MSR is not supported by the host CPU,

@@ -1346,3 +1335,18 @@ virHostCPUGetMSR(unsigned long index,

     return virHostCPUGetMSRFromKVM(index, msr);

 }

+

+#else

+

+int

+virHostCPUGetMSR(unsigned long index ATTRIBUTE_UNUSED,

+                 uint64_t *msr ATTRIBUTE_UNUSED)

+{

+    virReportSystemError(ENOSYS, "%s",

+                         _("Reading MSRs is not supported on this platform"));

+    return -1;

+}

+

+#endif /* HAVE_LINUX_KVM_H && defined(KVM_GET_MSRS) && \

+          (defined(__i386__) || defined(__x86_64__)) && \

+          (defined(__linux__) || defined(__FreeBSD__)) */

-- 

2.22.0