ia64/xen-unstable

changeset 7522:f2ad4e0a7259

Merged.
author emellor@leeni.uk.xensource.com
date Tue Oct 25 11:24:01 2005 +0100 (2005-10-25)
parents 25639d30d5d5 f0e92f206c8a
children cd1cfbadb75f
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Tue Oct 25 11:22:47 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Tue Oct 25 11:24:01 2005 +0100
     1.3 @@ -70,6 +70,9 @@ spinlock_t balloon_lock = SPIN_LOCK_UNLO
     1.4  static unsigned long current_pages;
     1.5  static unsigned long target_pages;
     1.6  
     1.7 +/* VM /proc information for memory */
     1.8 +extern unsigned long totalram_pages;
     1.9 +
    1.10  /* We may hit the hard limit in Xen. If we do then we remember it. */
    1.11  static unsigned long hard_limit;
    1.12  
    1.13 @@ -223,6 +226,7 @@ static int increase_reservation(unsigned
    1.14  	}
    1.15  
    1.16  	current_pages += nr_pages;
    1.17 +	totalram_pages = current_pages;
    1.18  
    1.19   out:
    1.20  	balloon_unlock(flags);
    1.21 @@ -295,6 +299,7 @@ static int decrease_reservation(unsigned
    1.22  		XENMEM_decrease_reservation, &reservation) != nr_pages);
    1.23  
    1.24  	current_pages -= nr_pages;
    1.25 +	totalram_pages = current_pages;
    1.26  
    1.27  	balloon_unlock(flags);
    1.28  
     2.1 --- a/tools/python/xen/xend/server/SrvDaemon.py	Tue Oct 25 11:22:47 2005 +0100
     2.2 +++ b/tools/python/xen/xend/server/SrvDaemon.py	Tue Oct 25 11:24:01 2005 +0100
     2.3 @@ -262,10 +262,7 @@ class Daemon:
     2.4              return 1
     2.5  
     2.6      def stop(self):
     2.7 -        result = self.cleanup_xend(True)
     2.8 -        from xen.xend import Vifctl
     2.9 -        Vifctl.network("stop")
    2.10 -        return result
    2.11 +        return self.cleanup_xend(True)
    2.12  
    2.13      def run(self, status):
    2.14          try: