[pve-devel] [PATCH 1/2] Revert "balloon: use qom-get for guest balloon statistics V5"

[Alexandre Derumier]

This reverts commit 09f7c4dfbc5de3e4c63f7e54e198bf2eb3374c02.

Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
 PVE/QemuServer.pm |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 2509a0a..bb7a7f3 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2490,12 +2490,17 @@ sub vmstatus {
 	my ($vmid, $resp) = @_;
 
 	my $info = $resp->{'return'};
+	return if !$info->{max_mem};
+
 	my $d = $res->{$vmid};
 
-	if (defined($info->{stats}->{"stat-total-memory"}) && defined($info->{stats}->{"stat-free-memory"})) {
-	    $d->{balloon} = int($info->{stats}->{"stat-total-memory"}/1024/1024);
-	    $d->{freemem} = int($info->{stats}->{"stat-free-memory"}/1024/1024);
-	    $d->{mem} = $d->{maxmem} - $d->{freemem};
+	# use memory assigned to VM
+	$d->{maxmem} = $info->{max_mem};
+	$d->{balloon} = $info->{actual};
+
+	if (defined($info->{total_mem}) && defined($info->{free_mem})) {
+	    $d->{mem} = $info->{total_mem} - $info->{free_mem};
+	    $d->{freemem} = $info->{free_mem};
 	}
 
     };
@@ -2519,13 +2524,7 @@ sub vmstatus {
 	$qmpclient->queue_cmd($vmid, $blockstatscb, 'query-blockstats');
 	# this fails if ballon driver is not loaded, so this must be
 	# the last commnand (following command are aborted if this fails).
-	# maybe is it fixed by
-	#http://git.qemu.org/?p=qemu.git;a=commit;h=38dbd48b247ebe05bdc6ef52ccdc60cc21274877
-
-	$qmpclient->queue_cmd($vmid, $ballooncb, 'qom-get',  
-			      path => "machine/peripheral/balloon0", 
-			      property => "guest-stats");
-
+	$qmpclient->queue_cmd($vmid, $ballooncb, 'query-balloon');
 
 	my $status = 'unknown';
 	if (!defined($status = $resp->{'return'}->{status})) {
-- 
1.7.10.4