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

diff --git a/hw/bt/core.c b/hw/bt/core.c
index 0ffc948898b997151373f465018156e1a7864997..615f0af073ce683c2adca758b367b6e490ba4531 100644 (file)
--- a/hw/bt/core.c
+++ b/hw/bt/core.c
@@ -17,6 +17,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/bt.h"
 #include "hw/bt.h"

diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
index 7b9b91608a87b035eac6048e3f6cb15e00f7fa64..0189b0ae2849915684371f8dc9f0f212fad4751e 100644 (file)
--- a/hw/bt/hci-csr.c
+++ b/hw/bt/hci-csr.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/char.h"
 #include "qemu/timer.h"

diff --git a/hw/bt/hci.c b/hw/bt/hci.c
index 2151d01281e82c3c3594f3ca6dd820a7510e1f1d..8bc33b50a5070ef7d9b72bf5850f363a5604c34d 100644 (file)
--- a/hw/bt/hci.c
+++ b/hw/bt/hci.c
@@ -18,6 +18,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "hw/usb.h"

diff --git a/hw/bt/hid.c b/hw/bt/hid.c
index af494e1e06b857308c04dba7d9c0747760ff4bbb..f6affbbb44436a70173ffbc5bb34ebf8df5cc348 100644 (file)
--- a/hw/bt/hid.c
+++ b/hw/bt/hid.c
@@ -18,6 +18,7 @@
  * with this program; if not, if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "ui/console.h"

diff --git a/hw/bt/l2cap.c b/hw/bt/l2cap.c
index 591e04778136929dbd2aef221c4f3eb723af373c..8065251947c0bad11723c0cd6a0b4c92272832c3 100644 (file)
--- a/hw/bt/l2cap.c
+++ b/hw/bt/l2cap.c
@@ -17,6 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "hw/bt.h"

diff --git a/hw/bt/sdp.c b/hw/bt/sdp.c
index 04eaecae6774eec913572e0e57f4a2ec2352d6ee..be26009b0de1daccadcf61bc7ce6321a4af5538a 100644 (file)
--- a/hw/bt/sdp.c
+++ b/hw/bt/sdp.c
@@ -17,6 +17,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/bt.h"
 

diff --git a/hw/char/escc.c b/hw/char/escc.c
index b35121461a1616a5955321c77291b8579886b179..98a1c21a8988326af18376a6f80ec42a136c5d3b 100644 (file)
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/char/escc.h"

diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c
index d4d875e7a6916b0d9546294184bc235b42c02a3d..146b387e7e04b85598b310178c6f5ab77cd57a6a 100644 (file)
--- a/hw/char/etraxfs_ser.c
+++ b/hw/char/etraxfs_ser.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "sysemu/char.h"
 #include "qemu/log.h"

diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c
index c8d5cdb361bb9544c71e7cc4d75f45a8141a9b60..bc0ae4980ec726e6b82b8d211fec781a15a1053a 100644 (file)
--- a/hw/char/ipoctal232.c
+++ b/hw/char/ipoctal232.c
@@ -8,6 +8,7 @@
  * later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/ipack/ipack.h"
 #include "qemu/bitops.h"
 #include "sysemu/char.h"

diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index cda22eea5dfeca612f1b0ab3ecffe196d7520b10..3c0438fd79150488c110cc78be04d961456ef69c 100644 (file)
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -5,6 +5,7 @@
  *
  * This code is licensed under the GPL
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/m68k/mcf.h"
 #include "sysemu/char.h"

diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 9328dd1b5745e043cbf9e38fdb1ec774d3334e5c..4c55dcb7dc8a0f993a028a85448ad78f3464e8ea 100644 (file)
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -24,6 +24,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/sh4/sh.h"
 #include "sysemu/char.h"

diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c
index 94e8cc1a66a7674f10834c65b11919e26c86ab26..e9063ad6d3adc0d30e1b0e652e4cb7398eedad99 100644 (file)
--- a/hw/cpu/a15mpcore.c
+++ b/hw/cpu/a15mpcore.c
@@ -18,6 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/cpu/a15mpcore.h"
 #include "sysemu/kvm.h"
 #include "kvm_arm.h"

