Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19b1d4bd authored by David Hildenbrand's avatar David Hildenbrand Committed by Greg Kroah-Hartman
Browse files

KVM: nVMX: kmap() can't fail 



commit 42cf014d38d8822cce63703a467e00f65d000952 upstream.

kmap() can't fail, therefore it will always return a valid pointer. Let's
just get rid of the unnecessary checks.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 34900390

arch/x86/kvm/vmx.c

+0 −9
Original line number Diff line number Diff line
@@ -4756,10 +4756,6 @@ static int vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu) 
			return 0;



		vapic_page = kmap(vmx->nested.virtual_apic_page);

		if (!vapic_page) {

			WARN_ON(1);

			return -ENOMEM;

		}

		__kvm_apic_update_irr(vmx->nested.pi_desc->pir, vapic_page);

		kunmap(vmx->nested.virtual_apic_page);
@@ -9584,11 +9580,6 @@ static inline bool nested_vmx_merge_msr_bitmap(struct kvm_vcpu *vcpu, 
	if (!page)

		return false;

	msr_bitmap_l1 = (unsigned long *)kmap(page);

	if (!msr_bitmap_l1) {

		nested_release_page_clean(page);

		WARN_ON(1);

		return false;

	}



	memset(msr_bitmap_l0, 0xff, PAGE_SIZE);