direct-io.hg

changeset 14125:047748faa4aa

Resolve conflict over use of name xen_elfnote.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Mon Feb 26 11:21:03 2007 +0000 (2007-02-26)
parents eefbc33a41ab
children bfd4fad0f052
files tools/libxc/xc_core.c tools/libxc/xc_core.h tools/libxc/xc_ptrace_core.c xen/arch/x86/domain_build.c xen/include/public/libelf.h
line diff
     1.1 --- a/tools/libxc/xc_core.c	Mon Feb 26 10:23:03 2007 +0000
     1.2 +++ b/tools/libxc/xc_core.c	Mon Feb 26 11:21:03 2007 +0000
     1.3 @@ -328,7 +328,7 @@ xc_domain_dumpcore_via_callback(int xc_h
     1.4      Elf_Shdr *shdr;
     1.5  
     1.6      /* elf notes */
     1.7 -    struct xen_elfnote elfnote;
     1.8 +    struct elfnote elfnote;
     1.9      struct xen_dumpcore_elfnote_none_desc none;
    1.10      struct xen_dumpcore_elfnote_header_desc header;
    1.11      struct xen_dumpcore_elfnote_xen_version_desc xen_version;
     2.1 --- a/tools/libxc/xc_core.h	Mon Feb 26 10:23:03 2007 +0000
     2.2 +++ b/tools/libxc/xc_core.h	Mon Feb 26 11:21:03 2007 +0000
     2.3 @@ -39,7 +39,7 @@
     2.4  #define XEN_DUMPCORE_ELFNOTE_NAME               "Xen"
     2.5  /* note numbers are defined in xen/elfnote.h */
     2.6  
     2.7 -struct xen_elfnote {
     2.8 +struct elfnote {
     2.9      uint32_t    namesz; /* Elf_Note note; */
    2.10      uint32_t    descsz;
    2.11      uint32_t    type;
    2.12 @@ -88,22 +88,22 @@ struct xen_dumpcore_elfnote_format_versi
    2.13  
    2.14  
    2.15  struct xen_dumpcore_elfnote_none {
    2.16 -    struct xen_elfnote                          elfnote;
    2.17 +    struct elfnote                              elfnote;
    2.18      struct xen_dumpcore_elfnote_none_desc       none;
    2.19  };
    2.20  
    2.21  struct xen_dumpcore_elfnote_header {
    2.22 -    struct xen_elfnote                          elfnote;
    2.23 +    struct elfnote                              elfnote;
    2.24      struct xen_dumpcore_elfnote_header_desc     header;
    2.25  };
    2.26  
    2.27  struct xen_dumpcore_elfnote_xen_version {
    2.28 -    struct xen_elfnote                                  elfnote;
    2.29 +    struct elfnote                                     elfnote;
    2.30      struct xen_dumpcore_elfnote_xen_version_desc        xen_version;
    2.31  };
    2.32  
    2.33  struct xen_dumpcore_elfnote_format_version {
    2.34 -    struct xen_elfnote                                  elfnote;
    2.35 +    struct elfnote                                      elfnote;
    2.36      struct xen_dumpcore_elfnote_format_version_desc     format_version;
    2.37  };
    2.38  
     3.1 --- a/tools/libxc/xc_ptrace_core.c	Mon Feb 26 10:23:03 2007 +0000
     3.2 +++ b/tools/libxc/xc_ptrace_core.c	Mon Feb 26 11:21:03 2007 +0000
     3.3 @@ -280,7 +280,7 @@ elf_core_search_note(struct elf_core* ec
     3.4  
     3.5      n = ecore->note_sec;
     3.6      while (n < note_sec_end) {
     3.7 -        const struct xen_elfnote *elfnote = (const struct xen_elfnote*)n;
     3.8 +        const struct elfnote *elfnote = (const struct elfnote *)n;
     3.9          if (elfnote->namesz == strlen(name) + 1 &&
    3.10              strncmp(elfnote->name, name, elfnote->namesz) == 0 &&
    3.11              elfnote->type == type) {
     4.1 --- a/xen/arch/x86/domain_build.c	Mon Feb 26 10:23:03 2007 +0000
     4.2 +++ b/xen/arch/x86/domain_build.c	Mon Feb 26 11:21:03 2007 +0000
     4.3 @@ -28,7 +28,6 @@
     4.4  #include <asm/paging.h>
     4.5  
     4.6  #include <public/version.h>
     4.7 -#include <public/elfnote.h>
     4.8  #include <public/libelf.h>
     4.9  
    4.10  extern unsigned long initial_images_nrpages(void);
     5.1 --- a/xen/include/public/libelf.h	Mon Feb 26 10:23:03 2007 +0000
     5.2 +++ b/xen/include/public/libelf.h	Mon Feb 26 11:21:03 2007 +0000
     5.3 @@ -10,6 +10,7 @@
     5.4  #endif
     5.5  
     5.6  #undef ELFSIZE
     5.7 +#include "elfnote.h"
     5.8  #include "elfstructs.h"
     5.9  #include "features.h"
    5.10