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

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index fea7009..1571c48 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -33,7 +33,7 @@
 #endif
 
 
-v3_cpu_arch_t v3_cpu_type;
+v3_cpu_arch_t v3_cpu_types[CONFIG_MAX_CPUS];
 struct v3_os_hooks * os_hooks = NULL;
 
 
@@ -45,12 +45,54 @@ 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;
+
+#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
+    if (v3_is_vmx_capable()) {
+	PrintDebug("Machine is VMX Capable\n");
+	v3_init_vmx_cpu(cpu_id);
+
+	if (cpu_id == 0) {
+	    v3_init_vmx_hooks(vmm_ops);
+	}	
+    } else 
+#endif
+    {
+       PrintError("CPU has no virtualization Extensions\n");
+    }
+}
+
+
+
+void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops, int num_cpus) {
+    int i;
+    struct vmm_init_arg arg;
+    arg.vmm_ops = vmm_ops;    
 
-void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
-    
     // Set global variables. 
     os_hooks = hooks;
-    v3_cpu_type = V3_INVALID_CPU;
+
+    for (i = 0; i < CONFIG_MAX_CPUS; i++) {
+	v3_cpu_types[i] = V3_INVALID_CPU;
+    }
 
     // Register all the possible device types
     v3_init_devices();
@@ -62,23 +104,18 @@ void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
 
     vmm_ops->allocate_guest = &allocate_guest;
 
-#ifdef CONFIG_SVM
-    if (v3_is_svm_capable()) {
-        PrintDebug("Machine is SVM Capable\n");
-        v3_init_SVM(vmm_ops);
 
-    } 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");
+    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);
+	}
     }
+
+
 }
 
 
@@ -137,9 +174,47 @@ 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 
+ * Non guest context threads should call this function with a NULL argument
+ */
 void v3_yield(struct guest_info * info) {
     V3_Yield();
-    rdtscll(info->yield_start_cycle);
+
+    if (info) {
+	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);
+    }
 }
 
 
+
+int v3_vm_enter(struct guest_info * info) {
+    switch (v3_cpu_types[info->cpu_id]) {
+#ifdef CONFIG_SVM
+	case V3_SVM_CPU:
+	case V3_SVM_REV3_CPU:
+	    return v3_svm_enter(info);
+	    break;
+#endif
+#if CONFIG_VMX && 0
+	case V3_VMX_CPU:
+	case V3_VMX_EPT_CPU:
+	    return v3_vmx_enter(info);
+	    break;
+#endif
+	default:
+	    PrintError("Attemping to enter a guest on an invalid CPU\n");
+	    return -1;
+    }
+}