From: Daniel Veillard <veillard@redhat.com>
Date: Sun, 30 Sep 2007 13:22:16 +0000 (+0000)
Subject: * src/virsh.c: use virNodeGetFreeMemory() for freecell without
X-Git-Tag: LIBVIRT_0_3_3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5a3d4da612362af035634163d4b7e84386e10a0;p=thirdparty%2Flibvirt.git

* src/virsh.c: use virNodeGetFreeMemory() for freecell without
  argument
* src/libvirt_sym.version: export virNodeGetFreeMemory()
Daniel
---

diff --git a/ChangeLog b/ChangeLog
index ca5f61e888..7e655622b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Sep 30 15:20:36 CEST 2007 Daniel Veillard <veillard@redhat.com>
+
+	* src/virsh.c: use virNodeGetFreeMemory() for freecell without
+	  argument
+	* src/libvirt_sym.version: export virNodeGetFreeMemory()
+
 Sun Sep 30 14:49:27 CEST 2007 Daniel Veillard <veillard@redhat.com>
 
 	* include/libvirt/libvirt.h include/libvirt/libvirt.h.in
diff --git a/src/libvirt_sym.version b/src/libvirt_sym.version
index fa7cda3225..9b194e9edd 100644
--- a/src/libvirt_sym.version
+++ b/src/libvirt_sym.version
@@ -59,6 +59,7 @@
 	virNodeGetInfo;
 	virConnectGetCapabilities;
 	virNodeGetCellsFreeMemory;
+	virNodeGetFreeMemory;
 
 	virDomainSetVcpus;
 	virDomainPinVcpu;
diff --git a/src/virsh.c b/src/virsh.c
index 0e47da8f10..5af821ce47 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -1588,13 +1588,13 @@ cmdFreecell(vshControl * ctl, vshCmd * cmd)
 
     cell = vshCommandOptInt(cmd, "cellno", &cell_given);
     if (!cell_given) {
-        cell = -1;
+        memory = virNodeGetFreeMemory(ctl->conn);
+    } else {
+	ret = virNodeGetCellsFreeMemory(ctl->conn, &memory, cell, 1);
+	if (ret != 1)
+	    return FALSE;
     }
 
-    ret = virNodeGetCellsFreeMemory(ctl->conn, &memory, cell, 1);
-    if (ret != 1)
-        return FALSE;
-    
     if (cell == -1)
 	vshPrint(ctl, "%s: %llu kB\n", _("Total"), memory);
     else