From: Warren Usui <warren.usui@inktank.com>
Date: Fri, 28 Mar 2014 23:04:05 +0000 (-0700)
Subject: Fix kvm issues for Trusty
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fheads%2Fdumpling;p=teuthology.git

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>
(cherry picked from commit eef2bf672b76a6c0243687c7acd20fd99e7dd44a)
---

diff --git a/teuthology/task/qemu.py b/teuthology/task/qemu.py
index f69e851ae..bd4fd6b91 100644
--- a/teuthology/task/qemu.py
+++ b/teuthology/task/qemu.py
@@ -167,7 +167,7 @@ def run_qemu(ctx, config):
             '{tdir}/archive/coverage'.format(tdir=testdir),
             '{tdir}/daemon-helper'.format(tdir=testdir),
             'term',
-            'kvm', '-enable-kvm', '-nographic',
+            'qemu-system-x86_64', '-enable-kvm', '-nographic',
             '-m', str(client_config.get('memory', DEFAULT_MEM)),
             # base OS device
             '-drive',
@@ -194,7 +194,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,