diff --git a/misc/config_tools/data/sample_launch_scripts/apl-mrb/acrn_guest.service b/misc/config_tools/data/sample_launch_scripts/apl-mrb/acrn_guest.service index 502b6ca02..08a883519 100644 --- a/misc/config_tools/data/sample_launch_scripts/apl-mrb/acrn_guest.service +++ b/misc/config_tools/data/sample_launch_scripts/apl-mrb/acrn_guest.service @@ -5,7 +5,7 @@ After=weston.service After=systemd-resolved.service ConditionPathExists=/sys/kernel/gvt -ConditionPathExists=/dev/acrn_vhm +ConditionPathExists=/dev/acrn_hsm [Service] Type=simple diff --git a/misc/config_tools/data/sample_launch_scripts/apl-mrb/launch_uos.sh b/misc/config_tools/data/sample_launch_scripts/apl-mrb/launch_uos.sh index 024dbe584..ae412eb92 100755 --- a/misc/config_tools/data/sample_launch_scripts/apl-mrb/launch_uos.sh +++ b/misc/config_tools/data/sample_launch_scripts/apl-mrb/launch_uos.sh @@ -2,13 +2,6 @@ # Copyright (C) 2019 Intel Corporation. # SPDX-License-Identifier: BSD-3-Clause -offline_path="/sys/class/vhm/acrn_vhm" - -# Check the device file of /dev/acrn_hsm to determine the offline_path -if [ -e "/dev/acrn_hsm" ]; then -offline_path="/sys/class/acrn/acrn_hsm" -fi - kernel_version=$(uname -r) audio_module="/usr/lib/modules/$kernel_version/kernel/sound/soc/intel/boards/snd-soc-sst_bxt_sos_tdf8532.ko" ipu_passthrough=0 @@ -572,7 +565,7 @@ for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do echo 0 > $i/online online=`cat $i/online` done - echo $idx > ${offline_path}/offline_cpu + echo $idx > /sys/devices/virtual/misc/acrn_hsm/remove_cpu fi done diff --git a/misc/config_tools/data/sample_launch_scripts/apl-up2/launch_uos.sh b/misc/config_tools/data/sample_launch_scripts/apl-up2/launch_uos.sh index c31f789f8..e83b49edf 100755 --- a/misc/config_tools/data/sample_launch_scripts/apl-up2/launch_uos.sh +++ b/misc/config_tools/data/sample_launch_scripts/apl-up2/launch_uos.sh @@ -2,13 +2,6 @@ # Copyright (C) 2019 Intel Corporation. # SPDX-License-Identifier: BSD-3-Clause -offline_path="/sys/class/vhm/acrn_vhm" - -# Check the device file of /dev/acrn_hsm to determine the offline_path -if [ -e "/dev/acrn_hsm" ]; then -offline_path="/sys/class/acrn/acrn_hsm" -fi - kernel_version=$(uname -r | awk -F. '{ printf("%d.%d", $1,$2) }') ipu_passthrough=0 @@ -459,7 +452,7 @@ for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do echo 0 > $i/online online=`cat $i/online` done - echo $idx > ${offline_path}/offline_cpu + echo $idx > /sys/devices/virtual/misc/acrn_hsm/remove_cpu fi done diff --git a/misc/config_tools/data/sample_launch_scripts/launch_ubuntu.sh b/misc/config_tools/data/sample_launch_scripts/launch_ubuntu.sh index 40d84b21d..df86408df 100755 --- a/misc/config_tools/data/sample_launch_scripts/launch_ubuntu.sh +++ b/misc/config_tools/data/sample_launch_scripts/launch_ubuntu.sh @@ -42,7 +42,7 @@ for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do echo 0 > $i/online online=`cat $i/online` done - echo $idx > /sys/class/vhm/acrn_vhm/offline_cpu + echo $idx > /sys/devices/virtual/misc/acrn_hsm/remove_cpu fi done diff --git a/misc/config_tools/data/sample_launch_scripts/nuc/launch_hard_rt_vm.sh b/misc/config_tools/data/sample_launch_scripts/nuc/launch_hard_rt_vm.sh index 0bff6168c..d5e0db461 100755 --- a/misc/config_tools/data/sample_launch_scripts/nuc/launch_hard_rt_vm.sh +++ b/misc/config_tools/data/sample_launch_scripts/nuc/launch_hard_rt_vm.sh @@ -71,7 +71,7 @@ for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do echo cpu$idx online=$online if [ "$online" = "1" ]; then echo 0 > $i/online - echo $idx > /sys/class/vhm/acrn_vhm/offline_cpu + echo $idx > /sys/devices/virtual/misc/acrn_hsm/remove_cpu fi done diff --git a/misc/config_tools/data/sample_launch_scripts/nuc/launch_uos.sh b/misc/config_tools/data/sample_launch_scripts/nuc/launch_uos.sh index a9bfb9531..bb7cf9861 100755 --- a/misc/config_tools/data/sample_launch_scripts/nuc/launch_uos.sh +++ b/misc/config_tools/data/sample_launch_scripts/nuc/launch_uos.sh @@ -2,14 +2,6 @@ # Copyright (C) 2019 Intel Corporation. # SPDX-License-Identifier: BSD-3-Clause -offline_path="/sys/class/vhm/acrn_vhm" - -# Check the device file of /dev/acrn_hsm to determine the offline_path -if [ -e "/dev/acrn_hsm" ]; then -offline_path="/sys/class/acrn/acrn_hsm" -fi - - function run_container() { vm_name=vm1 @@ -134,7 +126,7 @@ for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do echo 0 > $i/online online=`cat $i/online` done - echo $idx > ${offline_path}/offline_cpu + echo $idx > /sys/devices/virtual/misc/acrn_hsm/remove_cpu fi done diff --git a/misc/config_tools/data/sample_launch_scripts/nuc/launch_vxworks.sh b/misc/config_tools/data/sample_launch_scripts/nuc/launch_vxworks.sh index f5e647e1a..9511a531c 100755 --- a/misc/config_tools/data/sample_launch_scripts/nuc/launch_vxworks.sh +++ b/misc/config_tools/data/sample_launch_scripts/nuc/launch_vxworks.sh @@ -49,7 +49,7 @@ for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do echo 0 > $i/online online=`cat $i/online` done - echo $idx > /sys/class/vhm/acrn_vhm/offline_cpu + echo $idx > /sys/devices/virtual/misc/acrn_hsm/remove_cpu fi done diff --git a/misc/config_tools/data/sample_launch_scripts/nuc/launch_xenomai.sh b/misc/config_tools/data/sample_launch_scripts/nuc/launch_xenomai.sh index 3112beda8..6609d2640 100755 --- a/misc/config_tools/data/sample_launch_scripts/nuc/launch_xenomai.sh +++ b/misc/config_tools/data/sample_launch_scripts/nuc/launch_xenomai.sh @@ -215,7 +215,7 @@ for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do echo cpu$idx online=$online if [ "$online" = "1" ]; then echo 0 > $i/online - echo $idx > /sys/class/vhm/acrn_vhm/offline_cpu + echo $idx > /sys/devices/virtual/misc/acrn_hsm/remove_cpu fi done diff --git a/misc/config_tools/data/sample_launch_scripts/nuc/launch_zephyr.sh b/misc/config_tools/data/sample_launch_scripts/nuc/launch_zephyr.sh index 0ff97f858..e2b5a92d9 100755 --- a/misc/config_tools/data/sample_launch_scripts/nuc/launch_zephyr.sh +++ b/misc/config_tools/data/sample_launch_scripts/nuc/launch_zephyr.sh @@ -37,7 +37,7 @@ for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do echo 0 > $i/online online=`cat $i/online` done - echo $idx > /sys/class/vhm/acrn_vhm/offline_cpu + echo $idx > /sys/devices/virtual/misc/acrn_hsm/remove_cpu fi done diff --git a/misc/config_tools/launch_config/com.py b/misc/config_tools/launch_config/com.py index 8efeed4e9..f71082743 100644 --- a/misc/config_tools/launch_config/com.py +++ b/misc/config_tools/launch_config/com.py @@ -89,14 +89,6 @@ def off_line_cpus(args, vmid, uos_type, config): key = "scenario config error" launch_cfg_lib.ERR_LIST[key] = "No available cpu to offline and pass it to vm {}".format(vmid) - print('offline_path="/sys/class/vhm/acrn_vhm"', file=config) - print("", file=config) - - print("# Check the device file of /dev/acrn_hsm to determine the offline_path", file=config) - print('if [ -e "/dev/acrn_hsm" ]; then', file=config) - print('offline_path="/sys/class/acrn/acrn_hsm"', file=config) - print('fi', file=config) - print("", file=config) print("# offline pinned vCPUs from SOS before launch UOS", file=config) print('cpu_path="/sys/devices/system/cpu"', file=config) print("for i in `ls ${cpu_path}`; do", file=config) @@ -114,7 +106,7 @@ def off_line_cpus(args, vmid, uos_type, config): print(" echo 0 > ${cpu_path}/$i/online", file=config) print(" online=`cat ${cpu_path}/$i/online`", file=config) print(" done", file=config) - print(" echo $idx > ${offline_path}/offline_cpu", file=config) + print(" echo $idx > /sys/devices/virtual/misc/acrn_hsm/remove_cpu", file=config) print(" fi", file=config) print(" fi", file=config) print(" done", file=config) diff --git a/misc/services/acrn_manager/acrnd.service b/misc/services/acrn_manager/acrnd.service index e18b1a632..ceeeee8aa 100644 --- a/misc/services/acrn_manager/acrnd.service +++ b/misc/services/acrn_manager/acrnd.service @@ -3,7 +3,7 @@ Description=ACRN manager deamon After=weston.service After=systemd-resolved.service ConditionPathExists=/sys/kernel/gvt -ConditionPathExists=/dev/acrn_vhm +ConditionPathExists=/dev/acrn_hsm [Service] Type=simple