ia64/linux-2.6.18-xen.hg

changeset 728:69fc220cd737

Sync Xen public headers.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Nov 19 13:14:11 2008 +0000 (2008-11-19)
parents 69694615aebb
children f29bf0bf3e97
files include/xen/interface/features.h include/xen/interface/grant_table.h include/xen/interface/kexec.h include/xen/interface/trace.h
line diff
     1.1 --- a/include/xen/interface/features.h	Tue Nov 18 16:04:04 2008 +0000
     1.2 +++ b/include/xen/interface/features.h	Wed Nov 19 13:14:11 2008 +0000
     1.3 @@ -62,6 +62,12 @@
     1.4  /* x86: Does this Xen host support the MMU_{CLEAR,COPY}_PAGE hypercall? */
     1.5  #define XENFEAT_highmem_assist             6
     1.6  
     1.7 +/*
     1.8 + * If set, GNTTABOP_map_grant_ref honors flags to be placed into guest kernel
     1.9 + * available pte bits.
    1.10 + */
    1.11 +#define XENFEAT_gnttab_map_avail_bits      7
    1.12 +
    1.13  #define XENFEAT_NR_SUBMAPS 1
    1.14  
    1.15  #endif /* __XEN_PUBLIC_FEATURES_H__ */
     2.1 --- a/include/xen/interface/grant_table.h	Tue Nov 18 16:04:04 2008 +0000
     2.2 +++ b/include/xen/interface/grant_table.h	Wed Nov 19 13:14:11 2008 +0000
     2.3 @@ -360,7 +360,7 @@ DEFINE_XEN_GUEST_HANDLE(gnttab_unmap_and
     2.4  
     2.5  
     2.6  /*
     2.7 - * Bitfield values for update_pin_status.flags.
     2.8 + * Bitfield values for gnttab_map_grant_ref.flags.
     2.9   */
    2.10   /* Map the grant entry for access by I/O devices. */
    2.11  #define _GNTMAP_device_map      (0)
    2.12 @@ -388,6 +388,13 @@ DEFINE_XEN_GUEST_HANDLE(gnttab_unmap_and
    2.13  #define GNTMAP_contains_pte     (1<<_GNTMAP_contains_pte)
    2.14  
    2.15  /*
    2.16 + * Bits to be placed in guest kernel available PTE bits (architecture
    2.17 + * dependent; only supported when XENFEAT_gnttab_map_avail_bits is set).
    2.18 + */
    2.19 +#define _GNTMAP_guest_avail0    (16)
    2.20 +#define GNTMAP_guest_avail_mask ((uint32_t)~0 << _GNTMAP_guest_avail0)
    2.21 +
    2.22 +/*
    2.23   * Values for error status returns. All errors are -ve.
    2.24   */
    2.25  #define GNTST_okay             (0)  /* Normal return.                        */
     3.1 --- a/include/xen/interface/kexec.h	Tue Nov 18 16:04:04 2008 +0000
     3.2 +++ b/include/xen/interface/kexec.h	Wed Nov 19 13:14:11 2008 +0000
     3.3 @@ -155,27 +155,6 @@ typedef struct xen_kexec_range {
     3.4      unsigned long start;
     3.5  } xen_kexec_range_t;
     3.6  
     3.7 -/* vmcoreinfo stuff */
     3.8 -#define VMCOREINFO_BYTES           (4096)
     3.9 -#define VMCOREINFO_NOTE_NAME       "VMCOREINFO_XEN"
    3.10 -void arch_crash_save_vmcoreinfo(void);
    3.11 -void vmcoreinfo_append_str(const char *fmt, ...)
    3.12 -       __attribute__ ((format (printf, 1, 2)));
    3.13 -#define VMCOREINFO_PAGESIZE(value) \
    3.14 -       vmcoreinfo_append_str("PAGESIZE=%ld\n", value)
    3.15 -#define VMCOREINFO_SYMBOL(name) \
    3.16 -       vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name)
    3.17 -#define VMCOREINFO_SYMBOL_ALIAS(alias, name) \
    3.18 -       vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #alias, (unsigned long)&name)
    3.19 -#define VMCOREINFO_STRUCT_SIZE(name) \
    3.20 -       vmcoreinfo_append_str("SIZE(%s)=%zu\n", #name, sizeof(struct name))
    3.21 -#define VMCOREINFO_OFFSET(name, field) \
    3.22 -       vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \
    3.23 -                             (unsigned long)offsetof(struct name, field))
    3.24 -#define VMCOREINFO_OFFSET_ALIAS(name, field, alias) \
    3.25 -       vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #alias, \
    3.26 -                             (unsigned long)offsetof(struct name, field))
    3.27 -
    3.28  #endif /* _XEN_PUBLIC_KEXEC_H */
    3.29  
    3.30  /*
     4.1 --- a/include/xen/interface/trace.h	Tue Nov 18 16:04:04 2008 +0000
     4.2 +++ b/include/xen/interface/trace.h	Wed Nov 19 13:14:11 2008 +0000
     4.3 @@ -142,7 +142,9 @@
     4.4  #define TRC_HVM_INVLPG64        (TRC_HVM_HANDLER + TRC_64_FLAG + 0x14)
     4.5  #define TRC_HVM_MCE             (TRC_HVM_HANDLER + 0x15)
     4.6  #define TRC_HVM_IO_ASSIST       (TRC_HVM_HANDLER + 0x16)
     4.7 +#define TRC_HVM_IO_ASSIST64     (TRC_HVM_HANDLER + TRC_64_FLAG + 0x16)
     4.8  #define TRC_HVM_MMIO_ASSIST     (TRC_HVM_HANDLER + 0x17)
     4.9 +#define TRC_HVM_MMIO_ASSIST64   (TRC_HVM_HANDLER + TRC_64_FLAG + 0x17)
    4.10  #define TRC_HVM_CLTS            (TRC_HVM_HANDLER + 0x18)
    4.11  #define TRC_HVM_LMSW            (TRC_HVM_HANDLER + 0x19)
    4.12  #define TRC_HVM_LMSW64          (TRC_HVM_HANDLER + TRC_64_FLAG + 0x19)