Re: [GIT PULL] Early batch of KVM changes for 4.3 merge window

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 





On 09/02/2015 01:03 AM, Paolo Bonzini wrote:


diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index fb16a8ea3dee..3c745f3abde8 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -3309,13 +3309,13 @@ walk_shadow_page_get_mmio_spte(struct kvm_vcpu *vcpu, u64 addr, u64 *sptep)

  	walk_shadow_page_lockless_begin(vcpu);

-	for (shadow_walk_init(&iterator, vcpu, addr), root = iterator.level;
+	for (shadow_walk_init(&iterator, vcpu, addr),
+		 leaf = root = iterator.level;
  	     shadow_walk_okay(&iterator);
  	     __shadow_walk_next(&iterator, spte)) {
-		leaf = iterator.level;
  		spte = mmu_spte_get_lockless(iterator.sptep);

-		sptes[leaf - 1] = spte;
+		sptes[--leaf] = spte;

  		if (!is_shadow_present_pte(spte))
  			break;
@@ -3329,7 +3329,7 @@ walk_shadow_page_get_mmio_spte(struct kvm_vcpu *vcpu, u64 addr, u64 *sptep)
  	if (reserved) {
  		pr_err("%s: detect reserved bits on spte, addr 0x%llx, dump hierarchy:\n",
  		       __func__, addr);
-		while (root >= leaf) {
+		while (root > leaf) {
  			pr_err("------ spte 0x%llx level %d.\n",
  			       sptes[root - 1], root);
  			root--;


But honestly I haven't even compiled it yet.  Xiao, what do you think?


It looks good to me!

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux