X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=cb38aab2d2be4f89a6dbbbb4dec064d0d5c618ed;hb=5ab8dd9d463c5e1aa61910d6014fe8b770e1e301;hp=7e08dd9ce9e30f4cab24d04077eaf4c09886b176;hpb=fe2922a2862b1a4f1fb340ab4649f831ac17719c;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 7e08dd9..cb38aab 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -72,17 +72,17 @@ static void deinit_cpu(void * arg) {
 
 
     switch (v3_cpu_types[cpu_id]) {
- #ifdef CONFIG_SVM
-	case V3_VMX_CPU:
-	case V3_VMX_EPT_CPU:
-	    PrintDebug("Machine is SVM Capable\n");
+#ifdef CONFIG_SVM
+	case V3_SVM_CPU:
+	case V3_SVM_REV3_CPU:
+	    PrintDebug("Deinitializing SVM CPU %d\n", cpu_id);
 	    v3_deinit_svm_cpu(cpu_id);
 	    break;
 #endif
 #ifdef CONFIG_VMX
-	case V3_SVM_CPU:
-	case V3_SVM_REV3_CPU:
-	    PrintDebug("Machine is VMX Capable\n");
+	case V3_VMX_CPU:
+	case V3_VMX_EPT_CPU:
+	    PrintDebug("Deinitializing VMX CPU %d\n", cpu_id);
 	    v3_deinit_vmx_cpu(cpu_id);
 	    break;
 #endif
@@ -183,14 +183,13 @@ v3_cpu_arch_t v3_get_cpu_type(int cpu_id) {
 struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name) {
     struct v3_vm_info * vm = v3_config_guest(cfg, priv_data);
 
-    V3_Print("CORE 0 RIP=%p\n", (void *)(addr_t)(vm->cores[0].rip));
-
-
     if (vm == NULL) {
 	PrintError("Could not configure guest\n");
 	return NULL;
     }
 
+    V3_Print("CORE 0 RIP=%p\n", (void *)(addr_t)(vm->cores[0].rip));
+
     if (name == NULL) {
 	name = "[V3_VM]";
     } else if (strlen(name) >= 128) {
@@ -290,18 +289,19 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
 
 	    i--; // We reset the logical core idx. Not strictly necessary I guess... 
 	} else {
+
+	    /* 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;
+	    }
+	    
 	    core_idx = i;
 	}
 
 	major = core_idx / 8;
 	minor = core_idx % 8;
 
-	/* This assumes that the core 0 thread has been mapped to physical core 0 */
-	if (core_idx == V3_Get_CPU()) {
-	    // We skip the local CPU because it is reserved for vcore 0
-	    continue;
-	}
-
 
 	if ((core_mask[major] & (0x1 << minor)) == 0) {
 	    PrintError("Logical CPU %d not available for virtual core %d; not started\n",
@@ -373,8 +373,6 @@ int v3_stop_vm(struct v3_vm_info * vm) {
  	    break;
 	}
 
- 	V3_Print("Yielding\n");
-
 	v3_yield(NULL);
     }