ia64/xen-unstable

changeset 864:4c4ccae6252f

bitkeeper revision 1.539 (3f9fee97LmrWncvzqKoEIzrY9jj3TQ)

more mergey fun
author smh22@labyrinth.cl.cam.ac.uk
date Wed Oct 29 16:45:11 2003 +0000 (2003-10-29)
parents ad1f9e4c50e1
children fee13cf0d7d0 373b790a91e6
files BitKeeper/etc/ignore xen/include/hypervisor-ifs/block.h xen/include/xeno/sched.h xenolinux-2.4.22-sparse/include/asm-xeno/hypervisor.h
line diff
     1.1 --- a/BitKeeper/etc/ignore	Wed Oct 29 16:35:54 2003 +0000
     1.2 +++ b/BitKeeper/etc/ignore	Wed Oct 29 16:45:11 2003 +0000
     1.3 @@ -472,3 +472,5 @@ xen/drivers/net/dummy.o
     1.4  tools/misc/miniterm/miniterm
     1.5  tools/misc/xen_read_console
     1.6  extras/mini-os/h/hypervisor-ifs
     1.7 +xen/BLOG
     1.8 +xen/drivers/block/xen_vbd.o
     2.1 --- a/xen/include/hypervisor-ifs/block.h	Wed Oct 29 16:35:54 2003 +0000
     2.2 +++ b/xen/include/hypervisor-ifs/block.h	Wed Oct 29 16:45:11 2003 +0000
     2.3 @@ -9,14 +9,6 @@
     2.4  #define __BLOCK_H__
     2.5  
     2.6  /*
     2.7 - * Command values for block_io_op()
     2.8 - */
     2.9 -
    2.10 -#define BLKOP_PUSH_BUFFERS   0  /* Notify Xen of new requests on the ring. */
    2.11 -#define BLKOP_FLUSH_BUFFERS  1  /* Flush all pending request buffers.      */
    2.12 -
    2.13 -
    2.14 -/*
    2.15   * Device numbers
    2.16   */
    2.17  
     3.1 --- a/xen/include/xeno/sched.h	Wed Oct 29 16:35:54 2003 +0000
     3.2 +++ b/xen/include/xeno/sched.h	Wed Oct 29 16:45:11 2003 +0000
     3.3 @@ -63,8 +63,7 @@ extern struct mm_struct init_mm;
     3.4  #define PF_CONSTRUCTED  0x8  /* Has the guest OS been fully built yet? */
     3.5  
     3.6  #include <xeno/vif.h>
     3.7 -#include <xeno/block.h>
     3.8 -#include <xeno/segment.h>
     3.9 +#include <xeno/vbd.h>
    3.10  
    3.11  /* SMH: replace below when have explicit 'priv' flag or bitmask */
    3.12  #define IS_PRIV(_p) ((_p)->domain == 0) 
    3.13 @@ -145,7 +144,7 @@ struct task_struct
    3.14  				       the process can do raw access
    3.15  				       to. */
    3.16      spinlock_t physdev_lock;
    3.17 -    segment_t *segment_list[XEN_MAX_SEGMENTS];
    3.18 +    vbd_t *vbd_list[XEN_MAX_VBDS];
    3.19  
    3.20      /* VM */
    3.21      struct mm_struct mm;
     4.1 --- a/xenolinux-2.4.22-sparse/include/asm-xeno/hypervisor.h	Wed Oct 29 16:35:54 2003 +0000
     4.2 +++ b/xenolinux-2.4.22-sparse/include/asm-xeno/hypervisor.h	Wed Oct 29 16:45:11 2003 +0000
     4.3 @@ -282,13 +282,13 @@ static inline int HYPERVISOR_network_op(
     4.4      return ret;
     4.5  }
     4.6  
     4.7 -static inline int HYPERVISOR_block_io_op(unsigned int op)
     4.8 +static inline int HYPERVISOR_block_io_op(void * block_io_op)
     4.9  {
    4.10      int ret;
    4.11      __asm__ __volatile__ (
    4.12          TRAP_INSTR
    4.13          : "=a" (ret) : "0" (__HYPERVISOR_block_io_op),
    4.14 -        "b" (op) ); 
    4.15 +        "b" (block_io_op) ); 
    4.16  
    4.17      return ret;
    4.18  }