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

samples: Add tap name as launch function parameter 

launch two clearlinux will use the same 'LaaG' as tap interface name. Add tap
name as parameter that will meet two UOS using different tap interface.

Tracked-On: projectacrn/acrn-hypervisor#1194
Signed-off-by: Jiangbo Wu <jiangbo.wu@intel.com>
Reviewed-by: Binbin Wu <binbin.wu@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
Signed-off-by: Jiangbo Wu <jiangbo.wu@intel.com>
This commit is contained in:
Jiangbo Wu 2018-09-06 13:17:32 +08:00 committed by lijinxia
parent bcfe447f5c
commit a7de5a1940
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
devicemodel/samples/apl-mrb/launch_uos.sh
View File

@ -15,7 +15,7 @@ vm_name=vm$1
vm_name=${vm_name}-${mac:9:8} vm_name=${vm_name}-${mac:9:8}
# create a unique tap device for each VM # create a unique tap device for each VM
tap=tap_LaaG tap=tap_$6
tap_exist=$(ip a | grep acrn_"$tap" | awk '{print $1}') tap_exist=$(ip a | grep acrn_"$tap" | awk '{print $1}')
if [ "$tap_exist"x != "x" ]; then if [ "$tap_exist"x != "x" ]; then
echo "tap device existed, reuse acrn_$tap" echo "tap device existed, reuse acrn_$tap"
@ -96,7 +96,7 @@ if [ "$setup_mem" != "" ];then
fi fi
boot_dev_flag=",b" boot_dev_flag=",b"
if [ $6 == 1 ];then if [ $7 == 1 ];then
boot_image_option="--vsbl /usr/share/acrn/bios/VSBL_debug.bin" boot_image_option="--vsbl /usr/share/acrn/bios/VSBL_debug.bin"
else else
boot_image_option="--vsbl /usr/share/acrn/bios/VSBL.bin" boot_image_option="--vsbl /usr/share/acrn/bios/VSBL.bin"
@ -146,7 +146,7 @@ vm_name=vm$1
vm_name=${vm_name}-${mac:9:8} vm_name=${vm_name}-${mac:9:8}
# create a unique tap device for each VM # create a unique tap device for each VM
tap=tap_AaaG tap=tap_$6
tap_exist=$(ip a | grep acrn_"$tap" | awk '{print $1}') tap_exist=$(ip a | grep acrn_"$tap" | awk '{print $1}')
if [ "$tap_exist"x != "x" ]; then if [ "$tap_exist"x != "x" ]; then
echo "tap device existed, reuse acrn_$tap" echo "tap device existed, reuse acrn_$tap"
@ -265,7 +265,7 @@ kernel_cmdline_generic="maxcpus=$2 nohpet tsc=reliable intel_iommu=off \
i915.enable_hangcheck=0 use_nuclear_flip=1 i915.enable_guc_submission=0 i915.enable_guc=0" i915.enable_hangcheck=0 use_nuclear_flip=1 i915.enable_guc_submission=0 i915.enable_guc=0"
boot_dev_flag=",b" boot_dev_flag=",b"
if [ $6 == 1 ];then if [ $7 == 1 ];then
boot_image_option="--vsbl /usr/share/acrn/bios/VSBL_debug.bin" boot_image_option="--vsbl /usr/share/acrn/bios/VSBL_debug.bin"
else else
boot_image_option="--vsbl /usr/share/acrn/bios/VSBL.bin" boot_image_option="--vsbl /usr/share/acrn/bios/VSBL.bin"
@ -377,20 +377,20 @@ done
case $launch_type in case $launch_type in
1) echo "Launch clearlinux UOS" 1) echo "Launch clearlinux UOS"
launch_clearlinux 1 3 "64 448 8" 0x070F00 clearlinux $debug launch_clearlinux 1 3 "64 448 8" 0x070F00 clearlinux "LaaG" $debug
;; ;;
2) echo "Launch android UOS" 2) echo "Launch android UOS"
launch_android 1 3 "64 448 8" 0x070F00 android $debug launch_android 1 3 "64 448 8" 0x070F00 android "AaaG" $debug
;; ;;
3) echo "Launch clearlinux UOS + android UOS" 3) echo "Launch clearlinux UOS + android UOS"
launch_android 1 2 "64 448 4" 0x00000C android $debug & launch_android 1 2 "64 448 4" 0x00000C android "AaaG" $debug &
sleep 5 sleep 5
launch_clearlinux 2 1 "64 448 4" 0x070F00 clearlinux $debug launch_clearlinux 2 1 "64 448 4" 0x070F00 clearlinux "LaaG" $debug
;; ;;
4) echo "Launch two clearlinux UOSs" 4) echo "Launch two clearlinux UOSs"
launch_clearlinux 1 1 "64 448 4" 0x00000C clearlinux $debug & launch_clearlinux 1 1 "64 448 4" 0x00000C clearlinux "L1aaG" $debug &
sleep 5 sleep 5
launch_clearlinux 2 1 "64 448 4" 0x070F00 clearlinux_dup $debug launch_clearlinux 2 1 "64 448 4" 0x070F00 clearlinux_dup "L2aaG" $debug
;; ;;
esac esac