hw/arm: 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: 1449505425-32022-4-git-send-email-peter.maydell@linaro.org

diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index b0ca81cea3887594f7628919a4d6bd881ff4e500..02c8caa1915790742ee58f17a05ec306d7cf6435 100644 (file)
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -15,6 +15,7 @@
  * for more details.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/devices.h"
 #include "hw/arm/allwinner-a10.h"

diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index a80d2ad29c7f12fa2491e4ee986218e21b47cd0c..f3973f721a4280125eb9bdb0898c998e6ea046fc 100644 (file)
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -7,6 +7,7 @@
  * This code is licensed under the GPL.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "hw/loader.h"

diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 75f69bfe016bb2a995aa8bcb6908d8b3f915e37a..7742dd3cb6a7dafaf0fa6bde1fe5dcf65ad0c50d 100644 (file)
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -7,7 +7,7 @@
  * This code is licensed under the GPL.
  */
 
-#include "config.h"
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/arm/arm.h"
 #include "hw/arm/linux-boot-if.h"

diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 9991c0c4a009f44c3e54d15b8d65e1ad2055ed48..8bb308a42e4001fae9978f48cbc04f8148416647 100644 (file)
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -8,6 +8,7 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/boards.h"

diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
index a71e43cf5f1dc2713b57d14e8e24e807ea1ba776..2382c591587a8ad50e1f53b011a7449bb5e1d244 100644 (file)
--- a/hw/arm/cubieboard.c
+++ b/hw/arm/cubieboard.c
@@ -15,6 +15,7 @@
  * for more details.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/devices.h"
 #include "hw/boards.h"

diff --git a/hw/arm/digic.c b/hw/arm/digic.c
index 90f8190c48449fa89729e4fe232d60b6b1231ee9..82087bacb8ec76df01621e27cf309cae2a076ee9 100644 (file)
--- a/hw/arm/digic.c
+++ b/hw/arm/digic.c
@@ -20,6 +20,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/arm/digic.h"
 
 #define DIGIC4_TIMER_BASE(n)    (0xc0210000 + (n) * 0x100)

diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
index dfaed257f5f8353a58bc0c75a07643892bdc00e0..e5308f47ab4e077b1182ebbe2d71abe7eae574f0 100644 (file)
--- a/hw/arm/digic_boards.c
+++ b/hw/arm/digic_boards.c
@@ -23,6 +23,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/boards.h"
 #include "exec/address-spaces.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
index 79b7c5ab3d05144cbbafe6c26a35cd17f4ecabd2..6a8f0b54ced9ccf1796b23b3078fddacad035939 100644 (file)
--- a/hw/arm/exynos4210.c
+++ b/hw/arm/exynos4210.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/boards.h"
 #include "sysemu/sysemu.h"
 #include "hw/sysbus.h"

diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index da82b27bade0dbdf9638c71977d11f45d8fe8ba2..42faa8c48d2dffcf46afbd72f6e9625ec6805651 100644 (file)
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/qtest.h"
 #include "hw/sysbus.h"

diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index 36818ee025ee12c4f160c2cca9b6815dd544e99d..fb743bfbd0108ab9047dbda454b24076137e5985 100644 (file)
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -22,6 +22,7 @@
  *  with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/arm/fsl-imx25.h"
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"

diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c
index abdea0683a6d334471dabd3688c3202601de1c66..f2c2ce56f621d422a99138622639e589fe374540 100644 (file)
--- a/hw/arm/fsl-imx31.c
+++ b/hw/arm/fsl-imx31.c
@@ -19,6 +19,7 @@
  *  with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/arm/fsl-imx31.h"
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"

diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index 32ad041b204992959938230098c8116ecff422f2..626d3383736a394a981c584f611bfba434dad776 100644 (file)
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -34,6 +34,7 @@
  * # qemu-system-arm -M verdex -pflash flash -monitor null -nographic -m 289
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "net/net.h"

diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index cb9926e50f7ee249e1642166516e985552923d3e..620b52631a734c0e0950780e7903566d56a49acd 100644 (file)
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -17,6 +17,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "hw/devices.h"

diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c
index 039f0ebdb86a833a0c31a7bb369c9caee52719ce..b167e19f5aafd483ffb5c87aef2123c53806b08f 100644 (file)
--- a/hw/arm/imx25_pdk.c
+++ b/hw/arm/imx25_pdk.c
@@ -23,6 +23,7 @@
  *  with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/arm/fsl-imx25.h"
 #include "hw/boards.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 96dedce906b008c428134b0bb8ab331e5fe79b44..c6656a817c704fe2fe881fff93e3e04a42d163fd 100644 (file)
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -7,6 +7,7 @@
  * This code is licensed under the GPL
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/devices.h"
 #include "hw/boards.h"

diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index f4b463aa1ea02378e85be796a165cc3e86efeb70..55fb36021ccf740f82a2796648cd13e861333c04 100644 (file)
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -13,6 +13,7 @@
  * i.MX31 SoC
  */
 
+#include "qemu/osdep.h"
 #include "hw/arm/fsl-imx31.h"
 #include "hw/boards.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index e434cb6ab0432a88bf5bbac32fdddab17858370e..98a892ff6216d3c170a7c56e8659b412b4cf24bb 100644 (file)
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -11,6 +11,7 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/arm/arm.h"

diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index b534bb9041e1a0cb4ba0638ca093c84ff4bed195..54548f38bb0d6155573ddbd4e16960f689294313 100644 (file)
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -9,6 +9,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "hw/devices.h"

diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c
index 3ab83a1acd150ec4ba5c61f328511b7c8bbe15c0..86065d360a29dd41f0ddcea9a0dd0e88d490d4e5 100644 (file)
--- a/hw/arm/netduino2.c
+++ b/hw/arm/netduino2.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/boards.h"
 #include "qemu/error-report.h"
 #include "hw/arm/stm32f205_soc.h"

diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 57170aea8bf753500434c67b14d3403e6bcda6d3..d9e61f7779a595807c458f6d3e08fa9a9f5b5d8f 100644 (file)
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -18,6 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/sysemu.h"
 #include "hw/arm/omap.h"

diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 6b1c076598a1e6848745cebc12debef72bdd52ab..6f681304198d7b8d6b03023db79aa14f5b246b60 100644 (file)
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -17,6 +17,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/boards.h"
 #include "hw/hw.h"
 #include "hw/arm/arm.h"

diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index 98ee19f8619bbce83349d8346b35fddba75bb812..d11224e81e80f4880a9d6a68a3ff9c8b62ef2cf9 100644 (file)
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -18,6 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "hw/boards.h"

diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index 8eaf8f3315cdaf0ba94dbc1e500f1b16e1e9e0ed..68236a39b207b317c08ee3c9e180f6ca7d3a68be 100644 (file)
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -25,6 +25,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/arm/omap.h"

diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index 82ec99d936ab4d75bda7b287c788ffa8797e3d46..cae0a46561bedab7ec05369d92e237c5785fc2bb 100644 (file)
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -16,6 +16,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "audio/audio.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index 79d22d91e56409cd58e6b5fa6e3f196ba98c0116..db58781e0118ac373ea683fa6083ed9235102dfc 100644 (file)
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -7,6 +7,7 @@
  * This code is licensed under the GPL.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/arm/pxa.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c
index c89c8045c3a2a2197dc9bee6106bbb758cbe09f9..67e7e70943b0f86c7d3c8dc24ae367e92f3c7e77 100644 (file)
--- a/hw/arm/pxa2xx_gpio.c
+++ b/hw/arm/pxa2xx_gpio.c
@@ -7,6 +7,7 @@
  * This code is licensed under the GPL.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/arm/pxa.h"

diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c
index d41ac9341696dbd56aefeea54d9e6ebbd87b19ad..8a39b1caca0801fedc093e275cbeccbedcd252f9 100644 (file)
--- a/hw/arm/pxa2xx_pic.c
+++ b/hw/arm/pxa2xx_pic.c
@@ -8,6 +8,7 @@
  * This code is licensed under the GPL.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/sysbus.h"

diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index 2d6952c393d8217a3dc3bab70b71fa36e8119e11..90429fc456441e66ccbed167d0713395810b9dc5 100644 (file)
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -7,6 +7,7 @@
  * This code is licensed under the GPL.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "hw/arm/primecell.h"

diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index 8d3cc0b6b2cb7c014d4ba8279a5f89d68ce9c3f4..317ade120267ec1bf1c4cb4309eda558b83f2047 100644 (file)
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -10,6 +10,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/arm/arm.h"

diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 0114e0a7f87b5b8bc76f3127444b90dda582c64a..3eb7d3cb773fd09013705996d3e07d72a726ddca 100644 (file)
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -7,6 +7,7 @@
  * This code is licensed under the GPL.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/ssi.h"
 #include "hw/arm/arm.h"

diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
index 3f993406dd136a93b7ecb0e5fe874bd588475970..79bfe6d10fa3eb5c5c06ed3c5a437bdd1588552a 100644 (file)
--- a/hw/arm/stm32f205_soc.c
+++ b/hw/arm/stm32f205_soc.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/arm/arm.h"
 #include "exec/address-spaces.h"
 #include "hw/arm/stm32f205_soc.h"

diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index 9624ecb586ebce3b5ce3f3d1ff432fded8a6a5f7..d9f2f5b3aaeb023c572384de8ecae09b6b66de92 100644 (file)
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -27,6 +27,7 @@
  *  GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/boards.h"
 #include "hw/sysbus.h"
 #include "strongarm.h"

diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c
index 9d28797c87066b802677ce7cffad19de3311e54c..68a3de5cf8744df7340d2828e6794c756b11ec78 100644 (file)
--- a/hw/arm/sysbus-fdt.c
+++ b/hw/arm/sysbus-fdt.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/arm/sysbus-fdt.h"
 #include "qemu/error-report.h"
 #include "sysemu/device_tree.h"

diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index 02814d7aba55b78a8a9a2e6d23b59c084c04ddd9..c387950fb066878909dad06ab2ed3fea52c845bc 100644 (file)
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -11,6 +11,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/arm/arm.h"

diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index 70eefe9987b9344aae7dcab73e2dd41f25cbb45b..d061f0fd073ed75d121dade2e01da188e9447556 100644 (file)
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -7,6 +7,7 @@
  * This code is licensed under the GPL.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "hw/devices.h"

diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index ea9a9840d07694be34441c29bf635ee0b09633dd..3154aeaa95f48b3f3063544118dbb6646f77486b 100644 (file)
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -21,6 +21,7 @@
  *  GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "hw/arm/primecell.h"

diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 0d5c635cc8b9d3c3b319cee9a4dfbcd0f0a3a90c..87fbe7c97d99bc872841eed6d05eed36eb993d29 100644 (file)
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -26,6 +26,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/arm/virt-acpi-build.h"
 #include "qemu/bitmap.h"

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 92dcd021190df0f0ac06305b1ba1c7c0331059d8..05f9087ccae1fae61579387fee4b4b7f21413443 100644 (file)
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -28,6 +28,7 @@
  * This is essentially the same approach kvmtool uses.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "hw/arm/primecell.h"

diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index 65e92e1824380eb845f4f79a3a896c412c015cf9..40b476172a75a40c11f8979447a778fe7cce86f3 100644 (file)
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -15,6 +15,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "net/net.h"

diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-ep108.c
index 9099025a7966f764f67c75376eb3ff9630b090ed..c9414e6a25c011863034f7c1a738ba6ed98f8bb0 100644 (file)
--- a/hw/arm/xlnx-ep108.c
+++ b/hw/arm/xlnx-ep108.c
@@ -15,6 +15,7 @@
  * for more details.
  */
 
+#include "qemu/osdep.h"
 #include "hw/arm/xlnx-zynqmp.h"
 #include "hw/boards.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
index f26efd802afba731ceb615609f4ef06778d98379..57e926d5240b3a3a38c093bd2bed6a7bf81c05b8 100644 (file)
--- a/hw/arm/xlnx-zynqmp.c
+++ b/hw/arm/xlnx-zynqmp.c
@@ -15,6 +15,7 @@
  * for more details.
  */
 
+#include "qemu/osdep.h"
 #include "hw/arm/xlnx-zynqmp.h"
 #include "hw/intc/arm_gic_common.h"
 #include "exec/address-spaces.h"

diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index b44eb76fccecbb355a331e44857ef1b9201b7df8..aecb24a8e9a58abee7584acf632880684517a1d0 100644 (file)
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -11,6 +11,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/arm/arm.h"