ia64/xen-unstable

changeset 15681:a94bf8086002

[POWERPC][XEN] Deal with "shadow" -> "paging" fallout.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
author Hollis Blanchard <hollisb@us.ibm.com>
date Mon Jul 30 13:50:14 2007 -0500 (2007-07-30)
parents 403bb3c4130e
children 553f64e4f6ef
files xen/arch/powerpc/domain.c xen/arch/powerpc/domain_build.c xen/arch/powerpc/domctl.c xen/arch/powerpc/mm.c xen/arch/powerpc/shadow.c xen/arch/powerpc/sysctl.c xen/include/asm-powerpc/grant_table.h xen/include/asm-powerpc/mm.h xen/include/asm-powerpc/shadow.h
line diff
     1.1 --- a/xen/arch/powerpc/domain.c	Mon Jul 30 13:47:02 2007 -0500
     1.2 +++ b/xen/arch/powerpc/domain.c	Mon Jul 30 13:50:14 2007 -0500
     1.3 @@ -29,7 +29,7 @@
     1.4  #include <xen/domain.h>
     1.5  #include <xen/console.h>
     1.6  #include <xen/shutdown.h>
     1.7 -#include <xen/shadow.h>
     1.8 +#include <xen/paging.h>
     1.9  #include <xen/mm.h>
    1.10  #include <xen/softirq.h>
    1.11  #include <asm/htab.h>
     2.1 --- a/xen/arch/powerpc/domain_build.c	Mon Jul 30 13:47:02 2007 -0500
     2.2 +++ b/xen/arch/powerpc/domain_build.c	Mon Jul 30 13:50:14 2007 -0500
     2.3 @@ -26,10 +26,9 @@
     2.4  #include <xen/init.h>
     2.5  #include <xen/ctype.h>
     2.6  #include <xen/iocap.h>
     2.7 -#include <xen/shadow.h>
     2.8  #include <xen/domain.h>
     2.9  #include <xen/version.h>
    2.10 -#include <xen/shadow.h>
    2.11 +#include <xen/paging.h>
    2.12  #include <asm/processor.h>
    2.13  #include <asm/platform.h>
    2.14  #include <asm/papr.h>
     3.1 --- a/xen/arch/powerpc/domctl.c	Mon Jul 30 13:47:02 2007 -0500
     3.2 +++ b/xen/arch/powerpc/domctl.c	Mon Jul 30 13:50:14 2007 -0500
     3.3 @@ -25,7 +25,7 @@
     3.4  #include <xen/sched.h>
     3.5  #include <xen/domain.h>
     3.6  #include <xen/guest_access.h>
     3.7 -#include <xen/shadow.h>
     3.8 +#include <xen/paging.h>
     3.9  #include <public/xen.h>
    3.10  #include <public/domctl.h>
    3.11  #include <public/sysctl.h>
     4.1 --- a/xen/arch/powerpc/mm.c	Mon Jul 30 13:47:02 2007 -0500
     4.2 +++ b/xen/arch/powerpc/mm.c	Mon Jul 30 13:50:14 2007 -0500
     4.3 @@ -22,7 +22,7 @@
     4.4  
     4.5  #include <xen/config.h>
     4.6  #include <xen/mm.h>
     4.7 -#include <xen/shadow.h>
     4.8 +#include <xen/paging.h>
     4.9  #include <xen/kernel.h>
    4.10  #include <xen/sched.h>
    4.11  #include <xen/perfc.h>
     5.1 --- a/xen/arch/powerpc/shadow.c	Mon Jul 30 13:47:02 2007 -0500
     5.2 +++ b/xen/arch/powerpc/shadow.c	Mon Jul 30 13:50:14 2007 -0500
     5.3 @@ -20,7 +20,7 @@
     5.4  
     5.5  #include <xen/config.h>
     5.6  #include <xen/types.h>
     5.7 -#include <xen/shadow.h>
     5.8 +#include <xen/paging.h>
     5.9  
    5.10  static ulong htab_calc_sdr1(ulong htab_addr, ulong log_htab_size)
    5.11  {
     6.1 --- a/xen/arch/powerpc/sysctl.c	Mon Jul 30 13:47:02 2007 -0500
     6.2 +++ b/xen/arch/powerpc/sysctl.c	Mon Jul 30 13:50:14 2007 -0500
     6.3 @@ -24,7 +24,6 @@
     6.4  #include <xen/nodemask.h>
     6.5  #include <xen/sched.h>
     6.6  #include <xen/guest_access.h>
     6.7 -#include <xen/shadow.h>
     6.8  #include <public/xen.h>
     6.9  #include <public/domctl.h>
    6.10  #include <public/sysctl.h>
     7.1 --- a/xen/include/asm-powerpc/grant_table.h	Mon Jul 30 13:47:02 2007 -0500
     7.2 +++ b/xen/include/asm-powerpc/grant_table.h	Mon Jul 30 13:50:14 2007 -0500
     7.3 @@ -51,6 +51,11 @@ int replace_grant_host_mapping(
     7.4  #define gnttab_shared_gmfn(d, t, i)                     \
     7.5      (mfn_to_gmfn(d, gnttab_shared_mfn(d, t, i)))
     7.6  
     7.7 +static inline void mark_dirty(struct domain *d, unsigned int mfn)
     7.8 +{
     7.9 +    return;
    7.10 +}
    7.11 +#define gnttab_mark_dirty(d, f) mark_dirty((d), (f))
    7.12  #define gnttab_log_dirty(d, f) mark_dirty((d), (f))
    7.13  
    7.14  static inline void gnttab_clear_flag(unsigned long nr, uint16_t *addr)
     8.1 --- a/xen/include/asm-powerpc/mm.h	Mon Jul 30 13:47:02 2007 -0500
     8.2 +++ b/xen/include/asm-powerpc/mm.h	Mon Jul 30 13:50:14 2007 -0500
     8.3 @@ -275,4 +275,12 @@ extern int steal_page(struct domain *d, 
     8.4  
     8.5  #define domain_get_maximum_gpfn(d) (-ENOSYS)
     8.6  
     8.7 +extern int guest_physmap_max_mem_pages(struct domain *d, unsigned long new_max);
     8.8 +
     8.9 +extern void guest_physmap_add_page(
    8.10 +    struct domain *d, unsigned long gpfn, unsigned long mfn);
    8.11 +
    8.12 +extern void guest_physmap_remove_page(
    8.13 +    struct domain *d, unsigned long gpfn, unsigned long mfn);
    8.14 +
    8.15  #endif
     9.1 --- a/xen/include/asm-powerpc/shadow.h	Mon Jul 30 13:47:02 2007 -0500
     9.2 +++ b/xen/include/asm-powerpc/shadow.h	Mon Jul 30 13:50:14 2007 -0500
     9.3 @@ -32,23 +32,9 @@
     9.4        ? machine_to_phys_mapping[(mfn)]                 \
     9.5        : (mfn) )
     9.6  
     9.7 -extern int guest_physmap_max_mem_pages(struct domain *d, unsigned long new_max);
     9.8 -
     9.9 -extern void guest_physmap_add_page(
    9.10 -    struct domain *d, unsigned long gpfn, unsigned long mfn);
    9.11 -
    9.12 -extern void guest_physmap_remove_page(
    9.13 -    struct domain *d, unsigned long gpfn, unsigned long mfn);
    9.14 -
    9.15  extern void shadow_drop_references(
    9.16      struct domain *d, struct page_info *page);
    9.17  
    9.18 -static inline void mark_dirty(struct domain *d, unsigned int mfn)
    9.19 -{
    9.20 -    return;
    9.21 -}
    9.22 -#define gnttab_mark_dirty(d, f) mark_dirty((d), (f))
    9.23 -
    9.24  extern int shadow_domctl(struct domain *d, 
    9.25                     xen_domctl_shadow_op_t *sc,
    9.26                     XEN_GUEST_HANDLE(xen_domctl_t) u_domctl);