mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
zdump/scsi: reuse boot component struct definitions from boot_defs.h
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:
committed by
Jan Höppner
parent
fed12a71cf
commit
012b842652
@@ -15,6 +15,7 @@
|
||||
|
||||
#include "lib/zt_common.h"
|
||||
#include "lib/util_part.h"
|
||||
#include "boot/boot_defs.h"
|
||||
|
||||
#include "zgetdump.h"
|
||||
#include "zg.h"
|
||||
@@ -53,32 +54,6 @@ struct scsi_blockptr {
|
||||
uint8_t reserved[4];
|
||||
} __packed;
|
||||
|
||||
enum component_entry_type {
|
||||
component_execute = 0x01,
|
||||
component_load = 0x02
|
||||
};
|
||||
|
||||
struct component_entry {
|
||||
struct scsi_blockptr data;
|
||||
uint8_t pad[7];
|
||||
uint8_t component_type;
|
||||
union {
|
||||
uint64_t load_address;
|
||||
uint64_t load_psw;
|
||||
} address;
|
||||
} __packed;
|
||||
|
||||
enum component_header_type {
|
||||
component_header_ipl = 0x00,
|
||||
component_header_dump = 0x01
|
||||
};
|
||||
|
||||
struct component_header {
|
||||
uint8_t magic[4];
|
||||
uint8_t type;
|
||||
uint8_t reserved[27];
|
||||
} __packed;
|
||||
|
||||
struct boot_info {
|
||||
char magic[4];
|
||||
uint8_t version;
|
||||
@@ -124,7 +99,7 @@ static int check_dump_program(struct scsi_blockptr *blockptr)
|
||||
zg_read(g.fh, &header, sizeof(header), ZG_CHECK_ERR);
|
||||
if (check_zipl_magic(&header.magic))
|
||||
return -1;
|
||||
return (header.type == component_header_dump) ? 0 : -1;
|
||||
return (header.type == COMPONENT_HEADER_DUMP) ? 0 : -1;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user