diff options
Diffstat (limited to 'arch/x86/kvm/mmu.c')
-rw-r--r-- | arch/x86/kvm/mmu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 866d7133cad8..bce3e25ec79b 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
@@ -144,7 +144,7 @@ struct kvm_rmap_desc { | |||
144 | 144 | ||
145 | struct kvm_shadow_walk { | 145 | struct kvm_shadow_walk { |
146 | int (*entry)(struct kvm_shadow_walk *walk, struct kvm_vcpu *vcpu, | 146 | int (*entry)(struct kvm_shadow_walk *walk, struct kvm_vcpu *vcpu, |
147 | gva_t addr, u64 *spte, int level); | 147 | u64 addr, u64 *spte, int level); |
148 | }; | 148 | }; |
149 | 149 | ||
150 | static struct kmem_cache *pte_chain_cache; | 150 | static struct kmem_cache *pte_chain_cache; |
@@ -941,7 +941,7 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu, | |||
941 | } | 941 | } |
942 | 942 | ||
943 | static int walk_shadow(struct kvm_shadow_walk *walker, | 943 | static int walk_shadow(struct kvm_shadow_walk *walker, |
944 | struct kvm_vcpu *vcpu, gva_t addr) | 944 | struct kvm_vcpu *vcpu, u64 addr) |
945 | { | 945 | { |
946 | hpa_t shadow_addr; | 946 | hpa_t shadow_addr; |
947 | int level; | 947 | int level; |
@@ -1270,7 +1270,7 @@ struct direct_shadow_walk { | |||
1270 | 1270 | ||
1271 | static int direct_map_entry(struct kvm_shadow_walk *_walk, | 1271 | static int direct_map_entry(struct kvm_shadow_walk *_walk, |
1272 | struct kvm_vcpu *vcpu, | 1272 | struct kvm_vcpu *vcpu, |
1273 | gva_t addr, u64 *sptep, int level) | 1273 | u64 addr, u64 *sptep, int level) |
1274 | { | 1274 | { |
1275 | struct direct_shadow_walk *walk = | 1275 | struct direct_shadow_walk *walk = |
1276 | container_of(_walk, struct direct_shadow_walk, walker); | 1276 | container_of(_walk, struct direct_shadow_walk, walker); |
@@ -1289,7 +1289,7 @@ static int direct_map_entry(struct kvm_shadow_walk *_walk, | |||
1289 | 1289 | ||
1290 | if (*sptep == shadow_trap_nonpresent_pte) { | 1290 | if (*sptep == shadow_trap_nonpresent_pte) { |
1291 | pseudo_gfn = (addr & PT64_DIR_BASE_ADDR_MASK) >> PAGE_SHIFT; | 1291 | pseudo_gfn = (addr & PT64_DIR_BASE_ADDR_MASK) >> PAGE_SHIFT; |
1292 | sp = kvm_mmu_get_page(vcpu, pseudo_gfn, addr, level - 1, | 1292 | sp = kvm_mmu_get_page(vcpu, pseudo_gfn, (gva_t)addr, level - 1, |
1293 | 1, ACC_ALL, sptep); | 1293 | 1, ACC_ALL, sptep); |
1294 | if (!sp) { | 1294 | if (!sp) { |
1295 | pgprintk("nonpaging_map: ENOMEM\n"); | 1295 | pgprintk("nonpaging_map: ENOMEM\n"); |
@@ -1317,7 +1317,7 @@ static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write, | |||
1317 | .pt_write = 0, | 1317 | .pt_write = 0, |
1318 | }; | 1318 | }; |
1319 | 1319 | ||
1320 | r = walk_shadow(&walker.walker, vcpu, (gva_t)gfn << PAGE_SHIFT); | 1320 | r = walk_shadow(&walker.walker, vcpu, gfn << PAGE_SHIFT); |
1321 | if (r < 0) | 1321 | if (r < 0) |
1322 | return r; | 1322 | return r; |
1323 | return walker.pt_write; | 1323 | return walker.pt_write; |