hw/misc: 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-25-git-send-email-peter.maydell@linaro.org

diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c
index 6bd61e78281afe42131103dbed79427a8e1a916a..77fab5b9d2971912bd1f474b5d0380275341d29d 100644 (file)
--- a/hw/misc/applesmc.c
+++ b/hw/misc/applesmc.c
@@ -30,6 +30,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "ui/console.h"

diff --git a/hw/misc/arm_integrator_debug.c b/hw/misc/arm_integrator_debug.c
index 6d9dd74e38705e4eedb664f554cebf87334c2c95..902605fef41b817b3bbb88cb6afe494fe9e8c195 100644 (file)
--- a/hw/misc/arm_integrator_debug.c
+++ b/hw/misc/arm_integrator_debug.c
@@ -14,6 +14,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"

diff --git a/hw/misc/arm_l2x0.c b/hw/misc/arm_l2x0.c
index 9e220c9a56a966b64457b4e1b3af84ebb6b45f73..7e179f1a4e37a03e656abdd3a876d841e2431272 100644 (file)
--- a/hw/misc/arm_l2x0.c
+++ b/hw/misc/arm_l2x0.c
@@ -18,6 +18,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 
 /* L2C-310 r3p2 */

diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
index 3fad6f86de1210ac6651813b3d29cb069da01d63..339205b5c34d2c5f040d7798ac7d37027057612c 100644 (file)
--- a/hw/misc/arm_sysctl.c
+++ b/hw/misc/arm_sysctl.c
@@ -7,6 +7,7 @@
  * This code is licensed under the GPL.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "qemu/timer.h"
 #include "qemu/bitops.h"

diff --git a/hw/misc/cbus.c b/hw/misc/cbus.c
index 495d5078fe6536da57d92c0be4193419aaf021c8..fafe0709ec0d256c22dc017781c2c3c04d31548f 100644 (file)
--- a/hw/misc/cbus.c
+++ b/hw/misc/cbus.c
@@ -20,6 +20,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/irq.h"
 #include "hw/devices.h"

diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c
index 8bad6f682bc279715711731724859619c001345e..a0071f3eae3d4f768ba8314c1b28f90694b3d8ed 100644 (file)
--- a/hw/misc/eccmemctl.c
+++ b/hw/misc/eccmemctl.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "trace.h"
 

diff --git a/hw/misc/edu.c b/hw/misc/edu.c
index 43d5b18f2a6fb07862d4f001f63b701e856978a4..2639c642535b90452f8c03bc5f92b00c87525eb4 100644 (file)
--- a/hw/misc/edu.c
+++ b/hw/misc/edu.c
@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/pci/pci.h"
 #include "qemu/timer.h"
 #include "qemu/main-loop.h" /* iothread mutex */

diff --git a/hw/misc/hyperv_testdev.c b/hw/misc/hyperv_testdev.c
index d88844aabaa9c80fc402d62775b40e736e15eb88..1883fd7f20e2c467ca369b50d00d4acc1db1eafe 100644 (file)
--- a/hw/misc/hyperv_testdev.c
+++ b/hw/misc/hyperv_testdev.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/qdev.h"
 #include "hw/isa/isa.h"

diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index df585de10f72a36a919e42862e50761314386ca5..d5c89aeca108fd0373ac07939a00cf3b29dca4ac 100644 (file)
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -16,6 +16,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/i386/pc.h"
 #include "hw/pci/pci.h"
@@ -34,8 +35,6 @@
 #include "hw/misc/ivshmem.h"
 
 #include <sys/mman.h>
-#include <sys/types.h>
-#include <limits.h>
 
 #define PCI_VENDOR_ID_IVSHMEM   PCI_VENDOR_ID_REDHAT_QUMRANET
 #define PCI_DEVICE_ID_IVSHMEM   0x1110

diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c
index d619d61d34b0f275320284dab6d52d579eb74425..9014f0f705d6e88f046c61541fd25d1d566752b7 100644 (file)
--- a/hw/misc/max111x.c
+++ b/hw/misc/max111x.c
@@ -10,6 +10,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/ssi/ssi.h"
 
 typedef struct {

diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c
index d5090799f8300c4425708ed03e218275c6fe4729..48d7dfb2d7af9702d648abfc6b5425f93ee1dd5d 100644 (file)
--- a/hw/misc/mst_fpga.c
+++ b/hw/misc/mst_fpga.c
@@ -10,6 +10,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"
 

diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c
index 73d4f8becd66dc16598bc58aaa0680dc75688459..19151d07d62c22da52ed3c6f0452373e0982ded1 100644 (file)
--- a/hw/misc/omap_clk.c
+++ b/hw/misc/omap_clk.c
@@ -18,6 +18,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 "hw/arm/omap.h"
 

diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c
index 8960f1bf167e774c29c6e4fd2706c7e83614190a..67d8e2f0233e4b5164e64abfacb4889c4d466212 100644 (file)
--- a/hw/misc/omap_gpmc.c
+++ b/hw/misc/omap_gpmc.c
@@ -18,6 +18,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 "hw/block/flash.h"
 #include "hw/arm/omap.h"

diff --git a/hw/misc/omap_l4.c b/hw/misc/omap_l4.c
index 245ceac84cd862dab8c9044796598b3448a8c072..88c533a0fe66bbb7d117cf0b466ac5e9d0d2f21e 100644 (file)
--- a/hw/misc/omap_l4.c
+++ b/hw/misc/omap_l4.c
@@ -17,6 +17,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 "hw/arm/omap.h"
 

diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c
index bca25307b5982d7c861dfbcea7b1d5fa13f6181f..dff37ecaf924be9bbb10b5f1cc1e4cf1d9241c6d 100644 (file)
--- a/hw/misc/omap_sdrc.c
+++ b/hw/misc/omap_sdrc.c
@@ -17,6 +17,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 "hw/arm/omap.h"
 

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

diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
index 3709488728c1b1f76bb0164765acd3f231926d20..0ac1e6ac9be290c8ad36cfd321327aa022a72bd4 100644 (file)
--- a/hw/misc/pvpanic.c
+++ b/hw/misc/pvpanic.c
@@ -12,6 +12,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qjson.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c
index ec50f10757efd933f04b716da1fa2d3ba2b33ee0..edd5de0702f2b03957cd56f519c1ccbfbefc6f9f 100644 (file)
--- a/hw/misc/slavio_misc.c
+++ b/hw/misc/slavio_misc.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "hw/sysbus.h"
 #include "trace.h"

diff --git a/hw/misc/stm32f2xx_syscfg.c b/hw/misc/stm32f2xx_syscfg.c
index 4ae4042bf3fb949b6d3d765fa30b9197c8fcc568..d0d7076eff07c7d8a88e01b4861fe529ba4492b6 100644 (file)
--- a/hw/misc/stm32f2xx_syscfg.c
+++ b/hw/misc/stm32f2xx_syscfg.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/misc/stm32f2xx_syscfg.h"
 
 #ifndef STM_SYSCFG_ERR_DEBUG

diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c
index f3fe8b81fd77c23caec126a91f6ee30dac690fb4..e102b407563172c5da592ebbf6723a966c9a4d9e 100644 (file)
--- a/hw/misc/tmp105.c
+++ b/hw/misc/tmp105.c
@@ -18,6 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "tmp105.h"

diff --git a/hw/misc/vmport.c b/hw/misc/vmport.c
index cd5716a46d4fdc0754a66445d10a8b1cfed7873b..689678980116dfd01294d034d20d3decf0de34b1 100644 (file)
--- a/hw/misc/vmport.c
+++ b/hw/misc/vmport.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/isa/isa.h"
 #include "hw/i386/pc.h"

diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c
index d160ff2361bfa2d79dcd204c031558667a84ad99..71fbccd79f5c2ae630e3f508046472a079926a5b 100644 (file)
--- a/hw/misc/zynq-xadc.c
+++ b/hw/misc/zynq-xadc.c
@@ -13,6 +13,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/misc/zynq-xadc.h"
 #include "qemu/timer.h"