HVM SMBIOS v3 [1/5]

diff -r f328519053f5 -r 4cc861f6b425 tools/firmware/hvmloader/hvmloader.c
@@ -116,15 +116,6 @@ check_amd(void)
 }
 
 static void
-cpuid(uint32_t idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
-{
-	__asm__ __volatile__(
-		"cpuid"
-		: "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
-		: "0" (idx) );
-}
-
-static void
 wrmsr(uint32_t idx, uint64_t v)
 {
 	__asm__ __volatile__(

diff -r f328519053f5 -r 4cc861f6b425 tools/firmware/hvmloader/util.c
@@ -94,3 +94,12 @@ void puts(const char *s)
 	while (*s)
 		outb(0xE9, *s++);
 }
+
+void
+cpuid(uint32_t idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
+{
+        __asm__ __volatile__(
+                "cpuid"
+                : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
+                : "0" (idx) );
+}

diff -r f328519053f5 -r 4cc861f6b425 tools/firmware/hvmloader/util.h
@@ -8,6 +8,10 @@ void outb(uint16_t addr, uint8_t val);
 /* I/O input */
 uint8_t inb(uint16_t addr);
 
+/* Do cpuid instruction, with operation 'idx' */
+void
+cpuid(uint32_t idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx);
+
 /* String and memory functions */
 int strcmp(const char *cs, const char *ct);
 void *memcpy(void *dest, const void *src, unsigned n);