From patchwork Fri Jan 29 17:50:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 8166001 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C68F2BEEE5 for ; Fri, 29 Jan 2016 18:07:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B45F12038E for ; Fri, 29 Jan 2016 18:07:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 61C532038D for ; Fri, 29 Jan 2016 18:07:44 +0000 (UTC) Received: from localhost ([::1]:36002 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPDSR-0002zt-K2 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 Jan 2016 13:07:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPDBT-00032D-IK for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:50:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPDBR-0001vc-Hf for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:50:11 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:59685) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPDBR-0001uk-9o for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:50:09 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1aPDBO-0001Rd-1d; Fri, 29 Jan 2016 17:50:06 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 29 Jan 2016 17:50:00 +0000 Message-Id: <1454089805-5470-11-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1454089805-5470-1-git-send-email-peter.maydell@linaro.org> References: <1454089805-5470-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:8b0:1d0::1 Cc: patches@linaro.org Subject: [Qemu-devel] [PATCH 10/15] net: Clean up includes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- net/checksum.c | 1 + net/dump.c | 1 + net/eth.c | 1 + net/filter-buffer.c | 1 + net/filter.c | 1 + net/hub.c | 1 + net/l2tpv3.c | 2 +- net/net.c | 2 +- net/netmap.c | 3 +-- net/queue.c | 1 + net/slirp.c | 2 +- net/socket.c | 2 +- net/tap-aix.c | 2 +- net/tap-bsd.c | 1 + net/tap-haiku.c | 2 +- net/tap-linux.c | 1 + net/tap-solaris.c | 2 +- net/tap-win32.c | 2 +- net/tap.c | 3 +-- net/util.c | 3 +-- net/vde.c | 2 +- net/vhost-user.c | 1 + 22 files changed, 22 insertions(+), 15 deletions(-) diff --git a/net/checksum.c b/net/checksum.c index 14c0855..b5016ab 100644 --- a/net/checksum.c +++ b/net/checksum.c @@ -15,6 +15,7 @@ * along with this program; if not, see . */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "net/checksum.h" diff --git a/net/dump.c b/net/dump.c index 88d9582..dc0f339 100644 --- a/net/dump.c +++ b/net/dump.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "clients.h" #include "qemu-common.h" #include "qemu/error-report.h" diff --git a/net/eth.c b/net/eth.c index 7c61132..7e32d27 100644 --- a/net/eth.c +++ b/net/eth.c @@ -15,6 +15,7 @@ * */ +#include "qemu/osdep.h" #include "net/eth.h" #include "net/checksum.h" #include "qemu-common.h" diff --git a/net/filter-buffer.c b/net/filter-buffer.c index 57be149..2353d5b 100644 --- a/net/filter-buffer.c +++ b/net/filter-buffer.c @@ -6,6 +6,7 @@ * later. See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "net/filter.h" #include "net/queue.h" #include "qemu-common.h" diff --git a/net/filter.c b/net/filter.c index 5d90f83..19f0f61 100644 --- a/net/filter.c +++ b/net/filter.c @@ -6,6 +6,7 @@ * later. See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" diff --git a/net/hub.c b/net/hub.c index 9ae9f01..b6d44fd 100644 --- a/net/hub.c +++ b/net/hub.c @@ -12,6 +12,7 @@ * */ +#include "qemu/osdep.h" #include "monitor/monitor.h" #include "net/net.h" #include "clients.h" diff --git a/net/l2tpv3.c b/net/l2tpv3.c index 21d6119..824161c 100644 --- a/net/l2tpv3.c +++ b/net/l2tpv3.c @@ -23,9 +23,9 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include #include -#include "config-host.h" #include "net/net.h" #include "clients.h" #include "qemu-common.h" diff --git a/net/net.c b/net/net.c index 87dd356..01ba117 100644 --- a/net/net.c +++ b/net/net.c @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "config-host.h" +#include "qemu/osdep.h" #include "net/net.h" #include "clients.h" diff --git a/net/netmap.c b/net/netmap.c index 5558368..a39ca4b 100644 --- a/net/netmap.c +++ b/net/netmap.c @@ -23,11 +23,10 @@ */ +#include "qemu/osdep.h" #include #include #include -#include -#include #define NETMAP_WITH_LIBS #include #include diff --git a/net/queue.c b/net/queue.c index de8b9d3..9c32abd 100644 --- a/net/queue.c +++ b/net/queue.c @@ -21,6 +21,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "net/queue.h" #include "qemu/queue.h" #include "net/net.h" diff --git a/net/slirp.c b/net/slirp.c index f505570..e2b500b 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "net/slirp.h" -#include "config-host.h" #ifndef _WIN32 #include diff --git a/net/socket.c b/net/socket.c index e8605d4..e32e3cb 100644 --- a/net/socket.c +++ b/net/socket.c @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "config-host.h" +#include "qemu/osdep.h" #include "net/net.h" #include "clients.h" diff --git a/net/tap-aix.c b/net/tap-aix.c index e84fc39..9d830b7 100644 --- a/net/tap-aix.c +++ b/net/tap-aix.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "tap_int.h" -#include int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required, int mq_required, Error **errp) diff --git a/net/tap-bsd.c b/net/tap-bsd.c index 0103a97..83de19a 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "tap_int.h" #include "qemu-common.h" #include "sysemu/sysemu.h" diff --git a/net/tap-haiku.c b/net/tap-haiku.c index 2e738ec..397e532 100644 --- a/net/tap-haiku.c +++ b/net/tap-haiku.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "tap_int.h" -#include int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required, int mq_required, Error **errp) diff --git a/net/tap-linux.c b/net/tap-linux.c index 5bd9d21..0929cf7 100644 --- a/net/tap-linux.c +++ b/net/tap-linux.c @@ -23,6 +23,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "tap_int.h" #include "tap-linux.h" #include "net/tap.h" diff --git a/net/tap-solaris.c b/net/tap-solaris.c index 0f60f78..e3907a8 100644 --- a/net/tap-solaris.c +++ b/net/tap-solaris.c @@ -22,10 +22,10 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "tap_int.h" #include "sysemu/sysemu.h" -#include #include #include #include diff --git a/net/tap-win32.c b/net/tap-win32.c index 7fddb20..38bbac0 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -26,6 +26,7 @@ * distribution); if not, see . */ +#include "qemu/osdep.h" #include "tap_int.h" #include "qemu-common.h" @@ -34,7 +35,6 @@ #include "net/tap.h" /* tap_has_ufo, ... */ #include "sysemu/sysemu.h" #include "qemu/error-report.h" -#include #include #include diff --git a/net/tap.c b/net/tap.c index 85c4142..cfb6831 100644 --- a/net/tap.c +++ b/net/tap.c @@ -23,12 +23,11 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "tap_int.h" -#include "config-host.h" #include -#include #include #include #include diff --git a/net/util.c b/net/util.c index 7e95076..0b3dbfe 100644 --- a/net/util.c +++ b/net/util.c @@ -22,9 +22,8 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "util.h" -#include -#include int net_parse_macaddr(uint8_t *macaddr, const char *p) { diff --git a/net/vde.c b/net/vde.c index 4475d92..973faf5 100644 --- a/net/vde.c +++ b/net/vde.c @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "config-host.h" +#include "qemu/osdep.h" #include diff --git a/net/vhost-user.c b/net/vhost-user.c index e4dd089..451dbbf 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -8,6 +8,7 @@ * */ +#include "qemu/osdep.h" #include "clients.h" #include "net/vhost_net.h" #include "net/vhost-user.h"