Merge pull request #1160 from yanan-fu/machine_type

smbios_table: Update function call as the definition be changed

qemu/tests/boot_with_machine_types.py

@@ -22,7 +22,7 @@ def run(test, params, env):
     machine_types = []
     machine_type_mapping = {"pc": ["i440FX", "RHEL 6"], "q35": ["Q35"], "pseries": ["pSeries"],
                             "arm64-pci:virt": ["ARM"], "arm64-mmio:virt": ["ARM"], "s390-ccw-virtio": ["S390"]}
-    for m_type, s_name in zip(*utils_misc.get_support_machine_type(qemu_binary)):
+    for m_type, s_name in zip(*utils_misc.get_support_machine_type(qemu_binary)[:2]):
         for item in machine_type_mapping[params["machine_type"]]:
             if item in s_name:
                 if "arm64" in params["machine_type"]:

qemu/tests/smbios_table.py

@@ -54,7 +54,7 @@ def run(test, params, env):
         support_machine_types.append(params.get("machine_type"))
     else:
         qemu_binary = utils_misc.get_qemu_binary(params)
-        tmp = utils_misc.get_support_machine_type(qemu_binary)
+        tmp = utils_misc.get_support_machine_type(qemu_binary, remove_alias=True)[:2]
         (support_machine_types, expect_system_versions) = tmp
         machine_type = params.get("machine_type", "")
         if ':' in machine_type: