From 99dca286c608f5eef8e872a62f83a2c523b9a13a Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Thu, 14 Jan 2010 17:41:27 -0200 Subject: [PATCH] --- yaml --- r: 179957 b: refs/heads/master c: a6085fbaf65ab09bfb5ec8d902d6d21680fe1895 h: refs/heads/master i: 179955: 9541896b8e5bf0d83f0f6e92a9e9298dd0e33d5f v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/paging_tmpl.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7ceb1c6f4a37..cec8e643a42d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d72118cecabbb76b96b77107a50c74d1bb36c0c1 +refs/heads/master: a6085fbaf65ab09bfb5ec8d902d6d21680fe1895 diff --git a/trunk/arch/x86/kvm/paging_tmpl.h b/trunk/arch/x86/kvm/paging_tmpl.h index 58a0f1e88596..ede2131a9225 100644 --- a/trunk/arch/x86/kvm/paging_tmpl.h +++ b/trunk/arch/x86/kvm/paging_tmpl.h @@ -150,7 +150,9 @@ static int FNAME(walk_addr)(struct guest_walker *walker, walker->table_gfn[walker->level - 1] = table_gfn; walker->pte_gpa[walker->level - 1] = pte_gpa; - kvm_read_guest(vcpu->kvm, pte_gpa, &pte, sizeof(pte)); + if (kvm_read_guest(vcpu->kvm, pte_gpa, &pte, sizeof(pte))) + goto not_present; + trace_kvm_mmu_paging_element(pte, walker->level); if (!is_present_gpte(pte))