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

config_tools: add default value for some elements

Browse Source 
1. add default value for some elements.
2. update shared.xml for generic_board.

Tracked-On: #6690
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
This commit is contained in:
Kunhui-Li 2022-06-23 23:46:00 +08:00 committed by acrnsi-robot
parent 424674ecac
commit 33e465efe5
5 changed files with 145 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/config_tools/data/generic_board/shared.xml
View File

@ -1 +1 @@
shared_launch_6user_vm.xml
shared_launch_2user_vm.xml

133
misc/config_tools/data/generic_board/shared_launch_2user_vm.xml Normal file
View File

@ -0,0 +1,133 @@
<acrn-config>
<hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC_ENABLED>y</RELOC_ENABLED>
<SCHEDULER>SCHED_BVT</SCHEDULER>
<MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
<ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
<ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
<SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
<RDT>
<RDT_ENABLED>n</RDT_ENABLED>
<CDP_ENABLED>n</CDP_ENABLED>
<VCAT_ENABLED>n</VCAT_ENABLED>
</RDT>
<HYPERV_ENABLED>y</HYPERV_ENABLED>
<IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
<ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
<L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
<MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
<IVSHMEM/>
</FEATURES>
<MEMORY>
<STACK_SIZE>0x2000</STACK_SIZE>
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM/>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>
<GPU_SBDF>0x00000010</GPU_SBDF>
</MISC_CFG>
</hv>
<vm id="0">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs> rw rootwait root=/dev/nvme0n1p2 console=tty0 console=ttyS0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072
</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
</vm>
<vm id="1">
<load_order>POST_LAUNCHED_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>POST_STD_VM1</name>
<cpu_affinity>
<pcpu>
<pcpu_id>0</pcpu_id>
</pcpu>
<pcpu>
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<memory>
<size>4096</size>
</memory>
<priority>PRIO_LOW</priority>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev>00:02.0 VGA compatible controller: Intel Corporation TigerLake-LP GT2 [Iris Xe Graphics] (rev 01)</pci_dev>
</pci_devs>
<PTM>n</PTM>
<os_type>Windows OS</os_type>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<interface_name>WaaG</interface_name>
</network>
<input/>
<block>./win10-ltsc.img</block>
</virtio_devices>
</vm>
<vm id="2">
<load_order>POST_LAUNCHED_VM</load_order>
<vm_type>RTVM</vm_type>
<name>POST_RT_VM1</name>
<lapic_passthrough>y</lapic_passthrough>
<cpu_affinity>
<pcpu>
<pcpu_id>2</pcpu_id>
<real_time_vcpu>y</real_time_vcpu>
</pcpu>
<pcpu>
<pcpu_id>3</pcpu_id>
<real_time_vcpu>y</real_time_vcpu>
</pcpu>
</cpu_affinity>
<memory>
<size>1024</size>
</memory>
<priority>PRIO_LOW</priority>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<interface_name>RT</interface_name>
</network>
<input/>
<block>./core-image-weston-intel-corei7-64.wic</block>
</virtio_devices>
</vm>
</acrn-config>

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

