Skip to content

Commit df4a395

Browse files
Wei Liuwenlingz
authored andcommitted
acrn-config: expends parameters and functions to common lib
For purpose to refine the library/common and xx_cfg_lib, should have to expands parameters and functions to common.py firstly. Tracked-On: #3854 Signed-off-by: Wei Liu <weix.w.liu@intel.com> Acked-by: Victor Sun <victor.sun@intel.com> Acked-by: Terry Zou <terry.zou@intel.com>
1 parent 6bbc571 commit df4a395

File tree

8 files changed

+343
-324
lines changed

8 files changed

+343
-324
lines changed

misc/acrn-config/board_config/board_cfg_gen.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import acpi_platform_h
1414
import misc_cfg_h
1515
import new_board_kconfig
16+
import common
1617

1718
ACRN_PATH = board_cfg_lib.SOURCE_ROOT_DIR
1819
ACRN_CONFIG_TARGET = ACRN_PATH + "hypervisor/arch/x86/configs/"
@@ -41,9 +42,12 @@ def main(args):
4142
if err_dic:
4243
return err_dic
4344

45+
common.BOARD_INFO_FILE = board_info_file
46+
common.SCENARIO_INFO_FILE = scenario_info_file
47+
common.get_vm_num(scenario_info_file)
4448
board_cfg_lib.BOARD_INFO_FILE = board_info_file
4549
board_cfg_lib.SCENARIO_INFO_FILE = scenario_info_file
46-
board_cfg_lib.get_vm_count(scenario_info_file)
50+
board_cfg_lib.get_vm_num(scenario_info_file)
4751

4852
# get board name
4953
(err_dic, board) = board_cfg_lib.get_board_name()

misc/acrn-config/launch_config/launch_cfg_gen.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from launch_item import AvailablePthru, PthruSelected, VirtioDeviceSelect, AcrnDmArgs
1010
import launch_cfg_lib
1111
import com
12+
import common
1213

1314
ACRN_PATH = launch_cfg_lib.SOURCE_ROOT_DIR
1415
ACRN_CONFIG_TARGET = ACRN_PATH + '/misc/acrn-config/xmls/config-xmls/'
@@ -60,6 +61,9 @@ def validate_launch_setting(board_info, scenario_info, launch_info):
6061
:return: return a dictionary contain errors
6162
"""
6263
launch_cfg_lib.ERR_LIST = {}
64+
common.BOARD_INFO_FILE = board_info
65+
common.SCENARIO_INFO_FILE = scenario_info
66+
common.LAUNCH_INFO_FILE = launch_info
6367
launch_cfg_lib.BOARD_INFO_FILE = board_info
6468
launch_cfg_lib.SCENARIO_INFO_FILE = scenario_info
6569
launch_cfg_lib.LAUNCH_INFO_FILE = launch_info
@@ -161,6 +165,9 @@ def main(args):
161165
# 1: generate launch script for 1st post vm launch script
162166
# 2: generate launch script for 2nd post vm launch script
163167

168+
common.BOARD_INFO_FILE = board_info_file
169+
common.SCENARIO_INFO_FILE = scenario_info_file
170+
common.LAUNCH_INFO_FILE = launch_info_file
164171
launch_cfg_lib.BOARD_INFO_FILE = board_info_file
165172
launch_cfg_lib.SCENARIO_INFO_FILE = scenario_info_file
166173
launch_cfg_lib.LAUNCH_INFO_FILE = launch_info_file

misc/acrn-config/launch_config/launch_item.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# SPDX-License-Identifier: BSD-3-Clause
44
#
55

6+
import board_cfg_lib
67
import launch_cfg_lib
78

89
class AcrnDmArgs:
@@ -26,7 +27,7 @@ def get_args(self):
2627
self.args["xhci"] = launch_cfg_lib.get_leaf_tag_map(self.launch_info, "usb_xhci")
2728

2829
def check_item(self):
29-
rootfs = launch_cfg_lib.get_rootdev_info(self.board_info)
30+
rootfs = board_cfg_lib.get_rootfs(self.board_info)
3031
launch_cfg_lib.args_aval_check(self.args["uos_type"], "uos_type", launch_cfg_lib.UOS_TYPES)
3132
launch_cfg_lib.args_aval_check(self.args["rtos_type"], "rtos_type", launch_cfg_lib.RTOS_TYPE)
3233
launch_cfg_lib.mem_size_check(self.args["mem_size"], "mem_size")

0 commit comments

Comments
 (0)