ia64/xen-unstable

changeset 8318:c0dbb3a538f2

Fix indentation in a few places.
Signed-off-by: Xin Li <xin.b.li@intel.com>
author kaf24@firebug.cl.cam.ac.uk
date Sun Dec 11 00:16:26 2005 +0100 (2005-12-11)
parents 44301f65f23e
children 5f94478ca9b5
files tools/python/xen/xend/image.py xen/include/asm-x86/mm.h
line diff
     1.1 --- a/tools/python/xen/xend/image.py	Sun Dec 11 00:11:44 2005 +0100
     1.2 +++ b/tools/python/xen/xend/image.py	Sun Dec 11 00:16:26 2005 +0100
     1.3 @@ -365,13 +365,13 @@ class VmxImageHandler(ImageHandler):
     1.4  
     1.5      def getDomainMemory(self, mem):
     1.6          """@see ImageHandler.getDomainMemory"""
     1.7 -	page_kb = 4
     1.8 -	if os.uname()[4] == 'ia64':
     1.9 -	    page_kb = 16
    1.10 +        page_kb = 4
    1.11 +        if os.uname()[4] == 'ia64':
    1.12 +            page_kb = 16
    1.13          # for ioreq_t and xenstore
    1.14          static_pages = 2
    1.15          return mem + (self.getPageTableSize(mem / 1024) + static_pages) * page_kb
    1.16 -            
    1.17 +
    1.18      def getPageTableSize(self, mem_mb):
    1.19          """Return the pages of memory needed for 1:1 page tables for physical
    1.20             mode.
     2.1 --- a/xen/include/asm-x86/mm.h	Sun Dec 11 00:11:44 2005 +0100
     2.2 +++ b/xen/include/asm-x86/mm.h	Sun Dec 11 00:16:26 2005 +0100
     2.3 @@ -276,7 +276,7 @@ int check_descriptor(struct desc_struct 
     2.4  #define VALID_MFN(_mfn)         (!((_mfn) & (1U<<31)))
     2.5  
     2.6  #define set_mfn_from_pfn(pfn, mfn) (phys_to_machine_mapping[(pfn)] = (mfn))
     2.7 -static inline unsigned long get_mfn_from_pfn(unsigned long pfn) 
     2.8 +static inline unsigned long get_mfn_from_pfn(unsigned long pfn)
     2.9  {
    2.10      unsigned long mfn;
    2.11      l1_pgentry_t pte;
    2.12 @@ -284,11 +284,11 @@ static inline unsigned long get_mfn_from
    2.13      if ( (__copy_from_user(&pte, &phys_to_machine_mapping[pfn],
    2.14                             sizeof(pte)) == 0) &&
    2.15           (l1e_get_flags(pte) & _PAGE_PRESENT) )
    2.16 -	mfn = l1e_get_pfn(pte);
    2.17 +        mfn = l1e_get_pfn(pte);
    2.18      else
    2.19 -	mfn = INVALID_MFN;
    2.20 -    
    2.21 -    return mfn; 
    2.22 +        mfn = INVALID_MFN;
    2.23 +
    2.24 +    return mfn;
    2.25  }
    2.26  
    2.27  #ifdef MEMORY_GUARD
    2.28 @@ -331,8 +331,8 @@ struct ptwr_info {
    2.29  int  ptwr_init(struct domain *);
    2.30  void ptwr_destroy(struct domain *);
    2.31  void ptwr_flush(struct domain *, const int);
    2.32 -int  ptwr_do_page_fault(struct domain *, unsigned long, 
    2.33 -			struct cpu_user_regs *);
    2.34 +int  ptwr_do_page_fault(struct domain *, unsigned long,
    2.35 +                        struct cpu_user_regs *);
    2.36  int  revalidate_l1(struct domain *, l1_pgentry_t *, l1_pgentry_t *);
    2.37  
    2.38  void cleanup_writable_pagetable(struct domain *d);