github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 14:07:42 +00:00
Code Issues Projects Releases Wiki Activity

Revert "dm: script: enable discard feature for virtio-blk"

Browse Source 
This reverts commit 5df9cbe36a.
As DISCARD support will cause kernel hung in stability test of warm
reset, so not enable this feature in launch script.

Tracked-On: #2633
Signed-off-by: Conghui Chen <conghui.chen@intel.com>
This commit is contained in:
Conghui Chen 2019-02-28 01:49:52 +08:00 committed by wenlingz
parent 1a59fa26fe
commit 1d7c69a69f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,7 +151,7 @@ acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1:
-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,discard \
-s 3,virtio-blk$boot_dev_flag,/data/$5/$5.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 \
@ -352,7 +352,7 @@ echo "dm_run: after passthru dev preparing" > /dev/kmsg
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\
-s 9,virtio-net,$tap \
-s 3,virtio-blk$boot_dev_flag,/data/$5/$5.img,discard \
-s 3,virtio-blk$boot_dev_flag,/data/$5/$5.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 \
@ -426,7 +426,7 @@ if [ ! -b "/dev/mmcblk1p3" ]; then
fi
mkdir -p /data
mount -o discard /dev/mmcblk1p3 /data
mount /dev/mmcblk1p3 /data
if [ $launch_type == 6 ]; then
if [ -f "/data/android/android.img" ]; then