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

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 1b191d0..82073f0 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -28,8 +28,8 @@
 #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;
 
@@ -49,6 +49,9 @@ 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();
@@ -98,3 +101,31 @@ 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);
+}