direct-io.hg

changeset 3289:86e3ae8351cd

bitkeeper revision 1.1159.1.482 (41c08038WE4QP9GDCInODhJX2Xh7xQ)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen.bk-smp
author cl349@arcadians.cl.cam.ac.uk
date Wed Dec 15 18:19:36 2004 +0000 (2004-12-15)
parents 1a1036639bf5 0cbf74c61595
children b9ab4345fd1b
files linux-2.4.28-xen-sparse/arch/xen/mm/init.c tools/misc/xencons tools/python/xen/util/console_client.py
line diff
     1.1 --- a/linux-2.4.28-xen-sparse/arch/xen/mm/init.c	Wed Dec 15 18:16:37 2004 +0000
     1.2 +++ b/linux-2.4.28-xen-sparse/arch/xen/mm/init.c	Wed Dec 15 18:19:36 2004 +0000
     1.3 @@ -36,6 +36,10 @@
     1.4  #include <asm/apic.h>
     1.5  #include <asm/tlb.h>
     1.6  
     1.7 +/* XEN: We *cannot* use mmx_clear_page() this early. Force dumb memset(). */
     1.8 +#undef clear_page
     1.9 +#define clear_page(page) memset((void *)(page), 0, PAGE_SIZE)
    1.10 +
    1.11  mmu_gather_t mmu_gathers[NR_CPUS];
    1.12  unsigned long highstart_pfn, highend_pfn;
    1.13  static unsigned long totalram_pages;
     2.1 --- a/tools/misc/xencons	Wed Dec 15 18:16:37 2004 +0000
     2.2 +++ b/tools/misc/xencons	Wed Dec 15 18:19:36 2004 +0000
     2.3 @@ -27,24 +27,33 @@ def __recv_from_sock(sock):
     2.4      while not stop:
     2.5          try:
     2.6              data = sock.recv(1024)
     2.7 +        except socket.error, error:
     2.8 +            if error[0] != errno.EINTR:
     2.9 +                raise
    2.10 +        try:
    2.11              os.write(1, data)
    2.12 -        except socket.error, error:
    2.13 +        except os.error, error:
    2.14              if error[0] != errno.EINTR:
    2.15                  raise
    2.16      os.wait()
    2.17  
    2.18  def __send_to_sock(sock):
    2.19      while 1:
    2.20 -        data = os.read(0,1024)
    2.21 -        if ord(data[0]) == ord(']')-64:
    2.22 -            break
    2.23          try:
    2.24 -            sock.send(data)
    2.25 -        except socket.error, error:
    2.26 -            if error[0] == errno.EPIPE:
    2.27 -                sys.exit(0)
    2.28 +            data = os.read(0,1024)
    2.29 +        except os.error, error:
    2.30              if error[0] != errno.EINTR:
    2.31                  raise
    2.32 +        else:
    2.33 +            if ord(data[0]) == ord(']')-64:
    2.34 +                break
    2.35 +            try:
    2.36 +                sock.send(data)
    2.37 +            except socket.error, error:
    2.38 +                if error[0] == errno.EPIPE:
    2.39 +                    sys.exit(0)
    2.40 +                if error[0] != errno.EINTR:
    2.41 +                    raise
    2.42      sys.exit(0)
    2.43  
    2.44  def connect(host,port):
     3.1 --- a/tools/python/xen/util/console_client.py	Wed Dec 15 18:16:37 2004 +0000
     3.2 +++ b/tools/python/xen/util/console_client.py	Wed Dec 15 18:19:36 2004 +0000
     3.3 @@ -27,24 +27,33 @@ def __recv_from_sock(sock):
     3.4      while not stop:
     3.5          try:
     3.6              data = sock.recv(1024)
     3.7 +        except socket.error, error:
     3.8 +            if error[0] != errno.EINTR:
     3.9 +                raise
    3.10 +        try:
    3.11              os.write(1, data)
    3.12 -        except socket.error, error:
    3.13 +        except os.error, error:
    3.14              if error[0] != errno.EINTR:
    3.15                  raise
    3.16      os.wait()
    3.17  
    3.18  def __send_to_sock(sock):
    3.19      while 1:
    3.20 -        data = os.read(0,1024)
    3.21 -        if ord(data[0]) == ord(']')-64:
    3.22 -            break
    3.23          try:
    3.24 -            sock.send(data)
    3.25 -        except socket.error, error:
    3.26 -            if error[0] == errno.EPIPE:
    3.27 -                sys.exit(0)
    3.28 +            data = os.read(0,1024)
    3.29 +        except os.error, error:
    3.30              if error[0] != errno.EINTR:
    3.31                  raise
    3.32 +        else:
    3.33 +            if ord(data[0]) == ord(']')-64:
    3.34 +                break
    3.35 +            try:
    3.36 +                sock.send(data)
    3.37 +            except socket.error, error:
    3.38 +                if error[0] == errno.EPIPE:
    3.39 +                    sys.exit(0)
    3.40 +                if error[0] != errno.EINTR:
    3.41 +                    raise
    3.42      sys.exit(0)
    3.43  
    3.44  def connect(host,port):