From 5fcfbc0ee1220685f29dd75cfd2fd00bb2dece9b Mon Sep 17 00:00:00 2001
From: Xiyue Wang <xiywang@redhat.com>
Date: Wed, 7 Nov 2018 01:02:57 -0500
Subject: [PATCH] qemu_option_check: python3 compatible, add e1000e, remove
 e1000

1. fix python 3 compatible issue
2. add e1000e variant
3. remove e1000 for RHEL8 guest

Signed-off-by: Xiyue Wang <xiywang@redhat.com>
---
 qemu/tests/cfg/qemu_option_check.cfg |  5 +++++
 qemu/tests/qemu_option_check.py      | 22 ++++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/qemu/tests/cfg/qemu_option_check.cfg b/qemu/tests/cfg/qemu_option_check.cfg
index 9f120fff..30a0e95e 100644
--- a/qemu/tests/cfg/qemu_option_check.cfg
+++ b/qemu/tests/cfg/qemu_option_check.cfg
@@ -8,8 +8,13 @@
             s390x:
                 device_name = virtio-net-ccw
         - e1000:
+            RHEL:
+                only RHEL.6 RHEL.7
             no ppc64,ppc64le,s390x
             device_name = e1000
+        - e1000e:
+            no ppc64,ppc64le,s390x
+            device_name = e1000e
         - rtl8139:
             no ppc64,ppc64le,s390x
             device_name = rtl8139
diff --git a/qemu/tests/qemu_option_check.py b/qemu/tests/qemu_option_check.py
index 4e8c9456..c2f78e65 100644
--- a/qemu/tests/qemu_option_check.py
+++ b/qemu/tests/qemu_option_check.py
@@ -26,7 +26,8 @@ def run(test, params, env):
         """
         support_device = process.system_output("%s -device ? 2>&1"
                                                % qemu_binary, timeout=10,
-                                               ignore_status=True, shell=True)
+                                               ignore_status=True,
+                                               shell=True).decode()
         if not support_device:
             test.cancel("Can not get qemu support device list")
         device_list = re.findall(r'name\s+"(.*)",', support_device)
@@ -42,17 +43,18 @@ def run(test, params, env):
             err_msg = "Oops, Your qemu version doesn't support devic '%s', "
             err_msg += "make sure you have inputted a correct device name"
             test.cancel(err_msg % device_name)
-        device_support_option = process.run("%s -device %s,? 2>&1" %
-                                            (qemu_binary, device_name),
-                                            timeout=10,
-                                            ignore_status=True, shell=True)
-        if device_support_option.exit_status:
-            test.error("Oops, output status is wrong")
-        if not re.findall(r"%s\.(.*)=(.*)" % device_name,
-                          device_support_option.stdout):
+        device_support_option = process.system_output("%s -device %s,? 2>&1" %
+                                                      (qemu_binary,
+                                                       device_name),
+                                                      timeout=10,
+                                                      ignore_status=True,
+                                                      shell=True)
+        device_support_option = device_support_option.decode().strip()
+        if not re.findall(r"%s\.(.*)=(.*)" %
+                          device_name, device_support_option):
             test.fail("Qemu option check Failed")
         logging.info("Qemu options check successful. output is:\n%s" %
-                     device_support_option.stdout)
+                     device_support_option)
 
     device_name = params.get("device_name")
     qemu_binary = utils_misc.get_qemu_binary(params)
-- 
GitLab