From fdbdf1aa5fae0e93712200e9d039d94ee5ac1a81 Mon Sep 17 00:00:00 2001 From: Shixiong Zhang Date: Mon, 14 Sep 2020 02:17:56 -0400 Subject: [PATCH] acrn-config: fix the issue of generating the vuart with incorrect name When generate the launch scripts, the pm_by_vuart setting of pm_notify_channel in launch setting should be according to the config of SOS vuart1. Tracked-On: #5154 Signed-off-by: Shixiong Zhang --- misc/acrn-config/launch_config/com.py | 3 ++- misc/acrn-config/library/launch_cfg_lib.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/misc/acrn-config/launch_config/com.py b/misc/acrn-config/launch_config/com.py index d3ee2bb1c..e94761ca4 100644 --- a/misc/acrn-config/launch_config/com.py +++ b/misc/acrn-config/launch_config/com.py @@ -587,7 +587,8 @@ def dm_arg_set(names, sel, virt_io, dm, vmid, config): err_key = "uos:id={}:poweroff_channel".format(vmid) launch_cfg_lib.ERR_LIST[err_key] = "vuart1 of VM{} in scenario file should select 'SOS_COM2_BASE'".format(sos_vmid + vmid) return - print(" {} \\".format(launch_cfg_lib.PM_CHANNEL_DIC[pm_key]), file=config) + scenario_cfg_lib.get_sos_vuart_settings() + print(" {} \\".format(launch_cfg_lib.PM_CHANNEL_DIC[pm_key] + scenario_cfg_lib.SOS_UART1_VALID_NUM), file=config) # set logger_setting for all VMs print(" $logger_setting \\", file=config) diff --git a/misc/acrn-config/library/launch_cfg_lib.py b/misc/acrn-config/library/launch_cfg_lib.py index 0aba8ab75..3b4de1bef 100644 --- a/misc/acrn-config/library/launch_cfg_lib.py +++ b/misc/acrn-config/library/launch_cfg_lib.py @@ -49,7 +49,7 @@ PM_CHANNEL_DIC = { 'IOC':'--pm_notify_channel ioc', 'PowerButton':'--pm_notify_channel power_button', 'vuart1(pty)':'--pm_notify_channel uart \\\n --pm_by_vuart pty,/run/acrn/life_mngr_$vm_name \\\n -l com2,/run/acrn/life_mngr_$vm_name', - 'vuart1(tty)':'--pm_notify_channel uart --pm_by_vuart tty,/dev/ttyS1', + 'vuart1(tty)':'--pm_notify_channel uart --pm_by_vuart tty,/dev/', } MOUNT_FLAG_DIC = {}