From 68ecf79b0106e3bf67ef9eb8999ea4d8c3b43a2a Mon Sep 17 00:00:00 2001 From: Eduard Shishkin Date: Tue, 17 Sep 2024 13:34:20 +0200 Subject: [PATCH] zipl/src: cleanups in add_dump_progrem() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop a pair of duplicated assignmets Replace the parameter 'struct job_data' with 'struct job_dump_data' Signed-off-by: Eduard Shishkin Reviewed-by: Alexander Egorenkov Signed-off-by: Jan Höppner --- zipl/src/bootmap.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/zipl/src/bootmap.c b/zipl/src/bootmap.c index 68718aa4..9deb5e14 100644 --- a/zipl/src/bootmap.c +++ b/zipl/src/bootmap.c @@ -971,20 +971,18 @@ static int add_segment_program(struct install_set *bis, #define DUMP_PARAM_MAX_LEN 896 -static int add_dump_program(struct install_set *bis, struct job_data *job, +static int add_dump_program(struct install_set *bis, + const struct job_dump_data *dump, disk_blockptr_t *program, int verbose, component_header_type type, int program_table_id) { - struct job_dump_data *dump = &job->data.dump; struct job_ipl_data ipl; /* Convert fs dump job to IPL job */ memset(&ipl, 0, sizeof(ipl)); ipl.common = dump->common; - ipl.common.parmline = dump->common.parmline; - ipl.common.parm_addr = dump->common.parm_addr; return add_ipl_program(bis, NULL, false, NULL, &ipl, program, verbose, 1, type, SECURE_BOOT_DISABLED, 0 /* menu_idx */, program_table_id); @@ -1055,7 +1053,7 @@ static int build_program_table(struct job_data *job, printf("Adding dump section '%s' (default)\n", job->name); } - rc = add_dump_program(bis, job, &table[0], + rc = add_dump_program(bis, &job->data.dump, &table[0], verbose || job->command_line, COMPONENT_HEADER_DUMP, program_table_id);