Alex Williamson
2007-Oct-31 15:44 UTC
[Xen-devel] Re: [Xen-staging] [xen-unstable] hvm: Fail attempts to add pages to guest pseudophys memory map above
On Wed, 2007-10-31 at 10:08 +0000, Xen staging patchbot-unstable wrote:> # HG changeset patch > # User Keir Fraser > # Date 1193825262 0 > # Node ID 2717128cbdd11da80c5276aaa7b1a4992cfbf6f2 > # Parent c7d5d229f19122a8aad10dac178a4f86f39d73f0 > hvm: Fail attempts to add pages to guest pseudophys memory map above > 4GB when running with AMD NPT on PAE host.Patch for ia64 and missed define in common code below. Thanks, Alex Signed-off-by: Alex Williamson <alex.williamson@hp.com> -- diff -r 2717128cbdd1 xen/arch/ia64/xen/mm.c --- a/xen/arch/ia64/xen/mm.c Wed Oct 31 10:07:42 2007 +0000 +++ b/xen/arch/ia64/xen/mm.c Wed Oct 31 09:18:54 2007 -0600 @@ -2412,7 +2412,7 @@ steal_page(struct domain *d, struct page return 0; } -void +int guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long mfn) { @@ -2426,6 +2426,7 @@ guest_physmap_add_page(struct domain *d, //BUG_ON(mfn != ((lookup_domain_mpa(d, gpfn << PAGE_SHIFT) & _PFN_MASK) >> PAGE_SHIFT)); perfc_incr(guest_physmap_add_page); + return 0; } void diff -r 2717128cbdd1 xen/include/asm-ia64/grant_table.h --- a/xen/include/asm-ia64/grant_table.h Wed Oct 31 10:07:42 2007 +0000 +++ b/xen/include/asm-ia64/grant_table.h Wed Oct 31 09:19:16 2007 -0600 @@ -12,7 +12,7 @@ int replace_grant_host_mapping(unsigned int replace_grant_host_mapping(unsigned long gpaddr, unsigned long mfn, unsigned long new_gpaddr, unsigned int flags); // for grant transfer -void guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long mfn); +int guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long mfn); /* XXX * somewhere appropriate diff -r 2717128cbdd1 xen/include/asm-ia64/shadow.h --- a/xen/include/asm-ia64/shadow.h Wed Oct 31 10:07:42 2007 +0000 +++ b/xen/include/asm-ia64/shadow.h Wed Oct 31 09:19:29 2007 -0600 @@ -40,7 +40,7 @@ * Utilities to change relationship of gpfn->mfn for designated domain, * which is required by gnttab transfer, balloon, device model and etc. */ -void guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long mfn); +int guest_physmap_add_page(struct domain *d, unsigned long gpfn, unsigned long mfn); void guest_physmap_remove_page(struct domain *d, unsigned long gpfn, unsigned long mfn); static inline int diff -r 2717128cbdd1 xen/include/xen/paging.h --- a/xen/include/xen/paging.h Wed Oct 31 10:07:42 2007 +0000 +++ b/xen/include/xen/paging.h Wed Oct 31 09:19:49 2007 -0600 @@ -18,7 +18,7 @@ #else #define paging_mode_translate(d) (0) -#define guest_physmap_add_page(d, p, m) ((void)0) +#define guest_physmap_add_page(d, p, m) (0) #define guest_physmap_remove_page(d, p, m) ((void)0) #endif _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel