From d3f4dee49aa2488a51ba6323fc2bd7f4886bbbe0 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 27 Dec 2010 21:18:56 +0100
Subject: [PATCH] fireinfo: Display chart of CPUs with virtualization support.

---
 www/templates/stasy-stats-cpu-flags.html | 13 ++++++++++---
 www/webapp/handlers_stasy.py             | 12 ++++++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/www/templates/stasy-stats-cpu-flags.html b/www/templates/stasy-stats-cpu-flags.html
index 41771ac8..1787bebd 100644
--- a/www/templates/stasy-stats-cpu-flags.html
+++ b/www/templates/stasy-stats-cpu-flags.html
@@ -10,16 +10,23 @@
 		the operating system configuration.
 	</p>
 
-	<h4>{{ _("CPUs that support long mode") }}</h4>
+	<h4>{{ _("CPUs that support virtualization") }}</h4>
 	<p>
 		For future planning it is important to know if there is enough hardware
-		support for a 64bit version of IPFire.
+		support for virtualization like VT-x and AMD-V.
 	</p>
-	{{ modules.StasyTable(cpus_lm, sortby="percentage") }}
+	{{ modules.StasyTable(cpus_virt, sortby="percentage") }}
 
 	<h4>{{ _("CPUs with PAE") }}</h4>
 	<p>
 		This chart shows us which CPUs have got the PAE flag.
 	</p>
 	{{ modules.StasyTable(cpus_pae, sortby="percentage") }}
+
+	<h4>{{ _("CPUs that support long mode") }}</h4>
+	<p>
+		For future planning it is important to know if there is enough hardware
+		support for a 64bit version of IPFire.
+	</p>
+	{{ modules.StasyTable(cpus_lm, sortby="percentage") }}
 {% end block %}
diff --git a/www/webapp/handlers_stasy.py b/www/webapp/handlers_stasy.py
index 6a66ee77..e5612753 100644
--- a/www/webapp/handlers_stasy.py
+++ b/www/webapp/handlers_stasy.py
@@ -81,9 +81,17 @@ class StasyStatsCPUHandler(StasyBaseHandler):
 class StasyStatsCPUFlagsHandler(StasyBaseHandler):
 	def get(self):
 		kwargs = {}
+		
+		flags = (
+			("lm", "lm"),
+			("pae", "pae"),
+			("virt", ("vmx", "svm")),
+		)
+
+		for name, flag in flags:
+			kwargs["cpus_" + name] = self.stasy.get_cpu_flag_map(flag)
 
-		for flag in ("lm", "pae"):
-			kwargs["cpus_" + flag] = self.stasy.get_cpu_flag_map(flag)
+		print kwargs
 
 		return self.render("stasy-stats-cpu-flags.html", **kwargs)
 
-- 
2.47.3