github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-06-06 17:21:22 +00:00
Code Issues Projects Releases Wiki Activity

acrn-config: add virtio-block support for launch config

Browse Source 
Add virtio-block support to parse and get 'block' item value
from launch config files, these values are editable by user.

Tracked-On: #4172
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Wei Liu
2019-11-29 18:55:33 +08:00
committed by wenlingz
parent 40140281ae
commit 8464419af3
5 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
misc/acrn-config/library/common.py
View File

@@ -23,7 +23,7 @@ GUEST_FLAG = ["0UL", "GUEST_FLAG_SECURE_WORLD_ENABLED", "GUEST_FLAG_LAPIC_PASSTH
START_HPA_SIZE_LIST = ['0x20000000', '0x40000000', '0x80000000', 'CONFIG_SOS_RAM_SIZE', 'VM0_MEM_SIZE']
MULTI_ITEM = ["guest_flag", "pcpu_id", "input"]
MULTI_ITEM = ["guest_flag", "pcpu_id", "input", "block"]
class MultiItem():
@@ -32,6 +32,7 @@ class MultiItem():
self.guest_flag = []
self.pcpu_id = []
self.vir_input = []
self.vir_block = []
self.vir_console = []
self.vir_net = []
@@ -415,6 +416,10 @@ def get_leaf_value(tmp, tag_str, leaf):
if leaf.tag == "input" and tag_str == "input":
tmp.multi.vir_input.append(leaf.text)
# get virtio-blk for vm
if leaf.tag == "block" and tag_str == "block":
tmp.multi.vir_block.append(leaf.text)
def get_sub_value(tmp, tag_str, vm_id):
@@ -427,10 +432,14 @@ def get_sub_value(tmp, tag_str, vm_id):
if tmp.multi.pcpu_id and tag_str == "pcpu_id":
tmp.tag[vm_id] = tmp.multi.pcpu_id
# append input for vm
# append virtio input for vm
if tmp.multi.vir_input and tag_str == "input":
tmp.tag[vm_id] = tmp.multi.vir_input
# append virtio block for vm
if tmp.multi.vir_block and tag_str == "block":
tmp.tag[vm_id] = tmp.multi.vir_block
def get_leaf_tag_map(config_file, branch_tag, tag_str):
"""

2
misc/acrn-config/library/launch_cfg_lib.py
View File

@@ -461,7 +461,7 @@ def args_aval_check(arg_list, item, avl_list):
"""
# args should be set into launch xml from webUI
i_cnt = 1
skip_check_list = ['gvt_args', 'rootfs_dev']
skip_check_list = ['gvt_args']
if item in skip_check_list:
return