From 991735404e010697f1f0700a291119f980323d6e Mon Sep 17 00:00:00 2001 From: hangliu1 Date: Sun, 17 Apr 2022 21:32:41 -0400 Subject: [PATCH] config tool:update vbootloader xsd file update vbootloader and vuart0 in schema Tracked-On: #7294 Signed-off-by: hangliu1 --- .../cfl-k700-i7/hybrid_launch_2user_vm.xml | 8 +++---- .../cfl-k700-i7/shared_launch_6user_vm.xml | 24 +++++++++---------- .../generic_board/hybrid_launch_2user_vm.xml | 8 +++---- .../generic_board/shared_launch_6user_vm.xml | 24 +++++++++---------- .../nuc11tnbi5/hybrid_launch_2user_vm.xml | 8 +++---- .../nuc11tnbi5/shared_launch_6user_vm.xml | 24 +++++++++---------- .../shared_launch_2user_vm.xml | 8 +++---- .../hybrid_rt_launch_1user_vm_waag.xml | 4 ++-- .../shared_launch_1user_vm_hardrt.xml | 4 ++-- .../shared_launch_1user_vm_vxworks.xml | 4 ++-- .../shared_launch_1user_vm_waag.xml | 4 ++-- .../whl-ipc-i5/shared_launch_2user_vm.xml | 8 +++---- .../whl-ipc-i5/shared_launch_6user_vm.xml | 24 +++++++++---------- .../launch_config/launch_cfg_gen.py | 4 ++-- misc/config_tools/schema/config.xsd | 6 ++--- 15 files changed, 81 insertions(+), 81 deletions(-) diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml index 5e4052063..31f745c07 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml @@ -149,8 +149,8 @@ n Windows OS - Enable - Disable + y + n @@ -180,8 +180,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n diff --git a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml index 3c3f58918..778cd76c7 100644 --- a/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml @@ -96,8 +96,8 @@ n Windows OS - Enable - Disable + y + n @@ -134,8 +134,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -172,8 +172,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -210,8 +210,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -248,8 +248,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -286,8 +286,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n diff --git a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml index fea9a5e28..c3f45c503 100644 --- a/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml @@ -149,8 +149,8 @@ n Windows OS - Enable - Disable + y + n @@ -180,8 +180,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n diff --git a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml index 0ca540359..8ead2a5ba 100644 --- a/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml @@ -104,8 +104,8 @@ n Windows OS - Enable - Disable + y + n @@ -142,8 +142,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -180,8 +180,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -218,8 +218,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -256,8 +256,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -294,8 +294,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml index b2783fd6e..f2691c125 100644 --- a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml +++ b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml @@ -149,8 +149,8 @@ n Windows OS - Enable - Disable + y + n @@ -180,8 +180,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n diff --git a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml index 078669eed..cbe82416d 100644 --- a/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml @@ -116,8 +116,8 @@ n Windows OS - Enable - Disable + y + n @@ -154,8 +154,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -192,8 +192,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -230,8 +230,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -268,8 +268,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -306,8 +306,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n diff --git a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml index 28410ca9d..27f5941ab 100644 --- a/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml +++ b/misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml @@ -118,8 +118,8 @@ n Windows OS - Enable - Disable + y + n @@ -160,8 +160,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml index de17b8023..662b77bbe 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml @@ -169,8 +169,8 @@ n Windows OS - Enable - Enable + y + y diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml index abfcf029c..23136e14a 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml @@ -114,8 +114,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml index cd3abceb3..02834e609 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml @@ -96,8 +96,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml index 197a1034a..40c1437a6 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml @@ -97,8 +97,8 @@ n Windows OS - Enable - Enable + y + y diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml index a08bec9ff..82f5e7126 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml @@ -97,8 +97,8 @@ n Windows OS - Enable - Enable + y + y @@ -135,8 +135,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml index d1bebb300..8cb65adc5 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml @@ -97,8 +97,8 @@ n Windows OS - Enable - Enable + y + y @@ -135,8 +135,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -173,8 +173,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -205,8 +205,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -237,8 +237,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n @@ -269,8 +269,8 @@ COM Port 1 n Non-Windows OS - Enable - Disable + y + n diff --git a/misc/config_tools/launch_config/launch_cfg_gen.py b/misc/config_tools/launch_config/launch_cfg_gen.py index 0dbd4c986..d7d5e6be4 100755 --- a/misc/config_tools/launch_config/launch_cfg_gen.py +++ b/misc/config_tools/launch_config/launch_cfg_gen.py @@ -220,7 +220,7 @@ def generate_for_one_vm(board_etree, hv_scenario_etree, vm_scenario_etree, vm_id ### # Guest BIOS ### - if eval_xpath(vm_scenario_etree, ".//vbootloader/text()") == "Enable": + if eval_xpath(vm_scenario_etree, ".//vbootloader/text()") == "y": script.add_plain_dm_parameter("--ovmf /usr/share/acrn/bios/OVMF.fd") ### @@ -231,7 +231,7 @@ def generate_for_one_vm(board_etree, hv_scenario_etree, vm_scenario_etree, vm_id if eval_xpath(vm_scenario_etree, ".//vm_type/text()") != "RTVM": script.add_virtual_device("lpc", vbdf="1:0") - if eval_xpath(vm_scenario_etree, ".//vuart0/text()") == "Enable": + if eval_xpath(vm_scenario_etree, ".//vuart0/text()") == "y": script.add_plain_dm_parameter("-l com1,stdio") # Emulated PCI devices diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd index bb885a9aa..4104a6ddc 100644 --- a/misc/config_tools/schema/config.xsd +++ b/misc/config_tools/schema/config.xsd @@ -409,12 +409,12 @@ argument and memory. Select the OS type for this VM. This is required to run Windows in a User VM. See :ref:`acrn-dm_parameters` for how to include this in the Device Model arguments. - - + + Use virtual bootloader OVMF (Open Virtual Machine Firmware) to boot this VM. - + Enable the ACRN Device Model to emulate COM1 as a User VM stdio I/O. Hypervisor global emulation will take priority over this VM setting.