X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=82073f0619b6c54e1951f24c608698ddbc642572;hb=e23a867d9dcecc70fc76adc0f89404dbc50e5b78;hp=5525d65b4a1b031c3ce7af6b82d0dac4ecd9841d;hpb=c163873b7b96544683030cafba0e73a7ed988171;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 5525d65..82073f0 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -24,10 +24,12 @@
 #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;
 
@@ -47,24 +49,83 @@ void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
     os_hooks = hooks;
     v3_cpu_type = V3_INVALID_CPU;
 
+    // Register all the possible device types
+    v3_init_devices();
+
 
 #ifdef INSTRUMENT_VMM
     v3_init_instrumentation();
 #endif
 
+    vmm_ops->allocate_guest = &allocate_guest;
+
     if (v3_is_svm_capable()) {
+        PrintDebug("Machine is SVM Capable\n");
+        v3_init_SVM(vmm_ops);
+    } else if (v3_is_vmx_capable()) {
+        PrintDebug("Machine is VMX Capable\n");
+        v3_init_vmx(vmm_ops);
+    } else {
+        PrintDebug("CPU has no virtualization Extensions\n");
+    }
+}
 
-	PrintDebug("Machine is SVM Capable\n");
-	vmm_ops->allocate_guest = &allocate_guest;
-	vmm_ops->config_guest = &v3_config_guest;
-	v3_init_SVM(vmm_ops);
 
-	/*
-	  } else if (is_vmx_capable()) {
-	  vmm_cpu_type = VMM_VMX_CPU;
-	  PrintDebug("Machine is VMX Capable\n");
-	  //Init_VMX();*/
+
+#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 {
-	PrintDebug("CPU has no virtualization Extensions\n");
+	return PROTECTED;
+    }
+}
+
+#elif __V3_64BIT__
+
+v3_cpu_mode_t v3_get_host_cpu_mode() {
+    return LONG;
+}
+
+#endif 
+
+
+#define V3_Yield(addr)					\
+    do {						\
+	extern struct v3_os_hooks * os_hooks;		\
+	if ((os_hooks) && (os_hooks)->yield_cpu) {	\
+	    (os_hooks)->yield_cpu();			\
+	}						\
+    } while (0)						\
+
+
+void v3_yield_cond(struct guest_info * info) {
+    uint64_t cur_cycle;
+    rdtscll(cur_cycle);
+
+    if (cur_cycle > (info->yield_start_cycle + info->yield_cycle_period)) {
+
+	PrintDebug("Conditional Yield (cur_cyle=%p, start_cycle=%p, period=%p)\n", 
+		   (void *)cur_cycle, (void *)info->yield_start_cycle, (void *)info->yield_cycle_period);
+
+	V3_Yield();
+	rdtscll(info->yield_start_cycle);
     }
 }
+
+void v3_yield(struct guest_info * info) {
+    V3_Yield();
+    rdtscll(info->yield_start_cycle);
+}