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

zdump/scsi: reuse boot info struct definitions from boot_defs.h

Browse Source 
To remove duplication of definitions.

Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Reviewed-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Alexander Egorenkov
2022-06-01 07:08:48 +02:00
committed by Jan Höppner
parent ba7bf2f6d3
commit 8f37000137
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zdump/dt_scsi.c
View File

@@ -39,15 +39,6 @@ struct scsi_blockptr {
uint8_t reserved[4];
} __packed;
struct boot_info {
char magic[4];
uint8_t version;
uint8_t bp_type;
uint8_t dev_type;
uint8_t flags;
uint64_t sb_off;
} __packed;
struct scsi_mbr {
char magic[4];
uint32_t version;
@@ -57,11 +48,6 @@ struct scsi_mbr {
struct boot_info boot_info;
} __packed;
#define BOOT_INFO_VERSION 1
#define BOOT_INFO_MAGIC "zIPL"
#define BOOT_INFO_DEV_TYPE_SCSI 0x02
#define BOOT_INFO_BP_TYPE_DUMP 0x01
/*
* Check the zIPL magic number
*/
@@ -139,7 +125,7 @@ static int check_boot_info(struct boot_info *info)
return -1;
if (info->bp_type != BOOT_INFO_BP_TYPE_DUMP)
return -1;
zg_seek(g.fh, info->sb_off, ZG_CHECK);
zg_seek(g.fh, info->bp.dump.param.scsi.block, ZG_CHECK);
zg_read(g.fh, &l.sb, sizeof(l.sb), ZG_CHECK);
return check_sb();
}