From b25d5fa5028b79289afffd5f50eeff1da9c097d7 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Fri, 6 Mar 2020 13:37:39 +0800 Subject: [PATCH] acrn-config: remove redundant sos bootargs from vm config The SOS_BOOTARGS_DIFF which defined in config xml has included most diff bootargs, so the prints in vm_configuraton_h.py is redundant and would cause wrong boot param for SOS VM. Tracked-On: #4470 Signed-off-by: Wei Liu Acked-by: Victor Sun --- .../scenario_config/vm_configurations_h.py | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/misc/acrn-config/scenario_config/vm_configurations_h.py b/misc/acrn-config/scenario_config/vm_configurations_h.py index 0b7b7e758..cf33df17e 100644 --- a/misc/acrn-config/scenario_config/vm_configurations_h.py +++ b/misc/acrn-config/scenario_config/vm_configurations_h.py @@ -55,16 +55,7 @@ def gen_sdc_header(vm_info, config): print("", file=config) print("#define SOS_VM_BOOTARGS\t\t\tSOS_ROOTFS\t\\", file=config) - print('\t\t\t\t\t"rw rootwait "\t\\', file=config) - print('\t\t\t\t\t"console=tty0 " \\', file=config) print("\t\t\t\t\tSOS_CONSOLE\t\\", file=config) - print('\t\t\t\t\t"consoleblank=0 "\t\\', file=config) - print('\t\t\t\t\t"no_timer_check "\t\\', file=config) - print('\t\t\t\t\t"quiet loglevel=3 "\t\\', file=config) - print('\t\t\t\t\t"i915.nuclear_pageflip=1 " \\', file=config) - print('\t\t\t\t\t"i915.avail_planes_per_pipe=0x01010F "\t\\', file=config) - print('\t\t\t\t\t"i915.domain_plane_owners=0x011111110000 " \\', file=config) - print('\t\t\t\t\t"i915.enable_gvt=1 "\t\\', file=config) print("\t\t\t\t\tSOS_BOOTARGS_DIFF", file=config) print("", file=config) @@ -106,16 +97,7 @@ def gen_sdc2_header(vm_info, config): print("", file=config) print("#define SOS_VM_BOOTARGS\t\t\tSOS_ROOTFS\t\\", file=config) - print('\t\t\t\t\t"rw rootwait "\t\\', file=config) - print('\t\t\t\t\t"console=tty0 " \\', file=config) print("\t\t\t\t\tSOS_CONSOLE\t\\", file=config) - print('\t\t\t\t\t"consoleblank=0 "\t\\', file=config) - print('\t\t\t\t\t"no_timer_check "\t\\', file=config) - print('\t\t\t\t\t"quiet loglevel=3 "\t\\', file=config) - print('\t\t\t\t\t"i915.nuclear_pageflip=1 " \\', file=config) - print('\t\t\t\t\t"i915.avail_planes_per_pipe=0x01010F "\t\\', file=config) - print('\t\t\t\t\t"i915.domain_plane_owners=0x011111110000 " \\', file=config) - print('\t\t\t\t\t"i915.enable_gvt=1 "\t\\', file=config) print("\t\t\t\t\tSOS_BOOTARGS_DIFF", file=config) print("", file=config) @@ -234,16 +216,7 @@ def gen_industry_header(vm_info, config): print("\t\t\t\t\t\tGUEST_FLAG_RT | GUEST_FLAG_IO_COMPLETION_POLLING)", file=config) print("", file=config) print("#define SOS_VM_BOOTARGS\t\t\tSOS_ROOTFS\t\\", file=config) - print('\t\t\t\t\t"rw rootwait "\t\\', file=config) - print('\t\t\t\t\t"console=tty0 "\t\\', file=config) print("\t\t\t\t\tSOS_CONSOLE\t\\", file=config) - print('\t\t\t\t\t"consoleblank=0\t"\t\\', file=config) - print('\t\t\t\t\t"no_timer_check "\t\\', file=config) - print('\t\t\t\t\t"quiet loglevel=3 "\t\\', file=config) - print('\t\t\t\t\t"i915.nuclear_pageflip=1 " \\', file=config) - print('\t\t\t\t\t"i915.avail_planes_per_pipe=0x01010F "\t\\', file=config) - print('\t\t\t\t\t"i915.domain_plane_owners=0x011111110000 " \\', file=config) - print('\t\t\t\t\t"i915.enable_gvt=1 "\t\\', file=config) print("\t\t\t\t\tSOS_BOOTARGS_DIFF", file=config) print("", file=config) for i in range(scenario_cfg_lib.VM_COUNT): @@ -282,16 +255,7 @@ def gen_hybrid_header(vm_info, config): print("#define VM0_CONFIG_MEM_SIZE_HPA2\t{0}UL".format(vm_info.mem_info.mem_size_hpa2[0]), file=config) print("", file=config) print("#define SOS_VM_BOOTARGS\t\t\tSOS_ROOTFS\t\\", file=config) - print('\t\t\t\t\t"rw rootwait "\t\\', file=config) - print('\t\t\t\t\t"console=tty0 " \\', file=config) print("\t\t\t\t\tSOS_CONSOLE\t\\", file=config) - print('\t\t\t\t\t"consoleblank=0 "\t\\', file=config) - print('\t\t\t\t\t"no_timer_check "\t\\', file=config) - print('\t\t\t\t\t"quiet loglevel=3 "\t\\', file=config) - print('\t\t\t\t\t"i915.nuclear_pageflip=1 " \\', file=config) - print('\t\t\t\t\t"i915.avail_planes_per_pipe=0x01010F "\t\\', file=config) - print('\t\t\t\t\t"i915.domain_plane_owners=0x011111110000 " \\', file=config) - print('\t\t\t\t\t"i915.enable_gvt=1 "\t\\', file=config) print("\t\t\t\t\tSOS_BOOTARGS_DIFF", file=config) print("", file=config)