[Xen-changelog] Manual merge.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 7c95f26c2f0e5c9c717d3e7b942184256a2eae8a
# Parent  ecef9732b19b3944e8128662cc00e61691db9e12

# Parent  5985fc86b3daf01b176c9d286d51386b06a094a2
Manual merge.

diff -r ecef9732b19b -r 7c95f26c2f0e 
linux-2.6.11-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
--- a/linux-2.6.11-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Fri Jul  1 
13:17:53 2005
+++ b/linux-2.6.11-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Fri Jul  1 
13:35:03 2005
@@ -103,12 +103,6 @@
         } else if(n == 0){
                 err = -ENOENT;
                 kfree(data);
-        } else if(data[n - 1] != '\0') {
-                /* This shouldn't happen: everything is supposed to be a 
string. */
-               printk("XENBUS: Reading path %s: missing null terminator 
len=%i\n", path, n); 
-                err = -EINVAL;
-                kfree(data);
-                n = 0;
         }
         kfree(path);
   out:
diff -r ecef9732b19b -r 7c95f26c2f0e tools/ioemu/target-i386-dm/qemu-dm.debug
--- /dev/null   Fri Jul  1 13:17:53 2005
+++ b/tools/ioemu/target-i386-dm/qemu-dm.debug  Fri Jul  1 13:35:03 2005
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo $* > /tmp/args
+echo $DISPLAY >> /tmp/args
+exec /usr/bin/qemu-dm $*

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