aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tools/include/Makefile3
-rw-r--r--tools/libxc/xc_core.h2
-rw-r--r--tools/libxc/xc_dom.h2
-rw-r--r--tools/libxc/xc_elf.h2
-rw-r--r--tools/libxc/xc_hvm_build.c2
-rw-r--r--tools/xcutils/readnotes.c2
-rw-r--r--xen/arch/ia64/xen/domain.c2
-rw-r--r--xen/arch/x86/boot/mkelf32.c2
-rw-r--r--xen/arch/x86/domain_build.c2
-rw-r--r--xen/common/libelf/libelf-private.h4
-rw-r--r--xen/include/xen/elf.h2
-rw-r--r--xen/include/xen/elfstructs.h (renamed from xen/include/public/elfstructs.h)8
-rw-r--r--xen/include/xen/libelf.h (renamed from xen/include/public/libelf.h)19
13 files changed, 29 insertions, 23 deletions
diff --git a/tools/include/Makefile b/tools/include/Makefile
index db0b760559..62c27170ef 100644
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -10,11 +10,12 @@ xen-foreign:
xen/.dir:
@rm -rf xen
- mkdir xen
+ mkdir -p xen/libelf
ln -sf ../$(XEN_ROOT)/xen/include/public/COPYING xen
ln -sf $(addprefix ../,$(wildcard $(XEN_ROOT)/xen/include/public/*.h)) xen
ln -sf $(addprefix ../$(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) xen
ln -sf ../xen-sys/$(XEN_OS) xen/sys
+ ln -sf $(addprefix ../../$(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/
ln -s ../xen-foreign xen/foreign
touch $@
diff --git a/tools/libxc/xc_core.h b/tools/libxc/xc_core.h
index c5663e9426..30100ba416 100644
--- a/tools/libxc/xc_core.h
+++ b/tools/libxc/xc_core.h
@@ -23,7 +23,7 @@
#include "xen/version.h"
#include "xg_private.h"
-#include "xen/elfstructs.h"
+#include "xen/libelf/elfstructs.h"
/* section names */
#define XEN_DUMPCORE_SEC_NOTE ".note.Xen"
diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h
index 770e00bba2..ca03ba5db4 100644
--- a/tools/libxc/xc_dom.h
+++ b/tools/libxc/xc_dom.h
@@ -1,4 +1,4 @@
-#include <xen/libelf.h>
+#include <xen/libelf/libelf.h>
#define INVALID_P2M_ENTRY ((xen_pfn_t)-1)
diff --git a/tools/libxc/xc_elf.h b/tools/libxc/xc_elf.h
index 089df2b070..5f7119bd04 100644
--- a/tools/libxc/xc_elf.h
+++ b/tools/libxc/xc_elf.h
@@ -1 +1 @@
-#include <xen/elfstructs.h>
+#include <xen/libelf/elfstructs.h>
diff --git a/tools/libxc/xc_hvm_build.c b/tools/libxc/xc_hvm_build.c
index e0e75aac21..0b3bc61765 100644
--- a/tools/libxc/xc_hvm_build.c
+++ b/tools/libxc/xc_hvm_build.c
@@ -17,7 +17,7 @@
#include <xen/hvm/params.h>
#include "xc_e820.h"
-#include <xen/libelf.h>
+#include <xen/libelf/libelf.h>
#define SUPERPAGE_PFN_SHIFT 9
#define SUPERPAGE_NR_PFNS (1UL << SUPERPAGE_PFN_SHIFT)
diff --git a/tools/xcutils/readnotes.c b/tools/xcutils/readnotes.c
index 4ba53819c5..b770f56fe9 100644
--- a/tools/xcutils/readnotes.c
+++ b/tools/xcutils/readnotes.c
@@ -13,7 +13,7 @@
#include <xg_private.h>
#include <xc_dom.h> /* gunzip bits */
-#include <xen/libelf.h>
+#include <xen/libelf/libelf.h>
static void print_string_note(const char *prefix, struct elf_binary *elf,
const elf_note *note)
diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index 93dd4b28f7..b9379a19a1 100644
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -31,7 +31,7 @@
#include <xen/event.h>
#include <xen/console.h>
#include <xen/version.h>
-#include <public/libelf.h>
+#include <xen/libelf.h>
#include <asm/pgalloc.h>
#include <asm/offsets.h> /* for IA64_THREAD_INFO_SIZE */
#include <asm/vcpu.h> /* for function declarations */
diff --git a/xen/arch/x86/boot/mkelf32.c b/xen/arch/x86/boot/mkelf32.c
index 94cd3d84cc..d616fb1860 100644
--- a/xen/arch/x86/boot/mkelf32.c
+++ b/xen/arch/x86/boot/mkelf32.c
@@ -25,7 +25,7 @@
#define s16 int16_t
#define s32 int32_t
#define s64 int64_t
-#include "../../../include/public/elfstructs.h"
+#include "../../../include/xen/elfstructs.h"
#define DYNAMICALLY_FILLED 0
#define RAW_OFFSET 128
diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index 6ec0754aa5..3b8a1a15fe 100644
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -19,6 +19,7 @@
#include <xen/iocap.h>
#include <xen/bitops.h>
#include <xen/compat.h>
+#include <xen/libelf.h>
#include <asm/regs.h>
#include <asm/system.h>
#include <asm/io.h>
@@ -30,7 +31,6 @@
#include <asm/e820.h>
#include <public/version.h>
-#include <public/libelf.h>
extern unsigned long initial_images_nrpages(void);
extern void discard_initial_images(void);
diff --git a/xen/common/libelf/libelf-private.h b/xen/common/libelf/libelf-private.h
index 4ae587cd5d..e207b690c4 100644
--- a/xen/common/libelf/libelf-private.h
+++ b/xen/common/libelf/libelf-private.h
@@ -7,9 +7,9 @@
#include <xen/types.h>
#include <xen/string.h>
#include <xen/lib.h>
+#include <xen/libelf.h>
#include <asm/byteorder.h>
#include <public/elfnote.h>
-#include <public/libelf.h>
#define elf_msg(elf, fmt, args ... ) \
if (elf->verbose) printk(fmt, ## args )
@@ -49,7 +49,7 @@
#error Unsupported OS
#endif
#include <xen/elfnote.h>
-#include <xen/libelf.h>
+#include <xen/libelf/libelf.h>
#include "xenctrl.h"
#include "xc_private.h"
diff --git a/xen/include/xen/elf.h b/xen/include/xen/elf.h
index 209f4fa47e..03faac7bf2 100644
--- a/xen/include/xen/elf.h
+++ b/xen/include/xen/elf.h
@@ -27,7 +27,7 @@
#ifndef __XEN_ELF_H__
#define __XEN_ELF_H__
-#include <public/elfstructs.h>
+#include <xen/elfstructs.h>
#define ELFNOTE_ALIGN(_n_) (((_n_)+3)&~3)
#define ELFNOTE_NAME(_n_) ((char*)(_n_) + sizeof(*(_n_)))
diff --git a/xen/include/public/elfstructs.h b/xen/include/xen/elfstructs.h
index 77362f3b9e..62f9399694 100644
--- a/xen/include/public/elfstructs.h
+++ b/xen/include/xen/elfstructs.h
@@ -1,5 +1,5 @@
-#ifndef __XEN_PUBLIC_ELFSTRUCTS_H__
-#define __XEN_PUBLIC_ELFSTRUCTS_H__ 1
+#ifndef __XEN_ELFSTRUCTS_H__
+#define __XEN_ELFSTRUCTS_H__
/*
* Copyright (c) 1995, 1996 Erik Theisen. All rights reserved.
*
@@ -49,7 +49,7 @@ typedef uint16_t Elf64_Quarter;
/*
* e_ident[] identification indexes
- * See http://www.caldera.com/developers/gabi/2000-07-17/ch4.eheader.html
+ * See http://www.caldera.com/developers/gabi/2000-07-17/ch4.eheader.html
*/
#define EI_MAG0 0 /* file ID */
#define EI_MAG1 1 /* file ID */
@@ -524,4 +524,4 @@ typedef struct {
#define AuxInfo Aux64Info
#endif
-#endif /* __XEN_PUBLIC_ELFSTRUCTS_H__ */
+#endif /* __XEN_ELFSTRUCTS_H__ */
diff --git a/xen/include/public/libelf.h b/xen/include/xen/libelf.h
index 42df10b4cc..1c92a73f1d 100644
--- a/xen/include/public/libelf.h
+++ b/xen/include/xen/libelf.h
@@ -1,6 +1,6 @@
/******************************************************************************
* libelf.h
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
@@ -20,8 +20,8 @@
* DEALINGS IN THE SOFTWARE.
*/
-#ifndef __XC_LIBELF__
-#define __XC_LIBELF__ 1
+#ifndef __XEN_LIBELF_H__
+#define __XEN_LIBELF_H__
#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__)
#define XEN_ELF_LITTLE_ENDIAN
@@ -30,9 +30,14 @@
#endif
#undef ELFSIZE
-#include "elfnote.h"
#include "elfstructs.h"
-#include "features.h"
+#ifdef __XEN__
+#include <public/elfnote.h>
+#include <public/features.h>
+#else
+#include <xen/elfnote.h>
+#include <xen/features.h>
+#endif
/* ------------------------------------------------------------------------ */
@@ -220,7 +225,7 @@ struct elf_dom_parms {
const void *elf_note_start;
const void *elf_note_end;
struct xen_elfnote elf_notes[XEN_ELFNOTE_MAX + 1];
-
+
/* parsed */
char guest_os[16];
char guest_ver[16];
@@ -263,4 +268,4 @@ int elf_xen_parse_guest_info(struct elf_binary *elf,
int elf_xen_parse(struct elf_binary *elf,
struct elf_dom_parms *parms);
-#endif /* __XC_LIBELF__ */
+#endif /* __XEN_LIBELF_H__ */
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 13:38:34 +0000