提交 3abc6daa 编写于 作者: E Eduardo Habkost 提交者: Lucas Meneghel Rodrigues

qemu/tests/cpuid: check_models: don't fail when seeing extra CPU models

The existence of additional CPU models is not a bug, and should not
cause a test failure.

This changes the code to generate a INFO message in the log file, but
not cause the test to fail.
Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
上级 09cfb50b
......@@ -93,7 +93,6 @@ def run_cpuid(test, params, env):
cmd = qemu_binary + " -cpu ?"
result = utils.run(cmd)
qemu_models = extract_qemu_cpu_models(result.stdout)
cpu_models = params.get("cpu_models").split()
missing = set(cpu_models) - set(qemu_models)
......@@ -103,9 +102,7 @@ def run_cpuid(test, params, env):
(missing, cmd, result.stdout))
added = set(qemu_models) - set(cpu_models)
if added:
raise error.TestFail("Unexpected CPU models %s are in output "
"of command %s\n%s" %
(added, cmd, result.stdout))
logging.info("Extra CPU models in QEMU CPU listing: %s", added)
def get_guest_cpuid(self, cpu_model, feature=None):
test_kernel_dir = os.path.join(test.virtdir, "deps",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册