hw/net: 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: 1453832250-766-19-git-send-email-peter.maydell@linaro.org

diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index ab607e4846530dde04f98f47a439eb0ec0482c68..e847b77cf4e8385a8608ab1f11585f8200164f01 100644 (file)
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -17,6 +17,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/devices.h"
 #include "net/net.h"

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index bec06e90ec1c0dde7ab1eb5a6bf9283c9dafd8a9..4eda7a3289346e2b49253ced19c9f008f06ae245 100644 (file)
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "net/net.h"

diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index 685a4781b93cb26b09673f0b76d3590819f74466..9b4b9b59d2fb12a994bb01cd1273a0f8197c314c 100644 (file)
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -40,7 +40,7 @@
  *      * Wake-on-LAN is not implemented.
  */
 
-#include <stddef.h>             /* offsetof */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "net/net.h"

diff --git a/hw/net/etraxfs_eth.c b/hw/net/etraxfs_eth.c
index b562ac990ad19adcbc71d1cbe4c6da79828c6fdd..05495ec4051ebefb88a97dc44413ea963ac536cb 100644 (file)
--- a/hw/net/etraxfs_eth.c
+++ b/hw/net/etraxfs_eth.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
 #include "hw/cris/etraxfs.h"

diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index 04bb41da6491ee036c20a285a230e016b17a10eb..1e35f7f8c535829faabc1d37a8fc4d55a770636e 100644 (file)
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -26,6 +26,7 @@
  * This implementation doesn't include ring priority, TCP/IP Off-Load, QoS.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "hw/sysbus.h"
 #include "trace.h"

diff --git a/hw/net/fsl_etsec/miim.c b/hw/net/fsl_etsec/miim.c
index 1931b74e6cf4439a210bae86fce3ecc4d56291ca..6bba01c82ac61e24e4af1f5ad53347be40d0a830 100644 (file)
--- a/hw/net/fsl_etsec/miim.c
+++ b/hw/net/fsl_etsec/miim.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "etsec.h"
 #include "registers.h"
 

