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

config_tools: drop obsolete config items

Browse Source 
This patch drops a few config items which are no longer needed, including:

  - vm.os_config.name
  - vm.UEFI_OS_LOADER_NAME
  - vm.pci_dev_num

Tracked-On: #6690
Signed-off-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Junjie Mao 2022-03-03 23:09:01 +08:00 committed by acrnsi-robot
parent e88532b59d
commit 609e09cf37
23 changed files with 7 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>Zephyr</name>
<kern_type>KERNEL_ELF</kern_type>
<kern_mod>Zephyr_ElfImage</kern_mod>
<ramdisk_mod/>
@ -117,7 +116,6 @@
<start_hpa>0</start_hpa>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

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

@ -55,7 +55,6 @@
</CAPACITIES>
<MISC_CFG>
<GPU_SBDF>0x00000010</GPU_SBDF>
<UEFI_OS_LOADER_NAME/>
</MISC_CFG>
<vuart_connections>
<vuart_connection>
@ -96,7 +95,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>PREEMPT-RT</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>RT_bzImage</kern_mod>
<ramdisk_mod/>
@ -138,7 +136,6 @@
<start_hpa>0</start_hpa>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

2
misc/config_tools/data/cfl-k700-i7/partitioned.xml
View File

@ -88,7 +88,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>YOCTO</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod>Ubuntu</ramdisk_mod>
@ -128,7 +127,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>YOCTO</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod>Ubuntu</ramdisk_mod>

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

@ -41,7 +41,6 @@
</CAPACITIES>
<MISC_CFG>
<GPU_SBDF>0x00000010</GPU_SBDF>
<UEFI_OS_LOADER_NAME>\\EFI\\BOOT\\bootx64.efi</UEFI_OS_LOADER_NAME>
</MISC_CFG>
<vuart_connections>
<vuart_connection>
@ -70,7 +69,6 @@
<size>0x20000000</size>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

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

@ -86,7 +86,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>Zephyr</name>
<kern_type>KERNEL_ELF</kern_type>
<kern_mod>Zephyr_ElfImage</kern_mod>
<ramdisk_mod/>
@ -120,7 +119,6 @@
<start_hpa>0</start_hpa>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

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

@ -68,7 +68,6 @@
</CAPACITIES>
<MISC_CFG>
<GPU_SBDF>0x00000010</GPU_SBDF>
<UEFI_OS_LOADER_NAME/>
</MISC_CFG>
<vuart_connections>
<vuart_connection>
@ -109,7 +108,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>PREEMPT-RT</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>RT_bzImage</kern_mod>
<ramdisk_mod/>
@ -140,7 +138,6 @@
<start_hpa>0</start_hpa>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

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

@ -88,7 +88,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>YOCTO</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
@ -128,7 +127,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>YOCTO</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

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

@ -77,7 +77,6 @@
<size>0x20000000</size>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

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

@ -86,7 +86,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>Zephyr</name>
<kern_type>KERNEL_ELF</kern_type>
<kern_mod>Zephyr_ElfImage</kern_mod>
<ramdisk_mod/>
@ -120,7 +119,6 @@
<start_hpa>0</start_hpa>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

2
misc/config_tools/data/nuc11tnbi5/partitioned.xml
View File

@ -88,7 +88,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>YOCTO</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod>Ubuntu</ramdisk_mod>
@ -128,7 +127,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>YOCTO</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod>Ubuntu</ramdisk_mod>

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

@ -89,7 +89,6 @@
<size>0x20000000</size>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

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

@ -69,7 +69,6 @@
<start_hpa>0</start_hpa>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

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

@ -86,7 +86,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>Zephyr</name>
<kern_type>KERNEL_ELF</kern_type>
<kern_mod>Zephyr_ElfImage</kern_mod>
<ramdisk_mod/>
@ -120,7 +119,6 @@
<start_hpa>0</start_hpa>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

2
misc/config_tools/data/tgl-vecow-spc-7100-Corei7/partitioned.xml
View File

@ -88,7 +88,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>YOCTO</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod>Ubuntu</ramdisk_mod>
@ -128,7 +127,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>YOCTO</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

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

