From: Andrew Schoen <aschoen@redhat.com>
Date: Mon, 22 Dec 2014 16:51:25 +0000 (-0600)
Subject: Use qemu-kvm in the qemu task for rpm based systems.
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1739f0c1c1ffe0c888fdd7a43ca89e308d69a33a;p=ceph.git

Use qemu-kvm in the qemu task for rpm based systems.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/tasks/qemu.py b/tasks/qemu.py
index eec0324a0eb..4dd5fe0df73 100644
--- a/tasks/qemu.py
+++ b/tasks/qemu.py
@@ -169,14 +169,20 @@ def run_qemu(ctx, config):
                 ]
             )
 
-        base_file = '{tdir}/qemu/base.{client}.qcow2'.format(tdir=testdir, client=client)
+        base_file = '{tdir}/qemu/base.{client}.qcow2'.format(
+            tdir=testdir,
+            client=client
+        )
+        qemu_cmd = 'qemu-system-x86_64'
+        if remote.os.package_type == "rpm":
+            qemu_cmd = "/usr/libexec/qemu-kvm"
         args=[
             'adjust-ulimits',
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),
             'daemon-helper',
             'term',
-            'qemu-system-x86_64', '-enable-kvm', '-nographic',
+            qemu_cmd, '-enable-kvm', '-nographic',
             '-m', str(client_config.get('memory', DEFAULT_MEM)),
             # base OS device
             '-drive',