[Xen-changelog] merge

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 65e0699dc9e11e3b297865d4bf184856d916955f
# Parent  1a1c0f9b242edc6d614500c929f11d8ef47e553c
# Parent  80e393599413fdcd38b1e438042e22d218bec272
merge

diff -r 1a1c0f9b242e -r 65e0699dc9e1 tools/console/daemon/io.c
--- a/tools/console/daemon/io.c Thu Nov 17 12:02:19 2005
+++ b/tools/console/daemon/io.c Thu Nov 17 12:03:13 2005
@@ -114,7 +114,7 @@
                        buffer->data, buffer->max_capacity);
                buffer->data = realloc(buffer->data,
                                       buffer->max_capacity);
-               buffer->capacity = buffer->max_capacity;
+               buffer->size = buffer->capacity = buffer->max_capacity;
        }
 }
 

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