Fix cpu model detection regression on x86.

diff --git a/fireinfo/cpu.py b/fireinfo/cpu.py
index ed6317783d01de0046aa5e0a39df4a860e9e3b82..9199df96f486fe09a4b3b3215e36724af39eaf07 100644 (file)
--- a/fireinfo/cpu.py
+++ b/fireinfo/cpu.py
@@ -105,7 +105,10 @@ class CPU(object):
                """
                        Return the model string of this CPU.
                """
-               return self.__cpuinfo["Processor"]
+               try:
+                       return self.__cpuinfo["model_name"]
+               except KeyError:
+                       return self.__cpuinfo["Processor"]
 
        @property
        def vendor(self):
@@ -191,8 +194,6 @@ if __name__ == "__main__":
        print "Flags:", c.flags
        print "Bogomips:", c.bogomips
        print "Speed:", c.speed
-       print "Hypervisor:", c.hypervisor
-       print "Virtype:", c.virtype
        print "Family:", c.family
        print "Count:", c.count
        print "Model string:", c.model_string