kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zipl/dump: move dump parmline processing and verification

Browse Source 
The current code has different paths to construct the kernel parameters
depending on whether it's a dump kernel or a normal kernel. This would
require adding special handling to get_common_component(), because for
normal kernels the parmline is already set, contrary to dump kernels,
where the command line is constructed later.

To make the code simpler and fix a bug where the default command line no
longer works, move the dump command line processing to an earlier stage.
Also rename the old function to make the function name match what it is
actually doing.

Fixes: 5fb6434548 ("zipl: add get_common_components() and finalize_common_address_data()")
Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Sven Schnelle
2023-02-13 10:28:17 +01:00
committed by Jan Höppner
parent 6d8243d1b1
commit 2b511aa2b9
2 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zipl/src/job.c
+3
View File
@@ -30,6 +30,8 @@
#include "zipl.h"
#include "envblk.h"
#define DEFAULT_DUMP_PARMLINE "root=/dev/ram0 possible_cpus=1 cgroup_disable=memory"
const char *blsdir;
/* Command line options */
@@ -891,6 +893,7 @@ check_job_dump_images(struct job_dump_data* dump, char* name)
dump->common.ramdisk_addr = UNSPECIFIED_ADDRESS;
}
dump->common.parmline = misc_strdup(DEFAULT_DUMP_PARMLINE);
dump->common.parm_addr = UNSPECIFIED_ADDRESS;
return finalize_common_address_data(&dump->common, name);
}