diff --git a/hw/dma/etraxfs_dma.c b/hw/dma/etraxfs_dma.c
index 3599513411d99cfd14dee1da09a31160b909dca8..9cbb16580e24bcf6d7e8445fef9fdaa6b06890ef 100644 (file)
--- a/hw/dma/etraxfs_dma.c
+++ b/hw/dma/etraxfs_dma.c
@@ -21,8 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <stdio.h>
-#include <sys/time.h>
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "exec/address-spaces.h"
 #include "qemu-common.h"

diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
index f63097154f5e457356c2ab0b27159605d1bab3da..869721d848ad9c7eda7585c7a869f40d120d8cfa 100644 (file)
--- a/hw/dma/i82374.c
+++ b/hw/dma/i82374.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/isa/isa.h"
 
 //#define DEBUG_I82374

diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
index 3efa6de352629ebac0d7bbb2308f32c18530517e..1c4f8df16be1165816162724e7adbf570c8808d5 100644 (file)
--- a/hw/dma/rc4030.c
+++ b/hw/dma/rc4030.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/mips/mips.h"
 #include "hw/sysbus.h"

diff --git a/hw/dma/soc_dma.c b/hw/dma/soc_dma.c
index 94be376127020bfc243bfc9a4ff947ef1ac9b17f..9bb499bf9c484b0faa47cf343b3b6fcdb4b3e27e 100644 (file)
--- a/hw/dma/soc_dma.c
+++ b/hw/dma/soc_dma.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 "qemu-common.h"
 #include "qemu/timer.h"
 #include "hw/arm/soc_dma.h"

diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
index e6a453ce5c5fddb3cb614cc7c3580f55fddf5f0a..9d545e412ec7a7bbe059e9bb1047c15c0df51a7c 100644 (file)
--- a/hw/dma/sparc32_dma.c
+++ b/hw/dma/sparc32_dma.c
@@ -25,6 +25,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sparc/sparc32_dma.h"
 #include "hw/sparc/sun4m.h"

diff --git a/hw/dma/sun4m_iommu.c b/hw/dma/sun4m_iommu.c
index 9a488bc9b7229d62a304a941db46311fc7441dfe..b3cbc54c234ad029b86d26552fee9a6a70cc07da 100644 (file)
--- a/hw/dma/sun4m_iommu.c
+++ b/hw/dma/sun4m_iommu.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sparc/sun4m.h"
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"

diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c
index 2f59b134ee5b579af9790f30cf077548854faa9e..1bd5eaf911387d486308faeec67710b61582457f 100644 (file)
--- a/hw/gpio/max7310.c
+++ b/hw/gpio/max7310.c
@@ -7,6 +7,7 @@
  * This file is licensed under GNU GPL.
  */
 
+#include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
 
 #define TYPE_MAX7310 "max7310"

diff --git a/hw/gpio/mpc8xxx.c b/hw/gpio/mpc8xxx.c
index 1aeaaaaf039478fc37a509c455b4dad1dec8cecb..d149719469d6626428c5f5796e9e14fb16bcc86d 100644 (file)
--- a/hw/gpio/mpc8xxx.c
+++ b/hw/gpio/mpc8xxx.c
@@ -19,6 +19,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 
 #define TYPE_MPC8XXX_GPIO "mpc8xxx_gpio"

diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c
index 6d1bb03d6c6d1d9b88e47dc4c844c2b259ddf68e..6ed20602035b65f006d7222afe049eb89cf4907b 100644 (file)
--- a/hw/i2c/bitbang_i2c.c
+++ b/hw/i2c/bitbang_i2c.c
@@ -9,6 +9,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 "bitbang_i2c.h"
 #include "hw/sysbus.h"

diff --git a/hw/i2c/core.c b/hw/i2c/core.c
index 5a64026347ab73e60628001a0cf0dfa54db13112..ba22104af83f794f74561d7e573aa39cb260db4f 100644 (file)
--- a/hw/i2c/core.c
+++ b/hw/i2c/core.c
@@ -7,6 +7,7 @@
  * This code is licensed under the LGPL.
  */
 
+#include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
 
 struct I2CBus

diff --git a/hw/i2c/smbus.c b/hw/i2c/smbus.c
index 6e27ae8bd2b7e3e184013fbf29d7e0f7a48a4c77..3979b3dad71868cf62a478566f58c2980d61dec4 100644 (file)
--- a/hw/i2c/smbus.c
+++ b/hw/i2c/smbus.c
@@ -9,6 +9,7 @@
 
 /* TODO: Implement PEC.  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/smbus.h"

diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c
index 72c09cba6b657fd5681d58a8a550f67534779dd3..5b7bd891bc48f483bd218ff7ac2eee55776de803 100644 (file)
--- a/hw/i2c/smbus_eeprom.c
+++ b/hw/i2c/smbus_eeprom.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/smbus.h"

diff --git a/hw/input/adb.c b/hw/input/adb.c
index 09eead96b6947f718dff106b44af03be8e46237b..c384856c13fa795489ff47f0ab167b4284617ca0 100644 (file)
--- a/hw/input/adb.c
+++ b/hw/input/adb.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/input/adb.h"
 #include "ui/console.h"

diff --git a/hw/input/hid.c b/hw/input/hid.c
index 3221d2932b5d17b7cb6e97eaabee93111d73452d..a11e2bc0f291333dd7578beb07d2a13b1fbc42f8 100644 (file)
--- a/hw/input/hid.c
+++ b/hw/input/hid.c
@@ -22,6 +22,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 "ui/console.h"
 #include "qemu/timer.h"

diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c
index 530a6e01f5305c2547cffb7ab88cf45e083023f9..539682cac898ad4150bcc8f1c458979bcfd556f2 100644 (file)
--- a/hw/input/lm832x.c
+++ b/hw/input/lm832x.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 "qemu/timer.h"

diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index ddac69df6f67e34ab1070660174246616a76dc0d..1d932ec19ff9699ee8da8e23a1250c6d028f49db 100644 (file)
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.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/input/ps2.c b/hw/input/ps2.c
index 79754cd35a0b5bd4d5b46db3202ac2492abc4dfa..b6f0e8d8eb4360d329edd7e06caf1ce70429802c 100644 (file)
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.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/input/ps2.h"
 #include "ui/console.h"

diff --git a/hw/input/vmmouse.c b/hw/input/vmmouse.c
index d7b1c76f580a4a9acefa9be447c35516a800517b..6d15a887c6d9881d46cdbcd2395228b2fa147974 100644 (file)
--- a/hw/input/vmmouse.c
+++ b/hw/input/vmmouse.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 "ui/console.h"
 #include "hw/input/ps2.h"

diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c
index 59bfe2869e0e1ab7d1f9b3a9db91ad4dfb362e34..7c5c30de55cbb08e65649693ec5106357fba7909 100644 (file)
--- a/hw/ipack/ipack.c
+++ b/hw/ipack/ipack.c
@@ -8,6 +8,7 @@
  * later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/ipack/ipack.h"
 
 IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)

diff --git a/hw/ipack/tpci200.c b/hw/ipack/tpci200.c
index 1df02ee859f46b4fbc538d66bb1b327778d3a264..fdda6f41472432a721035a1d2576e2c7e532781a 100644 (file)
--- a/hw/ipack/tpci200.c
+++ b/hw/ipack/tpci200.c
@@ -8,10 +8,10 @@
  * later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/ipack/ipack.h"
 #include "hw/pci/pci.h"
 #include "qemu/bitops.h"
-#include <stdio.h>
 
 /* #define DEBUG_TPCI */
 

diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c
index 52aba1e20d76bd1af5d0fa84c645933d807c815a..dfab272f9ed5549d54132b7d45909f1d175dfbdc 100644 (file)
--- a/hw/ipmi/ipmi.c
+++ b/hw/ipmi/ipmi.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/ipmi/ipmi.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c
index 56073b37aea4499ea9c9014682cb225f05a82fe3..c31a3a02c2d0abccdb29d3716024667150b41393 100644 (file)
--- a/hw/ipmi/ipmi_bmc_extern.c
+++ b/hw/ipmi/ipmi_bmc_extern.c
@@ -27,7 +27,7 @@
  * using the "VM" connection type.  See that for details.
  */
 
