Merge lp:~leftyfb/checkbox/checkbox-1570098 into lp:checkbox

[Mike Rushton]

Fixes https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1570098

[Jeff Lane  (bladernr)]

Tested on Power systems by mike while we're sprinting. approved

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/bin/virtualization'
--- providers/plainbox-provider-checkbox/bin/virtualization	2016-03-04 21:59:26 +0000
+++ providers/plainbox-provider-checkbox/bin/virtualization	2016-04-13 21:42:30 +0000
@@ -110,7 +110,9 @@
         'qemu_bin': 'qemu-system-ppc64',
         'qemu_disk_type': QEMU_DISK_TYPE_VIRTIO,
         'qemu_extra_args': [
-            '-machine', 'pseries',
+	    '-enable-kvm',
+            '-machine', 'pseries,usb=off',
+	    '-cpu', 'POWER8',
         ],
     },
 }
@@ -444,7 +446,13 @@
         image = args.image
 
     kvm_test = KVMTest(image, timeout, args.log_file)
+    # If arch is ppc64el, disable smt
+    if kvm_test.arch == 'ppc64el':
+        os.system("/usr/sbin/ppc64_cpu --smt=off")
     result = kvm_test.start()
+    # If arch is ppc64el, re-enable smt
+    if kvm_test.arch == 'ppc64el':
+        os.system("/usr/sbin/ppc64_cpu --smt=on")
 
     sys.exit(result)