From 8f99e7c4eabcad7df87840b4121c7452fac50251 Mon Sep 17 00:00:00 2001 From: Mikhail Zaslonko Date: Tue, 20 Feb 2024 17:49:46 +0100 Subject: [PATCH] zdump: Move DUMPER_MAGIC constants to include/dump/s390_dump.h Move DUMPER_MAGIC constants from df_s390.h to the global header include/dump/s390_dump.h in order to reuse it in zipl code. Signed-off-by: Mikhail Zaslonko Reviewed-by: Alexander Egorenkov Signed-off-by: Steffen Eiden --- include/dump/s390_dump.h | 10 ++++++++++ zdump/df_s390.h | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/dump/s390_dump.h b/include/dump/s390_dump.h index 1832d684..0865d78b 100644 --- a/include/dump/s390_dump.h +++ b/include/dump/s390_dump.h @@ -26,6 +26,16 @@ #define DF_S390_EM_STR "DUMP_END" #define DF_S390_CPU_MAX 512 #define DF_S390_MAGIC_BLK_ECKD 3 +#define DF_S390_DUMPER_MAGIC32 "ZECKD31" +#define DF_S390_DUMPER_MAGIC64 "ZECKD64" +#define DF_S390_DUMPER_MAGIC_EXT "XECKD64" +#define DF_S390_DUMPER_MAGIC32_FBA "ZDFBA31" +#define DF_S390_DUMPER_MAGIC64_FBA "ZDFBA64" +#define DF_S390_DUMPER_MAGIC_FBA_EXT "XDFBA64" +#define DF_S390_DUMPER_MAGIC_MV "ZMULT64" +#define DF_S390_DUMPER_MAGIC_MV_EXT "XMULT64" +#define OLD_DUMPER_HEX_INSTR1 "\x0d\x10\x47\xf0" /* BASR + 1st halfword of BC */ +#define OLD_DUMPER_HEX_INSTR2 "\x0d\xd0" /* BASR 13,0 */ /* * Architecture of dumped system diff --git a/zdump/df_s390.h b/zdump/df_s390.h index 8a637816..98d6ace6 100644 --- a/zdump/df_s390.h +++ b/zdump/df_s390.h @@ -35,17 +35,6 @@ static inline enum dfi_arch df_s390_to_dfi_arch(enum df_s390_arch df_s390_arch) return df_s390_arch == DF_S390_ARCH_64 ? DFI_ARCH_64 : DFI_ARCH_32; } -#define DF_S390_DUMPER_MAGIC32 "ZECKD31" -#define DF_S390_DUMPER_MAGIC64 "ZECKD64" -#define DF_S390_DUMPER_MAGIC_EXT "XECKD64" -#define DF_S390_DUMPER_MAGIC32_FBA "ZDFBA31" -#define DF_S390_DUMPER_MAGIC64_FBA "ZDFBA64" -#define DF_S390_DUMPER_MAGIC_FBA_EXT "XDFBA64" -#define DF_S390_DUMPER_MAGIC_MV "ZMULT64" -#define DF_S390_DUMPER_MAGIC_MV_EXT "XMULT64" -#define OLD_DUMPER_HEX_INSTR1 "\x0d\x10\x47\xf0" /* BASR + 1st halfword of BC */ -#define OLD_DUMPER_HEX_INSTR2 "\x0d\xd0" /* BASR 13,0 */ - /* * Dump tool structure */