X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=dca1018e2ac731a6e2eef6f43fc119b461144bc1;hb=5e81abea907908ab9bdc0cb57a3537f05db77b5e;hp=9fc99fd438d5640f4cf3f40818cf12d9dac29b05;hpb=c0e8207d10b6b077c3fac4fb013ba7485f3a6391;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 9fc99fd..dca1018 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -21,7 +21,6 @@
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_config.h>
 #include <palacios/vm_guest.h>
-#include <palacios/vmm_instrument.h>
 #include <palacios/vmm_ctrl_regs.h>
 #include <palacios/vmm_lowlevel.h>
 #include <palacios/vmm_sprintf.h>
@@ -67,29 +66,33 @@ static void init_cpu(void * arg) {
     }
 }
 
-#if 0
+
 static void deinit_cpu(void * arg) {
-//    uint32_t cpu_id = (uint32_t)(addr_t)arg;
+    uint32_t cpu_id = (uint32_t)(addr_t)arg;
 
- #ifdef CONFIG_SVM
-    if (v3_is_svm_capable()) {
-        PrintDebug("Machine is SVM Capable\n");
-        //v3_deinit_svm_cpu(cpu_id);
 
-    } else 
+    switch (v3_cpu_types[cpu_id]) {
+ #ifdef CONFIG_SVM
+	case V3_VMX_CPU:
+	case V3_VMX_EPT_CPU:
+	    PrintDebug("Machine is SVM Capable\n");
+	    v3_deinit_svm_cpu(cpu_id);
+	    break;
 #endif
 #ifdef CONFIG_VMX
-    if (v3_is_vmx_capable()) {
-	PrintDebug("Machine is VMX Capable\n");
-	//v3_deinit_vmx_cpu(cpu_id);
-
-    } else 
+	case V3_SVM_CPU:
+	case V3_SVM_REV3_CPU:
+	    PrintDebug("Machine is VMX Capable\n");
+	    v3_deinit_vmx_cpu(cpu_id);
+	    break;
 #endif
-    {
-       PrintError("CPU has no virtualization Extensions\n");
+	case V3_INVALID_CPU:
+	default:
+	    PrintError("CPU has no virtualization Extensions\n");
+	    break;
     }
 }
-#endif
+
 
 
 void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
@@ -115,10 +118,6 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
     V3_init_symmod();
 #endif
 
-#ifdef CONFIG_INSTRUMENT_VMM
-    v3_init_instrumentation();
-#endif
-
 
 #ifdef CONFIG_VNET
     v3_init_vnet();
@@ -142,30 +141,25 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
 
 
 void Shutdown_V3() {
-    //  int i;
+    int i;
 
     V3_deinit_devices();
     V3_deinit_shdw_paging();
 
-#if 0
-
 #ifdef CONFIG_SYMMOD
     V3_deinit_symmod();
 #endif
 
-#ifdef CONFIG_INSTRUMENT_VMM
-    v3_deinit_instrumentation();
-#endif
 
 #ifdef CONFIG_VNET
     v3_deinit_vnet();
 #endif
 
 #ifdef CONFIG_MULTITHREAD_OS
-    if ((hooks) && (hooks->call_on_cpu)) {
+    if ((os_hooks) && (os_hooks->call_on_cpu)) {
 	for (i = 0; i < CONFIG_MAX_CPUS; i++) {
 	    if (v3_cpu_types[i] != V3_INVALID_CPU) {
-		deinit_cpu(i);
+		deinit_cpu((void *)(addr_t)i);
 	    }
 	}
     }
@@ -173,8 +167,6 @@ void Shutdown_V3() {
     deinit_cpu(0);
 #endif
 
-#endif
-
 }
 
 
@@ -240,12 +232,18 @@ static int start_core(void * p)
 
 
 // For the moment very ugly. Eventually we will shift the cpu_mask to an arbitrary sized type...
+#ifdef CONFIG_MULTITHREAD_OS
 #define MAX_CORES 32
+#else
+#define MAX_CORES 1
+#endif
 
 
 int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
     uint32_t i;
+#ifdef CONFIG_MULTITHREAD_OS
     int vcore_id = 0;
+#endif
     uint8_t * core_mask = (uint8_t *)&cpu_mask; // This is to make future expansion easier
     uint32_t avail_cores = 0;
 
@@ -273,6 +271,7 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
     }
 
 
+#ifdef CONFIG_MULTITHREAD_OS
     // spawn off new threads, for other cores
     for (i = 0, vcore_id = 1; (i < MAX_CORES) && (vcore_id < vm->num_cores); i++) {
 	int major = i / 8;
@@ -280,6 +279,7 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
 	void * core_thread = NULL;
 	struct guest_info * core = &(vm->cores[vcore_id]);
 
+	/* This assumes that the core 0 thread has been mapped to physical core 0 */
 	if (i == V3_Get_CPU()) {
 	    // We skip the local CPU, because it is reserved for vcore 0
 	    continue;
@@ -309,6 +309,7 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
 
 	vcore_id++;
     }
+#endif
 
     sprintf(vm->cores[0].exec_name, "%s", vm->name);