WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] Resolve conflict over use of name xen_elf

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] Resolve conflict over use of name xen_elfnote.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Mon, 26 Feb 2007 15:45:36 -0800
Delivery-date: Mon, 26 Feb 2007 15:45:37 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1172488863 0
# Node ID 047748faa4aa6b8be7ec8192437cf4ae8f573eb1
# Parent  eefbc33a41abf36451ae6c102ba79e8312906909
Resolve conflict over use of name xen_elfnote.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 tools/libxc/xc_core.c        |    2 +-
 tools/libxc/xc_core.h        |   10 +++++-----
 tools/libxc/xc_ptrace_core.c |    2 +-
 xen/arch/x86/domain_build.c  |    1 -
 xen/include/public/libelf.h  |    1 +
 5 files changed, 8 insertions(+), 8 deletions(-)

diff -r eefbc33a41ab -r 047748faa4aa tools/libxc/xc_core.c
--- a/tools/libxc/xc_core.c     Mon Feb 26 10:23:03 2007 +0000
+++ b/tools/libxc/xc_core.c     Mon Feb 26 11:21:03 2007 +0000
@@ -328,7 +328,7 @@ xc_domain_dumpcore_via_callback(int xc_h
     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;
diff -r eefbc33a41ab -r 047748faa4aa tools/libxc/xc_core.h
--- a/tools/libxc/xc_core.h     Mon Feb 26 10:23:03 2007 +0000
+++ b/tools/libxc/xc_core.h     Mon Feb 26 11:21:03 2007 +0000
@@ -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_versi
 
 
 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;
 };
 
diff -r eefbc33a41ab -r 047748faa4aa tools/libxc/xc_ptrace_core.c
--- a/tools/libxc/xc_ptrace_core.c      Mon Feb 26 10:23:03 2007 +0000
+++ b/tools/libxc/xc_ptrace_core.c      Mon Feb 26 11:21:03 2007 +0000
@@ -280,7 +280,7 @@ elf_core_search_note(struct elf_core* ec
 
     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) {
diff -r eefbc33a41ab -r 047748faa4aa xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c       Mon Feb 26 10:23:03 2007 +0000
+++ b/xen/arch/x86/domain_build.c       Mon Feb 26 11:21:03 2007 +0000
@@ -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);
diff -r eefbc33a41ab -r 047748faa4aa xen/include/public/libelf.h
--- a/xen/include/public/libelf.h       Mon Feb 26 10:23:03 2007 +0000
+++ b/xen/include/public/libelf.h       Mon Feb 26 11:21:03 2007 +0000
@@ -10,6 +10,7 @@
 #endif
 
 #undef ELFSIZE
+#include "elfnote.h"
 #include "elfstructs.h"
 #include "features.h"
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] Resolve conflict over use of name xen_elfnote., Xen patchbot-unstable <=