From: Peter Maydell Date: Tue, 26 Jan 2016 18:17:03 +0000 (+0000) Subject: x86: Clean up includes X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b6a0aa053711e27e1a7825c1fca662beb05bee6f;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git 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 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 c181bb226..d82131326 100644 --- 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 78e129020..21d2ea0c9 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -19,12 +19,8 @@ * with this program; if not, see . */ +#include "qemu/osdep.h" #include -#include -#include -#include -#include -#include #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 d9382f826..e04d60ad3 100644 --- a/hw/acpi/bios-linker-loader.c +++ b/hw/acpi/bios-linker-loader.c @@ -18,6 +18,7 @@ * with this program; if not, see . */ +#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 21e113d71..397e6da9b 100644 --- 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 f5b9972f2..2f99ec545 100644 --- 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 13b210ea8..97bb1092a 100644 --- 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 . */ +#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 1c7fcfa9d..746d8901e 100644 --- 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 65cbc8041..f65a3a21e 100644 --- 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 080d9add5..c75660215 100644 --- 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 +#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 df1b176b8..7ee7e1623 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -26,6 +26,7 @@ * License along with this library; if not, see */ +#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 fbbc4dde4..3e338b5ec 100644 --- 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 2cd2fee89..9694e5238 100644 --- 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 7a026c255..8ce7daf23 100644 --- 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 36f1c4adb..148632e68 100644 --- 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 c2b553f0d..f6ba76fd6 100644 --- 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 f3db024d0..b9b5bc6db 100644 --- 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 1c8b9be5c..8f1b6f3d8 100644 --- 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 566e9ef19..39e07db08 100644 --- 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 13984244a..1ff6c4da7 100644 --- 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 ce1713d26..6fc3923f5 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -17,6 +17,7 @@ * License along with this library; if not, see * . */ +#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 91d4d322c..498f03e83 100644 --- 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 78758e24a..739cfa3bb 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -20,12 +20,11 @@ * with this program; if not, see . */ +#include "qemu/osdep.h" #include "acpi-build.h" -#include #include #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 3fe27fa51..c25b1fd24 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -19,6 +19,7 @@ * with this program; if not, see . */ +#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 5b470562a..694d3989b 100644 --- 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 0593a3f1f..a3b300cad 100644 --- 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 90eea10df..e43b5c446 100644 --- 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 53e3ca8c6..2b207de01 100644 --- 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 b7390ca0d..8eb2c7a70 100644 --- 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 eec1340f4..d4089e7cc 100644 --- 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 -#include +#include "qemu/osdep.h" #include -#include -#include #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 f0922da68..c69f37404 100644 --- 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 6774a1932..c4d7d8328 100644 --- 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 78cf8fa0f..942ac0659 100644 --- 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 bc74557e3..9951d6e1d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include #include "hw/hw.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 6128b0226..56be9b1d1 100644 --- 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 579461fa1..2324e700b 100644 --- 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 e40b586b9..bff979a4d 100644 --- 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 -#include -#include -#include +#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 f5acd6a09..512814683 100644 --- 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 de83f4e3e..a2247b917 100644 --- 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 9abcf25c1..1095c65d4 100644 --- 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 0a840b851..a2994624f 100644 --- 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 */ +#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 ad959c4e7..659f377e5 100644 --- 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 */ +#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 e4bfaeade..378e663f6 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -20,6 +20,7 @@ * License along with this library; if not, see . */ +#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 65f6877d7..0a48de29b 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -19,6 +19,7 @@ * License along with this library; if not, see . */ +#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 ed9907d29..d19894568 100644 --- 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 644cfd953..5500fcc4d 100644 --- 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 69a1b004c..84fa1a5b9 100644 --- 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 18e94e07b..086893dcc 100644 --- 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 #endif diff --git a/hw/misc/sga.c b/hw/misc/sga.c index 83d2fd9d3..03b006d6f 100644 --- 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 17d826cba..e361ecb7e 100644 --- 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 b0d7e3160..3832ed689 100644 --- 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 1fb470758..42b421edf 100644 --- 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 d9d039b4e..0ad542037 100644 --- 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 9b65a3369..b84a33f87 100644 --- 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 07345f668..ed511b885 100644 --- 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 a9f0efd5e..eb0100aa2 100644 --- 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 eccd8031a..5a2e4be5d 100644 --- 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 01563fecc..88f341e1b 100644 --- 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 dac1b1a36..f47df1998 100644 --- a/target-i386/bpt_helper.c +++ b/target-i386/bpt_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#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 d5b7c7b17..99a3b5496 100644 --- a/target-i386/cc_helper.c +++ b/target-i386/cc_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#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 5e347bc46..ef37f4240 100644 --- a/target-i386/excp_helper.c +++ b/target-i386/excp_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#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 31afa4475..2d54b47ac 100644 --- a/target-i386/fpu_helper.c +++ b/target-i386/fpu_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include #include "cpu.h" #include "exec/helper-proto.h" diff --git a/target-i386/gdbstub.c b/target-i386/gdbstub.c index 6a9bf3c4a..4b5071398 100644 --- 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 . */ -#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 24f58117a..81568c8b2 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#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 e79b173a8..6b519c392 100644 --- 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 3dcd25fd6..9d0d21e78 100644 --- a/target-i386/int_helper.c +++ b/target-i386/int_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#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 6fefd65c2..8df9c5953 100644 --- 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 d6f5355aa..94024bc1b 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -12,7 +12,7 @@ * */ -#include +#include "qemu/osdep.h" #include #include #include diff --git a/target-i386/machine.c b/target-i386/machine.c index 6be73413c..ee5b94922 100644 --- 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 0e20df2f7..7de775259 100644 --- a/target-i386/mem_helper.c +++ b/target-i386/mem_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#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 13bd4f5ee..460257f6b 100644 --- a/target-i386/misc_helper.c +++ b/target-i386/misc_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#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 aac6b1ba8..fccfe40ab 100644 --- 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 20ee89222..4c7cab79f 100644 --- a/target-i386/seg_helper.c +++ b/target-i386/seg_helper.c @@ -18,6 +18,7 @@ * License along with this library; if not, see . */ +#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 c272a9840..b93042172 100644 --- a/target-i386/smm_helper.c +++ b/target-i386/smm_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#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 f1fabf54e..ab472f6ee 100644 --- a/target-i386/svm_helper.c +++ b/target-i386/svm_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#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 8ce0fcc0b..957a92d59 100644 --- 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 . */ -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include "qemu/host-utils.h" #include "cpu.h"