KVM: drop bsp_vcpu pointer from kvm struct

Drop bsp_vcpu pointer from kvm struct since its only use is incorrect
anyway.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

2 files changed, 1 insertions, 5 deletions

diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 71e2253edee7..dcaf272c26c0 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -185,7 +185,7 @@ static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq)
                 irqe.dest_mode = 0; /* Physical mode. */
                 /* need to read apic_id from apic regiest since
                  * it can be rewritten */
-                irqe.dest_id = ioapic->kvm->bsp_vcpu->vcpu_id;
+                irqe.dest_id = ioapic->kvm->bsp_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 d8bac0751666..0835c4b90d2f 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1743,10 +1743,6 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)
         smp_wmb();
         atomic_inc(&kvm->online_vcpus);
 
-#ifdef CONFIG_KVM_APIC_ARCHITECTURE
-        if (kvm->bsp_vcpu_id == id)
-                kvm->bsp_vcpu = vcpu;
-#endif
         mutex_unlock(&kvm->lock);
         return r;