github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-08 04:09:11 +00:00
Code Issues Projects Releases Wiki Activity

acrn-config: change gvt_args from selectbox to editbox

Browse Source 
1. Some VMs don't need pci-gvt args or or need specific configuration
for 'gvt_args' item tag, this patch changes from selectable behavior to
editable for 'gvt_args' item from webUI.

2. Modify the description for gvt_args item tag from launch config xmls.

Tracked-On: #3854
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-12-08 15:17:41 +08:00
committed by wenlingz
parent 05682b2bad
commit d699347e7b
39 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
misc/acrn-config/launch_config/com.py
View File

@@ -225,11 +225,13 @@ def interrupt_storm(pt_sel, config):
print("", file=config)
def gvt_arg_set(uos_type, config):
def gvt_arg_set(dm, vmid, uos_type, config):
if uos_type not in ('CLEARLINUX', 'ANDROID', 'ALIOS', 'WINDOWS'):
return
print(' -s 2,pci-gvt -G "$2" \\', file=config)
gvt_args = dm['gvt_args'][vmid]
if gvt_args:
print(' -s 2,pci-gvt -G "$2" \\', file=config)
def log_level_set(uos_type, config):
@@ -546,7 +548,7 @@ def dm_arg_set(names, sel, virt_io, dm, vmid, config):
virtio_args_set(dm, virt_io, vmid, config)
# GVT args set
gvt_arg_set(uos_type, config)
gvt_arg_set(dm, vmid, uos_type, config)
# vbootloader setting
vboot_arg_set(dm, vmid, config)

1
misc/acrn-config/launch_config/launch_cfg_gen.py
View File

@@ -47,7 +47,6 @@ def get_launch_item_values(board_info):
launch_item_values["uos,vbootloader"] = launch_cfg_lib.BOOT_TYPE
launch_item_values['uos,vuart0'] = launch_cfg_lib.DM_VUART0
launch_item_values['uos,poweroff_channel'] = launch_cfg_lib.PM_CHANNEL
launch_item_values['uos,gvt_args'] = launch_cfg_lib.GVT_ARGS
return launch_item_values

1
misc/acrn-config/launch_config/launch_item.py
View File

@@ -29,7 +29,6 @@ class AcrnDmArgs:
launch_cfg_lib.args_aval_check(self.args["uos_type"], "uos_type", launch_cfg_lib.UOS_TYPES)
launch_cfg_lib.args_aval_check(self.args["rtos_type"], "rtos_type", launch_cfg_lib.RTOS_TYPE)
launch_cfg_lib.mem_size_check(self.args["mem_size"], "mem_size")
launch_cfg_lib.args_aval_check(self.args["gvt_args"], "gvt_args", launch_cfg_lib.GVT_ARGS)
launch_cfg_lib.args_aval_check(self.args["vbootloader"], "vbootloader", launch_cfg_lib.BOOT_TYPE)
launch_cfg_lib.args_aval_check(self.args["vuart0"], "vuart0", launch_cfg_lib.DM_VUART0)