X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=fcc6ea55be17391534bff62893118e1018c58b61;hb=068d7e66db537f981fde19a098a12e4390fa3de4;hp=4c55dd66b8b5996ff76a6fa89a87e831aea15572;hpb=d34450b1e6fe3c2e1295c268c1722c669ba8d545;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 4c55dd6..fcc6ea5 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,10 +25,15 @@
 #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
 
 
-
-v3_cpu_arch_t v3_cpu_type;
+v3_cpu_arch_t v3_cpu_types[CONFIG_MAX_CPUS];
 struct v3_os_hooks * os_hooks = NULL;
 
 
@@ -42,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();
@@ -59,17 +104,18 @@ void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
 
     vmm_ops->allocate_guest = &allocate_guest;
 
-    if (v3_is_svm_capable()) {
-        PrintDebug("Machine is SVM Capable\n");
-        v3_init_SVM(vmm_ops);
-#ifdef CONFIG_VMX
-    } else if (v3_is_vmx_capable()) {
-        PrintDebug("Machine is VMX Capable\n");
-        v3_init_vmx(vmm_ops);
-#endif
-    } else {
-        PrintDebug("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);
+	}
     }
+
+
 }
 
 
@@ -132,3 +178,13 @@ 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);
+    }
+}