@ -1,273 +0,0 @@
<acrn-config>
<hv>
<BUILD_TYPE>debug</BUILD_TYPE>
<DEBUG_OPTIONS>
<SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
<MEM_LOGLEVEL>5</MEM_LOGLEVEL>
<NPK_LOGLEVEL>5</NPK_LOGLEVEL>
<CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
</DEBUG_OPTIONS>
<FEATURES>
<RELOC_ENABLED>y</RELOC_ENABLED>
<SCHEDULER>SCHED_BVT</SCHEDULER>
<MULTIBOOT2_ENABLED>y</MULTIBOOT2_ENABLED>
<ENFORCE_TURNOFF_AC>y</ENFORCE_TURNOFF_AC>
<ENFORCE_TURNOFF_GP>n</ENFORCE_TURNOFF_GP>
<SECURITY_VM_FIXUP>n</SECURITY_VM_FIXUP>
<RDT>
<RDT_ENABLED>n</RDT_ENABLED>
<CDP_ENABLED>y</CDP_ENABLED>
<VCAT_ENABLED>n</VCAT_ENABLED>
</RDT>
<HYPERV_ENABLED>y</HYPERV_ENABLED>
<IOMMU_ENFORCE_SNP>n</IOMMU_ENFORCE_SNP>
<ACPI_PARSE_ENABLED>y</ACPI_PARSE_ENABLED>
<L1D_VMENTRY_ENABLED>n</L1D_VMENTRY_ENABLED>
<MCE_ON_PSC_DISABLED>n</MCE_ON_PSC_DISABLED>
<IVSHMEM/>
</FEATURES>
<MEMORY>
<STACK_SIZE>0x2000</STACK_SIZE>
</MEMORY>
<CAPACITIES>
<MAX_VM_NUM>16</MAX_VM_NUM>
<MAX_IOAPIC_NUM>1</MAX_IOAPIC_NUM>
<MAX_PCI_DEV_NUM>96</MAX_PCI_DEV_NUM>
<MAX_IOAPIC_LINES>120</MAX_IOAPIC_LINES>
<MAX_PT_IRQ_ENTRIES>256</MAX_PT_IRQ_ENTRIES>
<MAX_MSIX_TABLE_NUM/>
<MAX_EMULATED_MMIO>16</MAX_EMULATED_MMIO>
</CAPACITIES>
<MISC_CFG>
<GPU_SBDF>0x00000010</GPU_SBDF>
</MISC_CFG>
<vuart_connections>
<vuart_connection>
<name>vUART connection 1</name>
<type>legacy</type>
<endpoint>
<vm_name>ACRN_Service_VM</vm_name>
<io_port>0x2F8</io_port>
</endpoint>
<endpoint>
<vm_name>POST_RT_VM1</vm_name>
<io_port>0x2F8</io_port>
</endpoint>
</vuart_connection>
</vuart_connections>
</hv>
<vm id="0">
<load_order>SERVICE_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>ACRN_Service_VM</name>
<os_config>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs>root=/dev/nvme0n1p2 rw rootwait console=tty0 console=ttyS0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
</vm>
<vm id="1">
<load_order>POST_LAUNCHED_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>POST_STD_VM1</name>
<cpu_affinity>
<pcpu>
<pcpu_id>0</pcpu_id>
</pcpu>
<pcpu>
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<memory>
<size>4096</size>
</memory>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev>00:02.0 VGA compatible controller: Intel Corporation TigerLake-LP GT2 [Iris Xe Graphics] (rev 01)</pci_dev>
</pci_devs>
<PTM>n</PTM>
<os_type>Windows OS</os_type>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console/>
<network>
<interface_name>WaaG</interface_name>
</network>
<input/>
<block>./win10-ltsc.img</block>
</virtio_devices>
</vm>
<vm id="2">
<load_order>POST_LAUNCHED_VM</load_order>
<vm_type>RTVM</vm_type>
<name>POST_RT_VM1</name>
<lapic_passthrough>y</lapic_passthrough>
<cpu_affinity>
<pcpu>
<pcpu_id>2</pcpu_id>
<real_time_vcpu>y</real_time_vcpu>
</pcpu>
<pcpu>
<pcpu_id>3</pcpu_id>
<real_time_vcpu>y</real_time_vcpu>
</pcpu>
</cpu_affinity>
<memory>
<size>1024</size>
</memory>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<interface_name>RT</interface_name>
</network>
<input/>
<block>./core-image-weston-intel-corei7-64.wic</block>
</virtio_devices>
</vm>
<vm id="3">
<load_order>POST_LAUNCHED_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>POST_STD_VM2</name>
<cpu_affinity>
<pcpu>
<pcpu_id>0</pcpu_id>
</pcpu>
<pcpu>
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<memory>
<size>512</size>
</memory>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<interface_name>YaaG3</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>
</vm>
<vm id="4">
<load_order>POST_LAUNCHED_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>POST_STD_VM3</name>
<cpu_affinity>
<pcpu>
<pcpu_id>0</pcpu_id>
</pcpu>
<pcpu>
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<memory>
<size>512</size>
</memory>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<interface_name>YaaG4</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>
</vm>
<vm id="5">
<load_order>POST_LAUNCHED_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>POST_STD_VM4</name>
<cpu_affinity>
<pcpu>
<pcpu_id>0</pcpu_id>
</pcpu>
<pcpu>
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<memory>
<size>512</size>
</memory>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<interface_name>YaaG5</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>
</vm>
<vm id="6">
<load_order>POST_LAUNCHED_VM</load_order>
<vm_type>STANDARD_VM</vm_type>
<name>POST_STD_VM5</name>
<cpu_affinity>
<pcpu>
<pcpu_id>0</pcpu_id>
</pcpu>
<pcpu>
<pcpu_id>1</pcpu_id>
</pcpu>
</cpu_affinity>
<memory>
<size>512</size>
</memory>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
<os_type>Non-Windows OS</os_type>
<vbootloader>y</vbootloader>
<vuart0>n</vuart0>
<usb_xhci/>
<virtio_devices>
<console>
<use_type>Virtio console</use_type>
<backend_type>stdio</backend_type>
</console>
<network>
<interface_name>YaaG6</interface_name>
</network>
<input/>
<block>./YaaG.img</block>
</virtio_devices>
</vm>
</acrn-config>

10
misc/config_tools/schema/VMtypes.xsd
View File

