summary refs log tree commit diff stats
path: root/io/channel-buffer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-02-16 15:47:35 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-02-16 15:47:35 +0000
commit250f53ddaac3211990fb20ced3c46d2338e195e3 (patch)
treea63512b4b83c92e9ccf688b2e57a0cec4d6a46de /io/channel-buffer.c
parentd5db2ec1774642db7febda0fba1cb3d0b9ef7236 (diff)
parente8f117f3b3eb41a766d38e0b765f89ec79c6a9ff (diff)
downloadfocaccia-qemu-250f53ddaac3211990fb20ced3c46d2338e195e3.tar.gz
focaccia-qemu-250f53ddaac3211990fb20ced3c46d2338e195e3.zip
Merge remote-tracking branch 'remotes/berrange/tags/pull-io-next-2016-02-16-1' into staging
Merge I/O fixes 2016/02/16 v1

# gpg: Signature made Tue 16 Feb 2016 15:42:29 GMT using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"

* remotes/berrange/tags/pull-io-next-2016-02-16-1:
  io: convert QIOChannelBuffer to use uint8_t instead of char
  io: introduce helper for creating channels from file descriptors
  io: improve docs for QIOChannelSocket async functions

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'io/channel-buffer.c')
-rw-r--r--io/channel-buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/io/channel-buffer.c b/io/channel-buffer.c
index 0f7c5671fe..3e5117bf28 100644
--- a/io/channel-buffer.c
+++ b/io/channel-buffer.c
@@ -32,7 +32,7 @@ qio_channel_buffer_new(size_t capacity)
     ioc = QIO_CHANNEL_BUFFER(object_new(TYPE_QIO_CHANNEL_BUFFER));
 
     if (capacity) {
-        ioc->data = g_new0(char, capacity);
+        ioc->data = g_new0(uint8_t, capacity);
         ioc->capacity = capacity;
     }