From 446ace09adefe1cd6a4359b5462080ad38e516aa Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Wed, 1 Jun 2022 07:01:38 +0200 Subject: [PATCH] zipl/boot: move SCSI superblock struct definitions to boot_defs.h for reuse MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To reduce duplication of definitions and facilitate reuse between zipl and zgetdump. Signed-off-by: Alexander Egorenkov Reviewed-by: Mikhail Zaslonko Signed-off-by: Jan Höppner --- include/boot/boot_defs.h | 19 +++++++++++++++++++ zipl/include/boot.h | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/boot/boot_defs.h b/include/boot/boot_defs.h index 76e67b7d..7b1e1ef1 100644 --- a/include/boot/boot_defs.h +++ b/include/boot/boot_defs.h @@ -102,4 +102,23 @@ struct component_entry { component_data compdat; } __packed; +/* SCSI dump super block */ + +struct scsi_dump_sb { + uint64_t magic; + uint64_t version; + uint64_t part_start; + uint64_t part_size; + uint64_t dump_offset; + uint64_t dump_size; + uint64_t csum_offset; + uint64_t csum_size; + uint64_t csum; +} __packed; + +#define SCSI_DUMP_SB_MAGIC 0x5a46435044554d50ULL /* ZFCPDUMP */ +/* To avoid a csum entry of 0 a seed is used */ +#define SCSI_DUMP_SB_SEED 0x12345678 +#define SCSI_DUMP_SB_CSUM_SIZE 4096 + #endif /* BOOT_DEFS_H */ diff --git a/zipl/include/boot.h b/zipl/include/boot.h index 31991925..5933c987 100644 --- a/zipl/include/boot.h +++ b/zipl/include/boot.h @@ -42,25 +42,6 @@ #define BOOT_INFO_FLAGS_ARCH 0x00 #endif -/* SCSI dump super block */ - -struct scsi_dump_sb { - uint64_t magic; - uint64_t version; - uint64_t part_start; - uint64_t part_size; - uint64_t dump_offset; - uint64_t dump_size; - uint64_t csum_offset; - uint64_t csum_size; - uint64_t csum; -} __packed; - -#define SCSI_DUMP_SB_MAGIC 0x5a46435044554d50ULL; /* ZFCPDUMP */ -/* To avoid a csum entry of 0 a seed is used */ -#define SCSI_DUMP_SB_SEED 0x12345678 -#define SCSI_DUMP_SB_CSUM_SIZE 4096 - struct boot_info_bp_dump { union { struct eckd_dump_param eckd;