summary refs log tree commit diff stats
path: root/hw/intc
diff options
context:
space:
mode:
authorNadav Amit <namit@cs.technion.ac.il>2015-04-02 02:58:36 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2015-04-02 15:57:27 +0200
commit9cb11fd7539b5b787d8fb3834004804a58dd16ae (patch)
treecd20dde0af304c6401ec4002b2f4e828a7c66a80 /hw/intc
parent420957a5982113416c5e442687de5e1ffaffeafc (diff)
downloadfocaccia-qemu-9cb11fd7539b5b787d8fb3834004804a58dd16ae.tar.gz
focaccia-qemu-9cb11fd7539b5b787d8fb3834004804a58dd16ae.zip
target-i386: clear bsp bit when designating bsp
Since the BSP bit is writable on real hardware, during reset all the CPUs which
were not chosen to be the BSP should have their BSP bit cleared. This fix is
required for KVM to work correctly when it changes the BSP bit.

An additional fix is required for QEMU tcg to allow software to change the BSP
bit.

Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Message-Id: <1427932716-11800-1-git-send-email-namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/intc')
-rw-r--r--hw/intc/apic_common.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index 0858b45943..042e960f42 100644
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -215,14 +215,18 @@ void apic_init_reset(DeviceState *dev)
     }
 }
 
-void apic_designate_bsp(DeviceState *dev)
+void apic_designate_bsp(DeviceState *dev, bool bsp)
 {
     if (dev == NULL) {
         return;
     }
 
     APICCommonState *s = APIC_COMMON(dev);
-    s->apicbase |= MSR_IA32_APICBASE_BSP;
+    if (bsp) {
+        s->apicbase |= MSR_IA32_APICBASE_BSP;
+    } else {
+        s->apicbase &= ~MSR_IA32_APICBASE_BSP;
+    }
 }
 
 static void apic_reset_common(DeviceState *dev)