From e3daad6283659794f4d70508fee23a340e42a93e Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@suse.com>
Date: Wed, 14 Oct 2020 14:11:49 +0200
Subject: [PATCH] kexec: some #include adjustments

In the context of working on x86's elf_core_save_regs() I noticed there
were far more source files getting rebuilt than I would have expected.
While the main offender looks to have been fixmap.h including kexec.h,
also drop use of elfcore.h from kexec.h.

While adjusting machine_kexec.c also replace use of guest_access.h by
domain_page.h.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
 xen/arch/x86/machine_kexec.c | 3 ++-
 xen/common/kexec.c           | 1 +
 xen/include/asm-x86/fixmap.h | 1 -
 xen/include/xen/elfcore.h    | 2 +-
 xen/include/xen/kexec.h      | 3 +--
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xen/arch/x86/machine_kexec.c b/xen/arch/x86/machine_kexec.c
index b70d5a6a86..08ec9fd43b 100644
--- a/xen/arch/x86/machine_kexec.c
+++ b/xen/arch/x86/machine_kexec.c
@@ -16,8 +16,9 @@
  */
 
 #include <xen/types.h>
+#include <xen/domain_page.h>
+#include <xen/elfstructs.h>
 #include <xen/kexec.h>
-#include <xen/guest_access.h>
 #include <asm/fixmap.h>
 #include <asm/hpet.h>
 #include <asm/page.h>
diff --git a/xen/common/kexec.c b/xen/common/kexec.c
index 9af7de4df3..52cdc4ebc3 100644
--- a/xen/common/kexec.c
+++ b/xen/common/kexec.c
@@ -10,6 +10,7 @@
 #include <xen/lib.h>
 #include <xen/acpi.h>
 #include <xen/ctype.h>
+#include <xen/elfcore.h>
 #include <xen/errno.h>
 #include <xen/guest_access.h>
 #include <xen/param.h>
diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h
index 8330097a74..83b2b7634d 100644
--- a/xen/include/asm-x86/fixmap.h
+++ b/xen/include/asm-x86/fixmap.h
@@ -21,7 +21,6 @@
 
 #include <xen/acpi.h>
 #include <xen/pfn.h>
-#include <xen/kexec.h>
 #include <asm/apicdef.h>
 #include <asm/msi.h>
 #include <acpi/apei.h>
diff --git a/xen/include/xen/elfcore.h b/xen/include/xen/elfcore.h
index 4ad477d5b8..0d78033424 100644
--- a/xen/include/xen/elfcore.h
+++ b/xen/include/xen/elfcore.h
@@ -56,7 +56,7 @@ typedef struct
     int pr_fpvalid;              /* True if math co-processor being used.  */
 } ELF_Prstatus;
 
-typedef struct {
+typedef struct crash_xen_info {
     unsigned long xen_major_version;
     unsigned long xen_minor_version;
     unsigned long xen_extra_version;
diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h
index e235339c85..e85ba16405 100644
--- a/xen/include/xen/kexec.h
+++ b/xen/include/xen/kexec.h
@@ -5,7 +5,6 @@
 
 #include <public/kexec.h>
 
-#include <xen/elfcore.h>
 #include <xen/kimage.h>
 
 typedef struct xen_kexec_reserve {
@@ -51,7 +50,7 @@ void machine_reboot_kexec(struct kexec_image *image);
 void machine_kexec(struct kexec_image *image);
 void kexec_crash(void);
 void kexec_crash_save_cpu(void);
-crash_xen_info_t *kexec_crash_save_info(void);
+struct crash_xen_info *kexec_crash_save_info(void);
 void machine_crash_shutdown(void);
 int machine_kexec_get(xen_kexec_range_t *range);
 int machine_kexec_get_xen(xen_kexec_range_t *range);
-- 
2.39.5