From 1e450e6f7b4e83de4d9d789cb2d5debb454e783f Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar@linux.ibm.com>
Date: Mon, 11 Oct 2021 14:32:39 +0200
Subject: [PATCH] zdump/dt: Move declaration of DT structs to dt.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move DT structs to the header where they belong to.

Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 zdump/dt.c       |  2 ++
 zdump/dt.h       | 26 ++++++++++++++++++--------
 zdump/zgetdump.h |  9 ---------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/zdump/dt.c b/zdump/dt.c
index 15032052..a0ccae40 100644
--- a/zdump/dt.c
+++ b/zdump/dt.c
@@ -10,6 +10,8 @@
  */
 
 #include "zgetdump.h"
+#include "zg.h"
+#include "dt.h"
 
 /*
  * Supported dump tools
diff --git a/zdump/dt.h b/zdump/dt.h
index 4ba2f5d1..0c0d97f3 100644
--- a/zdump/dt.h
+++ b/zdump/dt.h
@@ -12,9 +12,10 @@
 #ifndef DT_H
 #define DT_H
 
-#include "dfi.h"
 #include <stdbool.h>
 
+#include "dfi.h"
+
 #define DUMP_EXTENDED		true
 #define DUMP_NON_EXTENDED	false
 
@@ -24,12 +25,21 @@ struct dt {
 	void		(*info)(void);
 };
 
-extern void dt_init(void);
-extern void dt_info_print(void);
-extern void dt_arch_set(enum dfi_arch arch);
-extern void dt_version_set(int version);
-extern void dt_attr_mem_limit_set(u64 mem_limit);
-extern void dt_attr_force_set(int value);
-extern void dt_attr_dasd_type_set(const char *dasd_type);
+void dt_init(void);
+void dt_info_print(void);
+void dt_arch_set(enum dfi_arch arch);
+void dt_version_set(int version);
+void dt_attr_mem_limit_set(u64 mem_limit);
+void dt_attr_force_set(int value);
+void dt_attr_dasd_type_set(const char *dasd_type);
+
+/*
+ * Supported s390 dumpers
+ */
+extern struct dt dt_s390mv;
+extern struct dt dt_s390mv_ext;
+extern struct dt dt_s390sv;
+extern struct dt dt_s390sv_ext;
+extern struct dt dt_scsi;
 
 #endif
diff --git a/zdump/zgetdump.h b/zdump/zgetdump.h
index 5aedb66d..7f12c942 100644
--- a/zdump/zgetdump.h
+++ b/zdump/zgetdump.h
@@ -71,13 +71,4 @@ int zfuse_mount_dump(void);
 void zfuse_umount(void);
 #endif
 
-/*
- * Supported s390 dumpers
- */
-extern struct dt dt_s390mv;
-extern struct dt dt_s390mv_ext;
-extern struct dt dt_s390sv;
-extern struct dt dt_s390sv_ext;
-extern struct dt dt_scsi;
-
 #endif /* ZGETDUMP_H */