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

config_tools: merge board_private.rootfs and board_private.bootargs to os_config.bootargs

Browse Source 
1. remove the board_private tag in the schema and all existing scenario XML files,
and remove the related value check about board_private.rootfs and bootargs.
2. merge board_private.rootfs and board_private.bootargs to os_config.bootargs.
and no change to the related contents of the .c/.h files except the order of
define SERVICE_VM_ROOTFS.
3. update the schema to make os_config.bootargs configurable for service VM in UI.

Tracked-On: #6690
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
This commit is contained in:
Kunhui-Li
2021-12-14 14:51:01 +08:00
committed by acrnsi-robot
parent c86a39bbed
commit d78d06c23d
19 changed files with 40 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,7 +138,9 @@
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs>SERVICE_VM_OS_BOOTARGS</bootargs>
<bootargs>root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check
quiet loglevel=3 i915.nuclear_pageflip=1 swiotlb=131072
</bootargs>
</os_config>
<legacy_vuart id="0">
<type>VUART_LEGACY_PIO</type>
@@ -163,12 +165,6 @@
<pci_devs>
<pci_dev/>
</pci_devs>
<board_private>
<rootfs>/dev/nvme0n1p3</rootfs>
<bootargs> rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072
</bootargs>
</board_private>
</vm>
<vm id="2">
<vm_type>POST_STD_VM</vm_type>

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

@@ -134,7 +134,7 @@
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs>SERVICE_VM_OS_BOOTARGS</bootargs>
<bootargs>root=/dev/nvme0n1p3 rw rootwait console=ttyS0,115200n8 ignore_loglevel no_timer_check</bootargs>
</os_config>
<cpu_affinity>
<pcpu_id>0</pcpu_id>
@@ -167,12 +167,6 @@
<pci_devs>
<pci_dev/>
</pci_devs>
<board_private>
<rootfs>/dev/nvme0n1p3</rootfs>
<bootargs>
rw rootwait console=ttyS0,115200n8 ignore_loglevel no_timer_check
</bootargs>
</board_private>
</vm>
<vm id="2">
<vm_type>POST_STD_VM</vm_type>

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

@@ -67,7 +67,8 @@
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs>SERVICE_VM_OS_BOOTARGS</bootargs>
<bootargs>root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1</bootargs>
</os_config>
<legacy_vuart id="0">
<type>VUART_LEGACY_PIO</type>
@@ -92,13 +93,6 @@
<pci_devs>
<pci_dev/>
</pci_devs>
<board_private>
<rootfs>/dev/nvme0n1p3</rootfs>
<bootargs>
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1
</bootargs>
</board_private>
</vm>
<vm id="1">
<vm_type>POST_STD_VM</vm_type>

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

@@ -138,7 +138,8 @@
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs>SERVICE_VM_OS_BOOTARGS</bootargs>
<bootargs>root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072</bootargs>
</os_config>
<legacy_vuart id="0">
<type>VUART_LEGACY_PIO</type>
@@ -163,12 +164,6 @@
<pci_devs>
<pci_dev/>
</pci_devs>
<board_private>
<rootfs>/dev/nvme0n1p3</rootfs>
<bootargs> rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072
</bootargs>
</board_private>
</vm>
<vm id="2">
<vm_type>POST_STD_VM</vm_type>

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

@@ -144,7 +144,8 @@
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs>SERVICE_VM_OS_BOOTARGS</bootargs>
<bootargs>root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072</bootargs>
</os_config>
<legacy_vuart id="0">
<type>VUART_LEGACY_PIO</type>
@@ -169,13 +170,6 @@
<pci_devs>
<pci_dev/>
</pci_devs>
<board_private>
<rootfs>/dev/nvme0n1p3</rootfs>
<bootargs>
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072
</bootargs>
</board_private>
</vm>
<vm id="2">
<vm_type>POST_STD_VM</vm_type>

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

@@ -74,7 +74,8 @@
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs>SERVICE_VM_OS_BOOTARGS</bootargs>
<bootargs>root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072</bootargs>
</os_config>
<legacy_vuart id="0">
<type>VUART_LEGACY_PIO</type>
@@ -99,12 +100,6 @@
<pci_devs>
<pci_dev/>
</pci_devs>
<board_private>
<rootfs>/dev/nvme0n1p3</rootfs>
<bootargs> rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072
</bootargs>
</board_private>
</vm>
<vm id="1">
<vm_type>POST_STD_VM</vm_type>

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

