diff --git a/devicemodel/samples/apl-mrb/launch_uos.sh b/devicemodel/samples/apl-mrb/launch_uos.sh index 66b8914b8..74e999054 100755 --- a/devicemodel/samples/apl-mrb/launch_uos.sh +++ b/devicemodel/samples/apl-mrb/launch_uos.sh @@ -72,8 +72,8 @@ passthru_bdf=( function launch_clearlinux() { -if [ ! -f "/data/$5/$5.img" ]; then - echo "no /data/$5/$5.img, exit" +if [ ! -f "/data/$4/$4.img" ]; then + echo "no /data/$4/$4.img, exit" exit fi @@ -83,7 +83,7 @@ vm_name=vm$1 mac_seed=${mac:9:8}-${vm_name} # create a unique tap device for each VM -tap=tap_$6 +tap=tap_$5 tap_exist=$(ip a | grep "$tap" | awk '{print $1}') if [ "$tap_exist"x != "x" ]; then echo "tap device existed, reuse $tap" @@ -169,7 +169,7 @@ if [ "$setup_mem" != "" ];then fi boot_dev_flag=",b" -if [ $7 == 1 ];then +if [ $6 == 1 ];then boot_image_option="--vsbl /usr/share/acrn/bios/VSBL_debug.bin" else boot_image_option="--vsbl /usr/share/acrn/bios/VSBL.bin" @@ -181,7 +181,7 @@ intr_storm_monitor="--intr_monitor 10000,10,1,100" acrn-dm --help 2>&1 | grep 'GVT args' if [ $? == 0 ];then - GVT_args=$3 + GVT_args=$2 boot_GVT_option=" -s 0:2:0,pci-gvt -G " else boot_GVT_option='' @@ -189,11 +189,11 @@ else fi -acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \ +acrn-dm -A -m $mem_size $boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \ -s 5,virtio-console,@pty:pty_port \ -s 6,virtio-hyper_dmabuf \ -s 8,wdt-i6300esb \ - -s 3,virtio-blk$boot_dev_flag,/data/$5/$5.img \ + -s 3,virtio-blk$boot_dev_flag,/data/$4/$4.img \ -s 4,virtio-net,$tap $boot_image_option \ -s 7,xhci,1-1:1-2:1-3:2-1:2-2:2-3:cap=apl \ -s 9,passthru,0/15/1 \ @@ -205,19 +205,19 @@ acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1: -i /run/acrn/ioc_$vm_name,0x20 \ -l com2,/run/acrn/ioc_$vm_name \ --pm_notify_channel ioc \ - -B "root=/dev/vda2 rw rootwait maxcpus=$2 nohpet console=hvc0 \ + -B "root=/dev/vda2 rw rootwait nohpet console=hvc0 \ snd_soc_skl_virtio_fe.domain_id=1 \ snd_soc_skl_virtio_fe.domain_name="GuestOS" \ console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M \ - consoleblank=0 tsc=reliable i915.avail_planes_per_pipe=$4 i915.enable_guc_loading=0 \ + consoleblank=0 tsc=reliable i915.avail_planes_per_pipe=$3 i915.enable_guc_loading=0 \ i915.enable_hangcheck=0 i915.nuclear_pageflip=1 \ i915.enable_guc_submission=0 i915.enable_guc=0" $vm_name } function launch_android() { -if [ ! -f "/data/$5/$5.img" ]; then - echo "no /data/$5/$5.img, exit" +if [ ! -f "/data/$4/$4.img" ]; then + echo "no /data/$4/$4.img, exit" exit fi @@ -227,7 +227,7 @@ vm_name=vm$1 mac_seed=${mac:9:8}-${vm_name} # create a unique tap device for each VM -tap=tap_$6 +tap=tap_$5 tap_exist=$(ip a | grep "$tap" | awk '{print $1}') if [ "$tap_exist"x != "x" ]; then echo "tap device existed, reuse $tap" @@ -355,15 +355,15 @@ if [ "$setup_mem" != "" ];then mem_size=$setup_mem fi -kernel_cmdline_generic="maxcpus=$2 nohpet tsc=reliable intel_iommu=off \ +kernel_cmdline_generic="nohpet tsc=reliable intel_iommu=off \ androidboot.serialno=$ser \ snd_soc_skl_virtio_fe.domain_id=1 \ snd_soc_skl_virtio_fe.domain_name="GuestOS" \ - i915.enable_rc6=1 i915.enable_fbc=1 i915.enable_guc_loading=0 i915.avail_planes_per_pipe=$4 \ + i915.enable_rc6=1 i915.enable_fbc=1 i915.enable_guc_loading=0 i915.avail_planes_per_pipe=$3 \ i915.enable_hangcheck=0 use_nuclear_flip=1 i915.enable_guc_submission=0 i915.enable_guc=0" boot_dev_flag=",b" -if [ $7 == 1 ];then +if [ $6 == 1 ];then boot_image_option="--vsbl /usr/share/acrn/bios/VSBL_debug.bin" else boot_image_option="--vsbl /usr/share/acrn/bios/VSBL.bin" @@ -389,16 +389,16 @@ intr_storm_monitor="--intr_monitor 10000,10,1,100" acrn-dm --help 2>&1 | grep 'GVT args' if [ $? == 0 ];then - GVT_args=$3 + GVT_args=$2 boot_GVT_option=" -s 2,pci-gvt -G " else boot_GVT_option='' GVT_args='' fi - acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio $npk_virt\ + acrn-dm -A -m $mem_size $boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio $npk_virt\ -s 9,virtio-net,$tap \ - -s 3,virtio-blk$boot_dev_flag,/data/$5/$5.img \ + -s 3,virtio-blk$boot_dev_flag,/data/$4/$4.img \ -s 7,xhci,1-1:1-2:1-3:2-1:2-2:2-3:cap=apl \ -s 8,passthru,0/15/1 \ -s 13,virtio-rpmb \ @@ -576,23 +576,23 @@ done case $launch_type in 1) echo "Launch clearlinux UOS" - launch_clearlinux 1 3 "64 448 8" 0x070F00 clearlinux "LaaG" $debug + launch_clearlinux 1 "64 448 8" 0x070F00 clearlinux "LaaG" $debug ;; 2) echo "Launch android UOS" - launch_android 1 3 "64 448 8" 0x070F00 android "AaaG" $debug + launch_android 1 "64 448 8" 0x070F00 android "AaaG" $debug ;; 3) echo "Launch clearlinux UOS + android UOS" - launch_android 1 2 "64 448 4" 0x00000C android "AaaG" $debug & + launch_android 1 "64 448 4" 0x00000C android "AaaG" $debug & sleep 5 - launch_clearlinux 2 1 "64 448 4" 0x070F00 clearlinux "LaaG" $debug + launch_clearlinux 2 "64 448 4" 0x070F00 clearlinux "LaaG" $debug ;; 4) echo "Launch two clearlinux UOSs" - launch_clearlinux 1 1 "64 448 4" 0x00000C clearlinux "L1aaG" $debug & + launch_clearlinux 1 "64 448 4" 0x00000C clearlinux "L1aaG" $debug & sleep 5 - launch_clearlinux 2 1 "64 448 4" 0x070F00 clearlinux_dup "L2aaG" $debug + launch_clearlinux 2 "64 448 4" 0x070F00 clearlinux_dup "L2aaG" $debug ;; 5) echo "Launch alios UOS" - launch_alios 1 3 "64 448 8" 0x070F00 alios "AliaaG" $debug + launch_alios 1 "64 448 8" 0x070F00 alios "AliaaG" $debug ;; esac diff --git a/devicemodel/samples/apl-up2/launch_uos.sh b/devicemodel/samples/apl-up2/launch_uos.sh index 8237a841f..7f1d1a378 100755 --- a/devicemodel/samples/apl-up2/launch_uos.sh +++ b/devicemodel/samples/apl-up2/launch_uos.sh @@ -57,8 +57,8 @@ passthru_bdf=( function launch_clearlinux() { -if [ ! -f "/data/$5/$5.img" ]; then - echo "no /data/$5/$5.img, exit" +if [ ! -f "/data/$4/$4.img" ]; then + echo "no /data/$4/$4.img, exit" exit fi @@ -68,7 +68,7 @@ vm_name=vm$1 mac_seed=${mac:9:8}-${vm_name} # create a unique tap device for each VM -tap=tap_$6 +tap=tap_$5 tap_exist=$(ip a | grep "$tap" | awk '{print $1}') if [ "$tap_exist"x != "x" ]; then echo "tap device existed, reuse $tap" @@ -152,7 +152,7 @@ if [ "$setup_mem" != "" ];then fi boot_dev_flag=",b" -if [ $7 == 1 ];then +if [ $6 == 1 ];then boot_image_option="--vsbl /usr/share/acrn/bios/VSBL_debug.bin" else boot_image_option="--vsbl /usr/share/acrn/bios/VSBL.bin" @@ -164,7 +164,7 @@ intr_storm_monitor="--intr_monitor 10000,10,1,100" acrn-dm --help 2>&1 | grep 'GVT args' if [ $? == 0 ];then - GVT_args=$3 + GVT_args=$2 boot_GVT_option=" -s 0:2:0,pci-gvt -G " else boot_GVT_option='' @@ -174,11 +174,11 @@ fi #logger_setting, format: logger_name,level; like following logger_setting="--logger_setting console,level=4;kmsg,level=3;disk,level=5" -acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \ +acrn-dm -A -m $mem_size $boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \ -s 5,virtio-console,@pty:pty_port \ -s 6,virtio-hyper_dmabuf \ -s 8,wdt-i6300esb \ - -s 3,virtio-blk$boot_dev_flag,/data/$5/$5.img \ + -s 3,virtio-blk$boot_dev_flag,/data/$4/$4.img \ -s 4,virtio-net,$tap $boot_image_option \ -s 7,xhci,1-1:1-2:1-3:2-1:2-2:2-3:cap=apl \ -s 9,passthru,0/15/1 \ @@ -188,17 +188,17 @@ acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1: $boot_ipu_option \ --mac_seed $mac_seed \ --pm_notify_channel power_button \ - -B "root=/dev/vda2 rw rootwait maxcpus=$2 nohpet console=hvc0 \ + -B "root=/dev/vda2 rw rootwait nohpet console=hvc0 \ console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M \ - consoleblank=0 tsc=reliable i915.avail_planes_per_pipe=$4 i915.enable_guc_loading=0 \ + consoleblank=0 tsc=reliable i915.avail_planes_per_pipe=$3 i915.enable_guc_loading=0 \ i915.enable_hangcheck=0 i915.nuclear_pageflip=1 \ i915.enable_guc_submission=0 i915.enable_guc=0" $vm_name } function launch_android() { -if [ ! -f "/data/$5/$5.img" ]; then - echo "no /data/$5/$5.img, exit" +if [ ! -f "/data/$4/$4.img" ]; then + echo "no /data/$4/$4.img, exit" exit fi @@ -208,7 +208,7 @@ vm_name=vm$1 mac_seed=${mac:9:8}-${vm_name} # create a unique tap device for each VM -tap=tap_$6 +tap=tap_$5 tap_exist=$(ip a | grep "$tap" | awk '{print $1}') if [ "$tap_exist"x != "x" ]; then echo "tap device existed, reuse $tap" @@ -323,13 +323,13 @@ if [ "$setup_mem" != "" ];then mem_size=$setup_mem fi -kernel_cmdline_generic="maxcpus=$2 nohpet tsc=reliable intel_iommu=off \ +kernel_cmdline_generic="nohpet tsc=reliable intel_iommu=off \ androidboot.serialno=$ser \ - i915.enable_rc6=1 i915.enable_fbc=1 i915.enable_guc_loading=0 i915.avail_planes_per_pipe=$4 \ + i915.enable_rc6=1 i915.enable_fbc=1 i915.enable_guc_loading=0 i915.avail_planes_per_pipe=$3 \ i915.enable_hangcheck=0 use_nuclear_flip=1 i915.enable_guc_submission=0 i915.enable_guc=0" boot_dev_flag=",b" -if [ $7 == 1 ];then +if [ $6 == 1 ];then boot_image_option="--vsbl /usr/share/acrn/bios/VSBL_debug.bin" else boot_image_option="--vsbl /usr/share/acrn/bios/VSBL.bin" @@ -355,7 +355,7 @@ intr_storm_monitor="--intr_monitor 10000,10,1,100" acrn-dm --help 2>&1 | grep 'GVT args' if [ $? == 0 ];then - GVT_args=$3 + GVT_args=$2 boot_GVT_option=" -s 2,pci-gvt -G " else boot_GVT_option='' @@ -365,9 +365,9 @@ fi #logger_setting, format: logger_name,level; like following logger_setting="--logger_setting console,level=4;kmsg,level=3;disk,level=5" - acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio $npk_virt\ + acrn-dm -A -m $mem_size $boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio $npk_virt\ -s 9,virtio-net,$tap \ - -s 3,virtio-blk$boot_dev_flag,/data/$5/$5.img \ + -s 3,virtio-blk$boot_dev_flag,/data/$4/$4.img \ -s 7,xhci,1-1:1-2:1-3:2-1:2-2:2-3:cap=apl \ -s 8,passthru,0/15/1 \ -s 13,virtio-rpmb \ @@ -463,23 +463,23 @@ done case $launch_type in 1) echo "Launch clearlinux UOS" - launch_clearlinux 1 1 "64 448 8" 0x070F00 clearlinux "LaaG" $debug + launch_clearlinux 1 "64 448 8" 0x070F00 clearlinux "LaaG" $debug ;; 2) echo "Launch android UOS" - launch_android 1 1 "64 448 8" 0x070F00 android "AaaG" $debug + launch_android 1 "64 448 8" 0x070F00 android "AaaG" $debug ;; 3) echo "Launch clearlinux UOS + android UOS" - launch_android 1 2 "64 448 4" 0x00000C android "AaaG" $debug & + launch_android 1 "64 448 4" 0x00000C android "AaaG" $debug & sleep 5 - launch_clearlinux 2 1 "64 448 4" 0x070F00 clearlinux "LaaG" $debug + launch_clearlinux 2 "64 448 4" 0x070F00 clearlinux "LaaG" $debug ;; 4) echo "Launch two clearlinux UOSs" - launch_clearlinux 1 1 "64 448 4" 0x00000C clearlinux "L1aaG" $debug & + launch_clearlinux 1 "64 448 4" 0x00000C clearlinux "L1aaG" $debug & sleep 5 - launch_clearlinux 2 1 "64 448 4" 0x070F00 clearlinux_dup "L2aaG" $debug + launch_clearlinux 2 "64 448 4" 0x070F00 clearlinux_dup "L2aaG" $debug ;; 5) echo "Launch alios UOS" - launch_alios 1 3 "64 448 8" 0x070F00 alios "AliaaG" $debug + launch_alios 1 "64 448 8" 0x070F00 alios "AliaaG" $debug ;; esac diff --git a/devicemodel/samples/nuc/launch_hard_rt_vm.sh b/devicemodel/samples/nuc/launch_hard_rt_vm.sh index aab5e2cf5..c45b0cee5 100755 --- a/devicemodel/samples/nuc/launch_hard_rt_vm.sh +++ b/devicemodel/samples/nuc/launch_hard_rt_vm.sh @@ -35,7 +35,7 @@ pm_channel="--pm_notify_channel uart " pm_by_vuart="--pm_by_vuart tty,/dev/ttyS1" -/usr/bin/acrn-dm -A -m $mem_size -c $1 -s 0:0,hostbridge \ +/usr/bin/acrn-dm -A -m $mem_size -s 0:0,hostbridge \ -k /usr/lib/kernel/default-iot-lts2018-preempt-rt \ --lapic_pt \ --rtvm \ @@ -59,4 +59,4 @@ for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do fi done -launch_hard_rt_vm 1 +launch_hard_rt_vm diff --git a/devicemodel/samples/nuc/launch_uos.sh b/devicemodel/samples/nuc/launch_uos.sh index 0ea020408..545d108ad 100755 --- a/devicemodel/samples/nuc/launch_uos.sh +++ b/devicemodel/samples/nuc/launch_uos.sh @@ -100,8 +100,8 @@ pm_vuart_node=" -s 1:0,lpc -l com2,/run/acrn/life_mngr_"$vm_name #for memsize setting mem_size=2048M -acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge \ - -s 2,pci-gvt -G "$3" \ +acrn-dm -A -m $mem_size -s 0:0,hostbridge \ + -s 2,pci-gvt -G "$2" \ -s 5,virtio-console,@stdio:stdio_port \ -s 6,virtio-hyper_dmabuf \ -s 3,virtio-blk,/home/clear/uos/uos.img \ @@ -146,5 +146,5 @@ if [ "$1" = "-C" ];then echo "runc_container" run_container else - launch_clear 1 1 "64 448 8" 0x070F00 + launch_clear 1 "64 448 8" 0x070F00 fi diff --git a/devicemodel/samples/nuc/launch_vxworks.sh b/devicemodel/samples/nuc/launch_vxworks.sh index ecf284b3c..97602207e 100755 --- a/devicemodel/samples/nuc/launch_vxworks.sh +++ b/devicemodel/samples/nuc/launch_vxworks.sh @@ -21,7 +21,7 @@ mem_size=2048M # offically now and we are working on upstream the front-end drivers. # OVMF console is not available with default parameters. -acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge \ +acrn-dm -A -m $mem_size -s 0:0,hostbridge \ -s 5,virtio-console,@stdio:stdio_port \ -s 3,virtio-blk,./VxWorks.img \ --virtio_poll 1000000 \ @@ -47,4 +47,4 @@ for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do fi done -launch_vxworks 1 1 +launch_vxworks 1 diff --git a/devicemodel/samples/nuc/launch_win.sh b/devicemodel/samples/nuc/launch_win.sh index c3614b2ab..c00095a06 100755 --- a/devicemodel/samples/nuc/launch_win.sh +++ b/devicemodel/samples/nuc/launch_win.sh @@ -19,8 +19,8 @@ echo "0000:00:1f.3" > /sys/bus/pci/drivers/pci-stub/bind #for memsize setting mem_size=4096M -acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \ - -s 2,pci-gvt -G "$3" \ +acrn-dm -A -m $mem_size -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \ + -s 2,pci-gvt -G "$2" \ -s 3,virtio-blk,./win10-ltsc.img \ -s 4,virtio-net,tap0 \ -s 5,passthru,00/1f/3 \ @@ -45,4 +45,4 @@ for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do fi done -launch_win 1 1 "64 448 8" +launch_win 1 "64 448 8" diff --git a/devicemodel/samples/nuc/launch_zephyr.sh b/devicemodel/samples/nuc/launch_zephyr.sh index c4fbe508d..89ec04cd6 100755 --- a/devicemodel/samples/nuc/launch_zephyr.sh +++ b/devicemodel/samples/nuc/launch_zephyr.sh @@ -15,7 +15,7 @@ fi #for memsize setting mem_size=128M -acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \ +acrn-dm -A -m $mem_size -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \ -s 5,virtio-console,@pty:pty_port \ -s 3,virtio-blk,./zephyr.img \ --ovmf /usr/share/acrn/bios/OVMF.fd \ @@ -39,4 +39,4 @@ for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do fi done -launch_zephyr 1 1 +launch_zephyr 1