X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=afc8c1ca3c327d3d29e808df5069389f9aac0a8b;hp=8b4eed596649e70a8009ef7f7dddddbe7bf64b5e;hb=f82ccce5ce7629dce6f1a6feee8b47fa13a6756d;hpb=0cfc0855d8a1fc9c6982ec2672c2bc4683eb4e2a

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 8b4eed5..afc8c1c 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -255,7 +255,11 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
 	int minor = i % 8;
 	
 	if (core_mask[major] & (0x1 << minor)) {
-	    avail_cores++;
+	    if (v3_cpu_types[i] == V3_INVALID_CPU) {
+		core_mask[major] &= ~(0x1 << minor);
+	    } else {
+		avail_cores++;
+	    }
 	}
     }
 
@@ -323,6 +327,12 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
 	vcore_id--;
     }
 
+    if (vcore_id >= 0) {
+	PrintError("Error starting VM: Not enough available CPU cores\n");
+	v3_stop_vm(vm);
+	return -1;
+    }
+
 
     return 0;