* [PATCH] kexec: some #include adjustments
@ 2020-10-14 7:05 Jan Beulich
2020-10-14 7:26 ` Andrew Cooper
0 siblings, 1 reply; 2+ messages in thread
From: Jan Beulich @ 2020-10-14 7:05 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Wei Liu, Roger Pau Monné
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>
--- 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>
--- 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>
--- 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>
--- 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;
--- 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_i
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);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] kexec: some #include adjustments
2020-10-14 7:05 [PATCH] kexec: some #include adjustments Jan Beulich
@ 2020-10-14 7:26 ` Andrew Cooper
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Cooper @ 2020-10-14 7:26 UTC (permalink / raw)
To: Jan Beulich, xen-devel; +Cc: Wei Liu, Roger Pau Monné
On 14/10/2020 08:05, Jan Beulich wrote:
> 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>
Perhaps best not to ask why it was like that...
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-14 7:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-14 7:05 [PATCH] kexec: some #include adjustments Jan Beulich
2020-10-14 7:26 ` Andrew Cooper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).