OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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 <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Wei Liu 2020-03-06 13:37:39 +08:00 committed by wenlingz
parent e5ae37eb69
commit b25d5fa502
1 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
misc/acrn-config/scenario_config/vm_configurations_h.py
View File

@ -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)