[Xen-changelog] Merged.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID f2ad4e0a7259eaa85d10a9ed9b1e2be589609289
# Parent  25639d30d5d5018758ad8e13004e084ea8c75016
# Parent  f0e92f206c8a860a3fd59a09bd75c0d18ac8dd6d
Merged.

diff -r 25639d30d5d5 -r f2ad4e0a7259 
linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c        Tue Oct 25 
10:22:47 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c        Tue Oct 25 
10:24:01 2005
@@ -70,6 +70,9 @@
 static unsigned long current_pages;
 static unsigned long target_pages;
 
+/* VM /proc information for memory */
+extern unsigned long totalram_pages;
+
 /* We may hit the hard limit in Xen. If we do then we remember it. */
 static unsigned long hard_limit;
 
@@ -223,6 +226,7 @@
        }
 
        current_pages += nr_pages;
+       totalram_pages = current_pages;
 
  out:
        balloon_unlock(flags);
@@ -295,6 +299,7 @@
                XENMEM_decrease_reservation, &reservation) != nr_pages);
 
        current_pages -= nr_pages;
+       totalram_pages = current_pages;
 
        balloon_unlock(flags);
 
diff -r 25639d30d5d5 -r f2ad4e0a7259 tools/python/xen/xend/server/SrvDaemon.py
--- a/tools/python/xen/xend/server/SrvDaemon.py Tue Oct 25 10:22:47 2005
+++ b/tools/python/xen/xend/server/SrvDaemon.py Tue Oct 25 10:24:01 2005
@@ -262,10 +262,7 @@
             return 1
 
     def stop(self):
-        result = self.cleanup_xend(True)
-        from xen.xend import Vifctl
-        Vifctl.network("stop")
-        return result
+        return self.cleanup_xend(True)
 
     def run(self, status):
         try:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog