Skip to content

Commit 958830f

Browse files
Wei Liuwenlingz
authored andcommitted
acrn-config: add support to generate launch script
Add support to generate launch script for whl-ipc-i5/whl-ipc-i7. Tracked-On: #3854 Signed-off-by: Wei Liu <weix.w.liu@intel.com> Acked-by: Victor Sun <victor.sun@intel.com>
1 parent 70a405b commit 958830f

File tree

1 file changed

+23
-12
lines changed
  • misc/acrn-config/launch_config

1 file changed

+23
-12
lines changed

misc/acrn-config/launch_config/com.py

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,24 @@
77
import pt
88

99

10-
def is_nuc_clr(names, vmid):
10+
def is_nuc_whl_clr(names, vmid):
1111
uos_type = names['uos_types'][vmid]
1212
board_name = names['board_name']
1313

14-
if uos_type == "CLEARLINUX" and 'nuc' in board_name:
14+
if uos_type == "CLEARLINUX" and board_name not in ("apl-mrb", "apl-up2"):
1515
return True
1616

1717
return False
1818

1919

20+
def is_mount_needed(names, vmid):
21+
uos_type = names['uos_types'][vmid]
22+
if uos_type in ("CLEARLINUX", "ANDROID", "ALIOS") and not is_nuc_whl_clr(names, vmid):
23+
return True
24+
25+
return False
26+
27+
2028
def tap_uos_net(names, vmid, config):
2129
uos_type = names['uos_types'][vmid]
2230
board_name = names['board_name']
@@ -118,7 +126,7 @@ def run_container(board_name, uos_type, config):
118126
if 'nuc' in board_name:
119127
board_name = 'nuc'
120128

121-
if board_name == "apl-up2" or uos_type != "CLEARLINUX":
129+
if board_name not in ("apl-mrb", "nuc") or uos_type != "CLEARLINUX":
122130
return
123131

124132
print("function run_container()", file=config)
@@ -206,7 +214,7 @@ def boot_image_type(args, vmid, config):
206214
def interrupt_storm(names, vmid, config):
207215
uos_type = names['uos_types'][vmid]
208216

209-
if uos_type not in ("CLEARLINUX", "ANDROID", "ALIOS") or is_nuc_clr(names, vmid):
217+
if uos_type not in ("CLEARLINUX", "ANDROID", "ALIOS") or is_nuc_whl_clr(names, vmid):
210218
return
211219

212220
print("#interrupt storm monitor for pass-through devices, params order:", file=config)
@@ -249,7 +257,7 @@ def mem_size_set(names, args, vmid, config):
249257
uos_type = names['uos_types'][vmid]
250258
mem_size = args['mem_size'][vmid]
251259

252-
if uos_type not in ("CLEARLINUX", "ANDROID", "ALIOS") or is_nuc_clr(names, vmid):
260+
if uos_type not in ("CLEARLINUX", "ANDROID", "ALIOS") or is_nuc_whl_clr(names, vmid):
253261
print("mem_size={}M".format(mem_size), file=config)
254262
return
255263

@@ -274,8 +282,11 @@ def uos_launch(names, args, vmid, config):
274282
gvt_args = args['gvt_args'][vmid]
275283
uos_type = names['uos_types'][vmid]
276284
launch_uos = launch_cfg_lib.undline_name(uos_type).lower()
285+
board_name = names['board_name']
286+
if 'nuc' in board_name:
287+
board_name = 'nuc'
277288

278-
if uos_type in ("CLEARLINUX", "ANDROID", "ALIOS") and not is_nuc_clr(names, vmid):
289+
if uos_type == "CLEARLINUX" and board_name in ("apl-mrb", "nuc"):
279290
print('if [ "$1" = "-C" ];then', file=config)
280291
print(' if [ $(hostname) = "runc" ]; then', file=config)
281292
print(' echo "Already in container exit!"', file=config)
@@ -296,7 +307,7 @@ def uos_launch(names, args, vmid, config):
296307
if uos_type in ("CLEARLINUX", "WINDOWS"):
297308
print('launch_{} 1 "{}"'.format(launch_uos, gvt_args), file=config)
298309

299-
if uos_type in ("CLEARLINUX", "ANDROID", "ALIOS") and not is_nuc_clr(names, vmid):
310+
if is_mount_needed(names, vmid):
300311
print("", file=config)
301312
print('launch_{} {} "{}" "{}" $debug'.format(launch_uos, vmid, gvt_args, vmid), file=config)
302313
print("", file=config)
@@ -309,7 +320,7 @@ def launch_end(names, args, vmid, config):
309320
uos_type = names['uos_types'][vmid]
310321
mem_size = args["mem_size"][vmid]
311322

312-
if uos_type in ("CLEARLINUX", "ANDROID", "ALIOS") and not is_nuc_clr(names, vmid):
323+
if uos_type in ("CLEARLINUX", "ANDROID", "ALIOS") and not is_nuc_whl_clr(names, vmid):
313324
print("debug=0", file=config)
314325
print("", file=config)
315326
print('while getopts "M:hdC" opt', file=config)
@@ -335,7 +346,7 @@ def launch_end(names, args, vmid, config):
335346
print("done", file=config)
336347
print("", file=config)
337348

338-
if uos_type in ("CLEARLINUX", "ANDROID", "ALIOS") and not is_nuc_clr(names, vmid):
349+
if is_mount_needed(names, vmid):
339350
root_fs = args['rootfs_dev'][vmid]
340351

341352
print('if [ ! -b "{}" ]; then'.format(root_fs), file=config)
@@ -435,7 +446,7 @@ def dm_arg_set(names, sel, dm, vmid, config):
435446
else:
436447
print('{} $npk_virt \\'.format(dm_str), file=config)
437448

438-
if board_name == "apl-up2" or is_nuc_clr(names, vmid):
449+
if board_name == "apl-up2" or is_nuc_whl_clr(names, vmid):
439450
print(" $logger_setting \\", file=config)
440451

441452
if uos_type in ("CLEARLINUX", "ANDROID", "ALIOS"):
@@ -446,7 +457,7 @@ def dm_arg_set(names, sel, dm, vmid, config):
446457
if board_name == "apl-mrb":
447458
print(" --pm_notify_channel ioc \\", file=config)
448459

449-
if is_nuc_clr(names, vmid):
460+
if is_nuc_whl_clr(names, vmid):
450461
print(" --pm_notify_channel uart \\", file=config)
451462
print(' --pm_by_vuart pty,/run/acrn/life_mngr_$vm_name \\', file=config)
452463
print(' -l com2,/run/acrn/life_mngr_$vm_name \\', file=config)
@@ -506,7 +517,7 @@ def dm_arg_set(names, sel, dm, vmid, config):
506517
print(" -i /run/acrn/ioc_$vm_name,0x20 \\", file=config)
507518
print(" -l com2,/run/acrn/ioc_$vm_name \\", file=config)
508519

509-
if not is_nuc_clr(names, vmid):
520+
if not is_nuc_whl_clr(names, vmid):
510521
print(" -s {},wdt-i6300esb \\".format(launch_cfg_lib.virtual_dev_slot("wdt-i6300esb")), file=config)
511522
print(" $intr_storm_monitor \\", file=config)
512523
print(" -s {},xhci,1-1:1-2:1-3:2-1:2-2:2-3:cap=apl \\".format(launch_cfg_lib.virtual_dev_slot("xhci")), file=config)

0 commit comments

Comments
 (0)