From: Miaohe Lin <linmiaohe@huawei.com>
Date: Thu, 5 Dec 2019 03:40:16 +0000 (+0800)
Subject: KVM: explicitly set rmap_head->val to 0 in pte_list_desc_remove_entry()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fe3c2b4c228443b505f2d8981c4871b96cfec6d6;p=openwrt%2Fstaging%2Fblogic.git

KVM: explicitly set rmap_head->val to 0 in pte_list_desc_remove_entry()

When we reach here, we have desc->sptes[j] = NULL with j = 0.
So we can replace desc->sptes[0] with 0 to make it more clear.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 1e4ee4f8de5f..35d37099bec6 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -1414,7 +1414,7 @@ pte_list_desc_remove_entry(struct kvm_rmap_head *rmap_head,
 	if (j != 0)
 		return;
 	if (!prev_desc && !desc->more)
-		rmap_head->val = (unsigned long)desc->sptes[0];
+		rmap_head->val = 0;
 	else
 		if (prev_desc)
 			prev_desc->more = desc->more;