[COMMIT master] KVM: MMU: update 'root_hpa' out of loop in PAE shadow path

[Avi Kivity]

From: Xiao Guangrong <xiaoguangr...@cn.fujitsu.com>

The value of 'vcpu->arch.mmu.pae_root' is not modified, so we can update
'root_hpa' out of the loop.

Signed-off-by: Xiao Guangrong <xiaoguangr...@cn.fujitsu.com>
Signed-off-by: Avi Kivity <a...@redhat.com>

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index c94c432..3630046 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2393,8 +2393,8 @@ static int mmu_alloc_direct_roots(struct kvm_vcpu *vcpu)
                        ++sp->root_count;
                        spin_unlock(&vcpu->kvm->mmu_lock);
                        vcpu->arch.mmu.pae_root[i] = root | PT_PRESENT_MASK;
-                       vcpu->arch.mmu.root_hpa = __pa(vcpu->arch.mmu.pae_root);
                }
+               vcpu->arch.mmu.root_hpa = __pa(vcpu->arch.mmu.pae_root);
        } else
                BUG();
 
@@ -2466,8 +2466,8 @@ static int mmu_alloc_shadow_roots(struct kvm_vcpu *vcpu)
                spin_unlock(&vcpu->kvm->mmu_lock);
 
                vcpu->arch.mmu.pae_root[i] = root | pm_mask;
-               vcpu->arch.mmu.root_hpa = __pa(vcpu->arch.mmu.pae_root);
        }
+       vcpu->arch.mmu.root_hpa = __pa(vcpu->arch.mmu.pae_root);
 
        /*
         * If we shadow a 32 bit page table with a long mode page
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html