[Xen-changelog] [xen-unstable] Remove unused XENMAPSPACE_mfn

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1231933141 0
# Node ID 77476eeb8c422af78219fade0b26b8aa8c51eb65
# Parent  ee62aaafff46d29ab308dcab12b69f9f371afdb1
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@xxxxxxxxxx>
---
 xen/arch/ia64/xen/mm.c      |    5 ++---
 xen/arch/x86/mm.c           |    1 -
 xen/include/public/memory.h |    3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff -r ee62aaafff46 -r 77476eeb8c42 xen/arch/ia64/xen/mm.c
--- a/xen/arch/ia64/xen/mm.c    Wed Jan 14 11:24:37 2009 +0000
+++ b/xen/arch/ia64/xen/mm.c    Wed Jan 14 11:39:01 2009 +0000
@@ -3295,13 +3295,12 @@ arch_memory_op(int op, XEN_GUEST_HANDLE(
 
             spin_unlock(&d->grant_table->lock);
             break;
-        case XENMAPSPACE_gmfn:
-            xatp.idx = gmfn_to_mfn(d, xatp.idx);
-        case XENMAPSPACE_mfn: {
+        case XENMAPSPACE_gmfn: {
             struct xen_ia64_memmap_info memmap_info;
             efi_memory_desc_t md;
             int ret;
 
+            xatp.idx = gmfn_to_mfn(d, xatp.idx);
             if ( !get_page_from_pagenr(xatp.idx, d) )
                 break;
 
diff -r ee62aaafff46 -r 77476eeb8c42 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Wed Jan 14 11:24:37 2009 +0000
+++ b/xen/arch/x86/mm.c Wed Jan 14 11:39:01 2009 +0000
@@ -3810,7 +3810,6 @@ long arch_memory_op(int op, XEN_GUEST_HA
             break;
         case XENMAPSPACE_gmfn:
             xatp.idx = gmfn_to_mfn(d, xatp.idx);
-        case XENMAPSPACE_mfn:
             if ( !get_page_from_pagenr(xatp.idx, d) )
                 break;
             mfn = xatp.idx;
diff -r ee62aaafff46 -r 77476eeb8c42 xen/include/public/memory.h
--- a/xen/include/public/memory.h       Wed Jan 14 11:24:37 2009 +0000
+++ b/xen/include/public/memory.h       Wed Jan 14 11:39:01 2009 +0000
@@ -206,8 +206,7 @@ struct xen_add_to_physmap {
     /* Source mapping space. */
 #define XENMAPSPACE_shared_info 0 /* shared info page */
 #define XENMAPSPACE_grant_table 1 /* grant table page */
-#define XENMAPSPACE_mfn         2 /* MFN */
-#define XENMAPSPACE_gmfn        3 /* GMFN */
+#define XENMAPSPACE_gmfn        2 /* GMFN */
     unsigned int space;
 
     /* Index into source mapping space. */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog