X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=4a71a118bfe20f5a5e541f1d1283e0176b8a82d3;hb=55ced750335769366957df3c0cc3fbc8b82a3ea9;hp=7343cd5a057c79f009bb084775a10cd972fc3ad2;hpb=266af4b5b19da7bee8e7445288c7c1cb3ee194c7;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 7343cd5..4a71a11 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -19,13 +19,17 @@
 
 #include <palacios/vmm.h>
 #include <palacios/svm.h>
-#include <palacios/vmx.h>
+//#include <palacios/vmx.h>
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_config.h>
 #include <palacios/vm_guest.h>
 #include <palacios/vmm_instrument.h>
+#include <palacios/vmm_ctrl_regs.h>
+#include <palacios/vmm_lowlevel.h>
 
 
+/* These should be the only global variables in Palacios */
+/* They are architecture specific variables */
 v3_cpu_arch_t v3_cpu_type;
 struct v3_os_hooks * os_hooks = NULL;
 
@@ -40,10 +44,12 @@ static struct guest_info * allocate_guest() {
 
 
 void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
+    
+    // Set global variables. 
     os_hooks = hooks;
-
     v3_cpu_type = V3_INVALID_CPU;
 
+
 #ifdef INSTRUMENT_VMM
     v3_init_instrumentation();
 #endif
@@ -52,7 +58,6 @@ void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
 
 	PrintDebug("Machine is SVM Capable\n");
 	vmm_ops->allocate_guest = &allocate_guest;
-	vmm_ops->config_guest = &v3_config_guest;
 	v3_init_SVM(vmm_ops);
 
 	/*
@@ -66,5 +71,33 @@ void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
 }
 
 
-// Get CPU Type..
+
+#ifdef __V3_32BIT__
+
+v3_cpu_mode_t v3_get_host_cpu_mode() {
+    uint32_t cr4_val;
+    struct cr4_32 * cr4;
+
+    __asm__ (
+	     "movl %%cr4, %0; "
+	     : "=r"(cr4_val) 
+	     );
+
+    
+    cr4 = (struct cr4_32 *)&(cr4_val);
+
+    if (cr4->pae == 1) {
+	return PROTECTED_PAE;
+    } else {
+	return PROTECTED;
+    }
+}
+
+#elif __V3_64BIT__
+
+v3_cpu_mode_t v3_get_host_cpu_mode() {
+    return LONG;
+}
+
+#endif