diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid.xml b/misc/config_tools/data/cfl-k700-i7/hybrid.xml index 2fca0985e..2e2392e06 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid.xml @@ -138,7 +138,9 @@ KERNEL_BZIMAGE Linux_bzImage - SERVICE_VM_OS_BOOTARGS + root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check + quiet loglevel=3 i915.nuclear_pageflip=1 swiotlb=131072 + VUART_LEGACY_PIO @@ -163,12 +165,6 @@ - - /dev/nvme0n1p3 - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 swiotlb=131072 - - POST_STD_VM diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml index 74f4ac127..0d8434f29 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -134,7 +134,7 @@ KERNEL_BZIMAGE Linux_bzImage - SERVICE_VM_OS_BOOTARGS + root=/dev/nvme0n1p3 rw rootwait console=ttyS0,115200n8 ignore_loglevel no_timer_check 0 @@ -167,12 +167,6 @@ - - /dev/nvme0n1p3 - - rw rootwait console=ttyS0,115200n8 ignore_loglevel no_timer_check - - POST_STD_VM diff --git a/misc/config_tools/data/cfl-k700-i7/shared.xml b/misc/config_tools/data/cfl-k700-i7/shared.xml index 8d26fb173..ba5051e97 100644 --- a/misc/config_tools/data/cfl-k700-i7/shared.xml +++ b/misc/config_tools/data/cfl-k700-i7/shared.xml @@ -67,7 +67,8 @@ KERNEL_BZIMAGE Linux_bzImage - SERVICE_VM_OS_BOOTARGS + root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 + i915.nuclear_pageflip=1 VUART_LEGACY_PIO @@ -92,13 +93,6 @@ - - /dev/nvme0n1p3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 - - POST_STD_VM diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml index 04d6c7e3b..99ba079c1 100644 --- a/misc/config_tools/data/generic_board/hybrid.xml +++ b/misc/config_tools/data/generic_board/hybrid.xml @@ -138,7 +138,8 @@ KERNEL_BZIMAGE Linux_bzImage - SERVICE_VM_OS_BOOTARGS + root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 + i915.nuclear_pageflip=1 swiotlb=131072 VUART_LEGACY_PIO @@ -163,12 +164,6 @@ - - /dev/nvme0n1p3 - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 swiotlb=131072 - - POST_STD_VM diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml index 8cf5b5bf0..27310173d 100644 --- a/misc/config_tools/data/generic_board/hybrid_rt.xml +++ b/misc/config_tools/data/generic_board/hybrid_rt.xml @@ -144,7 +144,8 @@ KERNEL_BZIMAGE Linux_bzImage - SERVICE_VM_OS_BOOTARGS + root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 + i915.nuclear_pageflip=1 swiotlb=131072 VUART_LEGACY_PIO @@ -169,13 +170,6 @@ - - /dev/nvme0n1p3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 swiotlb=131072 - - POST_STD_VM diff --git a/misc/config_tools/data/generic_board/shared.xml b/misc/config_tools/data/generic_board/shared.xml index eed742f78..0e57d070f 100644 --- a/misc/config_tools/data/generic_board/shared.xml +++ b/misc/config_tools/data/generic_board/shared.xml @@ -74,7 +74,8 @@ KERNEL_BZIMAGE Linux_bzImage - SERVICE_VM_OS_BOOTARGS + root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 + i915.nuclear_pageflip=1 swiotlb=131072 VUART_LEGACY_PIO @@ -99,12 +100,6 @@ - - /dev/nvme0n1p3 - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 swiotlb=131072 - - POST_STD_VM diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml index f2dbc24b7..9ef4f1213 100644 --- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml +++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml @@ -138,7 +138,8 @@ KERNEL_BZIMAGE Linux_bzImage - SERVICE_VM_OS_BOOTARGS + root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 + i915.nuclear_pageflip=1 swiotlb=131072 VUART_LEGACY_PIO @@ -163,12 +164,6 @@ - - /dev/nvme0n1p3 - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 swiotlb=131072 - - POST_STD_VM diff --git a/misc/config_tools/data/nuc11tnbi5/shared.xml b/misc/config_tools/data/nuc11tnbi5/shared.xml index 75e5dca79..53dbbfe2b 100644 --- a/misc/config_tools/data/nuc11tnbi5/shared.xml +++ b/misc/config_tools/data/nuc11tnbi5/shared.xml @@ -74,7 +74,8 @@ KERNEL_BZIMAGE Linux_bzImage - SERVICE_VM_OS_BOOTARGS + rw rootwait root=/dev/nvme0n1p3 console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 + i915.nuclear_pageflip=1 swiotlb=131072 VUART_LEGACY_PIO @@ -99,12 +100,6 @@ - - /dev/nvme0n1p3 - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 swiotlb=131072 - - POST_STD_VM diff --git a/misc/config_tools/data/qemu/shared.xml b/misc/config_tools/data/qemu/shared.xml index d3c5318cc..7697904b7 100644 --- a/misc/config_tools/data/qemu/shared.xml +++ b/misc/config_tools/data/qemu/shared.xml @@ -66,7 +66,8 @@ KERNEL_BZIMAGE Linux_bzImage - SERVICE_VM_OS_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 VUART_LEGACY_PIO @@ -91,13 +92,6 @@ - - /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 - - POST_STD_VM diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml index 2fe8e6c6f..425f09883 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml @@ -128,7 +128,8 @@ KERNEL_BZIMAGE Linux_bzImage - SERVICE_VM_OS_BOOTARGS + root=/dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 + i915.nuclear_pageflip=1 VUART_LEGACY_PIO @@ -153,13 +154,6 @@ - - /dev/sda3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 - - POST_STD_VM diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml index 8e1a19de9..35ed92e79 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml @@ -133,7 +133,8 @@ KERNEL_BZIMAGE Linux_bzImage - SERVICE_VM_OS_BOOTARGS + root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 + i915.nuclear_pageflip=1 VUART_LEGACY_PIO @@ -158,13 +159,6 @@ - - /dev/nvme0n1p3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 - - POST_STD_VM diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml index 50dfdf838..73a3f8c79 100644 --- a/misc/config_tools/data/whl-ipc-i5/sdc.xml +++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml @@ -65,7 +65,8 @@ KERNEL_BZIMAGE Linux_bzImage - SERVICE_VM_OS_BOOTARGS + root=/dev/sda3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 + i915.nuclear_pageflip=1 VUART_LEGACY_PIO @@ -90,13 +91,6 @@ - - /dev/sda3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 - - POST_STD_VM diff --git a/misc/config_tools/data/whl-ipc-i5/shared.xml b/misc/config_tools/data/whl-ipc-i5/shared.xml index 6b113c012..c76c0eacd 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared.xml @@ -66,7 +66,8 @@ KERNEL_BZIMAGE Linux_bzImage - SERVICE_VM_OS_BOOTARGS + root=/dev/nvme0n1p3 rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 + i915.nuclear_pageflip=1 VUART_LEGACY_PIO @@ -91,13 +92,6 @@ - - /dev/nvme0n1p3 - - rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3 - i915.nuclear_pageflip=1 - - POST_STD_VM diff --git a/misc/config_tools/library/scenario_cfg_lib.py b/misc/config_tools/library/scenario_cfg_lib.py index 10ec425d9..7e68a5d94 100644 --- a/misc/config_tools/library/scenario_cfg_lib.py +++ b/misc/config_tools/library/scenario_cfg_lib.py @@ -197,22 +197,6 @@ def get_pci_dev_num_per_vm(): return pci_dev_num_per_vm -def check_board_private_info(): - - if 'SERVICE_VM' not in common.VM_TYPES.values(): - return - branch_tag = "board_private" - private_info = {} - dev_private_tags = ['rootfs'] - for tag_str in dev_private_tags: - dev_setting = common.get_leaf_tag_map(common.SCENARIO_INFO_FILE, branch_tag, tag_str) - private_info[tag_str] = dev_setting - - if not private_info['rootfs'] and err_dic: - ERR_LIST['vm:id=0,boot_private,rootfs'] = "The board have to chose one rootfs partition" - ERR_LIST.update(err_dic) - - def vm_name_check(vm_names, item): """ Check vm name @@ -473,23 +457,6 @@ def os_kern_mod_check(id_kern_mod_dic, prime_item, item): ERR_LIST[key] = "VM os config kernel mod tag should be in range [1,32] bytes" -def os_kern_args_check(id_kern_args_dic, prime_item, item): - """ - Check os kernel args - :param prime_item: the prime item in xml file - :param item: vm os config args item in xml - :return: None - """ - - for vm_i,vm_type in common.VM_TYPES.items(): - if vm_i not in id_kern_args_dic.keys(): - continue - kern_args = id_kern_args_dic[vm_i] - if "SERVICE_" in vm_type and kern_args != "SERVICE_VM_OS_BOOTARGS": - key = "vm:id={},{},{}".format(vm_i, prime_item, item) - ERR_LIST[key] = "VM os config kernel service os should be SERVICE_VM_OS_BOOTARGS" - - def os_kern_load_addr_check(kern_type, id_kern_load_addr_dic, prime_item, item): """ Check os kernel load address diff --git a/misc/config_tools/scenario_config/scenario_cfg_gen.py b/misc/config_tools/scenario_config/scenario_cfg_gen.py index 59119830c..0f277eabe 100755 --- a/misc/config_tools/scenario_config/scenario_cfg_gen.py +++ b/misc/config_tools/scenario_config/scenario_cfg_gen.py @@ -63,7 +63,6 @@ def get_scenario_item_values(board_info, scenario_info): scenario_item_values["vm,communication_vuart,base"] = ['INVALID_PCI_BASE', 'PCI_VUART'] # board - (scenario_item_values["vm,board_private,rootfs"], num) = board_cfg_lib.get_rootfs(board_info) scenario_item_values["hv,DEBUG_OPTIONS,RELEASE"] = hv_cfg_lib.N_Y scenario_item_values["hv,DEBUG_OPTIONS,NPK_LOGLEVEL"] = hv_cfg_lib.get_select_range("DEBUG_OPTIONS", "LOG_LEVEL") diff --git a/misc/config_tools/scenario_config/scenario_item.py b/misc/config_tools/scenario_config/scenario_item.py index 4a90f46e6..c6c81f6fe 100644 --- a/misc/config_tools/scenario_config/scenario_item.py +++ b/misc/config_tools/scenario_config/scenario_item.py @@ -108,7 +108,6 @@ class CfgOsKern: scenario_cfg_lib.os_kern_name_check(self.kern_name, "os_config", "name") scenario_cfg_lib.os_kern_type_check(self.kern_type, "os_config", "kern_type") scenario_cfg_lib.os_kern_mod_check(self.kern_mod, "os_config", "kern_mod") - scenario_cfg_lib.os_kern_args_check(self.kern_args, "os_config", "kern_args") scenario_cfg_lib.os_kern_load_addr_check(self.kern_type, self.kern_load_addr, "os_config", "kern_load_addr") scenario_cfg_lib.os_kern_entry_addr_check(self.kern_type, self.kern_entry_addr, "os_config", "kern_entry_addr") @@ -140,7 +139,6 @@ class VuartInfo: Check all items in this class :return: None """ - scenario_cfg_lib.check_board_private_info() scenario_cfg_lib.check_vuart(self.v0_vuart, self.v1_vuart) scenario_cfg_lib.check_pci_vuart(self.pci_vuarts, self.v0_vuart, self.v1_vuart) diff --git a/misc/config_tools/schema/VMtypes.xsd b/misc/config_tools/schema/VMtypes.xsd index 5427f7f51..f995a5d69 100644 --- a/misc/config_tools/schema/VMtypes.xsd +++ b/misc/config_tools/schema/VMtypes.xsd @@ -183,7 +183,7 @@ must exactly match the module tag in the GRUB multiboot cmdline. - + Configurable boot argument for pre-launched VM of hybrid or hybrid_rt mode. @@ -373,19 +373,4 @@ to the pre-launched VM. - - - - - Rootfs for the Linux kernel. - - - - - Specify kernel boot arguments for Service VM OS. - - - - - diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd index 74d381437..a99967dd8 100644 --- a/misc/config_tools/schema/config.xsd +++ b/misc/config_tools/schema/config.xsd @@ -410,7 +410,6 @@ its ``id`` attribute. When it is enabled, specify which target VM's vUART the cu PCI devices list. - Enable and disable PTM(Precision Timing Measurement) feature. diff --git a/misc/config_tools/xforms/misc_cfg.h.xsl b/misc/config_tools/xforms/misc_cfg.h.xsl index 7ae8c1866..bf28266d2 100644 --- a/misc/config_tools/xforms/misc_cfg.h.xsl +++ b/misc/config_tools/xforms/misc_cfg.h.xsl @@ -35,7 +35,6 @@ - @@ -65,10 +64,6 @@ - - - - @@ -88,7 +83,17 @@ - + + + + + + + + + + + @@ -106,7 +111,8 @@ - + +