aboutsummaryrefslogtreecommitdiff
path: root/qga
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-01-29 17:49:58 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-02-04 17:41:30 +0000
commit4459bf3866c380cc1e7cbb8771eee7b503d1163a (patch)
treeb2cd40da250e63f1c833bb89174257fc6270c318 /qga
parentcbf21151906c935d4276268b59429c58546462ae (diff)
qga: Clean up includes
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 <peter.maydell@linaro.org> Message-id: 1454089805-5470-9-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'qga')
-rw-r--r--qga/channel-posix.c7
-rw-r--r--qga/channel-win32.c5
-rw-r--r--qga/commands-posix.c9
-rw-r--r--qga/commands-win32.c3
-rw-r--r--qga/commands.c1
-rw-r--r--qga/guest-agent-command-state.c1
-rw-r--r--qga/main.c5
-rw-r--r--qga/service-win32.c3
-rw-r--r--qga/vss-win32.c2
9 files changed, 9 insertions, 27 deletions
diff --git a/qga/channel-posix.c b/qga/channel-posix.c
index 50d9dd3747..7ad3c00765 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 0452b9f75e..bb59661240 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 5f91275484..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 61ffbdf1ee..cf0757cd0f 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 58568d8452..5b56786ef6 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 128c549edb..20b9b22224 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 f83a97d245..0a168e2da8 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 aef41f04f1..72437587b0 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 2142b4964d..5182e3be91 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"