X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=402cedf5efbb3e4bbd77d5ff3b817e5e70a456ca;hp=1571c4871fc966941ad869315659fd2173a5e2ba;hb=68521eca0f94f8c22aa60e762c83e24beec7233c;hpb=28cfe68985ef4360c9bd7428a19c222b295e9d85

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 1571c48..402cedf 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -24,6 +24,8 @@
 #include <palacios/vmm_instrument.h>
 #include <palacios/vmm_ctrl_regs.h>
 #include <palacios/vmm_lowlevel.h>
+#include <palacios/vmm_sprintf.h>
+#include <palacios/vmm_vnet.h>
 
 #ifdef CONFIG_SVM
 #include <palacios/svm.h>
@@ -36,6 +38,7 @@
 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() {
@@ -45,24 +48,14 @@ static struct guest_info * allocate_guest() {
 }
 
 
-struct vmm_init_arg {
-    int cpu_id;
-    struct v3_ctrl_ops * vmm_ops;
-};
-
 static void init_cpu(void * arg) {
-    struct vmm_init_arg * vmm_arg = (struct vmm_init_arg *)arg;
-    int cpu_id = vmm_arg->cpu_id;
-    struct v3_ctrl_ops * vmm_ops = vmm_arg->vmm_ops;
+    uint32_t cpu_id = (uint32_t)(addr_t)arg;
 
 #ifdef CONFIG_SVM
     if (v3_is_svm_capable()) {
         PrintDebug("Machine is SVM Capable\n");
         v3_init_svm_cpu(cpu_id);
 	
-	if (cpu_id == 0) {
-	    v3_init_svm_hooks(vmm_ops);
-	}
     } else 
 #endif
 #ifdef CONFIG_VMX
@@ -70,9 +63,6 @@ static void init_cpu(void * arg) {
 	PrintDebug("Machine is VMX Capable\n");
 	v3_init_vmx_cpu(cpu_id);
 
-	if (cpu_id == 0) {
-	    v3_init_vmx_hooks(vmm_ops);
-	}	
     } else 
 #endif
     {
@@ -82,10 +72,10 @@ static void init_cpu(void * arg) {
 
 
 
-void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops, int num_cpus) {
+void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
     int i;
-    struct vmm_init_arg arg;
-    arg.vmm_ops = vmm_ops;    
+
+    V3_Print("V3 Print statement to fix a Kitten page fault bug\n");
 
     // Set global variables. 
     os_hooks = hooks;
@@ -97,28 +87,74 @@ void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops, int num_c
     // Register all the possible device types
     v3_init_devices();
 
-
 #ifdef INSTRUMENT_VMM
     v3_init_instrumentation();
 #endif
 
-    vmm_ops->allocate_guest = &allocate_guest;
-
-
     if ((hooks) && (hooks->call_on_cpu)) {
 
 	for (i = 0; i < num_cpus; i++) {
-	    arg.cpu_id = i;
 
 	    V3_Print("Initializing VMM extensions on cpu %d\n", i);
-	    hooks->call_on_cpu(i, &init_cpu, &arg);
+	    hooks->call_on_cpu(i, &init_cpu, (void *)(addr_t)i);
 	}
     }
 
+#ifdef CONFIG_VNET
+    v3_init_vnet();
+#endif
+}
+
+
+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;
+    }
+
+    if (v3_config_guest(info, cfg) == -1) {
+	PrintError("Could not configure guest\n");
+	return NULL;
+    }
 
+    return info;
 }
 
 
+int v3_start_vm(struct guest_info * info, unsigned int cpu_mask) {
+    
+    info->cpu_id = v3_get_cpu_id();
+
+    V3_Print("V3 --  Starting VM\n");
+
+    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;
+#endif
+#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;
+    }
+
+    return 0;
+}
+
 
 #ifdef __V3_32BIT__
 
@@ -159,6 +195,7 @@ 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);
@@ -174,6 +211,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 
@@ -189,6 +227,23 @@ void v3_yield(struct guest_info * info) {
 
 
 
+
+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 guest_info * info, int logical_cpu) {
     extern struct v3_os_hooks * os_hooks;
 
@@ -199,6 +254,19 @@ void v3_interrupt_cpu(struct guest_info * info, int logical_cpu) {
 
 
 
+unsigned int v3_get_cpu_id() {
+    extern struct v3_os_hooks * os_hooks;
+    unsigned int ret = (unsigned int)-1;
+
+    if ((os_hooks) && (os_hooks)->get_cpu) {
+	ret = os_hooks->get_cpu();
+    }
+
+    return ret;
+}
+
+
+
 int v3_vm_enter(struct guest_info * info) {
     switch (v3_cpu_types[info->cpu_id]) {
 #ifdef CONFIG_SVM
@@ -207,7 +275,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);