From a9c94277f07d19d3eb14f199c3e93491aa3eae0e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 22 Jun 2016 19:11:19 +0200 Subject: Use #include "..." for our own headers, <...> for others Tracked down with an ugly, brittle and probably buggy Perl script. Also move includes converted to <...> up so they get included before ours where that's obviously okay. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Tested-by: Eric Blake Reviewed-by: Richard Henderson --- include/hw/gpio/imx_gpio.h | 2 +- include/hw/i2c/imx_i2c.h | 2 +- include/hw/ide/ahci.h | 2 +- include/hw/ide/internal.h | 4 ++-- include/hw/ide/pci.h | 2 +- include/hw/ppc/spapr_drc.h | 2 +- include/hw/s390x/event-facility.h | 2 +- include/hw/s390x/sclp.h | 4 ++-- include/hw/s390x/storage-keys.h | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) (limited to 'include/hw') diff --git a/include/hw/gpio/imx_gpio.h b/include/hw/gpio/imx_gpio.h index b15a09f..4573570 100644 --- a/include/hw/gpio/imx_gpio.h +++ b/include/hw/gpio/imx_gpio.h @@ -20,7 +20,7 @@ #ifndef __IMX_GPIO_H_ #define __IMX_GPIO_H_ -#include +#include "hw/sysbus.h" #define TYPE_IMX_GPIO "imx.gpio" #define IMX_GPIO(obj) OBJECT_CHECK(IMXGPIOState, (obj), TYPE_IMX_GPIO) diff --git a/include/hw/i2c/imx_i2c.h b/include/hw/i2c/imx_i2c.h index e2ee8ea..fb95df5 100644 --- a/include/hw/i2c/imx_i2c.h +++ b/include/hw/i2c/imx_i2c.h @@ -21,7 +21,7 @@ #ifndef __IMX_I2C_H_ #define __IMX_I2C_H_ -#include +#include "hw/sysbus.h" #define TYPE_IMX_I2C "imx.i2c" #define IMX_I2C(obj) OBJECT_CHECK(IMXI2CState, (obj), TYPE_IMX_I2C) diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h index bc777ed..0ca7c65 100644 --- a/include/hw/ide/ahci.h +++ b/include/hw/ide/ahci.h @@ -24,7 +24,7 @@ #ifndef HW_IDE_AHCI_H #define HW_IDE_AHCI_H -#include +#include "hw/sysbus.h" #define AHCI_MEM_BAR_SIZE 0x1000 #define AHCI_MAX_PORTS 32 diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index 773928a..7824bc3 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -6,8 +6,8 @@ * only files in hw/ide/ are supposed to include this file. * non-internal declarations are in hw/ide.h */ -#include -#include +#include "hw/ide.h" +#include "hw/isa/isa.h" #include "sysemu/dma.h" #include "sysemu/sysemu.h" #include "hw/block/block.h" diff --git a/include/hw/ide/pci.h b/include/hw/ide/pci.h index 0f2d4b9..dbc6a03 100644 --- a/include/hw/ide/pci.h +++ b/include/hw/ide/pci.h @@ -1,7 +1,7 @@ #ifndef HW_IDE_PCI_H #define HW_IDE_PCI_H -#include +#include "hw/ide/internal.h" #define BM_STATUS_DMAING 0x01 #define BM_STATUS_ERROR 0x02 diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index 08e8411..6aa506f 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -12,9 +12,9 @@ #if !defined(__HW_SPAPR_DRC_H__) #define __HW_SPAPR_DRC_H__ +#include #include "qom/object.h" #include "hw/qdev.h" -#include "libfdt.h" #define TYPE_SPAPR_DR_CONNECTOR "spapr-dr-connector" #define SPAPR_DR_CONNECTOR_GET_CLASS(obj) \ diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-facility.h index dd88818..def1bb0 100644 --- a/include/hw/s390x/event-facility.h +++ b/include/hw/s390x/event-facility.h @@ -15,7 +15,7 @@ #ifndef HW_S390_SCLP_EVENT_FACILITY_H #define HW_S390_SCLP_EVENT_FACILITY_H -#include +#include "hw/qdev.h" #include "qemu/thread.h" #include "hw/s390x/sclp.h" diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index fbf357d..ba28d1d 100644 --- a/include/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h @@ -14,8 +14,8 @@ #ifndef HW_S390_SCLP_H #define HW_S390_SCLP_H -#include -#include +#include "hw/sysbus.h" +#include "hw/qdev.h" #define SCLP_CMD_CODE_MASK 0xffff00ff diff --git a/include/hw/s390x/storage-keys.h b/include/hw/s390x/storage-keys.h index 72b850c..5ed7a0e 100644 --- a/include/hw/s390x/storage-keys.h +++ b/include/hw/s390x/storage-keys.h @@ -12,7 +12,7 @@ #ifndef __S390_STORAGE_KEYS_H #define __S390_STORAGE_KEYS_H -#include +#include "hw/qdev.h" #include "monitor/monitor.h" #define TYPE_S390_SKEYS "s390-skeys" -- cgit v1.1