OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

acrn-config: refine the 'vm_name' parameter for launch script 

Use post_vm_id$(relative id) to identify each post-launched VM to
make sure simultaneous launching successfully.

Tracked-On: #4797
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Wei Liu 2020-04-30 10:32:27 +08:00 committed by wenlingz
parent 515c70010f
commit f644b3705b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
misc/acrn-config/launch_config/com.py
View File

@ -50,12 +50,12 @@ def tap_uos_net(names, virt_io, vmid, config):
print("#vm-name used to generate uos-mac address", file=config) print("#vm-name used to generate uos-mac address", file=config)
print("mac=$(cat /sys/class/net/e*/address)", file=config) print("mac=$(cat /sys/class/net/e*/address)", file=config)
print("vm_name=vm$1", file=config) print("vm_name=post_vm_id$1", file=config)
print("mac_seed=${mac:9:8}-${vm_name}", file=config) print("mac_seed=${mac:9:8}-${vm_name}", file=config)
print("", file=config) print("", file=config)
if uos_type in ("VXWORKS", "ZEPHYR", "WINDOWS", "PREEMPT-RT LINUX"): if uos_type in ("VXWORKS", "ZEPHYR", "WINDOWS", "PREEMPT-RT LINUX"):
print("vm_name={}_vm$1".format(vm_name), file=config) print("vm_name=post_vm_id$1", file=config)
for net in virt_io['network'][vmid]: for net in virt_io['network'][vmid]:
if net: if net:
@ -329,18 +329,18 @@ def uos_launch(names, args, virt_io, vmid, config):
else: else:
print("else", file=config) print("else", file=config)
if gvt_args == "gvtd": if gvt_args == "gvtd":
print(' launch_{} 1'.format(launch_uos), file=config) print(' launch_{} {}'.format(launch_uos, vmid), file=config)
elif gvt_args: elif gvt_args:
print(' launch_{} 1 "{}"'.format(launch_uos, gvt_args), file=config) print(' launch_{} {} "{}"'.format(launch_uos, vmid, gvt_args), file=config)
print("fi", file=config) print("fi", file=config)
else: else:
if uos_type in ("VXWORKS", "PREEMPT-RT LINUX", "ZEPHYR"): if uos_type in ("VXWORKS", "PREEMPT-RT LINUX", "ZEPHYR"):
print("launch_{} 1".format(launch_uos), file=config) print("launch_{} {}".format(launch_uos, vmid), file=config)
if uos_type in ("CLEARLINUX", "WINDOWS"): if uos_type in ("CLEARLINUX", "WINDOWS"):
if gvt_args == "gvtd": if gvt_args == "gvtd":
print('launch_{} 1'.format(launch_uos), file=config) print('launch_{} {}'.format(launch_uos, vmid), file=config)
else: else:
print('launch_{} 1 "{}"'.format(launch_uos, gvt_args), file=config) print('launch_{} {} "{}"'.format(launch_uos, vmid, gvt_args), file=config)
if is_mount_needed(virt_io, vmid): if is_mount_needed(virt_io, vmid):
print("", file=config) print("", file=config)