diff --git a/hw/net/fsl_etsec/registers.c b/hw/net/fsl_etsec/registers.c
index a7bbfa113f242718e947398afa73ca59a58c6a0f..46ce7a84b27fc61560ca812baf2a8e78beef4796 100644 (file)
--- a/hw/net/fsl_etsec/registers.c
+++ b/hw/net/fsl_etsec/registers.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "registers.h"
 
 const eTSEC_Register_Definition eTSEC_registers_def[] = {

diff --git a/hw/net/fsl_etsec/rings.c b/hw/net/fsl_etsec/rings.c
index 0a5c6cfe3f879ad6e19f6c5ae76b11b8b4509ac1..ed1de7da9b7fcd4401e45042d12bded1200d0d05 100644 (file)
--- a/hw/net/fsl_etsec/rings.c
+++ b/hw/net/fsl_etsec/rings.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "net/checksum.h"
 
 #include "etsec.h"

diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index 1734b5276d4cd0ba851e580b28bf39dc16ef8fa8..08dc474d612462b563605a719eddcf94f338bb59 100644 (file)
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -10,6 +10,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
 #include "hw/devices.h"

diff --git a/hw/net/lance.c b/hw/net/lance.c
index 780b39d65a50f601595deeb8f1cfbc27d3c16d88..6253d2103d4c172f3ebe8603bcb9a2d304c40797 100644 (file)
--- a/hw/net/lance.c
+++ b/hw/net/lance.c
@@ -35,6 +35,7 @@
  * http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR92C990.txt
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
 #include "qemu/timer.h"

diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c
index 21928f9f3f1279a8ff0abbebe25f9eb3e705af5a..7c0398ed9988d0e270faaf70d4556306697c8978 100644 (file)
--- a/hw/net/mcf_fec.c
+++ b/hw/net/mcf_fec.c
@@ -5,6 +5,7 @@
  *
  * This code is licensed under the GPL
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "net/net.h"
 #include "hw/m68k/mcf.h"

diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c
index f261011a2743f165166aa276ea89be6815db19a6..740cd98ff1fdc357e4565aa5bd5321a695ebe0d0 100644 (file)
--- a/hw/net/mipsnet.c
+++ b/hw/net/mipsnet.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "net/net.h"
 #include "trace.h"

diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c
index 18b064463afec01c2677c8a10dfd47537fdb4cf7..ac7277bb0f055ae0eed4ee9bf763c4a7d4179ccc 100644 (file)
--- a/hw/net/ne2000-isa.c
+++ b/hw/net/ne2000-isa.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/isa.h"

diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index a3dffff2ad14da65458bdf01428797d2bdbe7a6f..e408083a58b8ff4b319b612442556361c47d0ae5 100644 (file)
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "net/net.h"

diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
index 3642046efa76dfd5a3edcfc0323db762fc8e5a4c..09e239a65a6c5bbfd469fb5e303e80d39e4133bf 100644 (file)
--- a/hw/net/opencores_eth.c
+++ b/hw/net/opencores_eth.c
@@ -31,6 +31,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "net/net.h"

diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c
index b4d60b81230163c73d73b4c946353f18f3e24872..595439a65b9abc72d3be76f8b185af71e16e88fc 100644 (file)
--- a/hw/net/pcnet-pci.c
+++ b/hw/net/pcnet-pci.c
@@ -27,6 +27,7 @@
  * AMD Publication# 19436  Rev:E  Amendment/0  Issue Date: June 2000
  */
 
+#include "qemu/osdep.h"
 #include "hw/pci/pci.h"
 #include "net/net.h"
 #include "hw/loader.h"

diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index 1f4a3dbe49ed93658564c240a6f6b9ac2c4344ec..198a01f92d47c5e03d14d007530fbdfa3e1d4199 100644 (file)
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -35,6 +35,7 @@
  * http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR92C990.txt
  */
 
+#include "qemu/osdep.h"
 #include "hw/qdev.h"
 #include "net/net.h"
 #include "qemu/timer.h"

diff --git a/hw/net/rocker/qmp-norocker.c b/hw/net/rocker/qmp-norocker.c
index 49b498b6425cacc9ac5b581d133c059d2d07c416..6acbcdb02b943e1a96635521020bf3cf2175f7d3 100644 (file)
--- a/hw/net/rocker/qmp-norocker.c
+++ b/hw/net/rocker/qmp-norocker.c
@@ -15,6 +15,7 @@
  * GNU General Public License for more details.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qmp-commands.h"
 #include "qapi/qmp/qerror.h"

diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index 2e77e5086abfbde01cf46866209071fe19db73f6..f3e994d5631215f663f166f224f4f908e6d61b79 100644 (file)
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -15,6 +15,7 @@
  * GNU General Public License for more details.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/msix.h"

diff --git a/hw/net/rocker/rocker_desc.c b/hw/net/rocker/rocker_desc.c
index 5e697b19e35e9278b708337be07d748cae7a54fe..ac02797b7ee27d197c7715e0e43fa5f3083a757b 100644 (file)
--- a/hw/net/rocker/rocker_desc.c
+++ b/hw/net/rocker/rocker_desc.c
@@ -14,6 +14,7 @@
  * GNU General Public License for more details.
  */
 
+#include "qemu/osdep.h"
 #include "net/net.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"

diff --git a/hw/net/rocker/rocker_fp.c b/hw/net/rocker/rocker_fp.c
index 5906396b9db78d5d3b2b62307dd14632972e9c29..af37fefc0ae6ee58f6d9fb0ee89f2db0b07cbca1 100644 (file)
--- a/hw/net/rocker/rocker_fp.c
+++ b/hw/net/rocker/rocker_fp.c
@@ -14,6 +14,7 @@
  * GNU General Public License for more details.
  */
 
+#include "qemu/osdep.h"
 #include "net/clients.h"
 
 #include "rocker.h"

diff --git a/hw/net/rocker/rocker_of_dpa.c b/hw/net/rocker/rocker_of_dpa.c
index 3cf1d61fe4e8f85a027995082b7f2e32b88671eb..da3fc541d8be97b1aef2c23bd1428a065937cbc9 100644 (file)
--- a/hw/net/rocker/rocker_of_dpa.c
+++ b/hw/net/rocker/rocker_of_dpa.c
@@ -14,6 +14,7 @@
  * GNU General Public License for more details.
  */
 
+#include "qemu/osdep.h"
 #include "net/eth.h"
 #include "qemu/iov.h"
 #include "qemu/timer.h"

diff --git a/hw/net/rocker/rocker_world.c b/hw/net/rocker/rocker_world.c
index a6b18f1754e49d9678c329b9ee17f72e4f73c428..1ed0fcd163c7da44211e43a094cd9851298a63ee 100644 (file)
--- a/hw/net/rocker/rocker_world.c
+++ b/hw/net/rocker/rocker_world.c
@@ -14,6 +14,7 @@
  * GNU General Public License for more details.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/iov.h"
 
 #include "rocker.h"

diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index d192d573b4b5bd691983a789760bddb7091e16da..fee97bf60789c57dc2a25ddcac26dd8324ae4efc 100644 (file)
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -49,6 +49,7 @@
  */
 
 /* For crc32 */
+#include "qemu/osdep.h"
 #include <zlib.h>
 
 #include "hw/hw.h"

diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index c19cdd14dfc62cd727e83fc28c38b2e9faae620f..21c1b8f54b8b4be3586af74ee75687e3bc424f4e 100644 (file)
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -7,6 +7,7 @@
  * This code is licensed under the GPL
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
 #include "hw/devices.h"

diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 318c3e6ad2132a883d9d506137d25af1f5b0a829..0bd5131fdb15afc5ed804e480194afd8c6e70acc 100644 (file)
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -13,6 +13,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "net/net.h"
 #include "net/tap.h"
 #include "net/vhost-user.h"
@@ -21,19 +22,16 @@
 #include "net/vhost_net.h"
 #include "qemu/error-report.h"
 
-#include "config.h"
 
 #ifdef CONFIG_VHOST_NET
 #include <linux/vhost.h>
 #include <sys/socket.h>
 #include <linux/kvm.h>
-#include <fcntl.h>
 #include <netpacket/packet.h>
 #include <net/ethernet.h>
 #include <net/if.h>
 #include <netinet/in.h>
 
-#include <stdio.h>
 
 #include "standard-headers/linux/virtio_ring.h"
 #include "hw/virtio/vhost.h"

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 5147f05bd2db71a88846b64e7aa25b8179b4aec2..093a71e12e3dbf0deb368bfd3c1f53fcaeb34f5b 100644 (file)
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -15,6 +15,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "net/net.h"

diff --git a/hw/net/vmxnet_rx_pkt.c b/hw/net/vmxnet_rx_pkt.c
index aa5462931e5f0a97a75c66d73212115d06a6810a..21bb46e685b00e88223ade7da305830864947d6e 100644 (file)
--- a/hw/net/vmxnet_rx_pkt.c
+++ b/hw/net/vmxnet_rx_pkt.c
@@ -15,6 +15,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "vmxnet_rx_pkt.h"
 #include "net/eth.h"
 #include "qemu-common.h"

diff --git a/hw/net/vmxnet_tx_pkt.c b/hw/net/vmxnet_tx_pkt.c
index eb88ddf2549b99e6e0f9f9fec4b68b23e3621750..91e1e08fd948813af954bfa803a51312dd2afa25 100644 (file)
--- a/hw/net/vmxnet_tx_pkt.c
+++ b/hw/net/vmxnet_tx_pkt.c
@@ -15,6 +15,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "vmxnet_tx_pkt.h"
 #include "net/eth.h"

diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index d63c423247aa3b12f897d4212925661a75c1a394..2deb8ce84b29cd2ac6921477ebd765556cab1c43 100644 (file)
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "qemu/log.h"
 #include "net/net.h"

diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c
index ad6b55306d9786d949cd3b2a7a83643bd0d7652d..71a3224520fd37ff5172e6d7c90339bcfd4aeab3 100644 (file)
--- a/hw/net/xilinx_ethlite.c
+++ b/hw/net/xilinx_ethlite.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "net/net.h"