From 8f370001372e1728d5a71d50ccacf27c78a1f61b Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Wed, 1 Jun 2022 07:08:48 +0200 Subject: [PATCH] zdump/scsi: reuse boot info struct definitions from boot_defs.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To remove duplication of definitions. Signed-off-by: Alexander Egorenkov Reviewed-by: Mikhail Zaslonko Signed-off-by: Jan Höppner --- zdump/dt_scsi.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/zdump/dt_scsi.c b/zdump/dt_scsi.c index 92238856..eb1c30c1 100644 --- a/zdump/dt_scsi.c +++ b/zdump/dt_scsi.c @@ -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(); }