Commit 26de7988 authored by David Hildenbrand's avatar David Hildenbrand Committed by Paolo Bonzini
Browse files

KVM: x86: drop BUG_ON(vcpu->kvm) 



And also get rid of that superfluous local variable "kvm".

Reviewed-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 87ca74ad

arch/x86/kvm/x86.c

+2 −6
Original line number Diff line number Diff line
@@ -7974,16 +7974,12 @@ EXPORT_SYMBOL_GPL(kvm_no_apic_vcpu); 
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)

{

	struct page *page;

	struct kvm *kvm;

	int r;



	BUG_ON(vcpu->kvm == NULL);

	kvm = vcpu->kvm;



	vcpu->arch.apicv_active = kvm_x86_ops->get_enable_apicv(vcpu);

	vcpu->arch.pv.pv_unhalted = false;

	vcpu->arch.emulate_ctxt.ops = &emulate_ops;

	if (!irqchip_in_kernel(kvm) || kvm_vcpu_is_reset_bsp(vcpu))

	if (!irqchip_in_kernel(vcpu->kvm) || kvm_vcpu_is_reset_bsp(vcpu))

		vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;

	else

		vcpu->arch.mp_state = KVM_MP_STATE_UNINITIALIZED;
@@ -8001,7 +7997,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 
	if (r < 0)

		goto fail_free_pio_data;



	if (irqchip_in_kernel(kvm)) {

	if (irqchip_in_kernel(vcpu->kvm)) {

		r = kvm_create_lapic(vcpu);

		if (r < 0)

			goto fail_mmu_destroy;