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

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
...@@ -721,7 +721,6 @@ EXPORT_SYMBOL_GPL(load_pdptrs); ...@@ -721,7 +721,6 @@ EXPORT_SYMBOL_GPL(load_pdptrs);
bool pdptrs_changed(struct kvm_vcpu *vcpu) bool pdptrs_changed(struct kvm_vcpu *vcpu)
{ {
u64 pdpte[ARRAY_SIZE(vcpu->arch.walk_mmu->pdptrs)]; u64 pdpte[ARRAY_SIZE(vcpu->arch.walk_mmu->pdptrs)];
bool changed = true;
int offset; int offset;
gfn_t gfn; gfn_t gfn;
int r; int r;
...@@ -737,11 +736,9 @@ bool pdptrs_changed(struct kvm_vcpu *vcpu) ...@@ -737,11 +736,9 @@ bool pdptrs_changed(struct kvm_vcpu *vcpu)
r = kvm_read_nested_guest_page(vcpu, gfn, pdpte, offset, sizeof(pdpte), r = kvm_read_nested_guest_page(vcpu, gfn, pdpte, offset, sizeof(pdpte),
PFERR_USER_MASK | PFERR_WRITE_MASK); PFERR_USER_MASK | PFERR_WRITE_MASK);
if (r < 0) if (r < 0)
goto out; return true;
changed = memcmp(pdpte, vcpu->arch.walk_mmu->pdptrs, sizeof(pdpte)) != 0;
out:
return changed; return memcmp(pdpte, vcpu->arch.walk_mmu->pdptrs, sizeof(pdpte)) != 0;
} }
EXPORT_SYMBOL_GPL(pdptrs_changed); EXPORT_SYMBOL_GPL(pdptrs_changed);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment