kexec: some #include adjustments
PATCH 1/1 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.
xen/arch/x86/machine_kexec.c +2 -1
@@ -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>
xen/common/kexec.c +1 -0
@@ -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>
xen/include/asm-x86/fixmap.h +0 -1
@@ -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>
xen/include/xen/elfcore.h +1 -1
@@ -56,7 +56,7 @@ typedef structint 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;
xen/include/xen/kexec.h +1 -2
@@ -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_ivoid 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);
Quoted 9 lines · Jan Beulich
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 beenfixmap.hincludingkexec.h, also drop use ofelfcore.hfromkexec.h.While adjusting
machine_kexec.calso replace use ofguest_access.hbydomain_page.h.Signed-off-by Jan Beulich <[email protected]>
Perhaps best not to ask why it was like that...