Fix kvm issues for Trusty

Change kvm reference to qemu-system-x86_64 and use raw format
in kvm/qemu command.  Tested on both Trusty and Precise.

Fixes: 7825
Signed-off-by: Warren Usui <warren.usui@inktank.com>

diff --git a/teuthology/task/qemu.py b/teuthology/task/qemu.py
index db93107a9871aa276279a9875ab50b622fb1c847..a05b4dba0ac671b98a41d065245109296b676409 100644 (file)
--- a/teuthology/task/qemu.py
+++ b/teuthology/task/qemu.py
@@ -176,7 +176,7 @@ def run_qemu(ctx, config):
             '{tdir}/archive/coverage'.format(tdir=testdir),
             'daemon-helper',
             'term',
-            'kvm', '-enable-kvm', '-nographic',
+            'qemu-system-x86_64', '-enable-kvm', '-nographic',
             '-m', str(client_config.get('memory', DEFAULT_MEM)),
             # base OS device
             '-drive',
@@ -203,7 +203,7 @@ def run_qemu(ctx, config):
         for i in xrange(client_config.get('num_rbd', DEFAULT_NUM_RBD)):
             args.extend([
                 '-drive',
-                'file=rbd:rbd/{img}:id={id},format=rbd,if=virtio,cache={cachemode}'.format(
+                'file=rbd:rbd/{img}:id={id},format=raw,if=virtio,cache={cachemode}'.format(
                     img='{client}.{num}'.format(client=client, num=i),
                     id=client[len('client.'):],
                     cachemode=cachemode,