-#include <stdint.h>
+#include "qemu/osdep.h"
 #include "qemu/timer.h"
 #include "sysemu/char.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index 0a59e539f5495cc904cc1f7509f0c3635d9fcef1..dcdab035d6e35cf3a6ff6c53106e4dba3b345cf8 100644 (file)
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -22,9 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
+#include "qemu/osdep.h"
 #include "qemu/timer.h"
 #include "hw/ipmi/ipmi.h"
 #include "qemu/error-report.h"

diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index ce1b78a5a6c79a25730d380866be01368ea8422d..ace2dc0a809e779cfbf9794b04948a9a30e4bc69 100644 (file)
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.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/ipmi/ipmi.h"
 #include "hw/isa/isa.h"

diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index daa70c3cac79e96edaeefe233aa955fdae54460c..9841b7f3d5e011cc0a9f24417a613b1fb185db11 100644 (file)
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.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/ipmi/ipmi.h"
 #include "hw/isa/isa.h"

diff --git a/hw/isa/apm.c b/hw/isa/apm.c
index 26ab1702158c5d082b05520da592c62a3efe19cd..e232b0da033acb15705fc79585af0f1e4912514b 100644 (file)
--- a/hw/isa/apm.c
+++ b/hw/isa/apm.c
@@ -20,6 +20,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/isa/apm.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"

diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c
index 3793c6fe7a4ad28c6e6d96f55a919adaccaa8a3d..4d29a9900c151b77eb8d5e8d6ed674716b608fd8 100644 (file)
--- a/hw/isa/i82378.c
+++ b/hw/isa/i82378.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/pci/pci.h"
 #include "hw/i386/pc.h"
 #include "hw/timer/i8254.h"

diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 630054c03eaadda7708ea06792c5120cff312211..b487cb183959d38c3d25cc81a40464008105782e 100644 (file)
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -16,6 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "monitor/monitor.h"
 #include "hw/sysbus.h"

diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 6c2190b46c988bd03b73c547d6e669ff0e219634..41d5254f8e556bef6db0ab5205bf56b801b1a0c0 100644 (file)
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.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/i386/pc.h"
 #include "hw/isa/vt82c686.h"

diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
index 4fd397f015579efa533646fc5c1de567fe976a76..0a602f28ba6bb666013e23baf678630493511445 100644 (file)
--- a/hw/mem/nvdimm.c
+++ b/hw/mem/nvdimm.c
@@ -22,6 +22,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
 
+#include "qemu/osdep.h"
 #include "hw/mem/nvdimm.h"
 
 static void nvdimm_class_init(ObjectClass *oc, void *data)

diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index d5cdab2707c76d3994b5eba632eea20c37badae1..32d00ddee7580fcb2216672ed29d29e65971ee4f 100644 (file)
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -18,6 +18,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
 
+#include "qemu/osdep.h"
 #include "hw/mem/pc-dimm.h"
 #include "qemu/config-file.h"
 #include "qapi/visitor.h"

diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c
index 332598b257b63d2be222536994c3d2fd9c0c68bd..57d5ab2154564b45d96425be09d53ddcebb9e34d 100644 (file)
--- a/hw/nvram/ds1225y.c
+++ b/hw/nvram/ds1225y.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "trace.h"
 

diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c
index 0af4d6707f4b5c09d2dddb6ccc55ad786457d985..2c16fc23dfe604c862783d6ae2b2a7c047a3d4bc 100644 (file)
--- a/hw/nvram/eeprom93xx.c
+++ b/hw/nvram/eeprom93xx.c
@@ -35,6 +35,7 @@
  * - No emulation of EEPROM timings.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/nvram/eeprom93xx.h"
 

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index a1d650d5a9f9713dc68db47551287f275293006b..79c5742b3362d8856688880bf2d9a29360de0e85 100644 (file)
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.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 "sysemu/sysemu.h"
 #include "sysemu/dma.h"

diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
index 9f165664c610521486081e7c09c56471eca246a5..564ef936d16422fee9367b9cc0a40d575dafb58b 100644 (file)
--- a/hw/nvram/mac_nvram.c
+++ b/hw/nvram/mac_nvram.c
@@ -22,6 +22,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/nvram/openbios_firmware_abi.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/pcmcia/pcmcia.c b/hw/pcmcia/pcmcia.c
index 78efe5a67af3bd38cd35d304f1b1cc213e7fcc89..195672186a6e8d80731d63768e0553b5ae4b5a74 100644 (file)
--- a/hw/pcmcia/pcmcia.c
+++ b/hw/pcmcia/pcmcia.c
@@ -4,6 +4,7 @@
  * Copyright 2013 SUSE LINUX Products GmbH
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/hw.h"
 #include "hw/pcmcia.h"

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 1a9935cf916fc8d7febfd95c68e2587cb792cdd0..7580449f97c1d7bddd26fda6adc4c222d1a9ee31 100644 (file)
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -29,6 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "sysemu/block-backend.h"
 #include "hw/sd/sd.h"

diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 7acb4d7928f0511d20ccdad1e24a5615e3b352ac..30e3bf4f3ccee7779a77181830c4b14224f62779 100644 (file)
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -22,7 +22,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <inttypes.h>
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"

diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
index eeb96b9d76e3c7fd11e7789d362c540bd8c4de90..075e4ed5df85b3e6c72ac633c04393840c4b6964 100644 (file)
--- a/hw/sd/ssi-sd.c
+++ b/hw/sd/ssi-sd.c
@@ -10,6 +10,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "hw/ssi/ssi.h"

diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index a3e575ac790fb8738a961fa37ebbf7abab55a341..3b5f9bd534e7658e3284c052ad37fc01699c45c5 100644 (file)
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -15,6 +15,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c
index a0f57c0a72cf6eed3d4b8d6c4c1b74566de99357..9791c0d9471464acf4efe7e961ab20182c3dc979 100644 (file)
--- a/hw/ssi/ssi.c
+++ b/hw/ssi/ssi.c
@@ -12,6 +12,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/ssi/ssi.h"
 
 struct SSIBus {

diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index ab526db0bfab7a000e48d016fd87edd6002fa54e..e98efb709ed5afef730b3b8335739bda9c3bd803 100644 (file)
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -22,8 +22,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "sysemu/tpm_backend.h"

diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index 95fc66e8fcaf44098f3c46abf4dfaf7110345bf4..c1c3d4dcc385537537a605247b644eedd98f14fa 100644 (file)
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -22,6 +22,7 @@
  * TPM Profile (PTP) Specification, Familiy 2.0, Revision 00.43
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/tpm_backend.h"
 #include "tpm_int.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c
index 4ace5852e001a8e4dbbc5d197a7c5900c6261d6b..7b35429725a742c243a703637ebf85fed08c1b68 100644 (file)
--- a/hw/tpm/tpm_util.c
+++ b/hw/tpm/tpm_util.c
@@ -19,6 +19,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
 
+#include "qemu/osdep.h"
 #include "tpm_util.h"
 #include "tpm_int.h"
 

diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c
index 81de0e50b1210df9bb4e86464374031410e999df..194c9b4ed9e62ff4dd14f490efe0aaf2596fe857 100644 (file)
--- a/hw/watchdog/watchdog.c
+++ b/hw/watchdog/watchdog.c
@@ -19,6 +19,7 @@
  * By Richard W.M. Jones (rjones@redhat.com).
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"

diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c
index a91c8fdad0974b8f726f0498c1a95996ccb4b1d8..a83d951213177b4e23aa756e764c6dd976ac73b0 100644 (file)
--- a/hw/watchdog/wdt_i6300esb.c
+++ b/hw/watchdog/wdt_i6300esb.c
@@ -19,7 +19,7 @@
  * By Richard W.M. Jones (rjones@redhat.com).
  */
 
-#include <inttypes.h>
+#include "qemu/osdep.h"
 
 #include "qemu-common.h"
 #include "qemu/timer.h"

diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c
index 0917a713db81acdfb281282a393f4eac44600fd2..532530b95bec21b6eee9b3583df6ce867282a98a 100644 (file)
--- a/hw/watchdog/wdt_ib700.c
+++ b/hw/watchdog/wdt_ib700.c
@@ -19,6 +19,7 @@
  * By Richard W.M. Jones (rjones@redhat.com).
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "sysemu/watchdog.h"