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

diff --git a/hw/acpi/acpi_interface.c b/hw/acpi/acpi_interface.c
index c181bb2262d48b38d9d5e64b11806214afd6ded7..d82131326a8e01204db0bcc18fa8e3c543153de7 100644 (file)
--- a/hw/acpi/acpi_interface.c
+++ b/hw/acpi/acpi_interface.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/acpi/acpi_dev_interface.h"
 #include "qemu/module.h"
 

diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 78e12902086fc3356c45eb53ab90991e2f4c6eb0..21d2ea0c9c37d4cd14253458f1f7ded9022b467f 100644 (file)
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -19,12 +19,8 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include <glib/gprintf.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <stdbool.h>
-#include <string.h>
 #include "hw/acpi/aml-build.h"
 #include "qemu/bswap.h"
 #include "qemu/bitops.h"

diff --git a/hw/acpi/bios-linker-loader.c b/hw/acpi/bios-linker-loader.c
index d9382f826a2c63be916b57b4fdc9f97c7e348dfb..e04d60ad3f1d7534ec3f83b306117ecd11bdb259 100644 (file)
--- a/hw/acpi/bios-linker-loader.c
+++ b/hw/acpi/bios-linker-loader.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 "hw/acpi/bios-linker-loader.h"
 #include "hw/nvram/fw_cfg.h"

diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 21e113d713daa6c8422e7a2e3bd7a5a06988bdd7..397e6da9b6d00385b12cc2a95044b8f6c0c10d65 100644 (file)
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -18,6 +18,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 "sysemu/sysemu.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"

diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
index f5b9972f2dce1d8e7b6560a2fd683cc1e947b27d..2f99ec5455e5d415cfd0027d248c08e90bed7ab0 100644 (file)
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@@ -9,6 +9,7 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/acpi/cpu_hotplug.h"
 

diff --git a/hw/acpi/cpu_hotplug_acpi_table.c b/hw/acpi/cpu_hotplug_acpi_table.c
index 13b210ea8928735b2ce83f30b9b513588753e1d3..97bb1092a2549fa906fc55bf0b17b428de588348 100644 (file)
--- a/hw/acpi/cpu_hotplug_acpi_table.c
+++ b/hw/acpi/cpu_hotplug_acpi_table.c
@@ -13,6 +13,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/acpi/cpu_hotplug.h"
 
 void build_cpu_hotplug_aml(Aml *ctx)

diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 1c7fcfa9d7b3e935b9de9b12311b3056eed5af02..746d8901e491399dc600eba799f5a2c1e83e019b 100644 (file)
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -23,6 +23,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 "qapi/visitor.h"
 #include "hw/i386/pc.h"

diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index 65cbc80414d4bd194f43451789718d6cf834c739..f65a3a21ef419eea24ce910173092939e560008c 100644 (file)
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/acpi/memory_hotplug.h"
 #include "hw/acpi/pc-hotplug.h"
 #include "hw/mem/pc-dimm.h"

diff --git a/hw/acpi/memory_hotplug_acpi_table.c b/hw/acpi/memory_hotplug_acpi_table.c
index 080d9add5b0e81868a56db91f6021623e642e09d..c75660215d7fa1f4ed78fb01a5f9147e11177492 100644 (file)
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@@ -9,7 +9,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include <stdbool.h>
+#include "qemu/osdep.h"
 #include "hw/acpi/memory_hotplug.h"
 #include "include/hw/acpi/pc-hotplug.h"
 #include "hw/boards.h"

diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index df1b176b8ff4e329676d7e7d0071c5545e1310f5..7ee7e1623cc543031d676ca6eb3f4b4f4a767817 100644 (file)
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -26,6 +26,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
 
+#include "qemu/osdep.h"
 #include "hw/acpi/acpi.h"
 #include "hw/acpi/aml-build.h"
 #include "hw/mem/nvdimm.h"

diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index fbbc4dde4f23e3be36af8d9a8c90a7588d29a957..3e338b5ec251050833a1b62078689f8e72e9d4ba 100644 (file)
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -24,6 +24,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/acpi/pcihp.h"
 
 #include "hw/hw.h"

diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 2cd2fee8976fb9835e8b4ea5a9b0abe540c66ba7..9694e5238fe9230f9b95e3982772416b7a34a52d 100644 (file)
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -18,6 +18,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/isa/apm.h"

