From 96f4d5110761a6b5189e10bc39d1d3dbc7122034 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 29 Oct 2019 12:12:24 +0800 Subject: [PATCH] acrn-config: Remove virtio-blk for PREEMPT-RT LINUX 'virtio-blk' not needed for PREEMPT-RT LINUX vm. Tracked-On: #3949 Signed-off-by: Wei Liu Acked-by: Victor Sun --- misc/acrn-config/launch_config/com.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/misc/acrn-config/launch_config/com.py b/misc/acrn-config/launch_config/com.py index 7bf7ce8da..071b3c8de 100644 --- a/misc/acrn-config/launch_config/com.py +++ b/misc/acrn-config/launch_config/com.py @@ -514,10 +514,11 @@ def dm_arg_set(names, sel, dm, vmid, config): print(" $intr_storm_monitor \\", file=config) print(" -s {},xhci,1-1:1-2:1-3:2-1:2-2:2-3:cap=apl \\".format(launch_cfg_lib.virtual_dev_slot("xhci")), file=config) - if dm['vbootloader'][vmid] and dm['vbootloader'][vmid] == "vsbl": - print(" -s {},virtio-blk$boot_dev_flag,/data/{} \\".format(launch_cfg_lib.virtual_dev_slot("virtio-blk"), root_img), file=config) - elif dm['vbootloader'][vmid] and dm['vbootloader'][vmid] == "ovmf": - print(" -s {},virtio-blk,{} \\".format(launch_cfg_lib.virtual_dev_slot("virtio-blk"), root_img), file=config) + if uos_type != "PREEMPT-RT LINUX": + if dm['vbootloader'][vmid] and dm['vbootloader'][vmid] == "vsbl": + print(" -s {},virtio-blk$boot_dev_flag,/data/{} \\".format(launch_cfg_lib.virtual_dev_slot("virtio-blk"), root_img), file=config) + elif dm['vbootloader'][vmid] and dm['vbootloader'][vmid] == "ovmf": + print(" -s {},virtio-blk,{} \\".format(launch_cfg_lib.virtual_dev_slot("virtio-blk"), root_img), file=config) if uos_type in ("ANDROID", "ALIOS"): print(" --enable_trusty \\", file=config)