clean-includes: run it once more

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
10 years ago · e9abfcb57f
12 changed files with 3 additions and 9 deletions
--- a/hw/net/net_tx_pkt.c
+++ b/hw/net/net_tx_pkt.c
@ -15,6 +15,7 @@
 *
 */

+#include "qemu/osdep.h"
 #include "net_tx_pkt.h"
 #include "net/eth.h"
 #include "net/checksum.h"
--- a/hw/net/net_tx_pkt.h
+++ b/hw/net/net_tx_pkt.h
@ -18,7 +18,6 @@
 #ifndef NET_TX_PKT_H
 #define NET_TX_PKT_H

-#include "qemu/osdep.h"
 #include "net/eth.h"
 #include "exec/hwaddr.h"

--- a/include/qemu/qdist.h
+++ b/include/qemu/qdist.h
@ -7,7 +7,6 @@
 #ifndef QEMU_QDIST_H
 #define QEMU_QDIST_H

-#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/bitops.h"

--- a/include/qemu/qht.h
+++ b/include/qemu/qht.h
@ -7,7 +7,6 @@
 #ifndef QEMU_QHT_H
 #define QEMU_QHT_H

-#include "qemu/osdep.h"
 #include "qemu/seqlock.h"
 #include "qemu/thread.h"
 #include "qemu/qdist.h"
--- a/tests/e1000e-test.c
+++ b/tests/e1000e-test.c
@ -25,7 +25,6 @@


 #include "qemu/osdep.h"
-#include <glib.h>
 #include "libqtest.h"
 #include "qemu-common.h"
 #include "libqos/pci-pc.h"
--- a/tests/postcopy-test.c
+++ b/tests/postcopy-test.c
@ -11,7 +11,6 @@
 */

 #include "qemu/osdep.h"
-#include <glib.h>

 #include "libqtest.h"
 #include "qemu/option.h"
--- a/tests/qht-bench.c
+++ b/tests/qht-bench.c
@ -5,7 +5,6 @@
 *   See the COPYING file in the top-level directory.
 */
 #include "qemu/osdep.h"
-#include <glib.h>
 #include "qemu/processor.h"
 #include "qemu/atomic.h"
 #include "qemu/qht.h"
--- a/tests/test-qdist.c
+++ b/tests/test-qdist.c
@ -5,7 +5,6 @@
 *   See the COPYING file in the top-level directory.
 */
 #include "qemu/osdep.h"
-#include <glib.h>
 #include "qemu/qdist.h"

 #include <math.h>
--- a/tests/test-qht-par.c
+++ b/tests/test-qht-par.c
@ -5,7 +5,6 @@
 *   See the COPYING file in the top-level directory.
 */
 #include "qemu/osdep.h"
-#include <glib.h>

 #define TEST_QHT_STRING "tests/qht-bench 1>/dev/null 2>&1 -R -S0.1 -D10000 -N1 "

--- a/tests/test-qht.c
+++ b/tests/test-qht.c
@ -5,7 +5,6 @@
 *   See the COPYING file in the top-level directory.
 */
 #include "qemu/osdep.h"
-#include <glib.h>
 #include "qemu/qht.h"

 #define N 5000
--- a/util/qdist.c
+++ b/util/qdist.c
@ -6,6 +6,7 @@
 * License: GNU GPL, version 2 or later.
 *   See the COPYING file in the top-level directory.
 */
+#include "qemu/osdep.h"
 #include "qemu/qdist.h"

 #include <math.h>
--- a/util/qht.c
+++ b/util/qht.c
@ -65,6 +65,7 @@
 *   + Corbet, "Relativistic hash tables, part 1: Algorithms", @ lwn.net, 2014.
 *     https://lwn.net/Articles/612021/
 */
+#include "qemu/osdep.h"
 #include "qemu/qht.h"
 #include "qemu/atomic.h"
 #include "qemu/rcu.h"