diff --git a/hw/acpi/tco.c b/hw/acpi/tco.c
index 7a026c255bcf648a8dc7228c2e59adca4bd9f6df..8ce7daf23a11250bbd2ea81ecf53af2fa7ec6990 100644 (file)
--- a/hw/acpi/tco.c
+++ b/hw/acpi/tco.c
@@ -6,6 +6,7 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/watchdog.h"
 #include "hw/i386/ich9.h"

diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c
index 36f1c4adb3fa058d52347dda42e29f5fd39f55d9..148632e686dd474136fad0b2bd9320592691c13e 100644 (file)
--- a/hw/char/debugcon.c
+++ b/hw/char/debugcon.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "sysemu/char.h"
 #include "hw/isa/isa.h"

diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index c2b553f0d19206ebc1dad2539a6c2b91fae414b8..f6ba76fd6028f9ad3d61e97045298b5f2ec75419 100644 (file)
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.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 "sysemu/char.h"
 #include "hw/isa/isa.h"

diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c
index f3db024d0680f4a97b0ab993792166ec3fd75e1d..b9b5bc6db28a1b87ec89a69c6883906b1426869e 100644 (file)
--- a/hw/char/serial-isa.c
+++ b/hw/char/serial-isa.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/char/serial.h"
 #include "hw/isa/isa.h"
 

diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
index 1c8b9be5cc8b61ffed72cf564233e01d0abb9f7a..8f1b6f3d84b34c30d58be56a77b0a75503073029 100644 (file)
--- a/hw/char/serial-pci.c
+++ b/hw/char/serial-pci.c
@@ -25,6 +25,7 @@
 
 /* see docs/specs/pci-serial.txt */
 
+#include "qemu/osdep.h"
 #include "hw/char/serial.h"
 #include "hw/pci/pci.h"
 

diff --git a/hw/char/serial.c b/hw/char/serial.c
index 566e9ef194f7a0047098f80c0509ce85a405b8d0..39e07db0883f21d06070c536a307a31f0599766e 100644 (file)
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/char/serial.h"
 #include "sysemu/char.h"
 #include "qemu/timer.h"

diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index 13984244a605a4bb18d7c71ccd1bf9dda89d243b..1ff6c4da711171023e07f98d1ccecacf77453192 100644 (file)
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.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 "qemu/main-loop.h"

diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c
index ce1713d267e2db765b09ca9a9d510d7edf2984fc..6fc3923f560c08ac848037d4d5204ac9677c7cb1 100644 (file)
--- a/hw/i2c/pm_smbus.c
+++ b/hw/i2c/pm_smbus.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see
  * <http://www.gnu.org/licenses/>.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/i2c/pm_smbus.h"

diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c
index 91d4d322ca414fd3bbfe125aa0a020f6905c6754..498f03e8355fbb078cdc15743f90781655efd767 100644 (file)
--- a/hw/i2c/smbus_ich9.c
+++ b/hw/i2c/smbus_ich9.c
@@ -24,6 +24,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/i2c/pm_smbus.h"

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 78758e24aaae6fa122f0e41e49cbb2a4d9901bdf..739cfa3bb989b905d4f68ad4fedea3216b91f9b8 100644 (file)
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -20,12 +20,11 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "acpi-build.h"
-#include <stddef.h>
 #include <glib.h>
 #include "qemu-common.h"
 #include "qemu/bitmap.h"
-#include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "hw/pci/pci.h"
 #include "qom/cpu.h"

diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 3fe27fa5124cec6eccd297c62cb54b72a3b4ac90..c25b1fd2421b7ba73b1c41c315930072b3ccd200 100644 (file)
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -19,6 +19,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 #include "intel_iommu_internal.h"

diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c
index 5b470562a60863d19b69ac62d813a1d9bdff153e..694d3989b2bf3212327d4c88c9fb41ad99704e55 100644 (file)
--- a/hw/i386/kvm/apic.c
+++ b/hw/i386/kvm/apic.c
@@ -9,6 +9,7 @@
  * This work is licensed under the terms of the GNU GPL version 2.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/pci/msi.h"
 #include "sysemu/kvm.h"

diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index 0593a3f1f5bcc93d172a448968a28eef59c07519..a3b300cadf8443f53a8b26f6a60780ea83ed66bc 100644 (file)
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -13,6 +13,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/host-utils.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c
index 90eea10df75fce80b0c11c06ae1054ab8109925f..e43b5c4461101152a43a8920c004418ec4517bd0 100644 (file)
--- a/hw/i386/kvm/i8254.c
+++ b/hw/i386/kvm/i8254.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 "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "hw/timer/i8254.h"

diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c
index 53e3ca8c676f97498618fbb16cd8c13379385a03..2b207de01b1623067ba8a566aa366078c080f67a 100644 (file)
--- a/hw/i386/kvm/i8259.c
+++ b/hw/i386/kvm/i8259.c
@@ -9,6 +9,7 @@
  * This work is licensed under the terms of the GNU GPL version 2.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "hw/isa/i8259_internal.h"
 #include "hw/i386/apic_internal.h"
 #include "sysemu/kvm.h"

diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
index b7390ca0da6805319622a70293e582364fc6dc14..8eb2c7a70f0f203111001450619126b9ceece183 100644 (file)
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@@ -10,6 +10,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "monitor/monitor.h"
 #include "hw/i386/pc.h"
 #include "hw/i386/ioapic_internal.h"

diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index eec1340f472c8fb12d362e9b0749510633a87161..d4089e7cc22373adb1a70fb191b601231730d1e2 100644 (file)
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -20,11 +20,8 @@
  *  Copyright (C) 2008, Red Hat, Amit Shah (amit.shah@redhat.com)
  *  Copyright (C) 2008, IBM, Muli Ben-Yehuda (muli@il.ibm.com)
  */
-#include <stdio.h>
-#include <unistd.h>
+#include "qemu/osdep.h"
 #include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "qemu/error-report.h"

diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index f0922da682a6f962a94ac1ecba16219f80156f4a..c69f3740494083805d3393ea434bcdd4b0f8ed12 100644 (file)
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -8,6 +8,7 @@
  * (at your option) any later version. See the COPYING file in the
  * top-level directory.
  */
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/cpus.h"
 #include "sysemu/kvm.h"

diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index 6774a1932ef06a964601fd044ad516e553bf5f09..c4d7d8328fb42991a0da5d49ee1b9f33885e222a 100644 (file)
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/nvram/fw_cfg.h"
 #include "multiboot.h"

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 78cf8fa0f0efbb83206d54e76de593433dfc39a2..942ac0659a9d3129eb218ba464eb82835646ddeb 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.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/char/serial.h"

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index bc74557e35bf35788e6f20de4816caebc639351e..9951d6e1d5c28aa822d110a54d3249027bb10d1f 100644 (file)
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 
 #include "hw/hw.h"

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 6128b0226df2ee456cd4f5059ead1bfdfb51d26a..56be9b1d162620ecb99011cf8c8f275fa4f93e8c 100644 (file)
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -27,6 +27,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/loader.h"
 #include "sysemu/arch_init.h"

diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index 579461fa1ed4fd57e73f28ced993532d96e45696..2324e700b0ce086597f4dec6a945f704b54ecb03 100644 (file)
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/block-backend.h"
 #include "qemu/error-report.h"
 #include "hw/sysbus.h"

diff --git a/hw/i386/pci-assign-load-rom.c b/hw/i386/pci-assign-load-rom.c
index e40b586b92426a44daf0afb7da96683eb9e63a46..bff979a4d0c838c14f9c478ea08fc900e87a5898 100644 (file)
--- a/hw/i386/pci-assign-load-rom.c
+++ b/hw/i386/pci-assign-load-rom.c
@@ -1,10 +1,7 @@
 /*
  * This is splited from hw/i386/kvm/pci-assign.c
  */
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "qemu/error-report.h"

diff --git a/hw/i386/xen/xen_apic.c b/hw/i386/xen/xen_apic.c
index f5acd6a096216ac1558eca0f9dab170475d03098..512814683aac96bf8bceaef1896059f8eadeb105 100644 (file)
--- a/hw/i386/xen/xen_apic.c
+++ b/hw/i386/xen/xen_apic.c
@@ -9,6 +9,7 @@
  * This work is licensed under the terms of the GNU GPL version 2 or
  * later. See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/pci/msi.h"
 #include "hw/xen/xen.h"

diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index de83f4e3ee0e5295d8d13471fcae42873a706aff..a2247b917ad1c1a00b077ef1f1593a346394f441 100644 (file)
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/ide.h"

diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c
index 9abcf25c1aa4bee9bb3dce9271d452cd526f9430..1095c65d41b3471df729f9353685cba1991a9b1d 100644 (file)
--- a/hw/i386/xen/xen_pvdevice.c
+++ b/hw/i386/xen/xen_pvdevice.c
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "trace.h"

diff --git a/hw/intc/apic.c b/hw/intc/apic.c
index 0a840b851fe85559fd4d9accbdc5aae380462b0d..a2994624f5a2d870bc96fedb96024887cdffdc93 100644 (file)
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.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 "qemu/thread.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/i386/apic.h"

diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index ad959c4e77616e27f3a6481afa78cd014bd9aaba..659f377e5523f580a4eaf7b7077f2618a978f349 100644 (file)
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -17,6 +17,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/i386/apic.h"
 #include "hw/i386/apic_internal.h"
 #include "trace.h"

diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index e4bfaeade29d05271462015e015d4503917cd18a..378e663f65c6531ed1c039c841d028a3cb61b21e 100644 (file)
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -20,6 +20,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "monitor/monitor.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"

diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c
index 65f6877d79fec3ade28db8592d6c8dd4ab0a008a..0a48de29b9b4b55b8be4a76591e653bc5426da9b 100644 (file)
--- a/hw/intc/ioapic_common.c
+++ b/hw/intc/ioapic_common.c
@@ -19,6 +19,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "monitor/monitor.h"
 #include "hw/i386/ioapic.h"
 #include "hw/i386/ioapic_internal.h"

diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index ed9907d29ab77eee10da8cb197d4bd8de377d7ee..d198945686e906ac7d2cad37b843283265888b89 100644 (file)
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -27,6 +27,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/hw.h"
 #include "qapi/visitor.h"

diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 644cfd9536fef5f779dd0234f6a61cfb16edc4f8..5500fcc4d6ecef2a2c402c8b0e90d0000aaabbd1 100644 (file)
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"

