Modified boot and vmxassist to handle real/protected transition.

[palacios.git] / bios / vmxassist / util.h

diff --git a/bios/vmxassist/util.h b/bios/vmxassist/util.h
index 9c2982f..1fd52ed 100644 (file)
--- a/bios/vmxassist/util.h
+++ b/bios/vmxassist/util.h
@@ -23,14 +23,13 @@
 #include <stdarg.h>
 #include <vm86.h>
 
-#include <e820.h>
-#define E820_MAP_NR ((unsigned char *)E820_MAP_PAGE + E820_MAP_NR_OFFSET)
-#define E820_MAP    ((struct e820entry *)(E820_MAP_PAGE + E820_MAP_OFFSET))
-
 #define        offsetof(type, member)  ((unsigned) &((type *)0)->member)
 
 struct vmx_assist_context;
 
+#include "e820.h"
+
+extern void cpuid_addr_value(uint64_t addr, uint64_t *value);
 extern void hexdump(unsigned char *, int);
 extern void dump_regs(struct regs *);
 extern void dump_vmx_context(struct vmx_assist_context *);