@ -128,12 +128,12 @@ The size is a subset of the VM's total memory size specified on the Basic tab.</
<xs:complexType name="OSConfigurations">
<xs:all>
<xs:element name="kern_type" type="VMKernelType">
<xs:element name="kern_type" type="VMKernelType" default="KERNEL_BZIMAGE">
<xs:annotation acrn:title="Kernel image type">
<xs:documentation>Select the kernel image type so that the hypervisor can load it correctly.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="kern_mod" type="xs:string" minOccurs="0">
<xs:element name="kern_mod" type="xs:string" default="Linux_bzImage" minOccurs="0">
<xs:annotation acrn:title="Kernel module tag"
acrn:widget-options="'placeholder': 'An arbitrary string without white spaces. The same string shall be appended, in grub.conf, to the GRUB module containing the OS kernel.'">
<xs:documentation>Specify the tag for the kernel image that is used as a multiboot module. The tag's spelling must exactly match the module tag in the GRUB multiboot cmdline.</xs:documentation>
@ -145,7 +145,7 @@ The size is a subset of the VM's total memory size specified on the Basic tab.</
<xs:documentation>Specify the tag for the RAMdisk image that is used as a multiboot module. The tag's spelling must exactly match the module tag in the GRUB multiboot cmdline.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="bootargs" type="xs:string" minOccurs="0">
<xs:element name="bootargs" type="xs:string" default="rw rootwait root=/dev/nvme0n1p2 console=tty0 console=ttyS0 consoleblank=0 no_timer_check quiet loglevel=3 i915.nuclear_pageflip=1 swiotlb=131072" minOccurs="0">
<xs:annotation acrn:title="Kernel command-line parameters"
acrn:widget-options="'placeholder': '(Optional) The command line options to be passed to the OS kernel.'">
<xs:documentation>Specify the command-line parameters that will be used to boot the kernel for this VM. See `Linux documentation &lt;https://www.kernel.org/doc/html/latest/admin-guide/kernel-parameters.html&gt;`__ for a list of parameters.</xs:documentation>
@ -360,13 +360,13 @@ The size is a subset of the VM's total memory size specified on the Basic tab.</
<xs:complexType name="VirtioConsoleConfiguration">
<xs:all>
<xs:element name="use_type" type="VirtioConsoleUseType" minOccurs="0">
<xs:element name="use_type" type="VirtioConsoleUseType" default="Virtio console" minOccurs="0">
<xs:annotation acrn:title="Use type">
<xs:documentation>Specify device type in guest, ether HVC console when user config it as virtio console or /dev/vportXpY
device file when user config it as virtio serial port, which can be read and written from the user space.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="backend_type" type="VirtioConsoleBackendType" minOccurs="0">
<xs:element name="backend_type" type="VirtioConsoleBackendType" default="stdio" minOccurs="0">
<xs:annotation acrn:title="Backend type">
<xs:documentation>Specify backend device type in service VM.</xs:documentation>
</xs:annotation>

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

@ -19,17 +19,17 @@
<xs:documentation>Select the host serial device used for hypervisor debugging.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="MEM_LOGLEVEL" type="LogLevelType" default="0">
<xs:element name="MEM_LOGLEVEL" type="LogLevelType" default="5">
<xs:annotation acrn:title="ACRN log level" acrn:views="basic">
<xs:documentation>Select the default log level for log messages stored in memory. Value can be changed at runtime. Log messages with the selected value or lower are displayed.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="NPK_LOGLEVEL" type="LogLevelType" default="0">
<xs:element name="NPK_LOGLEVEL" type="LogLevelType" default="5">
<xs:annotation acrn:title="Intel Trace Hub log level" acrn:views="basic">
<xs:documentation>Select the default log level for the hypervisor via Intel Trace Hub log. Use the Intel Trace Hub's memory to record log messages. Value can be changed at runtime. Log messages with the selected value or lower are displayed.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CONSOLE_LOGLEVEL" type="LogLevelType" default="0">
<xs:element name="CONSOLE_LOGLEVEL" type="LogLevelType" default="5">
<xs:annotation acrn:title="Serial console log level" acrn:views="basic">
<xs:documentation>Select the default log level for log messages written to the serial console. Log messages with the selected value or lower are displayed.</xs:documentation>
</xs:annotation>
@ -93,12 +93,12 @@
<xs:documentation>Enable ACPI runtime parsing to get DMAR (DMA remapping) configuration data from the ACPI tables. Otherwise, use existing, static information from the associated board configuration file.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="L1D_VMENTRY_ENABLED" type="Boolean" default="y">
<xs:element name="L1D_VMENTRY_ENABLED" type="Boolean" default="n">
<xs:annotation acrn:title="Mitigate L1 terminal fault" acrn:views="advanced">
<xs:documentation>Enable L1 cache flush before VM entry to prevent L1 terminal fault. L1 terminal fault is a hardware vulnerability that could allow unauthorized disclosure of information residing in the L1 data cache.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="MCE_ON_PSC_DISABLED" type="Boolean" default="y">
<xs:element name="MCE_ON_PSC_DISABLED" type="Boolean" default="n">
<xs:annotation acrn:title="Disable MCE workaround" acrn:views="advanced">
<xs:documentation>Disable the software workaround for Machine Check Error on Page Size Change (erratum in some processor families).</xs:documentation>
</xs:annotation>
@ -320,7 +320,7 @@ Refer to :ref:`vuart_config` for detailed vUART settings.</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="vuart0" type="Boolean" default="y">
<xs:element name="vuart0" type="Boolean" default="n">
<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>