From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: patches@linaro.org
Subject: [Qemu-devel] [PATCH 08/15] qga: Clean up includes
Date: Fri, 29 Jan 2016 17:49:58 +0000 [thread overview]
Message-ID: <1454089805-5470-9-git-send-email-peter.maydell@linaro.org> (raw)
In-Reply-To: <1454089805-5470-1-git-send-email-peter.maydell@linaro.org>
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>
---
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(-)
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"
--
1.9.1
next prev parent reply other threads:[~2016-01-29 17:50 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-29 17:49 [Qemu-devel] [PATCH 00/15] clean includes, part 2 Peter Maydell
2016-01-29 17:49 ` [Qemu-devel] [PATCH 01/15] ui: Clean up includes Peter Maydell
2016-01-29 17:49 ` [Qemu-devel] [PATCH 02/15] stubs: " Peter Maydell
2016-01-29 17:49 ` [Qemu-devel] [PATCH 03/15] bsd-user: " Peter Maydell
2016-01-29 17:49 ` [Qemu-devel] [PATCH 04/15] backends: " Peter Maydell
2016-01-29 17:49 ` [Qemu-devel] [PATCH 05/15] util: " Peter Maydell
2016-02-04 17:38 ` Peter Maydell
2016-01-29 17:49 ` [Qemu-devel] [PATCH 06/15] disas: " Peter Maydell
2016-01-29 17:49 ` [Qemu-devel] [PATCH 07/15] qapi: " Peter Maydell
2016-01-29 18:31 ` Eric Blake
2016-02-08 12:30 ` Peter Maydell
2016-02-08 15:38 ` Eric Blake
2016-01-29 17:49 ` Peter Maydell [this message]
2016-01-29 17:49 ` [Qemu-devel] [PATCH 09/15] slirp: " Peter Maydell
2016-01-29 17:50 ` [Qemu-devel] [PATCH 10/15] net: " Peter Maydell
2016-01-29 17:50 ` [Qemu-devel] [PATCH 11/15] qobject: " Peter Maydell
2016-01-29 18:35 ` Eric Blake
2016-01-29 17:50 ` [Qemu-devel] [PATCH 12/15] qom: " Peter Maydell
2016-01-29 17:50 ` [Qemu-devel] [PATCH 13/15] io: " Peter Maydell
2016-01-29 17:50 ` [Qemu-devel] [PATCH 14/15] contrib: " Peter Maydell
2016-01-29 17:50 ` [Qemu-devel] [PATCH 15/15] all: " Peter Maydell
2016-02-04 18:23 ` [Qemu-devel] [PATCH 00/15] clean includes, part 2 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454089805-5470-9-git-send-email-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=patches@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).