Skip to content

Commit b25d5fa

Browse files
Wei Liuwenlingz
authored andcommitted
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>
1 parent e5ae37e commit b25d5fa

File tree

1 file changed

+0
-36
lines changed

1 file changed

+0
-36
lines changed

misc/acrn-config/scenario_config/vm_configurations_h.py

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,7 @@ def gen_sdc_header(vm_info, config):
5555

5656
print("", file=config)
5757
print("#define SOS_VM_BOOTARGS\t\t\tSOS_ROOTFS\t\\", file=config)
58-
print('\t\t\t\t\t"rw rootwait "\t\\', file=config)
59-
print('\t\t\t\t\t"console=tty0 " \\', file=config)
6058
print("\t\t\t\t\tSOS_CONSOLE\t\\", file=config)
61-
print('\t\t\t\t\t"consoleblank=0 "\t\\', file=config)
62-
print('\t\t\t\t\t"no_timer_check "\t\\', file=config)
63-
print('\t\t\t\t\t"quiet loglevel=3 "\t\\', file=config)
64-
print('\t\t\t\t\t"i915.nuclear_pageflip=1 " \\', file=config)
65-
print('\t\t\t\t\t"i915.avail_planes_per_pipe=0x01010F "\t\\', file=config)
66-
print('\t\t\t\t\t"i915.domain_plane_owners=0x011111110000 " \\', file=config)
67-
print('\t\t\t\t\t"i915.enable_gvt=1 "\t\\', file=config)
6859
print("\t\t\t\t\tSOS_BOOTARGS_DIFF", file=config)
6960
print("", file=config)
7061

@@ -106,16 +97,7 @@ def gen_sdc2_header(vm_info, config):
10697

10798
print("", file=config)
10899
print("#define SOS_VM_BOOTARGS\t\t\tSOS_ROOTFS\t\\", file=config)
109-
print('\t\t\t\t\t"rw rootwait "\t\\', file=config)
110-
print('\t\t\t\t\t"console=tty0 " \\', file=config)
111100
print("\t\t\t\t\tSOS_CONSOLE\t\\", file=config)
112-
print('\t\t\t\t\t"consoleblank=0 "\t\\', file=config)
113-
print('\t\t\t\t\t"no_timer_check "\t\\', file=config)
114-
print('\t\t\t\t\t"quiet loglevel=3 "\t\\', file=config)
115-
print('\t\t\t\t\t"i915.nuclear_pageflip=1 " \\', file=config)
116-
print('\t\t\t\t\t"i915.avail_planes_per_pipe=0x01010F "\t\\', file=config)
117-
print('\t\t\t\t\t"i915.domain_plane_owners=0x011111110000 " \\', file=config)
118-
print('\t\t\t\t\t"i915.enable_gvt=1 "\t\\', file=config)
119101
print("\t\t\t\t\tSOS_BOOTARGS_DIFF", file=config)
120102

121103
print("", file=config)
@@ -234,16 +216,7 @@ def gen_industry_header(vm_info, config):
234216
print("\t\t\t\t\t\tGUEST_FLAG_RT | GUEST_FLAG_IO_COMPLETION_POLLING)", file=config)
235217
print("", file=config)
236218
print("#define SOS_VM_BOOTARGS\t\t\tSOS_ROOTFS\t\\", file=config)
237-
print('\t\t\t\t\t"rw rootwait "\t\\', file=config)
238-
print('\t\t\t\t\t"console=tty0 "\t\\', file=config)
239219
print("\t\t\t\t\tSOS_CONSOLE\t\\", file=config)
240-
print('\t\t\t\t\t"consoleblank=0\t"\t\\', file=config)
241-
print('\t\t\t\t\t"no_timer_check "\t\\', file=config)
242-
print('\t\t\t\t\t"quiet loglevel=3 "\t\\', file=config)
243-
print('\t\t\t\t\t"i915.nuclear_pageflip=1 " \\', file=config)
244-
print('\t\t\t\t\t"i915.avail_planes_per_pipe=0x01010F "\t\\', file=config)
245-
print('\t\t\t\t\t"i915.domain_plane_owners=0x011111110000 " \\', file=config)
246-
print('\t\t\t\t\t"i915.enable_gvt=1 "\t\\', file=config)
247220
print("\t\t\t\t\tSOS_BOOTARGS_DIFF", file=config)
248221
print("", file=config)
249222
for i in range(scenario_cfg_lib.VM_COUNT):
@@ -282,16 +255,7 @@ def gen_hybrid_header(vm_info, config):
282255
print("#define VM0_CONFIG_MEM_SIZE_HPA2\t{0}UL".format(vm_info.mem_info.mem_size_hpa2[0]), file=config)
283256
print("", file=config)
284257
print("#define SOS_VM_BOOTARGS\t\t\tSOS_ROOTFS\t\\", file=config)
285-
print('\t\t\t\t\t"rw rootwait "\t\\', file=config)
286-
print('\t\t\t\t\t"console=tty0 " \\', file=config)
287258
print("\t\t\t\t\tSOS_CONSOLE\t\\", file=config)
288-
print('\t\t\t\t\t"consoleblank=0 "\t\\', file=config)
289-
print('\t\t\t\t\t"no_timer_check "\t\\', file=config)
290-
print('\t\t\t\t\t"quiet loglevel=3 "\t\\', file=config)
291-
print('\t\t\t\t\t"i915.nuclear_pageflip=1 " \\', file=config)
292-
print('\t\t\t\t\t"i915.avail_planes_per_pipe=0x01010F "\t\\', file=config)
293-
print('\t\t\t\t\t"i915.domain_plane_owners=0x011111110000 " \\', file=config)
294-
print('\t\t\t\t\t"i915.enable_gvt=1 "\t\\', file=config)
295259
print("\t\t\t\t\tSOS_BOOTARGS_DIFF", file=config)
296260

297261
print("", file=config)

0 commit comments

Comments
 (0)