@@ -138,7 +138,8 @@
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs>SERVICE_VM_OS_BOOTARGS</bootargs>
<bootargs>root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072</bootargs>
</os_config>
<legacy_vuart id="0">
<type>VUART_LEGACY_PIO</type>
@@ -163,12 +164,6 @@
<pci_devs>
<pci_dev/>
</pci_devs>
<board_private>
<rootfs>/dev/nvme0n1p3</rootfs>
<bootargs> rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072
</bootargs>
</board_private>
</vm>
<vm id="2">
<vm_type>POST_STD_VM</vm_type>

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

@@ -74,7 +74,8 @@
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs>SERVICE_VM_OS_BOOTARGS</bootargs>
<bootargs>rw rootwait root=/dev/nvme0n1p3 console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072</bootargs>
</os_config>
<legacy_vuart id="0">
<type>VUART_LEGACY_PIO</type>
@@ -99,12 +100,6 @@
<pci_devs>
<pci_dev/>
</pci_devs>
<board_private>
<rootfs>/dev/nvme0n1p3</rootfs>
<bootargs> rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1 swiotlb=131072
</bootargs>
</board_private>
</vm>
<vm id="1">
<vm_type>POST_STD_VM</vm_type>

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

@@ -66,7 +66,8 @@
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs>SERVICE_VM_OS_BOOTARGS</bootargs>
<bootargs>root=/dev/vda1 earlyprintk=serial,ttyS0,115200n8 rw rootwait console=tty0 consoleblank=0 no_timer_check ignore_loglevel
ignore_loglevel no_timer_check intel_iommu=off tsc=reliable</bootargs>
</os_config>
<legacy_vuart id="0">
<type>VUART_LEGACY_PIO</type>
@@ -91,13 +92,6 @@
<pci_devs>
<pci_dev/>
</pci_devs>
<board_private>
<rootfs>/dev/vda1</rootfs>
<bootargs>
earlyprintk=serial,ttyS0,115200n8 rw rootwait console=tty0 consoleblank=0 no_timer_check ignore_loglevel
ignore_loglevel no_timer_check intel_iommu=off tsc=reliable
</bootargs>
</board_private>
</vm>
<vm id="1">
<vm_type>POST_STD_VM</vm_type>

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

@@ -128,7 +128,8 @@
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs>SERVICE_VM_OS_BOOTARGS</bootargs>
<bootargs>root=/dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1</bootargs>
</os_config>
<legacy_vuart id="0">
<type>VUART_LEGACY_PIO</type>
@@ -153,13 +154,6 @@
<pci_devs>
<pci_dev/>
</pci_devs>
<board_private>
<rootfs>/dev/sda3</rootfs>
<bootargs>
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1
</bootargs>
</board_private>
</vm>
<vm id="2">
<vm_type>POST_STD_VM</vm_type>

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

@@ -133,7 +133,8 @@
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs>SERVICE_VM_OS_BOOTARGS</bootargs>
<bootargs>root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1</bootargs>
</os_config>
<legacy_vuart id="0">
<type>VUART_LEGACY_PIO</type>
@@ -158,13 +159,6 @@
<pci_devs>
<pci_dev/>
</pci_devs>
<board_private>
<rootfs>/dev/nvme0n1p3</rootfs>
<bootargs>
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1
</bootargs>
</board_private>
</vm>
<vm id="2">
<vm_type>POST_STD_VM</vm_type>

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

@@ -65,7 +65,8 @@
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs>SERVICE_VM_OS_BOOTARGS</bootargs>
<bootargs>root=/dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1</bootargs>
</os_config>
<legacy_vuart id="0">
<type>VUART_LEGACY_PIO</type>
@@ -90,13 +91,6 @@
<pci_devs>
<pci_dev/>
</pci_devs>
<board_private>
<rootfs>/dev/sda3</rootfs>
<bootargs>
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1
</bootargs>
</board_private>
</vm>
<vm id="1">
<vm_type>POST_STD_VM</vm_type>

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

@@ -66,7 +66,8 @@
<kern_type>KERNEL_BZIMAGE</kern_type>
<kern_mod>Linux_bzImage</kern_mod>
<ramdisk_mod/>
<bootargs>SERVICE_VM_OS_BOOTARGS</bootargs>
<bootargs>root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1</bootargs>
</os_config>
<legacy_vuart id="0">
<type>VUART_LEGACY_PIO</type>
@@ -91,13 +92,6 @@
<pci_devs>
<pci_dev/>
</pci_devs>
<board_private>
<rootfs>/dev/nvme0n1p3</rootfs>
<bootargs>
rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
i915.nuclear_pageflip=1
</bootargs>
</board_private>
</vm>
<vm id="1">
<vm_type>POST_STD_VM</vm_type>