diff options
| author | Tim Deegan <tim@xen.org> | 2013-01-17 15:55:02 +0000 |
|---|---|---|
| committer | Tim Deegan <tim@xen.org> | 2013-01-17 15:55:02 +0000 |
| commit | d633c601bd604ed68597aea4b2632458309ce1f1 (patch) | |
| tree | ee339f6596e3230c05f1104b9c814d4e8d0d527f /xen/arch/x86/hvm/hvm.c | |
| parent | f8079d5208755a9fa35aac4047af150a81420b78 (diff) | |
| download | xen-d633c601bd604ed68597aea4b2632458309ce1f1.tar.gz xen-d633c601bd604ed68597aea4b2632458309ce1f1.tar.bz2 xen-d633c601bd604ed68597aea4b2632458309ce1f1.zip | |
x86/mm: revert 26399:b0e618cb0233 (multiple vram areas)
Although this passed my smoke-tests at commit time, I'm now seeing screen
corruption on 32-bit WinXP guests. Reverting for now. :(
Signed-off-by: Tim Deegan <tim@xen.org>
Committed-by: Tim Deegan <tim@xen.org>
Diffstat (limited to 'xen/arch/x86/hvm/hvm.c')
| -rw-r--r-- | xen/arch/x86/hvm/hvm.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 4b8c60adce..c75f7c5920 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -57,7 +57,6 @@ #include <asm/hvm/cacheattr.h> #include <asm/hvm/trace.h> #include <asm/hvm/nestedhvm.h> -#include <asm/dirty_vram.h> #include <asm/mtrr.h> #include <asm/apic.h> #include <public/sched.h> @@ -1437,11 +1436,8 @@ int hvm_hap_nested_page_fault(paddr_t gpa, */ if ( access_w ) { - if ( p2m_change_type(v->domain, gfn, p2m_ram_logdirty, - p2m_ram_rw) == p2m_ram_logdirty ) - { - paging_mark_dirty_gpfn(v->domain, gfn); - } + paging_mark_dirty(v->domain, mfn_x(mfn)); + p2m_change_type(v->domain, gfn, p2m_ram_logdirty, p2m_ram_rw); } rc = 1; goto out_put_gfn; |