direct-io.hg

changeset 2111:bd1640d9d7d4

bitkeeper revision 1.1159.1.4 (41139d30ti25GcZ_ZdQ_JgKIlrbiHQ)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno
author kaf24@scramble.cl.cam.ac.uk
date Fri Aug 06 15:01:04 2004 +0000 (2004-08-06)
parents 8d3ff2e0b2e0 a989641f2755
children b142982228ea
files tools/libxc/xc.h tools/libxc/xc_domain.c tools/libxc/xc_evtchn.c tools/libxc/xc_linux_build.c tools/libxc/xc_linux_save.c tools/libxc/xc_netbsd_build.c tools/libxc/xc_private.c xen/include/hypervisor-ifs/dom0_ops.h xen/include/hypervisor-ifs/event_channel.h xen/include/hypervisor-ifs/hypervisor-if.h xen/include/hypervisor-ifs/io/domain_controller.h xen/include/hypervisor-ifs/sched_ctl.h xen/include/xen/sched.h
line diff
     1.1 --- a/tools/libxc/xc.h	Fri Aug 06 14:11:00 2004 +0000
     1.2 +++ b/tools/libxc/xc.h	Fri Aug 06 15:01:04 2004 +0000
     1.3 @@ -149,7 +149,7 @@ int xc_rrobin_global_set(int xc_handle, 
     1.4  
     1.5  int xc_rrobin_global_get(int xc_handle, u64 *slice);
     1.6  
     1.7 -#define DOMID_SELF              (0x7FFFFFFEU)
     1.8 +#define DOMID_SELF              (0x7FFEU)
     1.9  
    1.10  typedef struct {
    1.11  #define EVTCHNSTAT_closed       0  /* Chennel is not in use.                 */
     2.1 --- a/tools/libxc/xc_domain.c	Fri Aug 06 14:11:00 2004 +0000
     2.2 +++ b/tools/libxc/xc_domain.c	Fri Aug 06 15:01:04 2004 +0000
     2.3 @@ -25,7 +25,7 @@ int xc_domain_create(int xc_handle,
     2.4      op.u.createdomain.cpu = cpu;
     2.5  
     2.6      if ( (err = do_dom0_op(xc_handle, &op)) == 0 )
     2.7 -        *pdomid = (u32)op.u.createdomain.domain;
     2.8 +        *pdomid = (u16)op.u.createdomain.domain;
     2.9  
    2.10      return err;
    2.11  }    
    2.12 @@ -88,7 +88,7 @@ int xc_domain_getinfo(int xc_handle,
    2.13          op.u.getdomaininfo.ctxt = NULL; /* no exec context info, thanks. */
    2.14          if ( do_dom0_op(xc_handle, &op) < 0 )
    2.15              break;
    2.16 -        info->domid   = (u32)op.u.getdomaininfo.domain;
    2.17 +        info->domid   = (u16)op.u.getdomaininfo.domain;
    2.18  
    2.19          info->cpu     =
    2.20              (op.u.getdomaininfo.flags>>DOMFLAGS_CPUSHIFT) & DOMFLAGS_CPUMASK;
    2.21 @@ -111,7 +111,7 @@ int xc_domain_getinfo(int xc_handle,
    2.22          strncpy(info->name, op.u.getdomaininfo.name, XC_DOMINFO_MAXNAME);
    2.23          info->name[XC_DOMINFO_MAXNAME-1] = '\0';
    2.24  
    2.25 -        next_domid = (u32)op.u.getdomaininfo.domain + 1;
    2.26 +        next_domid = (u16)op.u.getdomaininfo.domain + 1;
    2.27          info++;
    2.28      }
    2.29  
    2.30 @@ -129,7 +129,7 @@ int xc_domain_getfullinfo(int xc_handle,
    2.31      op->u.getdomaininfo.ctxt = ctxt;
    2.32  
    2.33      rc = do_dom0_op(xc_handle, op);
    2.34 -    if ( ((u32)op->u.getdomaininfo.domain != domid) && rc > 0 )
    2.35 +    if ( ((u16)op->u.getdomaininfo.domain != domid) && rc > 0 )
    2.36          return -ESRCH;
    2.37      else
    2.38          return rc;
     3.1 --- a/tools/libxc/xc_evtchn.c	Fri Aug 06 14:11:00 2004 +0000
     3.2 +++ b/tools/libxc/xc_evtchn.c	Fri Aug 06 15:01:04 2004 +0000
     3.3 @@ -115,7 +115,7 @@ int xc_evtchn_status(int xc_handle,
     3.4          switch ( status->status = op.u.status.status )
     3.5          {
     3.6          case EVTCHNSTAT_interdomain:
     3.7 -            status->u.interdomain.dom  = (u32)op.u.status.u.interdomain.dom;
     3.8 +            status->u.interdomain.dom  = (u16)op.u.status.u.interdomain.dom;
     3.9              status->u.interdomain.port = op.u.status.u.interdomain.port;
    3.10              break;
    3.11          case EVTCHNSTAT_pirq:
     4.1 --- a/tools/libxc/xc_linux_build.c	Fri Aug 06 14:11:00 2004 +0000
     4.2 +++ b/tools/libxc/xc_linux_build.c	Fri Aug 06 15:01:04 2004 +0000
     4.3 @@ -440,7 +440,7 @@ int xc_linux_build(int xc_handle,
     4.4      op.u.getdomaininfo.domain = (domid_t)domid;
     4.5      op.u.getdomaininfo.ctxt = ctxt;
     4.6      if ( (do_dom0_op(xc_handle, &op) < 0) || 
     4.7 -         ((u32)op.u.getdomaininfo.domain != domid) )
     4.8 +         ((u16)op.u.getdomaininfo.domain != domid) )
     4.9      {
    4.10          PERROR("Could not get info on domain");
    4.11          goto error_out;
     5.1 --- a/tools/libxc/xc_linux_save.c	Fri Aug 06 14:11:00 2004 +0000
     5.2 +++ b/tools/libxc/xc_linux_save.c	Fri Aug 06 15:01:04 2004 +0000
     5.3 @@ -364,7 +364,7 @@ int xc_linux_save(int xc_handle, XcIOCon
     5.4              pgd[HYPERVISOR_VIRT_START>>L2_PAGETABLE_SHIFT]>>PAGE_SHIFT;
     5.5  
     5.6          live_mfn_to_pfn_table = 
     5.7 -            mfn_mapper_map_single(xc_handle, ~0UL, 
     5.8 +            mfn_mapper_map_single(xc_handle, 0x7FFFU, 
     5.9                                    PAGE_SIZE*1024, PROT_READ, 
    5.10                                    mfn_to_pfn_table_start_mfn );
    5.11      }
     6.1 --- a/tools/libxc/xc_netbsd_build.c	Fri Aug 06 14:11:00 2004 +0000
     6.2 +++ b/tools/libxc/xc_netbsd_build.c	Fri Aug 06 15:01:04 2004 +0000
     6.3 @@ -254,7 +254,7 @@ int xc_netbsd_build(int xc_handle,
     6.4      op.u.getdomaininfo.domain = (domid_t)domid;
     6.5      op.u.getdomaininfo.ctxt = ctxt;
     6.6      if ( (do_dom0_op(xc_handle, &op) < 0) || 
     6.7 -         ((u32)op.u.getdomaininfo.domain != domid) )
     6.8 +         ((u16)op.u.getdomaininfo.domain != domid) )
     6.9      {
    6.10          PERROR("Could not get info on domain");
    6.11          goto error_out;
     7.1 --- a/tools/libxc/xc_private.c	Fri Aug 06 14:11:00 2004 +0000
     7.2 +++ b/tools/libxc/xc_private.c	Fri Aug 06 15:01:04 2004 +0000
     7.3 @@ -296,7 +296,7 @@ long long  xc_domain_get_cpu_usage( int 
     7.4      op.u.getdomaininfo.domain = (domid_t)domid;
     7.5      op.u.getdomaininfo.ctxt = NULL;
     7.6      if ( (do_dom0_op(xc_handle, &op) < 0) || 
     7.7 -         ((u32)op.u.getdomaininfo.domain != domid) )
     7.8 +         ((u16)op.u.getdomaininfo.domain != domid) )
     7.9      {
    7.10          PERROR("Could not get info on domain");
    7.11          return -1;
     8.1 --- a/xen/include/hypervisor-ifs/dom0_ops.h	Fri Aug 06 14:11:00 2004 +0000
     8.2 +++ b/xen/include/hypervisor-ifs/dom0_ops.h	Fri Aug 06 15:01:04 2004 +0000
     8.3 @@ -19,7 +19,7 @@
     8.4   * This makes sure that old versions of dom0 tools will stop working in a
     8.5   * well-defined way (rather than crashing the machine, for instance).
     8.6   */
     8.7 -#define DOM0_INTERFACE_VERSION   0xAAAA0010
     8.8 +#define DOM0_INTERFACE_VERSION   0xAAAA0011
     8.9  
    8.10  #define MAX_DOMAIN_NAME    16
    8.11  
    8.12 @@ -29,7 +29,8 @@
    8.13  typedef struct {
    8.14      /* IN variables. */
    8.15      domid_t       domain;             /*  0 */
    8.16 -    u32           __pad;
    8.17 +    u16           __pad0;
    8.18 +    u32           __pad1;
    8.19      memory_t      max_pfns;           /*  8 */
    8.20      MEMORY_PADDING;
    8.21      void         *buffer;             /* 16 */
    8.22 @@ -54,10 +55,11 @@ typedef struct {
    8.23      MEMORY_PADDING;
    8.24      u8           name[MAX_DOMAIN_NAME]; /*  8 */
    8.25      u32          cpu;                 /* 24 */
    8.26 -    u32          __pad;               /* 28 */
    8.27 +    u32          __pad0;              /* 28 */
    8.28      /* IN/OUT parameters. */
    8.29      /* If 0, domain is allocated. If non-zero use it unless in use. */
    8.30      domid_t      domain;              /* 32 */
    8.31 +    u16          __pad1;
    8.32      /* OUT parameters. */
    8.33  } PACKED dom0_createdomain_t; /* 36 bytes */
    8.34  
    8.35 @@ -65,24 +67,28 @@ typedef struct {
    8.36  typedef struct {
    8.37      /* IN variables. */
    8.38      domid_t      domain;              /*  0 */
    8.39 +    u16          __pad;
    8.40  } PACKED dom0_destroydomain_t; /* 4 bytes */
    8.41  
    8.42  #define DOM0_PAUSEDOMAIN      10
    8.43  typedef struct {
    8.44      /* IN parameters. */
    8.45      domid_t domain;                   /*  0 */
    8.46 +    u16     __pad;
    8.47  } PACKED dom0_pausedomain_t; /* 4 bytes */
    8.48  
    8.49  #define DOM0_UNPAUSEDOMAIN    11
    8.50  typedef struct {
    8.51      /* IN parameters. */
    8.52      domid_t domain;                   /*  0 */
    8.53 +    u16     __pad;
    8.54  } PACKED dom0_unpausedomain_t; /* 4 bytes */
    8.55  
    8.56  #define DOM0_GETDOMAININFO    12
    8.57  typedef struct {
    8.58      /* IN variables. */
    8.59      domid_t  domain;                  /*  0 */ /* NB. IN/OUT variable. */
    8.60 +    u16     __pad;
    8.61      /* OUT variables. */
    8.62  #define DOMFLAGS_DYING     (1<<0) /* Domain is scheduled to die.             */
    8.63  #define DOMFLAGS_CRASHED   (1<<1) /* Crashed domain; frozen for postmortem.  */
    8.64 @@ -111,7 +117,8 @@ typedef struct {
    8.65  typedef struct {
    8.66      /* IN variables. */
    8.67      domid_t                 domain;   /*  0 */
    8.68 -    u32                     __pad;    /*  4 */
    8.69 +    u16                     __pad0;   /*  2 */
    8.70 +    u32                     __pad1;   /*  4 */
    8.71      /* IN/OUT parameters */
    8.72      full_execution_context_t *ctxt;   /*  8 */
    8.73      MEMORY_PADDING;
    8.74 @@ -120,6 +127,7 @@ typedef struct {
    8.75  #define DOM0_IOPL             14
    8.76  typedef struct {
    8.77      domid_t domain;                   /*  0 */
    8.78 +    u16     __pad;
    8.79      u32     iopl;                     /*  4 */
    8.80  } PACKED dom0_iopl_t; /* 8 bytes */
    8.81  
    8.82 @@ -140,17 +148,17 @@ typedef struct {
    8.83  typedef struct {
    8.84      /* IN variables. */
    8.85      domid_t domain;                   /*  0 */
    8.86 -    u8  opcode;                       /*  4 */
    8.87 -    u8  __pad0, __pad1, __pad2;
    8.88 -    u32 in1;                          /*  8 */
    8.89 -    u32 in2;                          /* 12 */
    8.90 -    u32 in3;                          /* 16 */
    8.91 -    u32 in4;                          /* 20 */
    8.92 +    u8  opcode;                       /*  2 */
    8.93 +    u8  __pad;
    8.94 +    u32 in1;                          /*  4 */
    8.95 +    u32 in2;                          /*  8 */
    8.96 +    u32 in3;                          /* 12 */
    8.97 +    u32 in4;                          /* 16 */
    8.98      /* OUT variables. */
    8.99 -    u32 status;                       /* 24 */
   8.100 -    u32 out1;                         /* 28 */
   8.101 -    u32 out2;                         /* 32 */
   8.102 -} PACKED dom0_debug_t; /* 36 bytes */
   8.103 +    u32 status;                       /* 20 */
   8.104 +    u32 out1;                         /* 24 */
   8.105 +    u32 out2;                         /* 28 */
   8.106 +} PACKED dom0_debug_t; /* 32 bytes */
   8.107  
   8.108  /*
   8.109   * Set clock such that it would read <secs,usecs> after 00:00:00 UTC,
   8.110 @@ -177,6 +185,7 @@ typedef struct {
   8.111      memory_t pfn;          /*  0: Machine page frame number to query.       */
   8.112      MEMORY_PADDING;
   8.113      domid_t domain;        /*  8: To which domain does the frame belong?    */
   8.114 +    u16     __pad;
   8.115      /* OUT variables. */
   8.116      /* Is the page PINNED to a type? */
   8.117      u32 type;              /* 12: see above type defs */
   8.118 @@ -200,6 +209,7 @@ typedef struct {
   8.119  typedef struct {
   8.120      /* IN variables. */
   8.121      domid_t      domain;              /*  0 */
   8.122 +    u16          __pad;
   8.123      s32          cpu;                 /*  4: -1 implies unpin */
   8.124  } PACKED dom0_pincpudomain_t; /* 8 bytes */
   8.125  
   8.126 @@ -234,6 +244,7 @@ typedef struct {
   8.127  typedef struct {
   8.128      /* IN variables. */
   8.129      domid_t      domain;              /*  0 */
   8.130 +    u16          __pad;
   8.131      u32          bus;                 /*  4 */
   8.132      u32          dev;                 /*  8 */
   8.133      u32          func;                /* 12 */
   8.134 @@ -274,6 +285,7 @@ typedef struct dom0_shadow_control
   8.135  typedef struct {
   8.136      /* IN variables. */
   8.137      domid_t        domain;            /*  0 */
   8.138 +    u16            __pad;
   8.139      u32            op;                /*  4 */
   8.140      unsigned long *dirty_bitmap;      /*  8: pointer to locked buffer */
   8.141      MEMORY_PADDING;
   8.142 @@ -289,6 +301,7 @@ typedef struct {
   8.143  typedef struct {
   8.144      /* IN variables. */
   8.145      domid_t  domain;                  /*  0 */
   8.146 +    u16      __pad;
   8.147      u8       name[MAX_DOMAIN_NAME];   /*  4 */
   8.148  } PACKED dom0_setdomainname_t; /* 20 bytes */
   8.149  
   8.150 @@ -296,7 +309,8 @@ typedef struct {
   8.151  typedef struct {
   8.152      /* IN variables. */
   8.153      domid_t     domain;               /*  0 */
   8.154 -    u32         __pad;
   8.155 +    u16         __pad0;
   8.156 +    u32         __pad1;
   8.157      memory_t    initial_memkb;        /*  8 */
   8.158      MEMORY_PADDING;
   8.159  } PACKED dom0_setdomaininitialmem_t; /* 16 bytes */
   8.160 @@ -305,7 +319,8 @@ typedef struct {
   8.161  typedef struct {
   8.162      /* IN variables. */
   8.163      domid_t     domain;               /*  0 */
   8.164 -    u32         __pad;
   8.165 +    u16         __pad0;
   8.166 +    u32         __pad1;
   8.167      memory_t    max_memkb;            /*  8 */
   8.168      MEMORY_PADDING;
   8.169  } PACKED dom0_setdomainmaxmem_t; /* 16 bytes */
   8.170 @@ -314,7 +329,8 @@ typedef struct {
   8.171  typedef struct {
   8.172      /* IN variables. */
   8.173      domid_t  domain;                  /*  0 */
   8.174 -    u32         __pad;
   8.175 +    u16      __pad0;
   8.176 +    u32      __pad1;
   8.177      memory_t num;                     /*  8 */
   8.178      MEMORY_PADDING;
   8.179      /* IN/OUT variables. */
     9.1 --- a/xen/include/hypervisor-ifs/event_channel.h	Fri Aug 06 14:11:00 2004 +0000
     9.2 +++ b/xen/include/hypervisor-ifs/event_channel.h	Fri Aug 06 15:01:04 2004 +0000
     9.3 @@ -19,10 +19,10 @@
     9.4  #define EVTCHNOP_bind_interdomain 0
     9.5  typedef struct {
     9.6      /* IN parameters. */
     9.7 -    domid_t dom1, dom2;               /*  0,  4 */
     9.8 +    domid_t dom1, dom2;               /*  0,  2 */
     9.9      /* OUT parameters. */
    9.10 -    u32     port1, port2;             /*  8, 12 */
    9.11 -} PACKED evtchn_bind_interdomain_t; /* 16 bytes */
    9.12 +    u32     port1, port2;             /*  4,  8 */
    9.13 +} PACKED evtchn_bind_interdomain_t; /* 12 bytes */
    9.14  
    9.15  /*
    9.16   * EVTCHNOP_bind_virq: Bind a local event channel to IRQ <irq>.
    9.17 @@ -65,6 +65,7 @@ typedef struct {
    9.18  typedef struct {
    9.19      /* IN parameters. */
    9.20      domid_t dom;                      /*  0 */
    9.21 +    u16     __pad;
    9.22      u32     port;                     /*  4 */
    9.23      /* No OUT parameters. */
    9.24  } PACKED evtchn_close_t; /* 8 bytes */
    9.25 @@ -92,6 +93,7 @@ typedef struct {
    9.26  typedef struct {
    9.27      /* IN parameters */
    9.28      domid_t dom;                      /*  0 */
    9.29 +    u16     __pad;
    9.30      u32     port;                     /*  4 */
    9.31      /* OUT parameters */
    9.32  #define EVTCHNSTAT_closed       0  /* Chennel is not in use.                 */
    9.33 @@ -103,6 +105,7 @@ typedef struct {
    9.34      union {                           /* 12 */
    9.35          struct {
    9.36              domid_t dom;                              /* 12 */
    9.37 +            u16     __pad;
    9.38              u32     port;                             /* 16 */
    9.39          } PACKED interdomain; /* EVTCHNSTAT_interdomain */
    9.40          u32 pirq;      /* EVTCHNSTAT_pirq        */   /* 12 */
    10.1 --- a/xen/include/hypervisor-ifs/hypervisor-if.h	Fri Aug 06 14:11:00 2004 +0000
    10.2 +++ b/xen/include/hypervisor-ifs/hypervisor-if.h	Fri Aug 06 15:01:04 2004 +0000
    10.3 @@ -193,9 +193,9 @@
    10.4  
    10.5  #ifndef __ASSEMBLY__
    10.6  
    10.7 -typedef u32 domid_t;
    10.8 +typedef u16 domid_t;
    10.9  /* DOMID_SELF is used in certain contexts to refer to oneself. */
   10.10 -#define DOMID_SELF (0x7FFFFFFEU)
   10.11 +#define DOMID_SELF (0x7FFEU)
   10.12  
   10.13  /*
   10.14   * Send an array of these to HYPERVISOR_mmu_update().
    11.1 --- a/xen/include/hypervisor-ifs/io/domain_controller.h	Fri Aug 06 14:11:00 2004 +0000
    11.2 +++ b/xen/include/hypervisor-ifs/io/domain_controller.h	Fri Aug 06 15:01:04 2004 +0000
    11.3 @@ -223,6 +223,7 @@ typedef struct {
    11.4  typedef struct { 
    11.5      /* IN */
    11.6      domid_t    domid;         /*  0: Domain attached to new interface.   */
    11.7 +    u16        __pad;
    11.8      u32        blkif_handle;  /*  4: Domain-specific interface handle.   */
    11.9      /* OUT */
   11.10      u32        status;        /*  8 */
   11.11 @@ -237,6 +238,7 @@ typedef struct {
   11.12  typedef struct { 
   11.13      /* IN */
   11.14      domid_t    domid;         /*  0: Identify interface to be destroyed. */
   11.15 +    u16        __pad;
   11.16      u32        blkif_handle;  /*  4: ...ditto...                         */
   11.17      /* OUT */
   11.18      u32        status;        /*  8 */
   11.19 @@ -251,6 +253,7 @@ typedef struct {
   11.20  typedef struct { 
   11.21      /* IN */
   11.22      domid_t    domid;         /*  0: Domain attached to new interface.   */
   11.23 +    u16        __pad;
   11.24      u32        blkif_handle;  /*  4: Domain-specific interface handle.   */
   11.25      memory_t   shmem_frame;   /*  8: Page cont. shared comms window.     */
   11.26      MEMORY_PADDING;
   11.27 @@ -268,6 +271,7 @@ typedef struct {
   11.28  typedef struct { 
   11.29      /* IN */
   11.30      domid_t    domid;         /*  0: Domain attached to new interface.   */
   11.31 +    u16        __pad;
   11.32      u32        blkif_handle;  /*  4: Domain-specific interface handle.   */
   11.33      /* OUT */
   11.34      u32        status;        /*  8 */
   11.35 @@ -277,6 +281,7 @@ typedef struct {
   11.36  typedef struct { 
   11.37      /* IN */
   11.38      domid_t    domid;         /*  0: Identify blkdev interface.          */
   11.39 +    u16        __pad;
   11.40      u32        blkif_handle;  /*  4: ...ditto...                         */
   11.41      blkif_vdev_t vdevice;     /*  8: Interface-specific id for this VBD. */
   11.42      u16        readonly;      /* 10: Non-zero -> VBD isn't writeable.    */
   11.43 @@ -288,9 +293,10 @@ typedef struct {
   11.44  typedef struct {
   11.45      /* IN */
   11.46      domid_t    domid;         /*  0: Identify blkdev interface.          */
   11.47 +    u16        __pad0;        /*  2 */
   11.48      u32        blkif_handle;  /*  4: ...ditto...                         */
   11.49      blkif_vdev_t vdevice;     /*  8: Interface-specific id of the VBD.   */
   11.50 -    u16        __pad;         /* 10 */
   11.51 +    u16        __pad1;        /* 10 */
   11.52      /* OUT */
   11.53      u32        status;        /* 12 */
   11.54  } PACKED blkif_be_vbd_destroy_t; /* 16 bytes */
   11.55 @@ -299,10 +305,11 @@ typedef struct {
   11.56  typedef struct { 
   11.57      /* IN */
   11.58      domid_t    domid;         /*  0: Identify blkdev interface.          */
   11.59 +    u16        __pad0;        /*  2 */
   11.60      u32        blkif_handle;  /*  4: ...ditto...                         */
   11.61      blkif_extent_t extent;    /*  8: Physical extent to append to VBD.   */
   11.62      blkif_vdev_t vdevice;     /* 28: Interface-specific id of the VBD.   */
   11.63 -    u16        __pad;         /* 30 */
   11.64 +    u16        __pad1;        /* 30 */
   11.65      /* OUT */
   11.66      u32        status;        /* 32 */
   11.67  } PACKED blkif_be_vbd_grow_t; /* 36 bytes */
   11.68 @@ -311,9 +318,10 @@ typedef struct {
   11.69  typedef struct { 
   11.70      /* IN */
   11.71      domid_t    domid;         /*  0: Identify blkdev interface.          */
   11.72 +    u16        __pad0;        /*  2 */
   11.73      u32        blkif_handle;  /*  4: ...ditto...                         */
   11.74      blkif_vdev_t vdevice;     /*  8: Interface-specific id of the VBD.   */
   11.75 -    u16        __pad;         /* 10 */
   11.76 +    u16        __pad1;        /* 10 */
   11.77      /* OUT */
   11.78      u32        status;        /* 12 */
   11.79  } PACKED blkif_be_vbd_shrink_t; /* 16 bytes */
   11.80 @@ -451,9 +459,10 @@ typedef struct {
   11.81  typedef struct { 
   11.82      /* IN */
   11.83      domid_t    domid;         /*  0: Domain attached to new interface.   */
   11.84 +    u16        __pad0;        /*  2 */
   11.85      u32        netif_handle;  /*  4: Domain-specific interface handle.   */
   11.86      u8         mac[6];        /*  8 */
   11.87 -    u16        __pad;         /* 14 */
   11.88 +    u16        __pad1;        /* 14 */
   11.89      /* OUT */
   11.90      u32        status;        /* 16 */
   11.91  } PACKED netif_be_create_t; /* 20 bytes */
   11.92 @@ -467,6 +476,7 @@ typedef struct {
   11.93  typedef struct { 
   11.94      /* IN */
   11.95      domid_t    domid;         /*  0: Identify interface to be destroyed. */
   11.96 +    u16        __pad;
   11.97      u32        netif_handle;  /*  4: ...ditto...                         */
   11.98      /* OUT */
   11.99      u32   status;             /*  8 */
  11.100 @@ -481,13 +491,14 @@ typedef struct {
  11.101  typedef struct { 
  11.102      /* IN */
  11.103      domid_t    domid;          /*  0: Domain attached to new interface.   */
  11.104 +    u16        __pad0;         /*  2 */
  11.105      u32        netif_handle;   /*  4: Domain-specific interface handle.   */
  11.106      memory_t   tx_shmem_frame; /*  8: Page cont. tx shared comms window.  */
  11.107      MEMORY_PADDING;
  11.108      memory_t   rx_shmem_frame; /* 16: Page cont. rx shared comms window.  */
  11.109      MEMORY_PADDING;
  11.110      u16        evtchn;         /* 24: Event channel for notifications.    */
  11.111 -    u16        __pad;          /* 26 */
  11.112 +    u16        __pad1;         /* 26 */
  11.113      /* OUT */
  11.114      u32        status;         /* 28 */
  11.115  } PACKED netif_be_connect_t; /* 32 bytes */
  11.116 @@ -501,6 +512,7 @@ typedef struct {
  11.117  typedef struct { 
  11.118      /* IN */
  11.119      domid_t    domid;         /*  0: Domain attached to new interface.   */
  11.120 +    u16        __pad;
  11.121      u32        netif_handle;  /*  4: Domain-specific interface handle.   */
  11.122      /* OUT */
  11.123      u32        status;        /*  8 */
    12.1 --- a/xen/include/hypervisor-ifs/sched_ctl.h	Fri Aug 06 14:11:00 2004 +0000
    12.2 +++ b/xen/include/hypervisor-ifs/sched_ctl.h	Fri Aug 06 15:01:04 2004 +0000
    12.3 @@ -52,7 +52,8 @@ struct sched_adjdom_cmd
    12.4      u32     sched_id;                 /*  0 */
    12.5      u32     direction;                /*  4 */
    12.6      domid_t domain;                   /*  8 */
    12.7 -    u32     __pad;
    12.8 +    u16     __pad0;
    12.9 +    u32     __pad1;
   12.10      union {                           /* 16 */
   12.11          struct bvt_adjdom
   12.12          {
    13.1 --- a/xen/include/xen/sched.h	Fri Aug 06 14:11:00 2004 +0000
    13.2 +++ b/xen/include/xen/sched.h	Fri Aug 06 15:01:04 2004 +0000
    13.3 @@ -155,7 +155,7 @@ struct domain
    13.4  extern struct domain idle0_task;
    13.5  
    13.6  extern struct domain *idle_task[NR_CPUS];
    13.7 -#define IDLE_DOMAIN_ID   (0x7FFFFFFFU)
    13.8 +#define IDLE_DOMAIN_ID   (0x7FFFU)
    13.9  #define is_idle_task(_p) (test_bit(DF_IDLETASK, &(_p)->flags))
   13.10  
   13.11  void free_domain_struct(struct domain *d);