[Xen-changelog] [linux-2.6.18-xen] [IA64] Sync public headers

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1193773374 21600
# Node ID 0edeca96e7d7821f8413589e2e1f90bf68b696bd
# Parent  32df30e24087e1d8dd0b5de78f8b5c2713dfdf42
[IA64] Sync public headers

For NITRS/NDTRS patch

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 include/xen/interface/arch-ia64.h            |   12 +++++++++---
 include/xen/interface/foreign/reference.size |    6 +++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff -r 32df30e24087 -r 0edeca96e7d7 include/xen/interface/arch-ia64.h
--- a/include/xen/interface/arch-ia64.h Tue Oct 23 10:23:00 2007 -0600
+++ b/include/xen/interface/arch-ia64.h Tue Oct 30 13:42:54 2007 -0600
@@ -297,8 +297,8 @@ DEFINE_XEN_GUEST_HANDLE(ia64_tr_entry_t)
 DEFINE_XEN_GUEST_HANDLE(ia64_tr_entry_t);
 
 struct vcpu_tr_regs {
-    struct ia64_tr_entry itrs[8];
-    struct ia64_tr_entry dtrs[8];
+    struct ia64_tr_entry itrs[12];
+    struct ia64_tr_entry dtrs[12];
 };
 
 union vcpu_ar_regs {
@@ -402,6 +402,7 @@ struct vcpu_guest_context_regs {
 
         /* Physical registers in case of debug event.  */
         unsigned long excp_iipa;
+        unsigned long excp_ifa;
         unsigned long excp_isr;
         unsigned int excp_vector;
 
@@ -421,12 +422,17 @@ struct vcpu_guest_context_regs {
 };
 
 struct vcpu_guest_context {
-#define VGCF_EXTRA_REGS (1UL << 1)     /* Get/Set extra regs.  */
+#define VGCF_EXTRA_REGS (1UL << 1)     /* Set extra regs.  */
     unsigned long flags;       /* VGCF_* flags */
 
     struct vcpu_guest_context_regs regs;
 
     unsigned long event_callback_ip;
+
+    /* xen doesn't share privregs pages with hvm domain so that this member
+     * doesn't make sense for hvm domain.
+     * ~0UL is already used for INVALID_P2M_ENTRY. */
+#define VGC_PRIVREGS_HVM       (~(-2UL))
     unsigned long privregs_pfn;
 };
 typedef struct vcpu_guest_context vcpu_guest_context_t;
diff -r 32df30e24087 -r 0edeca96e7d7 
include/xen/interface/foreign/reference.size
--- a/include/xen/interface/foreign/reference.size      Tue Oct 23 10:23:00 
2007 -0600
+++ b/include/xen/interface/foreign/reference.size      Tue Oct 30 13:42:54 
2007 -0600
@@ -7,9 +7,9 @@ cpu_user_regs             |      68     
 cpu_user_regs             |      68     200       -
 xen_ia64_boot_param       |       -       -      96
 ia64_tr_entry             |       -       -      32
-vcpu_tr_regs              |       -       -     512
-vcpu_guest_context_regs   |       -       -   21904
-vcpu_guest_context        |    2800    5168   21936
+vcpu_tr_regs              |       -       -     768
+vcpu_guest_context_regs   |       -       -   22176
+vcpu_guest_context        |    2800    5168   22208
 arch_vcpu_info            |      24      16       0
 vcpu_time_info            |      32      32      32
 vcpu_info                 |      64      64      48

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