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: Use os_info.h from include/boot

Browse Source 
Get rid of duplicate os_info definitions in dfi_vmcoreinfo.c

Acked-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Signed-off-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
This commit is contained in:
Mikhail Zaslonko
2024-05-06 17:02:52 +02:00
committed by Steffen Eiden
parent a7373674bf
commit 858da9af57
1 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zdump/dfi_vmcoreinfo.c
+5 -23
View File
@@ -20,6 +20,8 @@
#include "dfi_mem_chunk.h"
#include "dfi_vmcoreinfo.h"
#include "boot/os_info.h"
#ifdef __s390x__
#define LC_VMCORE_INFO 0xe0c
#else
@@ -27,26 +29,6 @@
#endif
#define LC_OS_INFO 0xe18
#define OS_INFO_MAGIC 0x4f53494e464f535aULL /* OSINFOSZ */
struct os_info {
u64 magic;
u32 csum;
u16 version_major;
u16 version_minor;
u64 crashkernel_addr;
u64 crashkernel_size;
u64 vmcoreinfo_addr;
u64 vmcoreinfo_size;
u32 vmcoreinfo_csum;
u64 reipl_block_addr;
u64 reipl_block_size;
u32 reipl_block_csum;
u64 init_fn_addr;
u64 init_fn_size;
u32 init_fn_csum;
u8 reserved[4004];
} __packed;
/*
* File local static data
@@ -95,10 +77,10 @@ void dfi_vmcoreinfo_init(void)
l.os_info = os_info_get();
if (l.os_info && l.os_info->vmcoreinfo_size) {
if (l.os_info && l.os_info->entry[OS_INFO_VMCOREINFO].size) {
util_log_print(UTIL_LOG_DEBUG, "DFI found valid osinfo\n");
addr = l.os_info->vmcoreinfo_addr;
size = l.os_info->vmcoreinfo_size;
addr = l.os_info->entry[OS_INFO_VMCOREINFO].addr;
size = l.os_info->entry[OS_INFO_VMCOREINFO].size;
} else {
if (dfi_mem_virt_read(LC_VMCORE_INFO, &addr, sizeof(addr)))
return;