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: add skip_prepare flag to struct install_set

Browse Source 
Instead of depending on array index to decide whether we
did already the preparation work for installing the bootloader,
add an explicit skip_prepare flag to struct install_set.

Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Acked-by: Eduard Shishkin <edward6@linux.ibm.com>
Acked-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
This commit is contained in:
Sven Schnelle
2023-04-21 07:14:59 +00:00
committed by Steffen Eiden
parent 555f3782d4
commit 7301883e69
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zipl/include/install.h
View File

@@ -69,6 +69,7 @@ struct install_set {
char *dump_mount_point;
unsigned int dump_tmp_dir_created:1;
unsigned int dump_mounted:1;
unsigned int skip_prepare:1;
struct disk_info *info;
disk_blockptr_t scsi_dump_sb_blockptr;
};

20
zipl/src/bootmap.c
View File

@@ -321,7 +321,7 @@ static int add_component_file_range(struct install_set *bis,
size_t size;
int rc;
if (program_table_id)
if (bis->skip_prepare)
/* skip the preparation work */
goto write_segment_table;
if (add_files) {
@@ -402,7 +402,7 @@ static int add_component_buffer_align(struct install_set *bis, void *buffer,
disk_blockptr_t segment;
int rc;
if (program_table_id)
if (bis->skip_prepare)
/* skip the preparation work */
goto write_segment_table;
/* Write buffer */
@@ -1449,12 +1449,11 @@ static void set_nr_tables(struct job_data *job, struct install_set *bis)
* Prepare resources to build a program table
*/
static int prepare_build_program_table_device(struct job_data *job,
struct install_set *bis,
int program_table_id)
struct install_set *bis)
{
ulong unused_size;
if (program_table_id)
if (bis->skip_prepare)
/* skip the preparation work */
return 0;
/* Get full path of bootmap file */
@@ -1530,7 +1529,7 @@ static int prepare_build_program_table_device(struct job_data *job,
static int bootmap_create_device(struct job_data *job, struct install_set *bis,
int program_table_id)
{
if (prepare_build_program_table_device(job, bis, program_table_id))
if (prepare_build_program_table_device(job, bis))
return -1;
if (build_program_table(job, bis, program_table_id))
return -1;
@@ -1547,10 +1546,9 @@ static int bootmap_create_device(struct job_data *job, struct install_set *bis,
*/
static int prepare_build_program_table_file(struct job_data *job,
char *bootmap_dir,
struct install_set *bis,
int program_table_id)
struct install_set *bis)
{
if (program_table_id)
if (bis->skip_prepare)
/* skip the preparation work */
return 0;
/* Create temporary bootmap file */
@@ -1631,8 +1629,7 @@ static int finalize_create_file(char *bootmap_dir, struct install_set *bis)
static int bootmap_create_file(struct job_data *job, char *bootmap_dir,
struct install_set *bis, int program_table_id)
{
if (prepare_build_program_table_file(job, bootmap_dir, bis,
program_table_id))
if (prepare_build_program_table_file(job, bootmap_dir, bis))
return -1;
if (build_program_table(job, bis, program_table_id))
return -1;
@@ -1806,6 +1803,7 @@ int prepare_bootloader(struct job_data *job, struct install_set *bis)
if (rc)
return rc;
for (i = 0;; i++) {
bis->skip_prepare = i > 0;
rc = bootmap_create(job, bis, i);
if (rc || is_last_table(bis, i))
break;