From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Fri, 21 Aug 2009 20:31:39 +0000 (-0500)
Subject: added palacios MACROs
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=2b9b1852a1c754b10f13576358b494fb04fe9940

added palacios MACROs
---

diff --git a/palacios/include/palacios/vmx_assist.h b/palacios/include/palacios/vmx_assist.h
index 31b9a37..3f5ec93 100644
--- a/palacios/include/palacios/vmx_assist.h
+++ b/palacios/include/palacios/vmx_assist.h
@@ -26,6 +26,8 @@
 #ifndef _VMX_ASSIST_H_
 #define _VMX_ASSIST_H_
 
+#ifdef __V3VEE__
+
 #include <palacios/vm_guest.h>
 
 #define VMXASSIST_BASE         0xD0000
@@ -35,8 +37,6 @@
 #define VMXASSIST_NEW_CONTEXT (VMXASSIST_BASE + 12)
 #define VMXASSIST_OLD_CONTEXT (VMXASSIST_NEW_CONTEXT + 4)
 
-#ifndef __ASSEMBLY__
-
 #define NR_EXCEPTION_HANDLER    32
 #define NR_INTERRUPT_HANDLERS   16
 #define NR_TRAPS        (NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
@@ -107,11 +107,13 @@ struct vmx_assist_context {
 
     unsigned char rm_irqbase[2];
 };
+
 typedef struct vmx_assist_context vmx_assist_context_t;
 
 int v3_vmxassist_ctx_switch(struct guest_info * info);
 
-#endif /* __ASSEMBLY__ */
+
+#endif
 
 #endif /* _VMX_ASSIST_H_ */