--- misc/xenconsole/ajaxdata.php	2012/12/10 12:32:50	1897
+++ misc/xenconsole/ajaxdata.php	2013/03/26 13:43:07	1958
@@ -82,15 +82,16 @@
 			$tmpos =  explode('|', $guest_metrics["os_version"]["name"]);
 			$os = $tmpos[0];
 			$guestversion = $guest_metrics["PV_drivers_version"]["major"] . "." . $guest_metrics["PV_drivers_version"]["minor"] . "." .  $guest_metrics["PV_drivers_version"]["micro"];
+
+			$maxmem = round($xenserver->VM__query_data_source($vmref, "memory") / (1024*1024) );
+			$free = round( $xenserver->VM__query_data_source($vmref, "memory_internal_free") / 1024 );	
+			$curmem = $maxmem - $free;
 		}
 		$cpusum = 0.0;
 		for ($i=0; $i<$cpus; $i++) {
 			$cpusum += $xenserver->VM__query_data_source($vmref, "cpu" . $i);
 		}	
 		$cpuavg = round (  ($cpusum/$cpus) * 100);
-		$maxmem = round($xenserver->VM__query_data_source($vmref, "memory") / (1024*1024) );
-		$free = round( $xenserver->VM__query_data_source($vmref, "memory_internal_free") / 1024 );	
-		$curmem = $maxmem - $free;
 
 	        foreach($vm["consoles"] as $conref) {
         	        $con = $xenserver->console__get_record( $conref );
@@ -101,7 +102,9 @@
 	                }
         	}
 
-        }
+        } else {
+		$maxmem = $vm["memory_static_max"] / (1024*1024);
+	}
 
 
 
@@ -116,6 +119,7 @@
 	echo "<cpuavg>{$cpuavg}</cpuavg>";
 	echo "<curmem>{$curmem}</curmem>";
 	echo "<maxmem>{$maxmem}</maxmem>";
+	echo "<cpus>{$cpus}</cpus>";
 	
 	echo "</vm>";	
 }