diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-08-06 09:15:42 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-08-06 09:15:42 +0100 |
| commit | 70fc2398f035f16a1e6e6fc99af73e4d539a40c2 (patch) | |
| tree | 4b7abf7ffe9477c7382ff631ba1f1b0612a33a39 /xen/arch/x86/hvm/mtrr.c | |
| parent | 376235d7ced0dd3e91a73596aeed3d7430dbe0af (diff) | |
| download | xen-70fc2398f035f16a1e6e6fc99af73e4d539a40c2.tar.gz xen-70fc2398f035f16a1e6e6fc99af73e4d539a40c2.tar.bz2 xen-70fc2398f035f16a1e6e6fc99af73e4d539a40c2.zip | |
ept mtrr: replace unsigned long with mfn_t for mfns.
Signed-off-by: Patrick Colp <Patrick.Colp@citrix.com>
Diffstat (limited to 'xen/arch/x86/hvm/mtrr.c')
| -rw-r--r-- | xen/arch/x86/hvm/mtrr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 58e9cef2ce..9cca4301a4 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -20,6 +20,7 @@ #include <public/hvm/e820.h> #include <xen/types.h> #include <asm/e820.h> +#include <asm/mm.h> #include <asm/paging.h> #include <asm/p2m.h> #include <xen/domain_page.h> @@ -712,7 +713,7 @@ HVM_REGISTER_SAVE_RESTORE(MTRR, hvm_save_mtrr_msr, hvm_load_mtrr_msr, uint8_t epte_get_entry_emt( struct domain *d, unsigned long gfn, - unsigned long mfn, uint8_t *igmt, int direct_mmio) + mfn_t mfn, uint8_t *igmt, int direct_mmio) { uint8_t gmtrr_mtype, hmtrr_mtype; uint32_t type; @@ -730,7 +731,7 @@ uint8_t epte_get_entry_emt( if ( (v == current) && v->domain->arch.hvm_domain.is_in_uc_mode ) return MTRR_TYPE_UNCACHABLE; - if ( !mfn_valid(mfn) ) + if ( !mfn_valid(mfn_x(mfn)) ) return MTRR_TYPE_UNCACHABLE; if ( hvm_get_mem_pinned_cacheattr(d, gfn, &type) ) @@ -752,6 +753,6 @@ uint8_t epte_get_entry_emt( } gmtrr_mtype = get_mtrr_type(&v->arch.hvm_vcpu.mtrr, (gfn << PAGE_SHIFT)); - hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn << PAGE_SHIFT)); + hmtrr_mtype = get_mtrr_type(&mtrr_state, (mfn_x(mfn) << PAGE_SHIFT)); return ((gmtrr_mtype <= hmtrr_mtype) ? gmtrr_mtype : hmtrr_mtype); } |