Use cpu_is_bsp() to check for bsp cpu.

Commit Message

Gleb Natapov June 25, 2009, 12:20 p.m. UTC

Signed-off-by: Gleb Natapov <[e-mail]>
---
 qemu-kvm-x86.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Comments

Avi Kivity June 28, 2009, 9:27 a.m. UTC | #1

On 06/25/2009 03:20 PM, Gleb Natapov wrote:
> Signed-off-by: Gleb Natapov<[e-mail]>
>    


Applied, thanks.

Patch

diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 568df53..a78073e 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -23,6 +23,7 @@ 
 #include <sys/ioctl.h>
 
 #include "kvm.h"
+#include "hw/pc.h"
 
 #define MSR_IA32_TSC		0x10
 
@@ -1349,7 +1350,7 @@  int handle_tpr_access(void *opaque, kvm_vcpu_context_t vcpu,
 void kvm_arch_cpu_reset(CPUState *env)
 {
     kvm_arch_load_regs(env);
-    if (env->cpu_index != 0) {
+    if (!cpu_is_bsp(env)) {
 	if (kvm_irqchip_in_kernel(kvm_context)) {
 #ifdef KVM_CAP_MP_STATE
 	    kvm_reset_mpstate(env->kvm_cpu_state.vcpu_ctx);
@@ -1583,7 +1584,7 @@  void kvm_update_after_sipi(CPUState *env)
 
 void kvm_apic_init(CPUState *env)
 {
-    if (env->cpu_index != 0)
+    if (!cpu_is_bsp(env))
 	env->kvm_cpu_state.init = 1;
     kvm_update_interrupt_request(env);
 }