[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] Merge.



# HG changeset patch
# User sos22@xxxxxxxxxxxxxxxxxxxx
# Node ID 5a9efc35feb2e2d7e0a8664543350179fac5040a
# Parent  a47b7a464f09648401ce43a6b24b2f42cb1a7e37
# Parent  2add7a26253079c1d9d6ba87a37aa72c89358a06
Merge.

Signed-off-by: Steven Smith, sos22@xxxxxxxxx

diff -r a47b7a464f09 -r 5a9efc35feb2 
linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c Fri Jan 27 20:57:07 2006
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c Fri Jan 27 21:18:15 2006
@@ -995,7 +995,7 @@
         * default LDT is a single-entry callgate to lcall7 for iBCS
         * and a callgate to lcall27 for Solaris/x86 binaries
         */
-       make_lowmem_page_readonly(&default_ldt[0]);
+       make_lowmem_mmu_page_readonly(&default_ldt[0]);
 
        /*
         * Should be a barrier for any external CPU state.
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/arch/x86/dom0_ops.c
--- a/xen/arch/x86/dom0_ops.c   Fri Jan 27 20:57:07 2006
+++ b/xen/arch/x86/dom0_ops.c   Fri Jan 27 21:18:15 2006
@@ -46,7 +46,7 @@
         (void)rdmsr_user(msr_addr, msr_lo, msr_hi);
 }
 
-long arch_do_dom0_op(dom0_op_t *op, dom0_op_t *u_dom0_op)
+long arch_do_dom0_op(struct dom0_op *op, struct dom0_op *u_dom0_op)
 {
     long ret = 0;
 
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Fri Jan 27 20:57:07 2006
+++ b/xen/arch/x86/mm.c Fri Jan 27 21:18:15 2006
@@ -2007,12 +2007,12 @@
 }
 
 int do_mmu_update(
-    mmu_update_t *ureqs,
+    struct mmu_update *ureqs,
     unsigned int count,
     unsigned int *pdone,
     unsigned int foreigndom)
 {
-    mmu_update_t req;
+    struct mmu_update req;
     void *va;
     unsigned long gpfn, mfn;
     struct pfn_info *page;
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/arch/x86/physdev.c
--- a/xen/arch/x86/physdev.c    Fri Jan 27 20:57:07 2006
+++ b/xen/arch/x86/physdev.c    Fri Jan 27 21:18:15 2006
@@ -17,11 +17,11 @@
 /*
  * Demuxing hypercall.
  */
-long do_physdev_op(physdev_op_t *uop)
+long do_physdev_op(struct physdev_op *uop)
 {
-    physdev_op_t op;
-    long         ret;
-    int          irq;
+    struct physdev_op op;
+    long ret;
+    int  irq;
 
     if ( unlikely(copy_from_user(&op, uop, sizeof(op)) != 0) )
         return -EFAULT;
@@ -39,7 +39,7 @@
             break;
         op.u.irq_status_query.flags = 0;
         /* Edge-triggered interrupts don't need an explicit unmask downcall. */
-        if ( strstr(irq_desc[irq_to_vector(irq)].handler->typename, "edge") == 
NULL )
+        if ( !strstr(irq_desc[irq_to_vector(irq)].handler->typename, "edge") )
             op.u.irq_status_query.flags |= PHYSDEVOP_IRQ_NEEDS_UNMASK_NOTIFY;
         ret = 0;
         break;
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c      Fri Jan 27 20:57:07 2006
+++ b/xen/arch/x86/setup.c      Fri Jan 27 21:18:15 2006
@@ -337,8 +337,9 @@
            nr_pages << (PAGE_SHIFT - 10));
     total_pages = nr_pages;
 
