X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=2af99d273b524d667287ef943fdd6aa8cfe3fc8a;hb=52e81251f82ccaf516e3ed626c8abbcc9fbe3f41;hp=4a71a118bfe20f5a5e541f1d1283e0176b8a82d3;hpb=1316eb77b6d89245583446dab3345f749c415764;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 4a71a11..2af99d2 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -18,8 +18,6 @@
  */
 
 #include <palacios/vmm.h>
-#include <palacios/svm.h>
-//#include <palacios/vmx.h>
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_config.h>
 #include <palacios/vm_guest.h>
@@ -27,9 +25,14 @@
 #include <palacios/vmm_ctrl_regs.h>
 #include <palacios/vmm_lowlevel.h>
 
+#ifdef CONFIG_SVM
+#include <palacios/svm.h>
+#endif
+#ifdef CONFIG_VMX
+#include <palacios/vmx.h>
+#endif
+
 
-/* 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;
 
@@ -49,24 +52,32 @@ 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
 
-    if (v3_is_svm_capable()) {
+    vmm_ops->allocate_guest = &allocate_guest;
 
-	PrintDebug("Machine is SVM Capable\n");
-	vmm_ops->allocate_guest = &allocate_guest;
-	v3_init_SVM(vmm_ops);
+#ifdef CONFIG_SVM
+    if (v3_is_svm_capable()) {
+        PrintDebug("Machine is SVM Capable\n");
+        v3_init_SVM(vmm_ops);
 
-	/*
-	  } else if (is_vmx_capable()) {
-	  vmm_cpu_type = VMM_VMX_CPU;
-	  PrintDebug("Machine is VMX Capable\n");
-	  //Init_VMX();*/
-    } else {
-	PrintDebug("CPU has no virtualization Extensions\n");
+    } else 
+#endif
+#ifdef CONFIG_VMX
+    if (v3_is_vmx_capable()) {
+	PrintDebug("Machine is VMX Capable\n");
+	v3_init_vmx(vmm_ops);
+	
+    } else 
+#endif
+    {
+       PrintError("CPU has no virtualization Extensions\n");
     }
 }
 
@@ -101,3 +112,42 @@ v3_cpu_mode_t v3_get_host_cpu_mode() {
 
 #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);
+}
+
+
+
+void v3_interrupt_cpu(struct guest_info * info, int logical_cpu) {
+    extern struct v3_os_hooks * os_hooks;
+
+    if ((os_hooks) && (os_hooks)->interrupt_cpu) {
+	(os_hooks)->interrupt_cpu(info, logical_cpu);
+    }
+}