# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID c0dbb3a538f229d1c42ad367258eebc129e6498a
# Parent 44301f65f23e5c15460097ec68e64c639af31e2f
Fix indentation in a few places.
Signed-off-by: Xin Li <xin.b.li@xxxxxxxxx>
diff -r 44301f65f23e -r c0dbb3a538f2 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py Sat Dec 10 23:11:44 2005
+++ b/tools/python/xen/xend/image.py Sat Dec 10 23:16:26 2005
@@ -365,13 +365,13 @@
def getDomainMemory(self, mem):
"""@see ImageHandler.getDomainMemory"""
- page_kb = 4
- if os.uname()[4] == 'ia64':
- page_kb = 16
+ page_kb = 4
+ if os.uname()[4] == 'ia64':
+ page_kb = 16
# for ioreq_t and xenstore
static_pages = 2
return mem + (self.getPageTableSize(mem / 1024) + static_pages) *
page_kb
-
+
def getPageTableSize(self, mem_mb):
"""Return the pages of memory needed for 1:1 page tables for physical
mode.
diff -r 44301f65f23e -r c0dbb3a538f2 xen/include/asm-x86/mm.h
--- a/xen/include/asm-x86/mm.h Sat Dec 10 23:11:44 2005
+++ b/xen/include/asm-x86/mm.h Sat Dec 10 23:16:26 2005
@@ -276,7 +276,7 @@
#define VALID_MFN(_mfn) (!((_mfn) & (1U<<31)))
#define set_mfn_from_pfn(pfn, mfn) (phys_to_machine_mapping[(pfn)] = (mfn))
-static inline unsigned long get_mfn_from_pfn(unsigned long pfn)
+static inline unsigned long get_mfn_from_pfn(unsigned long pfn)
{
unsigned long mfn;
l1_pgentry_t pte;
@@ -284,11 +284,11 @@
if ( (__copy_from_user(&pte, &phys_to_machine_mapping[pfn],
sizeof(pte)) == 0) &&
(l1e_get_flags(pte) & _PAGE_PRESENT) )
- mfn = l1e_get_pfn(pte);
+ mfn = l1e_get_pfn(pte);
else
- mfn = INVALID_MFN;
-
- return mfn;
+ mfn = INVALID_MFN;
+
+ return mfn;
}
#ifdef MEMORY_GUARD
@@ -331,8 +331,8 @@
int ptwr_init(struct domain *);
void ptwr_destroy(struct domain *);
void ptwr_flush(struct domain *, const int);
-int ptwr_do_page_fault(struct domain *, unsigned long,
- struct cpu_user_regs *);
+int ptwr_do_page_fault(struct domain *, unsigned long,
+ struct cpu_user_regs *);
int revalidate_l1(struct domain *, l1_pgentry_t *, l1_pgentry_t *);
void cleanup_writable_pagetable(struct domain *d);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|