X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fapic.c;h=26ccb110e99e119e054d352f7d24448e213a1023;hb=f97c2c116e958d0e87e7303fc1d00fdf0b148893;hp=86286ce857fd6e4e37bff7fe326da35cd1ea6c23;hpb=1f8ac11d4550b1113d9a8c23e62b236cb8ad8404;p=palacios.releases.git

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index 86286ce..26ccb11 100644
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -282,6 +282,12 @@ static int apic_write(struct guest_info * core, addr_t guest_addr, void * src, u
 
 static void set_apic_tpr(struct apic_state *apic, uint32_t val);
 
+static int is_apic_bsp(struct apic_state * apic) {
+    return ((apic->base_addr_msr.value & 0x0000000000000100LL) != 0);
+}
+
+
+
 
 // No locking done
 static void init_apic_state(struct apic_state * apic, uint32_t id) {
@@ -861,14 +867,18 @@ static int deliver_ipi(struct apic_state * src_apic,
 
 	    PrintDebug(VM_NONE, VCORE_NONE, " INIT delivery to core %u\n", dst_core->vcpu_id);
 
-	    // TODO: any APIC reset on dest core (shouldn't be needed, but not sure...)
+	    if (is_apic_bsp(dst_apic)) {
+		PrintError(VM_NONE, VCORE_NONE, "Attempted to INIT BSP CPU. Ignoring since I have no idea what the hell to do...\n");
+		break;
+	    }
+
 
-	    // Sanity check
 	    if (dst_apic->ipi_state != INIT_ST) { 
-		PrintError(VM_NONE, VCORE_NONE, " Warning: core %u is not in INIT state (mode = %d), ignored (assuming this is the deassert)\n",
-			   dst_core->vcpu_id, dst_apic->ipi_state);
-		// Only a warning, since INIT INIT SIPI is common
-		break;
+		v3_raise_barrier(dst_core->vm_info, src_apic->core);
+		dst_core->core_run_state = CORE_STOPPED;
+		dst_apic->ipi_state = INIT_ST;
+		v3_lower_barrier(dst_core->vm_info);
+
 	    }
 
 	    // We transition the target core to SIPI state