Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160608' into staging

[qemu.git] / qga / channel-win32.c

diff --git a/qga/channel-win32.c b/qga/channel-win32.c
index 0452b9f75eb0cc859d6c34e35ff983a799eed801..21f9deedf6dd7a2b13e5f7c21ec99c6c7b4b0e43 100644 (file)
--- a/qga/channel-win32.c
+++ b/qga/channel-win32.c
@@ -1,9 +1,5 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <glib.h>
+#include "qemu/osdep.h"
 #include <windows.h>
-#include <errno.h>
 #include <io.h>
 #include "qga/guest-agent-core.h"
 #include "qga/channel.h"
@@ -80,7 +76,7 @@ static gboolean ga_channel_prepare(GSource *source, gint *timeout_ms)
     }
 
 out:
-    /* dont block forever, iterate the main loop every once and a while */
+    /* don't block forever, iterate the main loop every once in a while */
     *timeout_ms = 500;
     /* if there's data in the read buffer, or another event is pending,
      * skip polling and issue user cb.