Commit 7f7f0d9c authored by Miaohe Lin's avatar Miaohe Lin Committed by Paolo Bonzini
Browse files

KVM: x86: get rid of odd out jump label in pdptrs_changed 



The odd out jump label is really not needed. Get rid of
it by return true directly while r < 0 as suggested by
Paolo. This further lead to var changed being unused.
Remove it too.

Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 53fafdbb

arch/x86/kvm/x86.c

+2 −5
Original line number Diff line number Diff line
@@ -721,7 +721,6 @@ EXPORT_SYMBOL_GPL(load_pdptrs); 
bool pdptrs_changed(struct kvm_vcpu *vcpu)

{

	u64 pdpte[ARRAY_SIZE(vcpu->arch.walk_mmu->pdptrs)];

	bool changed = true;

	int offset;

	gfn_t gfn;

	int r;
@@ -737,11 +736,9 @@ bool pdptrs_changed(struct kvm_vcpu *vcpu) 
	r = kvm_read_nested_guest_page(vcpu, gfn, pdpte, offset, sizeof(pdpte),

				       PFERR_USER_MASK | PFERR_WRITE_MASK);

	if (r < 0)

		goto out;

	changed = memcmp(pdpte, vcpu->arch.walk_mmu->pdptrs, sizeof(pdpte)) != 0;

out:

		return true;



	return changed;

	return memcmp(pdpte, vcpu->arch.walk_mmu->pdptrs, sizeof(pdpte)) != 0;

}

EXPORT_SYMBOL_GPL(pdptrs_changed);