-    /* Sanity check for unwanted bloat of dom0_op_t structure. */
-    BUG_ON(sizeof(((dom0_op_t *)0)->u) != sizeof(((dom0_op_t *)0)->u.pad));
+    /* Sanity check for unwanted bloat of dom0_op structure. */
+    BUG_ON(sizeof(((struct dom0_op *)0)->u) !=
+           sizeof(((struct dom0_op *)0)->u.pad));
 
     BUG_ON(sizeof(start_info_t) > PAGE_SIZE);
     BUG_ON(sizeof(shared_info_t) > PAGE_SIZE);
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c      Fri Jan 27 20:57:07 2006
+++ b/xen/arch/x86/traps.c      Fri Jan 27 21:18:15 2006
@@ -325,7 +325,7 @@
 {
     struct vcpu *v = current;
     struct trap_bounce *tb = &v->arch.trap_bounce;
-    trap_info_t *ti;
+    struct trap_info *ti;
     unsigned long fixup;
 
     DEBUGGER_trap_entry(trapnr, regs);
@@ -392,7 +392,7 @@
 {
     struct vcpu *v = current;
     struct trap_bounce *tb = &v->arch.trap_bounce;
-    trap_info_t *ti;
+    struct trap_info *ti;
 
     DEBUGGER_trap_entry(TRAP_int3, regs);
 
@@ -421,7 +421,7 @@
 
 void propagate_page_fault(unsigned long addr, u16 error_code)
 {
-    trap_info_t *ti;
+    struct trap_info *ti;
     struct vcpu *v = current;
     struct trap_bounce *tb = &v->arch.trap_bounce;
 
@@ -1014,7 +1014,7 @@
 {
     struct vcpu *v = current;
     struct trap_bounce *tb = &v->arch.trap_bounce;
-    trap_info_t *ti;
+    struct trap_info *ti;
     unsigned long fixup;
 
     DEBUGGER_trap_entry(TRAP_gp_fault, regs);
@@ -1217,7 +1217,7 @@
 asmlinkage int math_state_restore(struct cpu_user_regs *regs)
 {
     struct trap_bounce *tb;
-    trap_info_t *ti;
+    struct trap_info *ti;
 
     /* Prevent recursion. */
     clts();
@@ -1246,7 +1246,7 @@
     unsigned long condition;
     struct vcpu *v = current;
     struct trap_bounce *tb = &v->arch.trap_bounce;
-    trap_info_t *ti;
+    struct trap_info *ti;
 
     __asm__ __volatile__("mov %%db6,%0" : "=r" (condition));
 
@@ -1364,10 +1364,10 @@
 }
 
 
-long do_set_trap_table(trap_info_t *traps)
-{
-    trap_info_t cur;
-    trap_info_t *dst = current->arch.guest_context.trap_ctxt;
+long do_set_trap_table(struct trap_info *traps)
+{
+    struct trap_info cur;
+    struct trap_info *dst = current->arch.guest_context.trap_ctxt;
     long rc = 0;
 
     LOCK_BIGLOCK(current->domain);
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/arch/x86/x86_32/asm-offsets.c
--- a/xen/arch/x86/x86_32/asm-offsets.c Fri Jan 27 20:57:07 2006
+++ b/xen/arch/x86/x86_32/asm-offsets.c Fri Jan 27 21:18:15 2006
@@ -90,15 +90,15 @@
     BLANK();
 #endif
 
-    OFFSET(MULTICALL_op, multicall_entry_t, op);
-    OFFSET(MULTICALL_arg0, multicall_entry_t, args[0]);
-    OFFSET(MULTICALL_arg1, multicall_entry_t, args[1]);
-    OFFSET(MULTICALL_arg2, multicall_entry_t, args[2]);
-    OFFSET(MULTICALL_arg3, multicall_entry_t, args[3]);
-    OFFSET(MULTICALL_arg4, multicall_entry_t, args[4]);
-    OFFSET(MULTICALL_arg5, multicall_entry_t, args[5]);
-    OFFSET(MULTICALL_arg6, multicall_entry_t, args[6]);
-    OFFSET(MULTICALL_result, multicall_entry_t, result);
+    OFFSET(MULTICALL_op, struct multicall_entry, op);
+    OFFSET(MULTICALL_arg0, struct multicall_entry, args[0]);
+    OFFSET(MULTICALL_arg1, struct multicall_entry, args[1]);
+    OFFSET(MULTICALL_arg2, struct multicall_entry, args[2]);
+    OFFSET(MULTICALL_arg3, struct multicall_entry, args[3]);
+    OFFSET(MULTICALL_arg4, struct multicall_entry, args[4]);
+    OFFSET(MULTICALL_arg5, struct multicall_entry, args[5]);
+    OFFSET(MULTICALL_arg6, struct multicall_entry, args[6]);
+    OFFSET(MULTICALL_result, struct multicall_entry, result);
     BLANK();
 
     DEFINE(FIXMAP_apic_base, fix_to_virt(FIX_APIC_BASE));
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/arch/x86/x86_32/seg_fixup.c
--- a/xen/arch/x86/x86_32/seg_fixup.c   Fri Jan 27 20:57:07 2006
+++ b/xen/arch/x86/x86_32/seg_fixup.c   Fri Jan 27 21:18:15 2006
@@ -268,7 +268,7 @@
 int gpf_emulate_4gb(struct cpu_user_regs *regs)
 {
     struct vcpu *d = current;
-    trap_info_t   *ti;
+    struct trap_info   *ti;
     struct trap_bounce *tb;
     u8            modrm, mod, reg, rm, decode;
     void         *memreg, *regreg;
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/arch/x86/x86_32/traps.c
--- a/xen/arch/x86/x86_32/traps.c       Fri Jan 27 20:57:07 2006
+++ b/xen/arch/x86/x86_32/traps.c       Fri Jan 27 21:18:15 2006
@@ -157,7 +157,7 @@
         __asm__ __volatile__ ( "hlt" );
 }
 
-asmlinkage unsigned long do_iret(void)
+unsigned long do_iret(void)
 {
     struct cpu_user_regs *regs = guest_cpu_user_regs();
     u32 eflags;
@@ -263,7 +263,7 @@
 
 void init_int80_direct_trap(struct vcpu *v)
 {
-    trap_info_t *ti = &v->arch.guest_context.trap_ctxt[0x80];
+    struct trap_info *ti = &v->arch.guest_context.trap_ctxt[0x80];
 
     /*
      * We can't virtualise interrupt gates, as there's no way to get
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/arch/x86/x86_64/asm-offsets.c
--- a/xen/arch/x86/x86_64/asm-offsets.c Fri Jan 27 20:57:07 2006
+++ b/xen/arch/x86/x86_64/asm-offsets.c Fri Jan 27 21:18:15 2006
@@ -90,15 +90,15 @@
     BLANK();
 #endif
 
-    OFFSET(MULTICALL_op, multicall_entry_t, op);
-    OFFSET(MULTICALL_arg0, multicall_entry_t, args[0]);
-    OFFSET(MULTICALL_arg1, multicall_entry_t, args[1]);
-    OFFSET(MULTICALL_arg2, multicall_entry_t, args[2]);
-    OFFSET(MULTICALL_arg3, multicall_entry_t, args[3]);
-    OFFSET(MULTICALL_arg4, multicall_entry_t, args[4]);
-    OFFSET(MULTICALL_arg5, multicall_entry_t, args[5]);
-    OFFSET(MULTICALL_arg6, multicall_entry_t, args[6]);
-    OFFSET(MULTICALL_result, multicall_entry_t, result);
+    OFFSET(MULTICALL_op, struct multicall_entry, op);
+    OFFSET(MULTICALL_arg0, struct multicall_entry, args[0]);
+    OFFSET(MULTICALL_arg1, struct multicall_entry, args[1]);
+    OFFSET(MULTICALL_arg2, struct multicall_entry, args[2]);
+    OFFSET(MULTICALL_arg3, struct multicall_entry, args[3]);
+    OFFSET(MULTICALL_arg4, struct multicall_entry, args[4]);
+    OFFSET(MULTICALL_arg5, struct multicall_entry, args[5]);
+    OFFSET(MULTICALL_arg6, struct multicall_entry, args[6]);
+    OFFSET(MULTICALL_result, struct multicall_entry, result);
     BLANK();
 
     DEFINE(IRQSTAT_shift, LOG_2(sizeof(irq_cpustat_t)));
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/arch/x86/x86_64/traps.c
--- a/xen/arch/x86/x86_64/traps.c       Fri Jan 27 20:57:07 2006
+++ b/xen/arch/x86/x86_64/traps.c       Fri Jan 27 21:18:15 2006
@@ -122,7 +122,7 @@
     write_ptbase(v);
 }
 
-long do_iret(void)
+unsigned long do_iret(void)
 {
     struct cpu_user_regs *regs = guest_cpu_user_regs();
     struct iret_context iret_saved;
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/common/dom0_ops.c
--- a/xen/common/dom0_ops.c     Fri Jan 27 20:57:07 2006
+++ b/xen/common/dom0_ops.c     Fri Jan 27 21:18:15 2006
@@ -22,7 +22,8 @@
 #include <public/sched_ctl.h>
 #include <acm/acm_hooks.h>
 
-extern long arch_do_dom0_op(dom0_op_t *op, dom0_op_t *u_dom0_op);
+extern long arch_do_dom0_op(
+    struct dom0_op *op, struct dom0_op *u_dom0_op);
 extern void arch_getdomaininfo_ctxt(
     struct vcpu *, struct vcpu_guest_context *);
 
@@ -86,10 +87,10 @@
     memcpy(info->handle, d->handle, sizeof(xen_domain_handle_t));
 }
 
-long do_dom0_op(dom0_op_t *u_dom0_op)
+long do_dom0_op(struct dom0_op *u_dom0_op)
 {
     long ret = 0;
-    dom0_op_t curop, *op = &curop;
+    struct dom0_op curop, *op = &curop;
     void *ssid = NULL; /* save security ptr between pre and post/fail hooks */
     static spinlock_t dom0_lock = SPIN_LOCK_UNLOCKED;
 
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/common/event_channel.c
--- a/xen/common/event_channel.c        Fri Jan 27 20:57:07 2006
+++ b/xen/common/event_channel.c        Fri Jan 27 21:18:15 2006
@@ -580,10 +580,10 @@
     return 0;
 }
 
-long do_event_channel_op(evtchn_op_t *uop)
+long do_event_channel_op(struct evtchn_op *uop)
 {
     long rc;
-    evtchn_op_t op;
+    struct evtchn_op op;
 
     if ( copy_from_user(&op, uop, sizeof(op)) != 0 )
         return -EFAULT;
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/common/multicall.c
--- a/xen/common/multicall.c    Fri Jan 27 20:57:07 2006
+++ b/xen/common/multicall.c    Fri Jan 27 21:18:15 2006
@@ -15,7 +15,7 @@
 
 struct mc_state mc_state[NR_CPUS];
 
-long do_multicall(multicall_entry_t *call_list, unsigned int nr_calls)
+long do_multicall(struct multicall_entry *call_list, unsigned int nr_calls)
 {
     struct mc_state *mcs = &mc_state[smp_processor_id()];
     unsigned int     i;
@@ -51,7 +51,7 @@
              * Deliberately corrupt the contents of the multicall structure.
              * The caller must depend only on the 'result' field on return.
              */
-            multicall_entry_t corrupt;
+            struct multicall_entry corrupt;
             memset(&corrupt, 0xAA, sizeof(corrupt));
             (void)__copy_to_user(&call_list[i], &corrupt, sizeof(corrupt));
         }
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/include/acm/acm_hooks.h
--- a/xen/include/acm/acm_hooks.h       Fri Jan 27 20:57:07 2006
+++ b/xen/include/acm/acm_hooks.h       Fri Jan 27 21:18:15 2006
@@ -129,13 +129,13 @@
 
 #ifndef ACM_SECURITY
 
-static inline int acm_pre_dom0_op(dom0_op_t *op, void **ssid) 
-{ return 0; }
-static inline void acm_post_dom0_op(dom0_op_t *op, void *ssid) 
+static inline int acm_pre_dom0_op(struct dom0_op *op, void **ssid) 
+{ return 0; }
+static inline void acm_post_dom0_op(struct dom0_op *op, void *ssid) 
 { return; }
-static inline void acm_fail_dom0_op(dom0_op_t *op, void *ssid) 
+static inline void acm_fail_dom0_op(struct dom0_op *op, void *ssid) 
 { return; }
-static inline int acm_pre_event_channel(evtchn_op_t *op) 
+static inline int acm_pre_event_channel(struct evtchn_op *op) 
 { return 0; }
 static inline int acm_pre_grant_map_ref(domid_t id) 
 { return 0; }
@@ -223,7 +223,7 @@
         return ACM_ACCESS_PERMITTED;
 }
 
-static inline int acm_pre_dom0_op(dom0_op_t *op, void **ssid) 
+static inline int acm_pre_dom0_op(struct dom0_op *op, void **ssid) 
 {
     int ret = -EACCES;
     struct domain *d;
@@ -260,7 +260,7 @@
     return ret;
 }
 
-static inline void acm_post_dom0_op(dom0_op_t *op, void **ssid)
+static inline void acm_post_dom0_op(struct dom0_op *op, void **ssid)
 {
     switch(op->cmd) {
     case DOM0_CREATEDOMAIN:
@@ -279,7 +279,7 @@
     }
 }
 
-static inline void acm_fail_dom0_op(dom0_op_t *op, void *ssid) 
+static inline void acm_fail_dom0_op(struct dom0_op *op, void *ssid) 
 {
     switch(op->cmd) {
     case DOM0_CREATEDOMAIN:
@@ -289,7 +289,7 @@
     }
 }
 
-static inline int acm_pre_event_channel(evtchn_op_t *op) 
+static inline int acm_pre_event_channel(struct evtchn_op *op) 
 {
     int ret = -EACCES;
 
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/include/public/arch-x86_32.h
--- a/xen/include/public/arch-x86_32.h  Fri Jan 27 20:57:07 2006
+++ b/xen/include/public/arch-x86_32.h  Fri Jan 27 21:18:15 2006
@@ -118,7 +118,7 @@
 #define VGCF_IN_KERNEL  (1<<2)
     unsigned long flags;                    /* VGCF_* flags                 */
     cpu_user_regs_t user_regs;              /* User-level CPU registers     */
-    trap_info_t   trap_ctxt[256];           /* Virtual IDT                  */
+    struct trap_info trap_ctxt[256];        /* Virtual IDT                  */
     unsigned long ldt_base, ldt_ents;       /* LDT (linear address, # ents) */
     unsigned long gdt_frames[16], gdt_ents; /* GDT (machine frames, # ents) */
     unsigned long kernel_ss, kernel_sp;     /* Virtual TSS (only SS1/SP1)   */
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/include/public/arch-x86_64.h
--- a/xen/include/public/arch-x86_64.h  Fri Jan 27 20:57:07 2006
+++ b/xen/include/public/arch-x86_64.h  Fri Jan 27 21:18:15 2006
@@ -200,7 +200,7 @@
 #define VGCF_IN_KERNEL  (1<<2)
     unsigned long flags;                    /* VGCF_* flags                 */
     cpu_user_regs_t user_regs;              /* User-level CPU registers     */
-    trap_info_t   trap_ctxt[256];           /* Virtual IDT                  */
+    struct trap_info trap_ctxt[256];        /* Virtual IDT                  */
     unsigned long ldt_base, ldt_ents;       /* LDT (linear address, # ents) */
     unsigned long gdt_frames[16], gdt_ents; /* GDT (machine frames, # ents) */
     unsigned long kernel_ss, kernel_sp;     /* Virtual TSS (only SS1/SP1)   */
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/include/public/dom0_ops.h
--- a/xen/include/public/dom0_ops.h     Fri Jan 27 20:57:07 2006
+++ b/xen/include/public/dom0_ops.h     Fri Jan 27 21:18:15 2006
@@ -24,7 +24,7 @@
 /************************************************************************/
 
 #define DOM0_GETMEMLIST        2
-typedef struct {
+typedef struct dom0_getmemlist {
     /* IN variables. */
     domid_t       domain;
     unsigned long max_pfns;
@@ -42,7 +42,7 @@
 typedef struct sched_adjdom_cmd dom0_adjustdom_t;
 
 #define DOM0_CREATEDOMAIN      8
-typedef struct {
+typedef struct dom0_createdomain {
     /* IN parameters */
     uint32_t ssidref;
     xen_domain_handle_t handle;
@@ -52,25 +52,25 @@
 } dom0_createdomain_t;
 
 #define DOM0_DESTROYDOMAIN     9
-typedef struct {
+typedef struct dom0_destroydomain {
     /* IN variables. */
     domid_t domain;
 } dom0_destroydomain_t;
 
 #define DOM0_PAUSEDOMAIN      10
-typedef struct {
+typedef struct dom0_pausedomain {
     /* IN parameters. */
     domid_t domain;
 } dom0_pausedomain_t;
 
 #define DOM0_UNPAUSEDOMAIN    11
-typedef struct {
+typedef struct dom0_unpausedomain {
     /* IN parameters. */
     domid_t domain;
 } dom0_unpausedomain_t;
 
 #define DOM0_GETDOMAININFO    12
-typedef struct {
+typedef struct dom0_getdomaininfo {
     /* IN variables. */
     domid_t  domain;                  /* NB. IN/OUT variable. */
     /* OUT variables. */
@@ -95,7 +95,7 @@
 } dom0_getdomaininfo_t;
 
 #define DOM0_SETVCPUCONTEXT   13
-typedef struct {
+typedef struct dom0_setvcpucontext {
     /* IN variables. */
     domid_t               domain;
     uint32_t              vcpu;
@@ -104,7 +104,7 @@
 } dom0_setvcpucontext_t;
 
 #define DOM0_MSR              15
-typedef struct {
+typedef struct dom0_msr {
     /* IN variables. */
     uint32_t write;
     cpumap_t cpu_mask;
@@ -121,7 +121,7 @@
  * 1 January, 1970 if the current system time was <system_time>.
  */
 #define DOM0_SETTIME          17
-typedef struct {
+typedef struct dom0_settime {
     /* IN variables. */
     uint32_t secs;
     uint32_t nsecs;
@@ -139,7 +139,7 @@
 #define LTAB_MASK XTAB
 #define LTABTYPE_MASK (0x7<<28)
 
-typedef struct {
+typedef struct dom0_getpageframeinfo {
     /* IN variables. */
     unsigned long pfn;     /* Machine page frame number to query.       */
     domid_t domain;        /* To which domain does the frame belong?    */
@@ -152,7 +152,7 @@
  * Read console content from Xen buffer ring.
  */
 #define DOM0_READCONSOLE      19
-typedef struct {
+typedef struct dom0_readconsole {
     /* IN variables. */
     uint32_t clear;        /* Non-zero -> clear after reading. */
     /* IN/OUT variables. */
@@ -164,7 +164,7 @@
  * Set which physical cpus a vcpu can execute on.
  */
 #define DOM0_SETVCPUAFFINITY  20
-typedef struct {
+typedef struct dom0_setvcpuaffinity {
     /* IN variables. */
     domid_t   domain;
     uint32_t  vcpu;
@@ -173,7 +173,7 @@
 
 /* Get trace buffers machine base address */
 #define DOM0_TBUFCONTROL       21
-typedef struct {
+typedef struct dom0_tbufcontrol {
     /* IN variables */
 #define DOM0_TBUF_GET_INFO     0
 #define DOM0_TBUF_SET_CPU_MASK 1
@@ -194,7 +194,7 @@
  * Get physical information about the host machine
  */
 #define DOM0_PHYSINFO         22
-typedef struct {
+typedef struct dom0_physinfo {
     uint32_t threads_per_core;
     uint32_t cores_per_socket;
     uint32_t sockets_per_node;
@@ -209,7 +209,7 @@
  * Get the ID of the current scheduler.
  */
 #define DOM0_SCHED_ID        24
-typedef struct {
+typedef struct dom0_sched_id {
     /* OUT variable */
     uint32_t sched_id;
 } dom0_sched_id_t;
@@ -228,15 +228,14 @@
 #define DOM0_SHADOW_CONTROL_OP_CLEAN       11
 #define DOM0_SHADOW_CONTROL_OP_PEEK        12
 
-typedef struct dom0_shadow_control
-{
+typedef struct dom0_shadow_control_stats {
     uint32_t fault_count;
     uint32_t dirty_count;
     uint32_t dirty_net_count;     
     uint32_t dirty_block_count;     
 } dom0_shadow_control_stats_t;
 
-typedef struct {
+typedef struct dom0_shadow_control {
     /* IN variables. */
     domid_t        domain;
     uint32_t       op;
@@ -248,14 +247,14 @@
 } dom0_shadow_control_t;
 
 #define DOM0_SETDOMAINMAXMEM   28
-typedef struct {
+typedef struct dom0_setdomainmaxmem {
     /* IN variables. */
     domid_t       domain;
     unsigned long max_memkb;
 } dom0_setdomainmaxmem_t;
 
 #define DOM0_GETPAGEFRAMEINFO2 29   /* batched interface */
-typedef struct {
+typedef struct dom0_getpageframeinfo2 {
     /* IN variables. */
     domid_t        domain;
     unsigned long  num;
@@ -271,7 +270,7 @@
  * (x86-specific).
  */
 #define DOM0_ADD_MEMTYPE         31
-typedef struct {
+typedef struct dom0_add_memtype {
     /* IN variables. */
     unsigned long pfn;
     unsigned long nr_pfns;
@@ -289,7 +288,7 @@
  * (x86-specific).
  */
 #define DOM0_DEL_MEMTYPE         32
-typedef struct {
+typedef struct dom0_del_memtype {
     /* IN variables. */
     uint32_t handle;
     uint32_t reg;
@@ -297,7 +296,7 @@
 
 /* Read current type of an MTRR (x86-specific). */
 #define DOM0_READ_MEMTYPE        33
-typedef struct {
+typedef struct dom0_read_memtype {
     /* IN variables. */
     uint32_t reg;
     /* OUT variables. */
@@ -311,12 +310,12 @@
 /* Sub-operations: */
 #define DOM0_PERFCCONTROL_OP_RESET 1   /* Reset all counters to zero. */
 #define DOM0_PERFCCONTROL_OP_QUERY 2   /* Get perfctr information. */
-typedef struct {
+typedef struct dom0_perfc_desc {
     uint8_t      name[80];             /* name of perf counter */
     uint32_t     nr_vals;              /* number of values for this counter */
     uint32_t     vals[64];             /* array of values */
 } dom0_perfc_desc_t;
-typedef struct {
+typedef struct dom0_perfccontrol {
     /* IN variables. */
     uint32_t       op;                /*  DOM0_PERFCCONTROL_OP_??? */
     /* OUT variables. */
@@ -325,14 +324,14 @@
 } dom0_perfccontrol_t;
 
 #define DOM0_MICROCODE           35
-typedef struct {
+typedef struct dom0_microcode {
     /* IN variables. */
     void    *data;                    /* Pointer to microcode data */
     uint32_t length;                  /* Length of microcode data. */
 } dom0_microcode_t;
 
 #define DOM0_IOPORT_PERMISSION   36
-typedef struct {
+typedef struct dom0_ioport_permission {
     domid_t  domain;                  /* domain to be affected */
     uint32_t first_port;              /* first port int range */
     uint32_t nr_ports;                /* size of port range */
@@ -340,7 +339,7 @@
 } dom0_ioport_permission_t;
 
 #define DOM0_GETVCPUCONTEXT      37
-typedef struct {
+typedef struct dom0_getvcpucontext {
     /* IN variables. */
     domid_t  domain;                  /* domain to be affected */
     uint32_t vcpu;                    /* vcpu # */
@@ -349,7 +348,7 @@
 } dom0_getvcpucontext_t;
 
 #define DOM0_GETVCPUINFO         43
-typedef struct {
+typedef struct dom0_getvcpuinfo {
     /* IN variables. */
     domid_t  domain;                  /* domain to be affected */
     uint32_t vcpu;                    /* vcpu # */
@@ -363,7 +362,7 @@
 } dom0_getvcpuinfo_t;
 
 #define DOM0_GETDOMAININFOLIST   38
-typedef struct {
+typedef struct dom0_getdomaininfolist {
     /* IN variables. */
     domid_t               first_domain;
     uint32_t              max_domains;
@@ -374,13 +373,13 @@
 
 #define DOM0_PLATFORM_QUIRK      39  
 #define QUIRK_NOIRQBALANCING  1
-typedef struct {
+typedef struct dom0_platform_quirk {
     /* IN variables. */
     uint32_t quirk_id;
 } dom0_platform_quirk_t;
 
 #define DOM0_PHYSICAL_MEMORY_MAP 40
-typedef struct {
+typedef struct dom0_physical_memory_map {
     /* IN variables. */
     uint32_t max_map_entries;
     /* OUT variables. */
@@ -393,32 +392,32 @@
 } dom0_physical_memory_map_t;
 
 #define DOM0_MAX_VCPUS 41
-typedef struct {
+typedef struct dom0_max_vcpus {
     domid_t  domain;        /* domain to be affected */
     uint32_t max;           /* maximum number of vcpus */
 } dom0_max_vcpus_t;
 
 #define DOM0_SETDOMAINHANDLE 44
-typedef struct {
+typedef struct dom0_setdomainhandle {
     domid_t domain;
     xen_domain_handle_t handle;
 } dom0_setdomainhandle_t;
 
 #define DOM0_SETDEBUGGING 45
-typedef struct {
+typedef struct dom0_setdebugging {
     domid_t domain;
     uint8_t enable;
 } dom0_setdebugging_t;
 
 #define DOM0_IRQ_PERMISSION 46
-typedef struct {
+typedef struct dom0_irq_permission {
     domid_t domain;          /* domain to be affected */
     uint8_t pirq;
     uint8_t allow_access;    /* flag to specify enable/disable of IRQ access */
 } dom0_irq_permission_t;
 
 #define DOM0_IOMEM_PERMISSION 47
-typedef struct {
+typedef struct dom0_iomem_permission {
     domid_t  domain;          /* domain to be affected */
     unsigned long first_pfn;  /* first page (physical page number) in range */
     unsigned long nr_pfns;    /* number of pages in range (>0) */
@@ -426,52 +425,52 @@
 } dom0_iomem_permission_t;
  
 #define DOM0_HYPERCALL_INIT   48
-typedef struct {
+typedef struct dom0_hypercall_init {
     domid_t  domain;          /* domain to be affected */
     unsigned long mfn;        /* machine frame to be initialised */
 } dom0_hypercall_init_t;
  
-typedef struct {
+typedef struct dom0_op {
     uint32_t cmd;
     uint32_t interface_version; /* DOM0_INTERFACE_VERSION */
     union {
-        dom0_createdomain_t      createdomain;
-        dom0_pausedomain_t       pausedomain;
-        dom0_unpausedomain_t     unpausedomain;
-        dom0_destroydomain_t     destroydomain;
-        dom0_getmemlist_t        getmemlist;
-        dom0_schedctl_t          schedctl;
-        dom0_adjustdom_t         adjustdom;
-        dom0_setvcpucontext_t    setvcpucontext;
-        dom0_getdomaininfo_t     getdomaininfo;
-        dom0_getpageframeinfo_t  getpageframeinfo;
-        dom0_msr_t               msr;
-        dom0_settime_t           settime;
-        dom0_readconsole_t       readconsole;
-        dom0_setvcpuaffinity_t   setvcpuaffinity;
-        dom0_tbufcontrol_t       tbufcontrol;
-        dom0_physinfo_t          physinfo;
-        dom0_sched_id_t          sched_id;
-        dom0_shadow_control_t    shadow_control;
-        dom0_setdomainmaxmem_t   setdomainmaxmem;
-        dom0_getpageframeinfo2_t getpageframeinfo2;
-        dom0_add_memtype_t       add_memtype;
-        dom0_del_memtype_t       del_memtype;
-        dom0_read_memtype_t      read_memtype;
-        dom0_perfccontrol_t      perfccontrol;
-        dom0_microcode_t         microcode;
-        dom0_ioport_permission_t ioport_permission;
-        dom0_getvcpucontext_t    getvcpucontext;
-        dom0_getvcpuinfo_t       getvcpuinfo;
-        dom0_getdomaininfolist_t getdomaininfolist;
-        dom0_platform_quirk_t    platform_quirk;
-        dom0_physical_memory_map_t physical_memory_map;
-        dom0_max_vcpus_t         max_vcpus;
-        dom0_setdomainhandle_t   setdomainhandle;        
-        dom0_setdebugging_t      setdebugging;
-        dom0_irq_permission_t    irq_permission;
-        dom0_iomem_permission_t  iomem_permission;
-        dom0_hypercall_init_t    hypercall_init;
+        struct dom0_createdomain      createdomain;
+        struct dom0_pausedomain       pausedomain;
+        struct dom0_unpausedomain     unpausedomain;
+        struct dom0_destroydomain     destroydomain;
+        struct dom0_getmemlist        getmemlist;
+        struct sched_ctl_cmd          schedctl;
+        struct sched_adjdom_cmd       adjustdom;
+        struct dom0_setvcpucontext    setvcpucontext;
+        struct dom0_getdomaininfo     getdomaininfo;
+        struct dom0_getpageframeinfo  getpageframeinfo;
+        struct dom0_msr               msr;
+        struct dom0_settime           settime;
+        struct dom0_readconsole       readconsole;
+        struct dom0_setvcpuaffinity   setvcpuaffinity;
+        struct dom0_tbufcontrol       tbufcontrol;
+        struct dom0_physinfo          physinfo;
+        struct dom0_sched_id          sched_id;
+        struct dom0_shadow_control    shadow_control;
+        struct dom0_setdomainmaxmem   setdomainmaxmem;
+        struct dom0_getpageframeinfo2 getpageframeinfo2;
+        struct dom0_add_memtype       add_memtype;
+        struct dom0_del_memtype       del_memtype;
+        struct dom0_read_memtype      read_memtype;
+        struct dom0_perfccontrol      perfccontrol;
+        struct dom0_microcode         microcode;
+        struct dom0_ioport_permission ioport_permission;
+        struct dom0_getvcpucontext    getvcpucontext;
+        struct dom0_getvcpuinfo       getvcpuinfo;
+        struct dom0_getdomaininfolist getdomaininfolist;
+        struct dom0_platform_quirk    platform_quirk;
+        struct dom0_physical_memory_map physical_memory_map;
+        struct dom0_max_vcpus         max_vcpus;
+        struct dom0_setdomainhandle   setdomainhandle;        
+        struct dom0_setdebugging      setdebugging;
+        struct dom0_irq_permission    irq_permission;
+        struct dom0_iomem_permission  iomem_permission;
+        struct dom0_hypercall_init    hypercall_init;
         uint8_t                  pad[128];
     } u;
 } dom0_op_t;
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/include/public/xen.h
--- a/xen/include/public/xen.h  Fri Jan 27 20:57:07 2006
+++ b/xen/include/public/xen.h  Fri Jan 27 21:18:15 2006
@@ -250,8 +250,7 @@
  * Send an array of these to HYPERVISOR_mmu_update().
  * NB. The fields are natural pointer/address size for this architecture.
  */
-typedef struct
-{
+typedef struct mmu_update {
     uint64_t ptr;       /* Machine address of PTE. */
     uint64_t val;       /* New contents of PTE.    */
 } mmu_update_t;
@@ -260,8 +259,7 @@
  * Send an array of these to HYPERVISOR_multicall().
  * NB. The fields are natural register size for this architecture.
  */
-typedef struct
-{
+typedef struct multicall_entry {
     unsigned long op, result;
     unsigned long args[6];
 } multicall_entry_t;
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/include/xen/multicall.h
--- a/xen/include/xen/multicall.h       Fri Jan 27 20:57:07 2006
+++ b/xen/include/xen/multicall.h       Fri Jan 27 21:18:15 2006
@@ -12,8 +12,8 @@
 #define MCSF_in_multicall    (1<<_MCSF_in_multicall)
 #define MCSF_call_preempted  (1<<_MCSF_call_preempted)
 struct mc_state {
-    unsigned long     flags;
-    multicall_entry_t call;
+    unsigned long flags;
+    struct multicall_entry call;
 } __cacheline_aligned;
 
 extern struct mc_state mc_state[NR_CPUS];
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/include/asm-ia64/hypercall.h
--- /dev/null   Fri Jan 27 20:57:07 2006
+++ b/xen/include/asm-ia64/hypercall.h  Fri Jan 27 21:18:15 2006
@@ -0,0 +1,30 @@
+/******************************************************************************
+ * asm-ia64/hypercall.h
+ */
+
+#ifndef __ASM_IA64_HYPERCALL_H__
+#define __ASM_IA64_HYPERCALL_H__
+
+#include <public/xen.h>
+#include <asm/types.h>
+#include <asm/vcpu.h>
+
+extern int
+vmx_do_mmu_update(
+    mmu_update_t *ureqs,
+    u64 count,
+    u64 *pdone,
+    u64 foreigndom);
+
+extern int
+do_lock_page(
+    VCPU *vcpu,
+    u64 va,
+    u64 lock);
+
+extern int
+do_set_shared_page(
+    VCPU *vcpu,
+    u64 gpa);
+
+#endif /* __ASM_IA64_HYPERCALL_H__ */
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/include/asm-x86/hypercall.h
--- /dev/null   Fri Jan 27 20:57:07 2006
+++ b/xen/include/asm-x86/hypercall.h   Fri Jan 27 21:18:15 2006
@@ -0,0 +1,102 @@
+/******************************************************************************
+ * asm-x86/hypercall.h
+ */
+
+#ifndef __ASM_X86_HYPERCALL_H__
+#define __ASM_X86_HYPERCALL_H__
+
+struct trap_info;
+extern long
+do_set_trap_table(
+    struct trap_info *traps);
+
+struct mmu_update;
+extern int
+do_mmu_update(
+    struct mmu_update *ureqs,
+    unsigned int count,
+    unsigned int *pdone,
+    unsigned int foreigndom);
+
+extern long
+do_set_gdt(
+    unsigned long *frame_list,
+    unsigned int entries);
+
+extern long
+do_stack_switch(
+    unsigned long ss,
+    unsigned long esp);
+
+extern long
+do_fpu_taskswitch(
+    int set);
+
+extern long
+do_set_debugreg(
+    int reg,
+    unsigned long value);
+
+extern unsigned long
+do_get_debugreg(
+    int reg);
+
+extern long
+do_update_descriptor(
+    u64 pa,
+    u64 desc);
+
+extern int
+do_update_va_mapping(
+    unsigned long va,
+    u64 val64,
+    unsigned long flags);
+
+struct physdev_op;
+extern long
+do_physdev_op(
+    struct physdev_op *uop);
+
+extern int
+do_update_va_mapping_otherdomain(
+    unsigned long va,
+    u64 val64,
+    unsigned long flags,
+    domid_t domid);
+
+extern int
+do_mmuext_op(
+    struct mmuext_op *uops,
+    unsigned int count,
+    unsigned int *pdone,
+    unsigned int foreigndom);
+
+extern unsigned long
+do_iret(
+    void);
+
+#ifdef __x86_64__
+
+extern long
+do_set_callbacks(
+    unsigned long event_address,
+    unsigned long failsafe_address,
+    unsigned long syscall_address);
+
+extern long
+do_set_segment_base(
+    unsigned int which,
+    unsigned long base);
+
+#else
+
+extern long
+do_set_callbacks(
+    unsigned long event_selector,
+    unsigned long event_address,
+    unsigned long failsafe_selector,
+    unsigned long failsafe_address);
+
+#endif
+
+#endif /* __ASM_X86_HYPERCALL_H__ */
diff -r a47b7a464f09 -r 5a9efc35feb2 xen/include/xen/hypercall.h
--- /dev/null   Fri Jan 27 20:57:07 2006
+++ b/xen/include/xen/hypercall.h       Fri Jan 27 21:18:15 2006
@@ -0,0 +1,86 @@
+/******************************************************************************
+ * hypercall.h
+ */
+
+#ifndef __XEN_HYPERCALL_H__
+#define __XEN_HYPERCALL_H__
+
+#include <xen/config.h>
+#include <xen/types.h>
+#include <xen/time.h>
+#include <public/xen.h>
+#include <asm/hypercall.h>
+
+extern long
+do_ni_hypercall(
+    void);
+
+extern long
+do_sched_op(
+    int cmd,
+    unsigned long arg);
+
+struct dom0_op;
+extern long
+do_dom0_op(
+    struct dom0_op *u_dom0_op);
+
+extern long
+do_memory_op(
+    int cmd,
+    void *arg);
+
+struct multicall_entry;
+extern long
+do_multicall(
+    struct multicall_entry *call_list,
+    unsigned int nr_calls);
+
+extern long
+do_set_timer_op(
+    s_time_t timeout);
+
+struct evtchn_op;
+extern long
+do_event_channel_op(
+    struct evtchn_op *uop);
+
+extern long
+do_xen_version(
+    int cmd,
+    void *arg);
+
+extern long
+do_console_io(
+    int cmd,
+    int count,
+    char *buffer);
+
+extern long
+do_grant_table_op(
+    unsigned int cmd,
+    void *uop,
+    unsigned int count);
+
+extern long
+do_vm_assist(
+    unsigned int cmd,
+    unsigned int type);
+
+extern long
+do_vcpu_op(
+    int cmd,
+    int vcpuid,
+    void *arg);
+
+struct acm_op;
+extern long
+do_acm_op(
+    struct acm_op *u_acm_op);
+
+extern long
+do_nmi_op(
+    unsigned int cmd,
+    void *arg);
+
+#endif /* __XEN_HYPERCALL_H__ */

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


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.