[08/15] qga: Clean up includes

Commit Message

Peter Maydell Jan. 29, 2016, 5:49 p.m. UTC

Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.

Signed-off-by: Peter Maydell <[e-mail]>
---
 qga/channel-posix.c             | 7 +------
 qga/channel-win32.c             | 5 +----
 qga/commands-posix.c            | 9 +--------
 qga/commands-win32.c            | 3 +--
 qga/commands.c                  | 1 +
 qga/guest-agent-command-state.c | 1 +
 qga/main.c                      | 5 +----
 qga/service-win32.c             | 3 +--
 qga/vss-win32.c                 | 2 +-
 9 files changed, 9 insertions(+), 27 deletions(-)

Patch

diff --git a/qga/channel-posix.c b/qga/channel-posix.c
index 50d9dd3..7ad3c00 100644
--- a/qga/channel-posix.c
+++ b/qga/channel-posix.c
@@ -1,11 +1,6 @@ 
+#include "qemu/osdep.h"
 #include <glib.h>
 #include <termios.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include "qemu/osdep.h"
 #include "qemu/sockets.h"
 #include "qga/channel.h"
 
diff --git a/qga/channel-win32.c b/qga/channel-win32.c
index 0452b9f..bb59661 100644
--- a/qga/channel-win32.c
+++ b/qga/channel-win32.c
@@ -1,9 +1,6 @@ 
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
+#include "qemu/osdep.h"
 #include <glib.h>
 #include <windows.h>
-#include <errno.h>
 #include <io.h>
 #include "qga/guest-agent-core.h"
 #include "qga/channel.h"
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 5f91275..9589b2d634 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -11,18 +11,11 @@ 
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>
-#include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <dirent.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <inttypes.h>
 #include "qga/guest-agent-core.h"
 #include "qga-qmp-commands.h"
 #include "qapi/qmp/qerror.h"
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 61ffbdf..cf0757c 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -11,11 +11,10 @@ 
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 #include <wtypes.h>
 #include <powrprof.h>
-#include <stdio.h>
-#include <string.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <iptypes.h>
diff --git a/qga/commands.c b/qga/commands.c
index 58568d8..5b56786 100644
--- a/qga/commands.c
+++ b/qga/commands.c
@@ -10,6 +10,7 @@ 
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 #include "qga/guest-agent-core.h"
 #include "qga-qmp-commands.h"
diff --git a/qga/guest-agent-command-state.c b/qga/guest-agent-command-state.c
index 128c549..20b9b22 100644
--- a/qga/guest-agent-command-state.c
+++ b/qga/guest-agent-command-state.c
@@ -9,6 +9,7 @@ 
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include <glib.h>
 #include "qga/guest-agent-core.h"
 
diff --git a/qga/main.c b/qga/main.c
index f83a97d..0a168e2 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -10,16 +10,13 @@ 
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
+#include "qemu/osdep.h"
 #include <glib.h>
 #include <getopt.h>
 #include <glib/gstdio.h>
 #ifndef _WIN32
 #include <syslog.h>
 #include <sys/wait.h>
-#include <sys/stat.h>
 #endif
 #include "qapi/qmp/json-streamer.h"
 #include "qapi/qmp/json-parser.h"
diff --git a/qga/service-win32.c b/qga/service-win32.c
index aef41f0..7243758 100644
--- a/qga/service-win32.c
+++ b/qga/service-win32.c
@@ -10,8 +10,7 @@ 
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
-#include <stdlib.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include <glib.h>
 #include <windows.h>
 #include "qga/service-win32.h"
diff --git a/qga/vss-win32.c b/qga/vss-win32.c
index 2142b49..5182e3b 100644
--- a/qga/vss-win32.c
+++ b/qga/vss-win32.c
@@ -10,7 +10,7 @@ 
  * See the COPYING file in the top-level directory.
  */
 
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include <windows.h>
 #include "qga/guest-agent-core.h"
 #include "qga/vss-win32.h"