diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-01-05 16:36:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-05 23:55:27 -0800 |
| commit | e2dec939db126989808853d218e426daaeebc9e2 (patch) | |
| tree | 5c742e609e43090df396fc1c7a6b4c526099dbea /drivers/kvm/paging_tmpl.h | |
| parent | 714b93da1a6d97307dfafb9915517879d8a66c0d (diff) | |
| download | blackbird-op-linux-e2dec939db126989808853d218e426daaeebc9e2.tar.gz blackbird-op-linux-e2dec939db126989808853d218e426daaeebc9e2.zip | |
[PATCH] KVM: MMU: Detect oom conditions and propagate error to userspace
Signed-off-by: Avi Kivity <avi@qumranet.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/kvm/paging_tmpl.h')
| -rw-r--r-- | drivers/kvm/paging_tmpl.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/kvm/paging_tmpl.h b/drivers/kvm/paging_tmpl.h index 4e6670ff1847..32b385188454 100644 --- a/drivers/kvm/paging_tmpl.h +++ b/drivers/kvm/paging_tmpl.h @@ -339,7 +339,8 @@ static int FNAME(fix_write_pf)(struct kvm_vcpu *vcpu, * - normal guest page fault due to the guest pte marked not present, not * writable, or not executable * - * Returns: 1 if we need to emulate the instruction, 0 otherwise + * Returns: 1 if we need to emulate the instruction, 0 otherwise, or + * a negative value on error. */ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code) @@ -351,10 +352,13 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u64 *shadow_pte; int fixed; int write_pt = 0; + int r; pgprintk("%s: addr %lx err %x\n", __FUNCTION__, addr, error_code); - mmu_topup_memory_caches(vcpu); + r = mmu_topup_memory_caches(vcpu); + if (r) + return r; /* * Look up the shadow pte for the faulting address. |
