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

config tool:update vbootloader xsd file

Browse Source 
update vbootloader and vuart0 in schema

Tracked-On: #7294
Signed-off-by: hangliu1 <hang1.liu@linux.intel.com>
This commit is contained in:
hangliu1 2022-04-17 21:32:41 -04:00 committed by acrnsi-robot
parent 50082af5b2
commit 991735404e
15 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
misc/config_tools/data/cfl-k700-i7/hybrid_launch_2user_vm.xml
View File

@ -149,8 +149,8 @@
</pci_devs>
<PTM>n</PTM>
<os_type>Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>
@ -180,8 +180,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>

24
misc/config_tools/data/cfl-k700-i7/shared_launch_6user_vm.xml
View File

@ -96,8 +96,8 @@
</pci_devs>
<PTM>n</PTM>
<os_type>Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>
@ -134,8 +134,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
@ -172,8 +172,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
@ -210,8 +210,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
@ -248,8 +248,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
@ -286,8 +286,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>

8
misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
View File

@ -149,8 +149,8 @@
</pci_devs>
<PTM>n</PTM>
<os_type>Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>
@ -180,8 +180,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>

24
misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
View File

@ -104,8 +104,8 @@
</pci_devs>
<PTM>n</PTM>
<os_type>Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>
@ -142,8 +142,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
@ -180,8 +180,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
@ -218,8 +218,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
@ -256,8 +256,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
@ -294,8 +294,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>

8
misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
View File

@ -149,8 +149,8 @@
</pci_devs>
<PTM>n</PTM>
<os_type>Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>
@ -180,8 +180,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>

24
misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
View File

@ -116,8 +116,8 @@
</pci_devs>
<PTM>n</PTM>
<os_type>Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>
@ -154,8 +154,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
@ -192,8 +192,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
@ -230,8 +230,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
@ -268,8 +268,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
@ -306,8 +306,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>

8
misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared_launch_2user_vm.xml
View File

@ -118,8 +118,8 @@
</pci_devs>
<PTM>n</PTM>
<os_type>Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
@ -160,8 +160,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>

4
misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
View File

@ -169,8 +169,8 @@
</pci_devs>
<PTM>n</PTM>
<os_type>Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Enable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>y</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>

4
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
View File

@ -114,8 +114,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>

4
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
View File

@ -96,8 +96,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>

4
misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
View File

@ -97,8 +97,8 @@
</pci_devs>
<PTM>n</PTM>
<os_type>Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Enable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>y</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>

8
misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
View File

@ -97,8 +97,8 @@
</pci_devs>
<PTM>n</PTM>
<os_type>Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Enable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>y</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>
@ -135,8 +135,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>

24
misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
View File

@ -97,8 +97,8 @@
</pci_devs>
<PTM>n</PTM>
<os_type>Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Enable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>y</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>
@ -135,8 +135,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
@ -173,8 +173,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>
@ -205,8 +205,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>
@ -237,8 +237,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>
@ -269,8 +269,8 @@
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>Enable</vbootloader>
<vuart0>Disable</vuart0>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>

4
misc/config_tools/launch_config/launch_cfg_gen.py
View File

@ -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

6
misc/config_tools/schema/config.xsd
View File

@ -409,12 +409,12 @@ argument and memory.</xs:documentation>
<xs:documentation>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.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="vbootloader" type="EnablementType" default="Enable">
<xs:annotation acrn:title="Open Virtual Machine Firmware" acrn:applicable-vms="post-launched" acrn:views="basic">
<xs:element name="vbootloader" type="Boolean" default="y">
<xs:annotation acrn:title="Enable Open Virtual Machine FW" acrn:applicable-vms="post-launched" acrn:views="basic">
<xs:documentation>Use virtual bootloader OVMF (Open Virtual Machine Firmware) to boot this VM.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="vuart0" type="EnablementType" default="Enable">
<xs:element name="vuart0" type="Boolean" default="y">
<xs:annotation acrn:title="Emulate COM1 as stdio I/O" acrn:applicable-vms="post-launched" acrn:views="basic">
<xs:documentation>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.</xs:documentation>
</xs:annotation>