KVM: x86: remove check on nr_mmu_pages in kvm_arch_commit_memory_region()
authorWei Yang <richard.weiyang@gmail.com>
Thu, 27 Sep 2018 00:31:26 +0000 (08:31 +0800)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 28 Mar 2019 16:27:19 +0000 (17:27 +0100)
commit4d66623cfba0949b2f0d669bd2ae732124c99ded
treec031dcad0bdd4e7e995696f18f09c9c88219f16b
parent711eff3a8fa1d6193139a895524240912011b4dc
KVM: x86: remove check on nr_mmu_pages in kvm_arch_commit_memory_region()

* nr_mmu_pages would be non-zero only if kvm->arch.n_requested_mmu_pages is
  non-zero.

* nr_mmu_pages is always non-zero, since kvm_mmu_calculate_mmu_pages()
  never return zero.

Based on these two reasons, we can merge the two *if* clause and use the
return value from kvm_mmu_calculate_mmu_pages() directly. This simplify
the code and also eliminate the possibility for reader to believe
nr_mmu_pages would be zero.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/include/asm/kvm_host.h
arch/x86/kvm/mmu.c
arch/x86/kvm/x86.c