From 48a6e736fdd103527bf78cab551a5f9de1792a67 Mon Sep 17 00:00:00 2001
From: Ben Walker <benjamin.walker@intel.com>
Date: Mon, 1 Jul 2019 05:38:31 -0700
Subject: [PATCH] test: Install packaged QEMU in vm_setup.sh

We only need the fork for OCSSD tests. And eventually we won't
even need that.

Change-Id: I0f52c44f504435a3bab2f478664a88ba6acfe464
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459960
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
---
 test/common/config/vm_setup.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh
index e2fe4c5d8..33417bf4d 100755
--- a/test/common/config/vm_setup.sh
+++ b/test/common/config/vm_setup.sh
@@ -186,7 +186,18 @@ function install_flamegraph()
 function install_qemu()
 {
     if echo $CONF | grep -q qemu; then
-        # Qemu is used in the vhost tests.
+        # Two versions of QEMU are used in the tests.
+        # Stock QEMU is used for vhost. A special fork
+        # is used to test OCSSDs. Install both.
+
+        # Packaged QEMU
+        if [ "$PACKAGEMNG" = "dnf" ]; then
+                sudo dnf install -y qemu-system-x86 qemu-img
+        elif [ "$PACKAGEMNG" = "apt-get" ]; then
+                sudo apt-get install -y qemu-system-x86 qemu-img
+        fi
+
+        # Forked QEMU
         SPDK_QEMU_BRANCH=spdk-3.0.0
         mkdir -p qemu
         if [ ! -d "qemu/$SPDK_QEMU_BRANCH" ]; then