summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorLan Tianyu <Tianyu.Lan@microsoft.com>2019-02-02 04:20:27 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2019-02-20 16:48:52 -0500
commita67794cafbc4594debf53dbe4e2a7708426f492e (patch)
tree81a043afe06d1d0af15b195a76deaac5d7315459 /virt
parent7539b174aef405d9d57db48c58390ba360c91312 (diff)
Revert "KVM: Eliminate extra function calls in kvm_get_dirty_log_protect()"
The value of "dirty_bitmap[i]" is already check before setting its value to mask. The following check of "mask" is redundant. The check of "mask" was introduced by commit 58d2930f4ee3 ("KVM: Eliminate extra function calls in kvm_get_dirty_log_protect()"), revert it. Signed-off-by: Lan Tianyu <Tianyu.Lan@microsoft.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 5087cf703ed1..276af92ace6c 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1205,11 +1205,9 @@ int kvm_get_dirty_log_protect(struct kvm *kvm,
1205 mask = xchg(&dirty_bitmap[i], 0); 1205 mask = xchg(&dirty_bitmap[i], 0);
1206 dirty_bitmap_buffer[i] = mask; 1206 dirty_bitmap_buffer[i] = mask;
1207 1207
1208 if (mask) { 1208 offset = i * BITS_PER_LONG;
1209 offset = i * BITS_PER_LONG; 1209 kvm_arch_mmu_enable_log_dirty_pt_masked(kvm, memslot,
1210 kvm_arch_mmu_enable_log_dirty_pt_masked(kvm, memslot, 1210 offset, mask);
1211 offset, mask);
1212 }
1213 } 1211 }
1214 spin_unlock(&kvm->mmu_lock); 1212 spin_unlock(&kvm->mmu_lock);
1215 } 1213 }