[pve-devel] r5681 - in qemu-server/pve2: . PVE

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-03-11 07:28:52 +0100 (Fri, 11 Mar 2011)
New Revision: 5681

Modified:
   qemu-server/pve2/PVE/QemuServer.pm
   qemu-server/pve2/qm
Log:
fix units


Modified: qemu-server/pve2/PVE/QemuServer.pm
===================================================================
--- qemu-server/pve2/PVE/QemuServer.pm	2011-03-10 12:56:04 UTC (rev 5680)
+++ qemu-server/pve2/PVE/QemuServer.pm	2011-03-11 06:28:52 UTC (rev 5681)
@@ -1661,7 +1661,7 @@
 	}
 
 	$d->{cpus} = ($conf->{sockets} || 1) * ($conf->{cores} || 1);
-	$d->{name} = $conf->{name} || "VM$vmid";
+	$d->{name} = $conf->{name} || "VM $vmid";
 	$d->{maxmem} = $conf->{memory} ? $conf->{memory}*(1024*1024) : 0; 
 
 

Modified: qemu-server/pve2/qm
===================================================================
--- qemu-server/pve2/qm	2011-03-10 12:56:04 UTC (rev 5680)
+++ qemu-server/pve2/qm	2011-03-11 06:28:52 UTC (rev 5681)
@@ -351,7 +351,10 @@
 
 		 foreach my $rec (sort { $a->{vmid} <=> $b->{vmid} } @$vmlist) {
 		     printf "%10s %-20s %-10s %-10s %12.2f %-10s\n", $rec->{vmid}, $rec->{name}, 
-		     $rec->{status}, $rec->{maxmem}, $rec->{maxdisk}||0, $rec->{pid}||0;
+		     $rec->{status}, 
+		     ($rec->{maxmem} || 0)/(1024*1024), 
+		     ($rec->{maxdisk} || 0)/(1024*1024*1024), 
+		     $rec->{pid}||0;
 		 }