Provide function pointer abstractions for cpuid() and cpuid_count()

Code common between PV and HVM using cpuid() needs to use different cpuid()
implementations, as PV guests need to use the Xen forced emulation prefix.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/include/arch/x86/cpuid.h b/include/arch/x86/cpuid.h
new file mode 100644 (file)
index 0000000..ea9d024
--- /dev/null
+++ b/include/arch/x86/cpuid.h
@@ -0,0 +1,21 @@
+#ifndef XTF_X86_CPUID_H
+#define XTF_X86_CPUID_H
+
+typedef void (*cpuid_fn_t)(uint32_t leaf,
+                           uint32_t *eax, uint32_t *ebx,
+                           uint32_t *ecx, uint32_t *edx);
+typedef void (*cpuid_count_fn_t)(uint32_t leaf, uint32_t subleaf,
+                                 uint32_t *eax, uint32_t *ebx,
+                                 uint32_t *ecx, uint32_t *edx);
+
+#endif /* XTF_X86_CPUID_H */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

diff --git a/include/arch/x86/xtf.h b/include/arch/x86/xtf.h
index eb7f9dd3960a6e5397f735bbbff2b922f038d623..ab0bf69db9b5c119bd956a416fd2dd5d7d97ca14 100644 (file)
--- a/include/arch/x86/xtf.h
+++ b/include/arch/x86/xtf.h
@@ -1,6 +1,7 @@
 #ifndef XTF_X86_XTF_H
 #define XTF_X86_XTF_H
 
+#include <arch/x86/cpuid.h>
 #include <arch/x86/lib.h>
 
 #endif /* XTF_X86_XTF_H */

diff --git a/tests/cpuid/main.c b/tests/cpuid/main.c
index adb5bc1c31862e61c7a9fa0cff1096de12336310..bdb9a2300e31f4d3b6e1110e6908fcb2fa41ee35 100644 (file)
--- a/tests/cpuid/main.c
+++ b/tests/cpuid/main.c
@@ -11,11 +11,7 @@
  */
 #include <xtf.h>
 
-static void dump_leaves(
-    void (*cpuid_fn)(uint32_t leaf, uint32_t subleaf,
-                     uint32_t *eax, uint32_t *ebx,
-                     uint32_t *ecx, uint32_t *edx)
-    )
+static void dump_leaves(cpuid_count_fn_t cpuid_fn)
 {
     uint32_t leaf = 0, subleaf = ~0U;