diff options
| author | Gleb Natapov <gleb@redhat.com> | 2009-06-09 15:56:26 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-09-10 08:32:51 +0300 |
| commit | c5af89b68abb26eea5e745f33228f4d672f115e5 (patch) | |
| tree | aad12571ebedea7b869adbeec27e614c498715f4 /virt | |
| parent | d555c333aa544b222fe077adcd5dfea024b2c913 (diff) | |
| download | kernel-crypto-c5af89b68abb26eea5e745f33228f4d672f115e5.tar.gz kernel-crypto-c5af89b68abb26eea5e745f33228f4d672f115e5.tar.xz kernel-crypto-c5af89b68abb26eea5e745f33228f4d672f115e5.zip | |
KVM: Introduce kvm_vcpu_is_bsp() function.
Use it instead of open code "vcpu_id zero is BSP" assumption.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/ioapic.c | 4 | ||||
| -rw-r--r-- | virt/kvm/kvm_main.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index 2a566717399..0532fa68f5d 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -164,7 +164,9 @@ static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq) /* Always delivery PIT interrupt to vcpu 0 */ if (irq == 0) { irqe.dest_mode = 0; /* Physical mode. */ - irqe.dest_id = ioapic->kvm->vcpus[0]->vcpu_id; + /* need to read apic_id from apic regiest since + * it can be rewritten */ + irqe.dest_id = ioapic->kvm->bsp_vcpu->vcpu_id; } #endif return kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe); diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 0d481b28244..0d54edecbc7 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1747,6 +1747,8 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, int n) goto vcpu_destroy; } kvm->vcpus[n] = vcpu; + if (n == 0) + kvm->bsp_vcpu = vcpu; mutex_unlock(&kvm->lock); /* Now it's all set up, let userspace reach it */ |