probe for kvm_intel as on some boxes this does not load
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 15 Jan 2011 21:28:00 +0000 (22:28 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 15 Jan 2011 21:28:00 +0000 (22:28 +0100)
scripts/manage-infrastructure.py

index ccc381f..ffc1af6 100755 (executable)
@@ -250,12 +250,13 @@ class BuildBoxes:
         else:
             command=['lsmod']
             modules=self.backquote_ssh(box,command).split('\n')
-            kqemu_msg='*NO kqemu/kmv MODULE LOADED*'
+            kqemu_msg='*NO kqemu/kmv_intel MODULE LOADED*'
             for module in modules:
                 if module.find('kqemu')==0:
                     kqemu_msg='kqemu module loaded'
-                elif module.find('kvm')==0:
-                    kqemu_msg='kvm module loaded'
+                # kvm might be loaded without vkm_intel (we dont have AMD)
+                elif module.find('kvm_intel')==0:
+                    kqemu_msg='kvm_intel module loaded'
             
             command=['pgrep','qemu']
             if self.options.dry_run: