From e38e026332e6df28c53488f94ee07ce1387caa85 Mon Sep 17 00:00:00 2001 From: Yin Fengwei Date: Mon, 9 Sep 2019 14:25:09 +0800 Subject: [PATCH] script: launch_uos: Give right pm notify channel We seperate the guest power event notify channel out. And now it's required to give the guest power event notify channel explicitly. Update the sample launch script to have correct parameters. Tracked-On: #3564 Signed-off-by: Yin Fengwei --- devicemodel/samples/apl-mrb/launch_uos.sh | 2 ++ devicemodel/samples/apl-up2/launch_uos.sh | 2 ++ devicemodel/samples/nuc/launch_uos.sh | 1 + 3 files changed, 5 insertions(+) diff --git a/devicemodel/samples/apl-mrb/launch_uos.sh b/devicemodel/samples/apl-mrb/launch_uos.sh index b1fe15de0..66b8914b8 100755 --- a/devicemodel/samples/apl-mrb/launch_uos.sh +++ b/devicemodel/samples/apl-mrb/launch_uos.sh @@ -204,6 +204,7 @@ acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1: $boot_ipu_option \ -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 \ snd_soc_skl_virtio_fe.domain_id=1 \ snd_soc_skl_virtio_fe.domain_name="GuestOS" \ @@ -413,6 +414,7 @@ fi $boot_ipu_option \ -i /run/acrn/ioc_$vm_name,0x20 \ -l com2,/run/acrn/ioc_$vm_name \ + --pm_notify_channel ioc \ $boot_image_option \ --enable_trusty \ -B "$kernel_cmdline" $vm_name diff --git a/devicemodel/samples/apl-up2/launch_uos.sh b/devicemodel/samples/apl-up2/launch_uos.sh index 945fa5f02..8237a841f 100755 --- a/devicemodel/samples/apl-up2/launch_uos.sh +++ b/devicemodel/samples/apl-up2/launch_uos.sh @@ -187,6 +187,7 @@ acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1: $logger_setting \ $boot_ipu_option \ --mac_seed $mac_seed \ + --pm_notify_channel power_button \ -B "root=/dev/vda2 rw rootwait maxcpus=$2 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 \ @@ -380,6 +381,7 @@ logger_setting="--logger_setting console,level=4;kmsg,level=3;disk,level=5" --mac_seed $mac_seed \ $boot_image_option \ --enable_trusty \ + --pm_notify_channel power_button \ -B "$kernel_cmdline" $vm_name } diff --git a/devicemodel/samples/nuc/launch_uos.sh b/devicemodel/samples/nuc/launch_uos.sh index 53e58b070..648cdb359 100755 --- a/devicemodel/samples/nuc/launch_uos.sh +++ b/devicemodel/samples/nuc/launch_uos.sh @@ -103,6 +103,7 @@ acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge \ -s 4,virtio-net,tap0 \ -s 7,virtio-rnd \ --ovmf ./OVMF.fd \ + --pm_notify_channel power_button \ $logger_setting \ --mac_seed $mac_seed \ $vm_name