ia64/xen-unstable

changeset 19043:77476eeb8c42

Remove unused XENMAPSPACE_mfn

Not present in any stable release of Xen. Introduced for qemu-dm but
not needed.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Jan 14 11:39:01 2009 +0000 (2009-01-14)
parents ee62aaafff46
children 10a8fae412c5
files xen/arch/ia64/xen/mm.c xen/arch/x86/mm.c xen/include/public/memory.h
line diff
     1.1 --- a/xen/arch/ia64/xen/mm.c	Wed Jan 14 11:24:37 2009 +0000
     1.2 +++ b/xen/arch/ia64/xen/mm.c	Wed Jan 14 11:39:01 2009 +0000
     1.3 @@ -3295,13 +3295,12 @@ arch_memory_op(int op, XEN_GUEST_HANDLE(
     1.4  
     1.5              spin_unlock(&d->grant_table->lock);
     1.6              break;
     1.7 -        case XENMAPSPACE_gmfn:
     1.8 -            xatp.idx = gmfn_to_mfn(d, xatp.idx);
     1.9 -        case XENMAPSPACE_mfn: {
    1.10 +        case XENMAPSPACE_gmfn: {
    1.11              struct xen_ia64_memmap_info memmap_info;
    1.12              efi_memory_desc_t md;
    1.13              int ret;
    1.14  
    1.15 +            xatp.idx = gmfn_to_mfn(d, xatp.idx);
    1.16              if ( !get_page_from_pagenr(xatp.idx, d) )
    1.17                  break;
    1.18  
     2.1 --- a/xen/arch/x86/mm.c	Wed Jan 14 11:24:37 2009 +0000
     2.2 +++ b/xen/arch/x86/mm.c	Wed Jan 14 11:39:01 2009 +0000
     2.3 @@ -3810,7 +3810,6 @@ long arch_memory_op(int op, XEN_GUEST_HA
     2.4              break;
     2.5          case XENMAPSPACE_gmfn:
     2.6              xatp.idx = gmfn_to_mfn(d, xatp.idx);
     2.7 -        case XENMAPSPACE_mfn:
     2.8              if ( !get_page_from_pagenr(xatp.idx, d) )
     2.9                  break;
    2.10              mfn = xatp.idx;
     3.1 --- a/xen/include/public/memory.h	Wed Jan 14 11:24:37 2009 +0000
     3.2 +++ b/xen/include/public/memory.h	Wed Jan 14 11:39:01 2009 +0000
     3.3 @@ -206,8 +206,7 @@ struct xen_add_to_physmap {
     3.4      /* Source mapping space. */
     3.5  #define XENMAPSPACE_shared_info 0 /* shared info page */
     3.6  #define XENMAPSPACE_grant_table 1 /* grant table page */
     3.7 -#define XENMAPSPACE_mfn         2 /* MFN */
     3.8 -#define XENMAPSPACE_gmfn        3 /* GMFN */
     3.9 +#define XENMAPSPACE_gmfn        2 /* GMFN */
    3.10      unsigned int space;
    3.11  
    3.12      /* Index into source mapping space. */