[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] [HVM] Revert cset 14083
# HG changeset patch # User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx> # Date 1172482110 0 # Node ID 78c0ae1f77f2329825556ddcce826799ca0160e6 # Parent 2d3ceb082114bdc77e53b5710a076a1827254710 [HVM] Revert cset 14083 which was wrong, and not very useful. Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx> --- xen/arch/x86/mm/shadow/multi.c | 3 +-- xen/include/asm-x86/p2m.h | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff -r 2d3ceb082114 -r 78c0ae1f77f2 xen/arch/x86/mm/shadow/multi.c --- a/xen/arch/x86/mm/shadow/multi.c Mon Feb 26 09:13:50 2007 +0000 +++ b/xen/arch/x86/mm/shadow/multi.c Mon Feb 26 09:28:30 2007 +0000 @@ -2394,8 +2394,7 @@ static int validate_gl1e(struct vcpu *v, gfn = guest_l1e_get_gfn(*new_gl1e); gmfn = vcpu_gfn_to_mfn(v, gfn); - mmio = (is_hvm_vcpu(v) && paging_vcpu_mode_translate(v) && - mmio_space(gfn_to_paddr(gfn))); + mmio = (is_hvm_vcpu(v) && paging_vcpu_mode_translate(v) && !mfn_valid(gmfn)); l1e_propagate_from_guest(v, new_gl1e, _mfn(INVALID_MFN), gmfn, &new_sl1e, ft_prefetch, mmio); diff -r 2d3ceb082114 -r 78c0ae1f77f2 xen/include/asm-x86/p2m.h --- a/xen/include/asm-x86/p2m.h Mon Feb 26 09:13:50 2007 +0000 +++ b/xen/include/asm-x86/p2m.h Mon Feb 26 09:28:30 2007 +0000 @@ -86,11 +86,11 @@ static inline unsigned long get_mfn_from return mfn_x(gfn_to_mfn_current(pfn)); } -/* Is this guest address an mmio one? */ +/* Is this guest address an mmio one? (i.e. not defined in p2m map) */ static inline int mmio_space(paddr_t gpa) { - return (gpa >= 0xf0000000 /* 256MB hole just below 4GB */ - || (gpa >= 0xa0000 && gpa < 0xc0000)); /* VGA hole */ + unsigned long gfn = gpa >> PAGE_SHIFT; + return !mfn_valid(mfn_x(gfn_to_mfn_current(gfn))); } /* Translate the frame number held in an l1e from guest to machine */ _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |