X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=3f5fa6c8df1bacde2fd1a706f02518c83e2d3200;hb=b8e77690b473b3ac50c5fef0a32d1710a2e8a1d9;hp=0a53a7f5bb435bea5599a37cdb80f3ff0ef016bd;hpb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 0a53a7f..3f5fa6c 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -24,6 +24,7 @@
 #include <palacios/vmm_instrument.h>
 #include <palacios/vmm_ctrl_regs.h>
 #include <palacios/vmm_lowlevel.h>
+#include <palacios/vmm_sprintf.h>
 
 #ifdef CONFIG_SVM
 #include <palacios/svm.h>
@@ -36,18 +37,10 @@
 v3_cpu_arch_t v3_cpu_types[CONFIG_MAX_CPUS];
 struct v3_os_hooks * os_hooks = NULL;
 
+int v3_dbg_enable = 0;
 
 
 
-
-
-static struct guest_info * allocate_guest() {
-    void * info = V3_Malloc(sizeof(struct guest_info));
-    memset(info, 0, sizeof(struct guest_info));
-    return info;
-}
-
-
 static void init_cpu(void * arg) {
     uint32_t cpu_id = (uint32_t)(addr_t)arg;
 
@@ -72,11 +65,11 @@ static void init_cpu(void * arg) {
 
 
 
-
-
 void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
     int i;
 
+    V3_Print("V3 Print statement to fix a Kitten page fault bug\n");
+
     // Set global variables. 
     os_hooks = hooks;
 
@@ -101,52 +94,54 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
     }
 }
 
+
 v3_cpu_arch_t v3_get_cpu_type(int cpu_id) {
     return v3_cpu_types[cpu_id];
 }
 
 
-struct guest_info * v3_create_vm(void * cfg) {
-    struct guest_info * info = allocate_guest();
-    
-    if (!info) {
-	PrintError("Could not allocate Guest\n");
-	return NULL;
-    }
+struct v3_vm_info * v3_create_vm(void * cfg) {
+    struct v3_vm_info * vm = v3_config_guest(cfg);
 
-    if (v3_config_guest(info, cfg) == -1) {
+    if (vm == NULL) {
 	PrintError("Could not configure guest\n");
 	return NULL;
     }
 
-    return info;
+    return vm;
 }
 
-int v3_start_vm(struct guest_info * info, unsigned int cpu_mask) {
-    
-    info->cpu_id = v3_get_cpu_id();
 
+int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
+    int i = 0;
     V3_Print("V3 --  Starting VM\n");
 
-    switch (v3_cpu_types[info->cpu_id]) {
+
+    for (i = 0; i < vm->num_cores; i++) {
+	struct guest_info * info = &(vm->cores[i]);
+
+	/* GRUESOM HACK... */
+	//	vm->cpu_id = v3_get_cpu_id();
+
+	switch (v3_cpu_types[info->cpu_id]) {
 #ifdef CONFIG_SVM
-	case V3_SVM_CPU:
-	case V3_SVM_REV3_CPU:
-	    return v3_start_svm_guest(info);
-	    break;
+	    case V3_SVM_CPU:
+	    case V3_SVM_REV3_CPU:
+		return v3_start_svm_guest(info);
+		break;
 #endif
-#if CONFIG_VMX && 0
-	case V3_VMX_CPU:
-	case V3_VMX_EPT_CPU:
-	    return v3_start_vmx_guest(info);
-	    break;
+#if CONFIG_VMX
+	    case V3_VMX_CPU:
+	    case V3_VMX_EPT_CPU:
+		return v3_start_vmx_guest(info);
+		break;
 #endif
-	default:
-	    PrintError("Attemping to enter a guest on an invalid CPU\n");
-	    return -1;
+	    default:
+		PrintError("Attemping to enter a guest on an invalid CPU\n");
+		return -1;
+	}
     }
 
-
     return 0;
 }
 
@@ -190,11 +185,12 @@ v3_cpu_mode_t v3_get_host_cpu_mode() {
     } 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)) {
+    if (cur_cycle > (info->yield_start_cycle + info->vm_info->yield_cycle_period)) {
 
 	/*
 	  PrintDebug("Conditional Yield (cur_cyle=%p, start_cycle=%p, period=%p)\n", 
@@ -205,6 +201,7 @@ void v3_yield_cond(struct guest_info * info) {
     }
 }
 
+
 /* 
  * unconditional cpu yield 
  * if the yielding thread is a guest context, the guest quantum is reset on resumption 
@@ -220,11 +217,28 @@ void v3_yield(struct guest_info * info) {
 
 
 
-void v3_interrupt_cpu(struct guest_info * info, int logical_cpu) {
+
+void v3_print_cond(const char * fmt, ...) {
+    if (v3_dbg_enable == 1) {
+	char buf[2048];
+	va_list ap;
+
+	va_start(ap, fmt);
+	vsnprintf(buf, 2048, fmt, ap);
+	va_end(ap);
+
+	V3_Print("%s", buf);
+    }    
+}
+
+
+
+
+void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu) {
     extern struct v3_os_hooks * os_hooks;
 
     if ((os_hooks) && (os_hooks)->interrupt_cpu) {
-	(os_hooks)->interrupt_cpu(info, logical_cpu);
+	(os_hooks)->interrupt_cpu(vm, logical_cpu);
     }
 }
 
@@ -243,8 +257,6 @@ unsigned int v3_get_cpu_id() {
 
 
 
-
-
 int v3_vm_enter(struct guest_info * info) {
     switch (v3_cpu_types[info->cpu_id]) {
 #ifdef CONFIG_SVM
@@ -253,7 +265,7 @@ int v3_vm_enter(struct guest_info * info) {
 	    return v3_svm_enter(info);
 	    break;
 #endif
-#if CONFIG_VMX && 0
+#if CONFIG_VMX
 	case V3_VMX_CPU:
 	case V3_VMX_EPT_CPU:
 	    return v3_vmx_enter(info);
@@ -264,6 +276,3 @@ int v3_vm_enter(struct guest_info * info) {
 	    return -1;
     }
 }
-
-
-