ia64/xen-unstable

changeset 14172:9149ef0e61ce

Add suspend_cancel flag to linux elf notes.

Signed-off-by: Brendan Cully <brendan@cs.ubc.ca>
author kfraser@localhost.localdomain
date Wed Feb 28 09:41:02 2007 +0000 (2007-02-28)
parents 0ba4f202d504
children 40dc331c4423
files linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S tools/xcutils/readnotes.c xen/common/libelf/libelf-dominfo.c xen/include/public/elfnote.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S	Wed Feb 28 09:39:23 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S	Wed Feb 28 09:41:02 2007 +0000
     1.3 @@ -206,3 +206,4 @@ ENTRY(cpu_gdt_table)
     1.4  	ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID,   .long,  _PAGE_PRESENT,_PAGE_PRESENT)
     1.5  #endif
     1.6  	ELFNOTE(Xen, XEN_ELFNOTE_LOADER,         .asciz, "generic")
     1.7 +	ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long,  1)
     2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Wed Feb 28 09:39:23 2007 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Wed Feb 28 09:41:02 2007 +0000
     2.3 @@ -186,3 +186,4 @@ ENTRY(empty_zero_page)
     2.4  	ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID,   .quad,  _PAGE_PRESENT,_PAGE_PRESENT)
     2.5  	ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,       .asciz, "writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel")
     2.6  	ELFNOTE(Xen, XEN_ELFNOTE_LOADER,         .asciz, "generic")
     2.7 +	ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long,  1)
     3.1 --- a/tools/xcutils/readnotes.c	Wed Feb 28 09:39:23 2007 +0000
     3.2 +++ b/tools/xcutils/readnotes.c	Wed Feb 28 09:41:02 2007 +0000
     3.3 @@ -103,6 +103,9 @@ static int print_notes(struct elf_binary
     3.4  		case XEN_ELFNOTE_HV_START_LOW:
     3.5  			print_numeric_note("HV_START_LOW", elf , note);
     3.6  			break;
     3.7 +		case XEN_ELFNOTE_SUSPEND_CANCEL:
     3.8 +			print_numeric_note("SUSPEND_CANCEL", elf, note);
     3.9 +			break;
    3.10  		case XEN_ELFNOTE_L1_MFN_VALID:
    3.11  			print_l1_mfn_valid_note("L1_MFN_VALID", elf , note);
    3.12  			break;
     4.1 --- a/xen/common/libelf/libelf-dominfo.c	Wed Feb 28 09:39:23 2007 +0000
     4.2 +++ b/xen/common/libelf/libelf-dominfo.c	Wed Feb 28 09:41:02 2007 +0000
     4.3 @@ -99,6 +99,7 @@ int elf_xen_parse_note(struct elf_binary
     4.4          [XEN_ELFNOTE_PAE_MODE] = { "PAE_MODE", 1},
     4.5          [XEN_ELFNOTE_FEATURES] = { "FEATURES", 1},
     4.6          [XEN_ELFNOTE_BSD_SYMTAB] = { "BSD_SYMTAB", 1},
     4.7 +        [XEN_ELFNOTE_SUSPEND_CANCEL] = { "SUSPEND_CANCEL", 0 },
     4.8      };
     4.9  /* *INDENT-ON* */
    4.10  
     5.1 --- a/xen/include/public/elfnote.h	Wed Feb 28 09:39:23 2007 +0000
     5.2 +++ b/xen/include/public/elfnote.h	Wed Feb 28 09:41:02 2007 +0000
     5.3 @@ -157,9 +157,14 @@
     5.4  #define XEN_ELFNOTE_L1_MFN_VALID  13
     5.5  
     5.6  /*
     5.7 + * Whether or not the guest supports cooperative suspend cancellation.
     5.8 + */
     5.9 +#define XEN_ELFNOTE_SUSPEND_CANCEL 14
    5.10 +
    5.11 +/*
    5.12   * The number of the highest elfnote defined.
    5.13   */
    5.14 -#define XEN_ELFNOTE_MAX XEN_ELFNOTE_L1_MFN_VALID
    5.15 +#define XEN_ELFNOTE_MAX XEN_ELFNOTE_SUSPEND_CANCEL
    5.16  
    5.17  /*
    5.18   * System information exported through crash notes.