mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
Resolve conflict over use of name xen_elfnote.
Signed-off-by: Keir Fraser <keir@xensource.com>
This commit is contained in:
kfraser@localhost.localdomain committed
1 parent
cf5a7b113f
commit
f7e153faad
5 files changed
+8
-8
No files matched your search
@@ -328,7 +328,7 @@ xc_domain_dumpcore_via_callback(int xc_handle,
|
||||
Elf_Shdr *shdr;
|
||||
|
||||
/* elf notes */
|
||||
struct xen_elfnote elfnote;
|
||||
struct elfnote elfnote;
|
||||
struct xen_dumpcore_elfnote_none_desc none;
|
||||
struct xen_dumpcore_elfnote_header_desc header;
|
||||
struct xen_dumpcore_elfnote_xen_version_desc xen_version;
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
#define XEN_DUMPCORE_ELFNOTE_NAME "Xen"
|
||||
/* note numbers are defined in xen/elfnote.h */
|
||||
|
||||
struct xen_elfnote {
|
||||
struct elfnote {
|
||||
uint32_t namesz; /* Elf_Note note; */
|
||||
uint32_t descsz;
|
||||
uint32_t type;
|
||||
@@ -88,22 +88,22 @@ struct xen_dumpcore_elfnote_format_version_desc {
|
||||
|
||||
|
||||
struct xen_dumpcore_elfnote_none {
|
||||
struct xen_elfnote elfnote;
|
||||
struct elfnote elfnote;
|
||||
struct xen_dumpcore_elfnote_none_desc none;
|
||||
};
|
||||
|
||||
struct xen_dumpcore_elfnote_header {
|
||||
struct xen_elfnote elfnote;
|
||||
struct elfnote elfnote;
|
||||
struct xen_dumpcore_elfnote_header_desc header;
|
||||
};
|
||||
|
||||
struct xen_dumpcore_elfnote_xen_version {
|
||||
struct xen_elfnote elfnote;
|
||||
struct elfnote elfnote;
|
||||
struct xen_dumpcore_elfnote_xen_version_desc xen_version;
|
||||
};
|
||||
|
||||
struct xen_dumpcore_elfnote_format_version {
|
||||
struct xen_elfnote elfnote;
|
||||
struct elfnote elfnote;
|
||||
struct xen_dumpcore_elfnote_format_version_desc format_version;
|
||||
};
|
||||
|
||||
|
||||
@@ -280,7 +280,7 @@ elf_core_search_note(struct elf_core* ecore, const char* name, uint32_t type,
|
||||
|
||||
n = ecore->note_sec;
|
||||
while (n < note_sec_end) {
|
||||
const struct xen_elfnote *elfnote = (const struct xen_elfnote*)n;
|
||||
const struct elfnote *elfnote = (const struct elfnote *)n;
|
||||
if (elfnote->namesz == strlen(name) + 1 &&
|
||||
strncmp(elfnote->name, name, elfnote->namesz) == 0 &&
|
||||
elfnote->type == type) {
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
#include <asm/paging.h>
|
||||
|
||||
#include <public/version.h>
|
||||
#include <public/elfnote.h>
|
||||
#include <public/libelf.h>
|
||||
|
||||
extern unsigned long initial_images_nrpages(void);
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#endif
|
||||
|
||||
#undef ELFSIZE
|
||||
#include "elfnote.h"
|
||||
#include "elfstructs.h"
|
||||
#include "features.h"
|
||||
|
||||
|
||||