@ -89,7 +89,6 @@
<size>0x20000000</size>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

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

@ -78,7 +78,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>Zephyr</name>
<kern_type>KERNEL_ELF</kern_type>
<kern_mod>Zephyr_ElfImage</kern_mod>
<ramdisk_mod/>
@ -110,7 +109,6 @@
<start_hpa>0</start_hpa>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

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

@ -95,7 +95,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>PREEMPT-RT</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>RT_bzImage</kern_mod>
<ramdisk_mod/>
@ -129,7 +128,6 @@
<start_hpa>0</start_hpa>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

2
misc/config_tools/data/whl-ipc-i5/partitioned.xml
View File

@ -80,7 +80,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>YOCTO</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
@ -121,7 +120,6 @@
<size_hpa2>0x0</size_hpa2>
</memory>
<os_config>
<name>YOCTO</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

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

@ -55,7 +55,6 @@
<start_hpa>0</start_hpa>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

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

@ -69,7 +69,6 @@
<size>0x20000000</size>
</memory>
<os_config>
<name>ACRN Service OS</name>
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>

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

@ -114,22 +114,7 @@ allocations in Bytes for the VM.</xs:documentation>
</xs:complexType>
<xs:complexType name="OSConfigurations">
<xs:sequence>
<xs:element name="name">
<xs:annotation>
<xs:documentation>Specify the OS name of VM.
Is not referenced by the hypervisor code. </xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:annotation>
<xs:documentation>A string with 1 to 32 characters.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string">
<xs:minLength value="1" />
<xs:maxLength value="32" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:all>
<xs:element name="kern_type" type="VMKernelType">
<xs:annotation>
<xs:documentation>Specify the kernel image type so the hypervisor can load it correctly.</xs:documentation>
@ -162,7 +147,7 @@ must exactly match the module tag in the GRUB multiboot cmdline.</xs:documentati
<xs:documentation>The entry address in host memory for the VM kernel.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:all>
</xs:complexType>
<xs:simpleType name="VMKernelType">

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

@ -276,11 +276,6 @@ If this value is empty, then the default value will be calculated from informati
<xs:documentation>Segment, Bus, Device, and function of the GPU.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="UEFI_OS_LOADER_NAME" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:documentation>UEFI OS loader name.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:all>
</xs:complexType>
@ -411,11 +406,6 @@ its ``id`` attribute.</xs:documentation>
<xs:documentation>MMIO resources to passthrough.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="pci_dev_num" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:documentation>PCI devices number of the VM.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="pt_intx" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:documentation>pt intx mapping.</xs:documentation>

10
misc/config_tools/xforms/vm_configurations.c.xsl
View File

@ -187,15 +187,15 @@
<xsl:template match="memory">
<xsl:value-of select="acrn:initializer('memory', '{', true())" />
<xsl:choose>
<xsl:when test="acrn:is-service-vm(../load_order)">
<xsl:value-of select="acrn:initializer('start_hpa', concat(start_hpa, 'UL'))" />
</xsl:when>
<xsl:otherwise>
<xsl:when test="acrn:is-pre-launched-vm(../load_order)">
<xsl:value-of select="acrn:initializer('start_hpa', concat('VM', ../@id, '_CONFIG_MEM_START_HPA'))" />
<xsl:value-of select="acrn:initializer('size', concat('VM', ../@id, '_CONFIG_MEM_SIZE'))" />
<xsl:value-of select="acrn:initializer('start_hpa2', concat('VM', ../@id, '_CONFIG_MEM_START_HPA2'))" />
<xsl:value-of select="acrn:initializer('size_hpa2', concat('VM', ../@id, '_CONFIG_MEM_SIZE_HPA2'))" />
</xsl:otherwise>
</xsl:when>
<xsl:when test="acrn:is-service-vm(../load_order)">
<xsl:value-of select="acrn:initializer('start_hpa', concat(start_hpa, 'UL'))" />
</xsl:when>
</xsl:choose>
<xsl:text>},</xsl:text>
<xsl:value-of select="$newline" />