From bc5e4721852f7a139cccb9a507f13e9a1d345e1e Mon Sep 17 00:00:00 2001 From: Shuang Zheng Date: Tue, 2 Feb 2021 15:08:04 +0000 Subject: [PATCH] config_tools: update condition for bootargs error check add bootargs error check only when kernel type is KERNEL_BZIMAGE. Tracked-On: #5689 Signed-off-by: Shuang Zheng --- misc/config_tools/acpi_gen/asl_gen.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/config_tools/acpi_gen/asl_gen.py b/misc/config_tools/acpi_gen/asl_gen.py index b9a7e7270..db076ec75 100644 --- a/misc/config_tools/acpi_gen/asl_gen.py +++ b/misc/config_tools/acpi_gen/asl_gen.py @@ -446,9 +446,9 @@ def main(args): PASSTHROUGH_PTCT = False kern_args = common.get_leaf_tag_map(scenario, "os_config", "bootargs") - vm_type = common.get_leaf_tag_map(scenario, "vm_type") + kern_type = common.get_leaf_tag_map(scenario, "os_config", "kern_type") for vm_id, passthru_devices in dict_passthru_devices.items(): - if kern_args[int(vm_id)].find('reboot=acpi') == -1 and vm_type[int(vm_id)] not in ['SAFETY_VM']: + if kern_args[int(vm_id)].find('reboot=acpi') == -1 and kern_type[int(vm_id)] in ['KERNEL_BZIMAGE']: emsg = "you need to specify 'reboot=acpi' in scenario file's bootargs for VM{}".format(vm_id) print(emsg) err_dic['vm,bootargs'] = emsg