diff --git a/hw/misc/debugexit.c b/hw/misc/debugexit.c
index 69a1b004cb5b5dc69bc77d36a081314fdeb6285b..84fa1a5b9d550a298283924d2710b5a65f887558 100644 (file)
--- a/hw/misc/debugexit.c
+++ b/hw/misc/debugexit.c
@@ -7,6 +7,7 @@
  * (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/isa/isa.h"
 

diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c
index 18e94e07b1a2fac76441f2af9c64cd36396faa0c..086893dcca962d24c6aa8b980327088e28b6af91 100644 (file)
--- a/hw/misc/pc-testdev.c
+++ b/hw/misc/pc-testdev.c
@@ -35,7 +35,7 @@
  * git://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git
 */
 
-#include "config-host.h"
+#include "qemu/osdep.h"
 #if defined(CONFIG_POSIX)
 #include <sys/mman.h>
 #endif

diff --git a/hw/misc/sga.c b/hw/misc/sga.c
index 83d2fd9d3dacbef9fd9a91aaf6b34b8fb2735b2d..03b006d6f0a0629aace7918a35142e32809b3c28 100644 (file)
--- a/hw/misc/sga.c
+++ b/hw/misc/sga.c
@@ -24,6 +24,7 @@
  * sgabios code originally available at code.google.com/p/sgabios
  *
  */
+#include "qemu/osdep.h"
 #include "hw/pci/pci.h"
 #include "hw/i386/pc.h"
 #include "hw/loader.h"

diff --git a/hw/pci-host/pam.c b/hw/pci-host/pam.c
index 17d826cba5039b237f7b8fe3f98359c6cf40bf7e..e361ecb7eef9725557505a5c1e933b7aecbff064 100644 (file)
--- a/hw/pci-host/pam.c
+++ b/hw/pci-host/pam.c
@@ -27,6 +27,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qom/object.h"
 #include "sysemu/sysemu.h"
 #include "hw/pci-host/pam.h"

diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index b0d7e316076ca632650f794597aff071b309c5e3..3832ed6893e4f88b11c956881d4bd35f5b90ec9c 100644 (file)
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"

diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 1fb470758b6e22c804aa1f9db06213445879b9f0..42b421edfbd20a18c1db0ad331e2b61b4bf28705 100644 (file)
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -27,6 +27,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-host/q35.h"
 #include "qapi/visitor.h"

diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index d9d039b4edfedf1832a5c9441cc98ba2053c255a..0ad542037a4d0dbf6e55343ae16a6d3df178f5b3 100644 (file)
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -24,6 +24,7 @@
  * This driver attempts to emulate an HPET device in software.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "ui/console.h"

diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c
index 9b65a336923f99d5277915820accafa976a3e45f..b84a33f874223e3b367adcde4c2038cc8940e202 100644 (file)
--- a/hw/timer/i8254.c
+++ b/hw/timer/i8254.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/timer/i8254_common.c b/hw/timer/i8254_common.c
index 07345f668ccad1fa0d5aa85f22fd4d4c20ebcc9f..ed511b885b54610ed069c3f2a565569b9c2aae95 100644 (file)
--- a/hw/timer/i8254_common.c
+++ b/hw/timer/i8254_common.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/i386/pc.h"
 #include "hw/isa/isa.h"

diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index a9f0efd5e0041a0cd906d1112021bac2b5763855..eb0100aa25314667a46c01efd0684bf09af287c0 100644 (file)
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.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 "qemu/timer.h"
 #include "sysemu/sysemu.h"

diff --git a/target-i386/arch_dump.c b/target-i386/arch_dump.c
index eccd8031afb0883a1fd197e48170767b815bac57..5a2e4be5d003effac58cfa2101156296885b753b 100644 (file)
--- a/target-i386/arch_dump.c
+++ b/target-i386/arch_dump.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/cpu-all.h"
 #include "sysemu/dump.h"

diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c
index 01563fecceb7cf4d929753a419d8a006f6b7bc70..88f341e1bbd0ae14a992ea7c4c11de54463c7eb8 100644 (file)
--- a/target-i386/arch_memory_mapping.c
+++ b/target-i386/arch_memory_mapping.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/cpu-all.h"
 #include "sysemu/memory_mapping.h"

diff --git a/target-i386/bpt_helper.c b/target-i386/bpt_helper.c
index dac1b1a360002813e283731e232449686f82715f..f47df19988793c52f8346adc7051c4455118632f 100644 (file)
--- a/target-i386/bpt_helper.c
+++ b/target-i386/bpt_helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
 

diff --git a/target-i386/cc_helper.c b/target-i386/cc_helper.c
index d5b7c7b17a238edba2754720e03d476a7ab58695..99a3b5496bb1ef81bb3bc3983830b5804cf5fdf4 100644 (file)
--- a/target-i386/cc_helper.c
+++ b/target-i386/cc_helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
 

diff --git a/target-i386/excp_helper.c b/target-i386/excp_helper.c
index 5e347bc46c39782f4f5295a40eb82e085934b1fd..ef37f42401a21746dbfd08b956b1412e7e456ba6 100644 (file)
--- a/target-i386/excp_helper.c
+++ b/target-i386/excp_helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "qemu/log.h"
 #include "sysemu/sysemu.h"

diff --git a/target-i386/fpu_helper.c b/target-i386/fpu_helper.c
index 31afa4475d1d2c8238ee2e9cce140c8fb16de1d1..2d54b47ac6fa34dbc462ee7647f55677d22eace5 100644 (file)
--- a/target-i386/fpu_helper.c
+++ b/target-i386/fpu_helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include <math.h>
 #include "cpu.h"
 #include "exec/helper-proto.h"

diff --git a/target-i386/gdbstub.c b/target-i386/gdbstub.c
index 6a9bf3c4a0b213d802e0d7dab99aac6a55678d0e..4b5071398fe5245ab0229c67d219d71999190d48 100644 (file)
--- a/target-i386/gdbstub.c
+++ b/target-i386/gdbstub.c
@@ -17,7 +17,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 "config.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "exec/gdbstub.h"
 

diff --git a/target-i386/helper.c b/target-i386/helper.c
index 24f58117ab7ba12e76ed0ce20aa8aca8aec3299b..81568c8b2bdc761e8b4c0b574b996034240ea246 100644 (file)
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "sysemu/kvm.h"
 #include "kvm_i386.h"

diff --git a/target-i386/hyperv.c b/target-i386/hyperv.c
index e79b173a816f4f3dd6d8d8b42a2e1e7e8f284f0c..6b519c392e925fa500bc6caed329bd30ffe9b694 100644 (file)
--- a/target-i386/hyperv.c
+++ b/target-i386/hyperv.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hyperv.h"
 #include "standard-headers/asm-x86/hyperv.h"
 

diff --git a/target-i386/int_helper.c b/target-i386/int_helper.c
index 3dcd25fd6eb60ecfda1a1ed12c59d02768f76f3f..9d0d21e786ff53a1734354709c79da0ba1914b58 100644 (file)
--- a/target-i386/int_helper.c
+++ b/target-i386/int_helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"

diff --git a/target-i386/kvm-stub.c b/target-i386/kvm-stub.c
index 6fefd65c236c143badfe9a84e9ca21a4a84795b7..8df9c5953f540252b7fc8ac4c991d00756d7cd9f 100644 (file)
--- a/target-i386/kvm-stub.c
+++ b/target-i386/kvm-stub.c
@@ -9,6 +9,7 @@
  * See the COPYING file in the top-level directory.
  *
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "kvm_i386.h"
 

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index d6f5355aa9dde560be65fa70f19709702fa48e34..94024bc1b1d78fa7038688b5c85d4f2abe4ed207 100644 (file)
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -12,7 +12,7 @@
  *
  */
 
-#include <sys/types.h>
+#include "qemu/osdep.h"
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/utsname.h>

diff --git a/target-i386/machine.c b/target-i386/machine.c
index 6be73413cb66edfaed1083ce7bbe7262c65bca06..ee5b94922b036cc28705f416fe12088952723e32 100644 (file)
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/i386/pc.h"

diff --git a/target-i386/mem_helper.c b/target-i386/mem_helper.c
index 0e20df2f759e1224fcbef87d96ed30790cc6c175..7de775259daba50c18c8ab34589c9443381046cd 100644 (file)
--- a/target-i386/mem_helper.c
+++ b/target-i386/mem_helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "exec/cpu_ldst.h"

diff --git a/target-i386/misc_helper.c b/target-i386/misc_helper.c
index 13bd4f5eec555015980302db082cd9d53edd12c5..460257f6bc4579257a978f248b3b9afa75c2064f 100644 (file)
--- a/target-i386/misc_helper.c
+++ b/target-i386/misc_helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "exec/cpu_ldst.h"

diff --git a/target-i386/monitor.c b/target-i386/monitor.c
index aac6b1ba8e475cd3e528bac05fe0a14f0b109a5e..fccfe40ab7b3d6523de4d190cc3828e716af501a 100644 (file)
--- a/target-i386/monitor.c
+++ b/target-i386/monitor.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 "cpu.h"
 #include "monitor/monitor.h"
 #include "monitor/hmp-target.h"

diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c
index 20ee89222490c7acb8c8f6587ae8b93f66aa354e..4c7cab79ffaec1a4df48ed3f3394c0635d73cf1a 100644 (file)
--- a/target-i386/seg_helper.c
+++ b/target-i386/seg_helper.c
@@ -18,6 +18,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "qemu/log.h"
 #include "exec/helper-proto.h"

diff --git a/target-i386/smm_helper.c b/target-i386/smm_helper.c
index c272a98407c82ae24773f7fef573de489f1a9c16..b93042172482f47f2ecf233fea1b8096385720a3 100644 (file)
--- a/target-i386/smm_helper.c
+++ b/target-i386/smm_helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
 

diff --git a/target-i386/svm_helper.c b/target-i386/svm_helper.c
index f1fabf54e7bfd5af124613c38bfef6cd8575c400..ab472f6eea354fb6ab74fe118c1aa48adf13e075 100644 (file)
--- a/target-i386/svm_helper.c
+++ b/target-i386/svm_helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/cpu-all.h"
 #include "exec/helper-proto.h"

diff --git a/target-i386/translate.c b/target-i386/translate.c
index 8ce0fcc0bd23255c907aaa89bd21ef7748faafb0..957a92d5910967a02734ed03fb0766632e11df2c 100644 (file)
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -16,11 +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 <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
 
 #include "qemu/host-utils.h"
 #include "cpu.h"