[Xen-changelog] [xen-unstable] fix regression from c/s 23735:537918f518ee

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxxxx>
# Date 1311598088 -3600
# Node ID 50ddc200a60cad3929a79a992f09145fd39af49d
# Parent  d8725d9fb8657874011d2f2772f5e970b24dfe9b
fix regression from c/s 23735:537918f518ee

This was checking presence of the wrong (old) ELF note. I don't really
understand how this failed consistently only for one of the xen-boot
tests...

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---


diff -r d8725d9fb865 -r 50ddc200a60c xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c        Sat Jul 23 09:57:04 2011 +0100
+++ b/xen/arch/ia64/xen/domain.c        Mon Jul 25 13:48:08 2011 +0100
@@ -2164,7 +2164,7 @@
                return -1;
        }
 
-       if (parms.elf_notes[XEN_ELFNOTE_FEATURES].type != XEN_ENT_NONE &&
+       if (parms.elf_notes[XEN_ELFNOTE_SUPPORTED_FEATURES].type != 
XEN_ENT_NONE &&
            !test_bit(XENFEAT_dom0, parms.f_supported))
        {
                printk("Kernel does not support Dom0 operation\n");
diff -r d8725d9fb865 -r 50ddc200a60c xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c       Sat Jul 23 09:57:04 2011 +0100
+++ b/xen/arch/x86/domain_build.c       Mon Jul 25 13:48:08 2011 +0100
@@ -415,7 +415,7 @@
         return -EINVAL;
     }
 
-    if ( parms.elf_notes[XEN_ELFNOTE_FEATURES].type != XEN_ENT_NONE &&
+    if ( parms.elf_notes[XEN_ELFNOTE_SUPPORTED_FEATURES].type != XEN_ENT_NONE 
&&
          !test_bit(XENFEAT_dom0, parms.f_supported) )
     {
         printk("Kernel does not support Dom0 operation\n");

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