From ba802725038144c8e51007fa5d134836e1650b90 Mon Sep 17 00:00:00 2001 From: Kunhui-Li Date: Wed, 3 Jan 2024 18:27:18 +0800 Subject: [PATCH] config_tools: ACPI table needs to be generated automatedly for Pre-launched VM Currently, for pre-launched VM, ACPI table is generated only when "reboot=acpi" is added to cmdline in the scenario file. This patch removes this check support that ACPI table must be generated automatedly for the Pre-launched VM. Tracked-On: #8546 Signed-off-by: Kunhui-Li Reviewed-by: Junjie Mao --- misc/config_tools/acpi_gen/asl_gen.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/misc/config_tools/acpi_gen/asl_gen.py b/misc/config_tools/acpi_gen/asl_gen.py index a61c896ef..bf409971f 100644 --- a/misc/config_tools/acpi_gen/asl_gen.py +++ b/misc/config_tools/acpi_gen/asl_gen.py @@ -918,13 +918,6 @@ def main(args): kern_args = acrn_config_utilities.get_leaf_tag_map(scenario, "os_config", "bootargs") kern_type = acrn_config_utilities.get_leaf_tag_map(scenario, "os_config", "kern_type") for vm_id, passthru_devices in dict_passthru_devices.items(): - bootargs_node= get_node(f"//vm[@id='{vm_id}']/os_config/bootargs", scenario_etree) - if bootargs_node is not None and 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 - break - print('start to generate ACPI ASL code for VM{}'.format(vm_id)) dest_vm_acpi_path = os.path.join(DEST_ACPI_PATH, 'ACPI_VM'+vm_id) if not os.path.isdir(dest_vm_acpi_path):