From 18c86e2b9d85a89818f485c2cadafa6e3932e43a Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 26 Jan 2016 18:17:29 +0000 Subject: [PATCH] hw/core: 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-37-git-send-email-peter.maydell@linaro.org --- hw/core/empty_slot.c | 1 + hw/core/fw-path-provider.c | 1 + hw/core/hotplug.c | 1 + hw/core/irq.c | 1 + hw/core/loader.c | 1 + hw/core/machine.c | 1 + hw/core/nmi.c | 1 + hw/core/null-machine.c | 1 + hw/core/platform-bus.c | 1 + hw/core/ptimer.c | 1 + hw/core/qdev-properties-system.c | 1 + hw/core/qdev-properties.c | 1 + hw/core/qdev.c | 2 +- hw/core/stream.c | 1 + hw/core/sysbus.c | 1 + 15 files changed, 15 insertions(+), 1 deletion(-) diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c index 612b1093aa..c1b9c2b104 100644 --- a/hw/core/empty_slot.c +++ b/hw/core/empty_slot.c @@ -9,6 +9,7 @@ * version. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" #include "hw/empty_slot.h" diff --git a/hw/core/fw-path-provider.c b/hw/core/fw-path-provider.c index 7442d322d5..33b99830e7 100644 --- a/hw/core/fw-path-provider.c +++ b/hw/core/fw-path-provider.c @@ -15,6 +15,7 @@ * along with this program; if not, see . */ +#include "qemu/osdep.h" #include "hw/fw-path-provider.h" char *fw_path_provider_get_dev_path(FWPathProvider *p, BusState *bus, diff --git a/hw/core/hotplug.c b/hw/core/hotplug.c index 4e01074557..645cfca1b9 100644 --- a/hw/core/hotplug.c +++ b/hw/core/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/hotplug.h" #include "qemu/module.h" diff --git a/hw/core/irq.c b/hw/core/irq.c index 8a62a36d5e..49ff2e64fe 100644 --- a/hw/core/irq.c +++ b/hw/core/irq.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 "qemu-common.h" #include "hw/irq.h" #include "qom/object.h" diff --git a/hw/core/loader.c b/hw/core/loader.c index 6b69852479..3a57415bf8 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -42,6 +42,7 @@ * with this program; if not, see . */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "disas/disas.h" #include "monitor/monitor.h" diff --git a/hw/core/machine.c b/hw/core/machine.c index c46ddc7d15..1261368add 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -10,6 +10,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hw/boards.h" #include "qapi-visit.h" #include "qapi/visitor.h" diff --git a/hw/core/nmi.c b/hw/core/nmi.c index 4057cdd6a2..6ca569bd7f 100644 --- a/hw/core/nmi.c +++ b/hw/core/nmi.c @@ -19,6 +19,7 @@ * along with this program; if not, see . */ +#include "qemu/osdep.h" #include "hw/nmi.h" #include "qapi/qmp/qerror.h" #include "monitor/monitor.h" diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index f36fbf2318..0351ba7828 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "hw/hw.h" #include "hw/boards.h" diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c index aa55d01817..36f84ab72f 100644 --- a/hw/core/platform-bus.c +++ b/hw/core/platform-bus.c @@ -19,6 +19,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "hw/platform-bus.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index edf077cfd0..153c835136 100644 --- a/hw/core/ptimer.c +++ b/hw/core/ptimer.c @@ -5,6 +5,7 @@ * * This code is licensed under the GNU LGPL. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "qemu/timer.h" #include "hw/ptimer.h" diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index 1589abaf60..ff00f5c9cb 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -10,6 +10,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "net/net.h" #include "hw/qdev.h" #include "qapi/qmp/qerror.h" diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index aacad669e3..e878e80c67 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "net/net.h" #include "hw/qdev.h" #include "qapi/qmp/qerror.h" diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 655f5d5d5b..779de2ba93 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -25,10 +25,10 @@ inherit from a particular bus (e.g. PCI or I2C) rather than this API directly. */ +#include "qemu/osdep.h" #include "hw/qdev.h" #include "hw/fw-path-provider.h" #include "sysemu/sysemu.h" -#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" #include "qapi/qmp/qjson.h" diff --git a/hw/core/stream.c b/hw/core/stream.c index e6a05a543e..4439ecdf0b 100644 --- a/hw/core/stream.c +++ b/hw/core/stream.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "hw/stream.h" size_t diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index 3c58629894..a7dbe2b324 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ +#include "qemu/osdep.h" #include "hw/sysbus.h" #include "monitor/monitor.h" #include "exec/address-spaces.h" -- 2.11.4.GIT