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: pass job to is_ngdump_enabled()

Browse Source 
No functional change, only preparation for the next patches.

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-19 05:44:57 +00:00
committed by Steffen Eiden
parent 7095da9f9d
commit ee4f503ec0
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zipl/include/job.h
View File

@@ -136,6 +136,6 @@ void job_free(struct job_data* job);
int type_from_target(char *target, disk_type_t *type);
int check_job_dump_images(struct job_dump_data* dump, char* name);
int check_job_images_ngdump(struct job_dump_data* dump, char* name);
bool is_ngdump_enabled(const char* device, struct job_target_data* target);
bool is_ngdump_enabled(struct job_data *job);
#endif /* not JOB_H */

2
zipl/src/bootmap.c
View File

@@ -1800,7 +1800,7 @@ int prepare_bootloader(struct job_data *job, struct install_set *bis)
if (init_bis(job, bis))
return -1;
if (job->id == job_dump_partition) {
if (is_ngdump_enabled(job->data.dump.device, &job->target))
if (is_ngdump_enabled(job))
return prepare_bootloader_ngdump(job, bis);
else
return prepare_bootloader_device(job, bis);

2
zipl/src/install.c
View File

@@ -460,7 +460,7 @@ int install_bootloader(struct job_data *job, struct install_set *bis)
if (job->id == job_dump_partition) {
rc = install_bootloader_dump(bis->tables, info,
scsi_dump_sb_blockptr,
is_ngdump_enabled(job->data.dump.device, &job->target),
is_ngdump_enabled(job),
fd);
} else {
rc = install_bootloader_ipl(bis->tables, info, fd);

4
zipl/src/job.c
View File

@@ -2020,7 +2020,7 @@ job_get(int argc, char* argv[], struct job_data** data)
}
bool
is_ngdump_enabled(const char* device, struct job_target_data* target)
is_ngdump_enabled(struct job_data *job)
{
return disk_is_nvme(device, target);
return disk_is_nvme(job->data.dump.device, &job->target);
}

2
zipl/src/zipl.c
View File

@@ -184,7 +184,7 @@ main(int argc, char* argv[])
rc = -1;
break;
}
if (is_ngdump_enabled(job->data.dump.device, &job->target))
if (is_ngdump_enabled(job))
rc = check_job_images_ngdump(&job->data.dump, job->name);
else
rc = check_job_dump_images(&job->data.dump, job->name);