diff --git a/qemu/tests/cfg/qemu_option_check.cfg b/qemu/tests/cfg/qemu_option_check.cfg index 9f120fffa5e74d1725d103e370145b3386232337..30a0e95e5bb01bc449af68566b9c83800530b5c0 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 4e8c9456f6d982e4bb5df40b750fcc77b506ff81..c2f78e65684cbe2ac40f4b61551353a65053816c 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)