| Message ID | 1453832250-766-8-git-send-email-peter.maydell@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 26 Jan 2016 18:17:00 +0000 Peter Maydell <peter.maydell@linaro.org> wrote: > 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> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> BTW: Does/should checkpatch look for osdep.h for new files? > --- > hw/char/sclpconsole-lm.c | 1 + > hw/char/sclpconsole.c | 1 + > hw/s390x/css.c | 1 + > hw/s390x/event-facility.c | 1 + > hw/s390x/ipl.c | 1 + > hw/s390x/s390-pci-bus.c | 1 + > hw/s390x/s390-pci-inst.c | 1 + > hw/s390x/s390-skeys-kvm.c | 1 + > hw/s390x/s390-skeys.c | 1 + > hw/s390x/s390-virtio-ccw.c | 1 + > hw/s390x/s390-virtio-hcall.c | 1 + > hw/s390x/s390-virtio.c | 1 + > hw/s390x/sclp.c | 1 + > hw/s390x/sclpcpu.c | 1 + > hw/s390x/sclpquiesce.c | 1 + > hw/s390x/virtio-ccw.c | 1 + > hw/watchdog/wdt_diag288.c | 1 + > target-s390x/arch_dump.c | 1 + > target-s390x/cc_helper.c | 1 + > target-s390x/cpu.c | 1 + > target-s390x/fpu_helper.c | 1 + > target-s390x/gdbstub.c | 2 +- > target-s390x/helper.c | 1 + > target-s390x/int_helper.c | 1 + > target-s390x/interrupt.c | 1 + > target-s390x/ioinst.c | 2 +- > target-s390x/kvm.c | 2 +- > target-s390x/machine.c | 1 + > target-s390x/mem_helper.c | 1 + > target-s390x/misc_helper.c | 2 +- > target-s390x/mmu_helper.c | 1 + > target-s390x/translate.c | 1 + > 32 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c index 02ac80b..7d4ff81 100644 --- a/hw/char/sclpconsole-lm.c +++ b/hw/char/sclpconsole-lm.c @@ -13,6 +13,7 @@ * */ +#include "qemu/osdep.h" #include "hw/qdev.h" #include "qemu/thread.h" #include "qemu/error-report.h" diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index b014c7f..45997ff 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -12,6 +12,7 @@ * */ +#include "qemu/osdep.h" #include <hw/qdev.h> #include "qemu/thread.h" #include "qemu/error-report.h" diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 343c352..db96b66 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -9,6 +9,7 @@ * directory. */ +#include "qemu/osdep.h" #include <hw/qdev.h> #include "qemu/bitops.h" #include "exec/address-spaces.h" diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 907b485..85be24d 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -15,6 +15,7 @@ * */ +#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 9c01be5..6992add 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "cpu.h" #include "elf.h" diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 132588b..5d6cebb 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -11,6 +11,7 @@ * directory. */ +#include "qemu/osdep.h" #include "s390-pci-bus.h" #include <hw/pci/pci_bus.h> #include <hw/pci/msi.h> diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index 1a6a3e7..fe73ca8 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -11,6 +11,7 @@ * directory. */ +#include "qemu/osdep.h" #include "s390-pci-inst.h" #include "s390-pci-bus.h" #include <exec/memory-internal.h> diff --git a/hw/s390x/s390-skeys-kvm.c b/hw/s390x/s390-skeys-kvm.c index eaa37ba..131da56 100644 --- a/hw/s390x/s390-skeys-kvm.c +++ b/hw/s390x/s390-skeys-kvm.c @@ -9,6 +9,7 @@ * directory. */ +#include "qemu/osdep.h" #include "hw/s390x/storage-keys.h" #include "sysemu/kvm.h" #include "qemu/error-report.h" diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index f2b732e..18c14ea 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -9,6 +9,7 @@ * directory. */ +#include "qemu/osdep.h" #include "hw/boards.h" #include "qmp-commands.h" #include "migration/qemu-file.h" diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 586ddbb..89f5d0d 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -9,6 +9,7 @@ * directory. */ +#include "qemu/osdep.h" #include "hw/boards.h" #include "exec/address-spaces.h" #include "s390-virtio.h" diff --git a/hw/s390x/s390-virtio-hcall.c b/hw/s390x/s390-virtio-hcall.c index c7bdc20..23d67d6 100644 --- a/hw/s390x/s390-virtio-hcall.c +++ b/hw/s390x/s390-virtio-hcall.c @@ -9,6 +9,7 @@ * directory. */ +#include "qemu/osdep.h" #include "cpu.h" #include "hw/s390x/s390-virtio.h" diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index 946325f..9efb9c6 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -21,6 +21,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 74f2b40..5de0219 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -12,6 +12,7 @@ * */ +#include "qemu/osdep.h" #include "cpu.h" #include "sysemu/kvm.h" #include "exec/memory.h" diff --git a/hw/s390x/sclpcpu.c b/hw/s390x/sclpcpu.c index 322eb31..b1f3ef8 100644 --- a/hw/s390x/sclpcpu.c +++ b/hw/s390x/sclpcpu.c @@ -12,6 +12,7 @@ * option) any later version. See the COPYING file in the top-level directory. * */ +#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" #include "hw/s390x/event-facility.h" diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c index 15b06e1..c0ecab9 100644 --- a/hw/s390x/sclpquiesce.c +++ b/hw/s390x/sclpquiesce.c @@ -11,6 +11,7 @@ * option) any later version. See the COPYING file in the top-level directory. * */ +#include "qemu/osdep.h" #include <hw/qdev.h> #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 95a6c14..74b9e2e 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -10,6 +10,7 @@ * directory. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c index 2a885a4..fbb8383 100644 --- a/hw/watchdog/wdt_diag288.c +++ b/hw/watchdog/wdt_diag288.c @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include "sysemu/watchdog.h" #include "hw/sysbus.h" #include "qemu/timer.h" diff --git a/target-s390x/arch_dump.c b/target-s390x/arch_dump.c index 549a99b..4731869 100644 --- a/target-s390x/arch_dump.c +++ b/target-s390x/arch_dump.c @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include "cpu.h" #include "elf.h" #include "exec/cpu-all.h" diff --git a/target-s390x/cc_helper.c b/target-s390x/cc_helper.c index c4ee002..0d9411b 100644 --- a/target-s390x/cc_helper.c +++ b/target-s390x/cc_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 "exec/helper-proto.h" #include "qemu/host-utils.h" diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index e5a3f65..45ae725 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -23,6 +23,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "cpu.h" #include "qemu-common.h" #include "qemu/timer.h" diff --git a/target-s390x/fpu_helper.c b/target-s390x/fpu_helper.c index 45b7ddf..1c7f673 100644 --- a/target-s390x/fpu_helper.c +++ b/target-s390x/fpu_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 "exec/cpu_ldst.h" #include "exec/helper-proto.h" diff --git a/target-s390x/gdbstub.c b/target-s390x/gdbstub.c index a05d1cd..9fc36cb 100644 --- a/target-s390x/gdbstub.c +++ b/target-s390x/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" #include "qemu/bitops.h" diff --git a/target-s390x/helper.c b/target-s390x/helper.c index e541d69..15707ab 100644 --- a/target-s390x/helper.c +++ b/target-s390x/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 "exec/gdbstub.h" #include "qemu/timer.h" diff --git a/target-s390x/int_helper.c b/target-s390x/int_helper.c index a46c736..cc1071e 100644 --- a/target-s390x/int_helper.c +++ b/target-s390x/int_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/host-utils.h" #include "exec/helper-proto.h" diff --git a/target-s390x/interrupt.c b/target-s390x/interrupt.c index 1404d0a..07d210a 100644 --- a/target-s390x/interrupt.c +++ b/target-s390x/interrupt.c @@ -7,6 +7,7 @@ * option) any later version. See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "cpu.h" #include "sysemu/kvm.h" diff --git a/target-s390x/ioinst.c b/target-s390x/ioinst.c index 77f2a1f..564dc28 100644 --- a/target-s390x/ioinst.c +++ b/target-s390x/ioinst.c @@ -9,7 +9,7 @@ * directory. */ -#include <sys/types.h> +#include "qemu/osdep.h" #include "cpu.h" #include "ioinst.h" diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index b8222cc..9b21b96 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -21,7 +21,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include <sys/types.h> +#include "qemu/osdep.h" #include <sys/ioctl.h> #include <sys/mman.h> diff --git a/target-s390x/machine.c b/target-s390x/machine.c index b76fb08..c46bf3a 100644 --- a/target-s390x/machine.c +++ b/target-s390x/machine.c @@ -14,6 +14,7 @@ * or (at your option) any later version. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "cpu.h" #include "sysemu/kvm.h" diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c index 90399f1..7078622 100644 --- a/target-s390x/mem_helper.c +++ b/target-s390x/mem_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 "exec/helper-proto.h" #include "exec/cpu_ldst.h" diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index dab02d3..71cbe34 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -18,11 +18,11 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/memory.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" -#include <string.h> #include "sysemu/kvm.h" #include "qemu/timer.h" #include "exec/address-spaces.h" diff --git a/target-s390x/mmu_helper.c b/target-s390x/mmu_helper.c index f4e1872..5323c53 100644 --- a/target-s390x/mmu_helper.c +++ b/target-s390x/mmu_helper.c @@ -15,6 +15,7 @@ * GNU General Public License for more details. */ +#include "qemu/osdep.h" #include "qemu/error-report.h" #include "exec/address-spaces.h" #include "cpu.h" diff --git a/target-s390x/translate.c b/target-s390x/translate.c index c79a2cb..811928b 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -28,6 +28,7 @@ # define LOG_DISAS(...) do { } while (0) #endif +#include "qemu/osdep.h" #include "cpu.h" #include "disas/disas.h" #include "tcg-op.h"
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> --- hw/char/sclpconsole-lm.c | 1 + hw/char/sclpconsole.c | 1 + hw/s390x/css.c | 1 + hw/s390x/event-facility.c | 1 + hw/s390x/ipl.c | 1 + hw/s390x/s390-pci-bus.c | 1 + hw/s390x/s390-pci-inst.c | 1 + hw/s390x/s390-skeys-kvm.c | 1 + hw/s390x/s390-skeys.c | 1 + hw/s390x/s390-virtio-ccw.c | 1 + hw/s390x/s390-virtio-hcall.c | 1 + hw/s390x/s390-virtio.c | 1 + hw/s390x/sclp.c | 1 + hw/s390x/sclpcpu.c | 1 + hw/s390x/sclpquiesce.c | 1 + hw/s390x/virtio-ccw.c | 1 + hw/watchdog/wdt_diag288.c | 1 + target-s390x/arch_dump.c | 1 + target-s390x/cc_helper.c | 1 + target-s390x/cpu.c | 1 + target-s390x/fpu_helper.c | 1 + target-s390x/gdbstub.c | 2 +- target-s390x/helper.c | 1 + target-s390x/int_helper.c | 1 + target-s390x/interrupt.c | 1 + target-s390x/ioinst.c | 2 +- target-s390x/kvm.c | 2 +- target-s390x/machine.c | 1 + target-s390x/mem_helper.c | 1 + target-s390x/misc_helper.c | 2 +- target-s390x/mmu_helper.c | 1 + target-s390x/translate.c | 1 + 32 files changed, 32 insertions(+), 4 deletions(-)