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

config_tools: more annotation on the config items

Browse Source 
This patch adds the following annotations to the config items defined in
the schema of scenario XMLs:

  - acrn:title, which defines the human-readable label of the corresponding
    widgets in the configurator.

  - acrn:views, which controls in which view(s) this item shows in the
    configurator.

  - acrn:applicable-vms, which specifies the kinds of VMs (pre-launched,
    post-launched and/or service VM) this item applies to. An item not
    applicable to a certain type of VM will not be shown in the
    configurator, and will trigger validation error if that item exists for
    a VM of that specific type.

v1 -> v2:

  * Preserve the CPU affinity settings for service VMs. This will be needed
    later when we want to restrict the available CPUs the service VM can use at
    runtime (but not at initialization time).

Tracked-On: #6690
Signed-off-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Junjie Mao
2022-02-25 22:08:37 +08:00
committed by acrnsi-robot
parent f392164b40
commit 678879fd34
19 changed files with 182 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
misc/config_tools/data/cfl-k700-i7/hybrid.xml
View File

@@ -124,9 +124,6 @@
</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="2">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -138,10 +135,6 @@
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -155,10 +148,6 @@
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>

11
misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
View File

@@ -144,9 +144,6 @@
<bootargs>root=/dev/nvme0n1p3 rw rootwait console=ttyS0,115200n8 ignore_loglevel no_timer_check</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="2">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -162,10 +159,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -181,10 +174,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>

27
misc/config_tools/data/cfl-k700-i7/shared.xml
View File

@@ -76,9 +76,6 @@
i915.nuclear_pageflip=1</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="1">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -92,10 +89,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
</vm>
<vm id="2">
@@ -110,10 +103,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -129,10 +118,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -148,10 +133,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -167,10 +148,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -186,10 +163,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>

11
misc/config_tools/data/generic_board/hybrid.xml
View File

@@ -126,9 +126,6 @@
i915.nuclear_pageflip=1 swiotlb=131072</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="2">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -140,10 +137,6 @@
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -157,10 +150,6 @@
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>

11
misc/config_tools/data/generic_board/hybrid_rt.xml
View File

@@ -147,9 +147,6 @@
i915.nuclear_pageflip=1 swiotlb=131072</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="2">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -163,10 +160,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -180,10 +173,6 @@
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>

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

@@ -84,9 +84,6 @@
i915.nuclear_pageflip=1 swiotlb=131072</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="1">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -100,10 +97,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -120,10 +113,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -139,10 +128,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -158,10 +143,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -177,10 +158,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -196,10 +173,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>

11
misc/config_tools/data/nuc11tnbi5/hybrid.xml
View File

@@ -126,9 +126,6 @@
i915.nuclear_pageflip=1 swiotlb=131072</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="2">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -140,10 +137,6 @@
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -157,10 +150,6 @@
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>

27
misc/config_tools/data/nuc11tnbi5/shared.xml
View File

@@ -96,9 +96,6 @@
i915.nuclear_pageflip=1 swiotlb=131072</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="1">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -112,10 +109,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -132,10 +125,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -151,10 +140,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -170,10 +155,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -189,10 +170,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -208,10 +185,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>

7
misc/config_tools/data/qemu/shared.xml
View File

@@ -76,9 +76,6 @@
ignore_loglevel no_timer_check intel_iommu=off tsc=reliable</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="1">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -90,10 +87,6 @@
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>None</console_vuart>
</vm>
</acrn-config>

11
misc/config_tools/data/tgl-vecow-spc-7100-Corei7/hybrid.xml
View File

@@ -127,9 +127,6 @@
</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="2">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -141,10 +138,6 @@
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -158,10 +151,6 @@
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>

11
misc/config_tools/data/tgl-vecow-spc-7100-Corei7/shared.xml
View File

@@ -97,9 +97,6 @@
</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="1">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -113,10 +110,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<priority>PRIO_LOW</priority>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
@@ -134,10 +127,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<priority>PRIO_LOW</priority>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>

7
misc/config_tools/data/whl-ipc-i5/hybrid.xml
View File

@@ -116,9 +116,6 @@
i915.nuclear_pageflip=1</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="2">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -130,10 +127,6 @@
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>

11
misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
View File

@@ -137,9 +137,6 @@
i915.nuclear_pageflip=1</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="2">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -153,10 +150,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -170,10 +163,6 @@
<clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>

7
misc/config_tools/data/whl-ipc-i5/sdc.xml
View File

@@ -62,9 +62,6 @@
i915.nuclear_pageflip=1</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="1">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -78,10 +75,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>None</console_vuart>
<PTM>n</PTM>
</vm>

27
misc/config_tools/data/whl-ipc-i5/shared.xml
View File

@@ -76,9 +76,6 @@
i915.nuclear_pageflip=1</bootargs>
</os_config>
<console_vuart>COM Port 1</console_vuart>
<pci_devs>
<pci_dev/>
</pci_devs>
</vm>
<vm id="1">
<load_order>POST_LAUNCHED_VM</load_order>
@@ -92,10 +89,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
</vm>
<vm id="2">
@@ -110,10 +103,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -129,10 +118,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -148,10 +133,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -167,10 +148,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>
@@ -186,10 +163,6 @@
<vcpu_clos>0</vcpu_clos>
<vcpu_clos>0</vcpu_clos>
</clos>
<epc_section>
<base>0</base>
<size>0</size>
</epc_section>
<console_vuart>COM Port 1</console_vuart>
<PTM>n</PTM>
</vm>