# HG changeset patch
# User Hollis Blanchard <hollisb@xxxxxxxxxx>
# Date 1185821414 18000
# Node ID a94bf8086002290270f3e6c6a464986462ba8809
# Parent 403bb3c4130e132976033ee8290dcd08fd024700
[POWERPC][XEN] Deal with "shadow" -> "paging" fallout.
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
---
xen/arch/powerpc/domain.c | 2 +-
xen/arch/powerpc/domain_build.c | 3 +--
xen/arch/powerpc/domctl.c | 2 +-
xen/arch/powerpc/mm.c | 2 +-
xen/arch/powerpc/shadow.c | 2 +-
xen/arch/powerpc/sysctl.c | 1 -
xen/include/asm-powerpc/grant_table.h | 5 +++++
xen/include/asm-powerpc/mm.h | 8 ++++++++
xen/include/asm-powerpc/shadow.h | 14 --------------
9 files changed, 18 insertions(+), 21 deletions(-)
diff -r 403bb3c4130e -r a94bf8086002 xen/arch/powerpc/domain.c
--- a/xen/arch/powerpc/domain.c Mon Jul 30 13:47:02 2007 -0500
+++ b/xen/arch/powerpc/domain.c Mon Jul 30 13:50:14 2007 -0500
@@ -29,7 +29,7 @@
#include <xen/domain.h>
#include <xen/console.h>
#include <xen/shutdown.h>
-#include <xen/shadow.h>
+#include <xen/paging.h>
#include <xen/mm.h>
#include <xen/softirq.h>
#include <asm/htab.h>
diff -r 403bb3c4130e -r a94bf8086002 xen/arch/powerpc/domain_build.c
--- a/xen/arch/powerpc/domain_build.c Mon Jul 30 13:47:02 2007 -0500
+++ b/xen/arch/powerpc/domain_build.c Mon Jul 30 13:50:14 2007 -0500
@@ -26,10 +26,9 @@
#include <xen/init.h>
#include <xen/ctype.h>
#include <xen/iocap.h>
-#include <xen/shadow.h>
#include <xen/domain.h>
#include <xen/version.h>
-#include <xen/shadow.h>
+#include <xen/paging.h>
#include <asm/processor.h>
#include <asm/platform.h>
#include <asm/papr.h>
diff -r 403bb3c4130e -r a94bf8086002 xen/arch/powerpc/domctl.c
--- a/xen/arch/powerpc/domctl.c Mon Jul 30 13:47:02 2007 -0500
+++ b/xen/arch/powerpc/domctl.c Mon Jul 30 13:50:14 2007 -0500
@@ -25,7 +25,7 @@
#include <xen/sched.h>
#include <xen/domain.h>
#include <xen/guest_access.h>
-#include <xen/shadow.h>
+#include <xen/paging.h>
#include <public/xen.h>
#include <public/domctl.h>
#include <public/sysctl.h>
diff -r 403bb3c4130e -r a94bf8086002 xen/arch/powerpc/mm.c
--- a/xen/arch/powerpc/mm.c Mon Jul 30 13:47:02 2007 -0500
+++ b/xen/arch/powerpc/mm.c Mon Jul 30 13:50:14 2007 -0500
@@ -22,7 +22,7 @@
#include <xen/config.h>
#include <xen/mm.h>
-#include <xen/shadow.h>
+#include <xen/paging.h>
#include <xen/kernel.h>
#include <xen/sched.h>
#include <xen/perfc.h>
diff -r 403bb3c4130e -r a94bf8086002 xen/arch/powerpc/shadow.c
--- a/xen/arch/powerpc/shadow.c Mon Jul 30 13:47:02 2007 -0500
+++ b/xen/arch/powerpc/shadow.c Mon Jul 30 13:50:14 2007 -0500
@@ -20,7 +20,7 @@
#include <xen/config.h>
#include <xen/types.h>
-#include <xen/shadow.h>
+#include <xen/paging.h>
static ulong htab_calc_sdr1(ulong htab_addr, ulong log_htab_size)
{
diff -r 403bb3c4130e -r a94bf8086002 xen/arch/powerpc/sysctl.c
--- a/xen/arch/powerpc/sysctl.c Mon Jul 30 13:47:02 2007 -0500
+++ b/xen/arch/powerpc/sysctl.c Mon Jul 30 13:50:14 2007 -0500
@@ -24,7 +24,6 @@
#include <xen/nodemask.h>
#include <xen/sched.h>
#include <xen/guest_access.h>
-#include <xen/shadow.h>
#include <public/xen.h>
#include <public/domctl.h>
#include <public/sysctl.h>
diff -r 403bb3c4130e -r a94bf8086002 xen/include/asm-powerpc/grant_table.h
--- a/xen/include/asm-powerpc/grant_table.h Mon Jul 30 13:47:02 2007 -0500
+++ b/xen/include/asm-powerpc/grant_table.h Mon Jul 30 13:50:14 2007 -0500
@@ -51,6 +51,11 @@ int replace_grant_host_mapping(
#define gnttab_shared_gmfn(d, t, i) \
(mfn_to_gmfn(d, gnttab_shared_mfn(d, t, i)))
+static inline void mark_dirty(struct domain *d, unsigned int mfn)
+{
+ return;
+}
+#define gnttab_mark_dirty(d, f) mark_dirty((d), (f))
#define gnttab_log_dirty(d, f) mark_dirty((d), (f))
static inline void gnttab_clear_flag(unsigned long nr, uint16_t *addr)
diff -r 403bb3c4130e -r a94bf8086002 xen/include/asm-powerpc/mm.h
--- a/xen/include/asm-powerpc/mm.h Mon Jul 30 13:47:02 2007 -0500
+++ b/xen/include/asm-powerpc/mm.h Mon Jul 30 13:50:14 2007 -0500
@@ -275,4 +275,12 @@ extern int steal_page(struct domain *d,
#define domain_get_maximum_gpfn(d) (-ENOSYS)
+extern int guest_physmap_max_mem_pages(struct domain *d, unsigned long
new_max);
+
+extern void guest_physmap_add_page(
+ struct domain *d, unsigned long gpfn, unsigned long mfn);
+
+extern void guest_physmap_remove_page(
+ struct domain *d, unsigned long gpfn, unsigned long mfn);
+
#endif
diff -r 403bb3c4130e -r a94bf8086002 xen/include/asm-powerpc/shadow.h
--- a/xen/include/asm-powerpc/shadow.h Mon Jul 30 13:47:02 2007 -0500
+++ b/xen/include/asm-powerpc/shadow.h Mon Jul 30 13:50:14 2007 -0500
@@ -32,22 +32,8 @@
? machine_to_phys_mapping[(mfn)] \
: (mfn) )
-extern int guest_physmap_max_mem_pages(struct domain *d, unsigned long
new_max);
-
-extern void guest_physmap_add_page(
- struct domain *d, unsigned long gpfn, unsigned long mfn);
-
-extern void guest_physmap_remove_page(
- struct domain *d, unsigned long gpfn, unsigned long mfn);
-
extern void shadow_drop_references(
struct domain *d, struct page_info *page);
-
-static inline void mark_dirty(struct domain *d, unsigned int mfn)
-{
- return;
-}
-#define gnttab_mark_dirty(d, f) mark_dirty((d), (f))
extern int shadow_domctl(struct domain *d,
xen_domctl_shadow_op_t *sc,
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home