direct-io.hg

changeset 5633:7c95f26c2f0e

Manual merge.
author kaf24@firebug.cl.cam.ac.uk
date Fri Jul 01 13:35:03 2005 +0000 (2005-07-01)
parents ecef9732b19b 5985fc86b3da
children 43e2d33fc5d9 cb3da7250118
files linux-2.6.11-xen-sparse/drivers/xen/xenbus/xenbus_probe.c tools/ioemu/target-i386-dm/qemu-dm.debug
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Fri Jul 01 13:17:53 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Fri Jul 01 13:35:03 2005 +0000
     1.3 @@ -103,12 +103,6 @@ char *xenbus_read(const char *dir, const
     1.4          } else if(n == 0){
     1.5                  err = -ENOENT;
     1.6                  kfree(data);
     1.7 -        } else if(data[n - 1] != '\0') {
     1.8 -                /* This shouldn't happen: everything is supposed to be a string. */
     1.9 -		printk("XENBUS: Reading path %s: missing null terminator len=%i\n", path, n); 
    1.10 -                err = -EINVAL;
    1.11 -                kfree(data);
    1.12 -                n = 0;
    1.13          }
    1.14          kfree(path);
    1.15    out:
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/tools/ioemu/target-i386-dm/qemu-dm.debug	Fri Jul 01 13:35:03 2005 +0000
     2.3 @@ -0,0 +1,5 @@
     2.4 +#!/bin/sh
     2.5 +
     2.6 +echo $* > /tmp/args
     2.7 +echo $DISPLAY >> /tmp/args
     2.8 +exec /usr/bin/qemu-dm $*