[Qemu-devel] [PATCH 46/50] hw: explicitly include qemu/log.h

[Paolo Bonzini]

Move the inclusion out of hw/hw.h, most files do not need it.

Signed-off-by: Paolo Bonzini 
---
 hw/arm/ast2400.c   | 1 +
 hw/arm/nseries.c   | 1 +
 hw/arm/palmetto-bmc.c  | 1 +
 hw/arm/pxa2xx_gpio.c   | 1 +
 hw/arm/stellaris.c | 1 +
 hw/arm/strongarm.c | 1 +
 hw/arm/xlnx-ep108.c| 1 +
 hw/audio/pl041.c   | 1 +
 hw/block/m25p80.c  | 1 +
 hw/block/pflash_cfi01.c| 1 +
 hw/char/bcm2835_aux.c  | 1 +
 hw/char/cadence_uart.c | 4 
 hw/char/digic-uart.c   | 1 +
 hw/char/imx_serial.c   | 1 +
 hw/char/pl011.c| 1 +
 hw/char/stm32f2xx_usart.c  | 1 +
 hw/display/bcm2835_fb.c| 1 +
 hw/display/cg3.c   | 1 +
 hw/display/pl110.c | 1 +
 hw/display/virtio-gpu.c| 1 +
 hw/dma/bcm2835_dma.c   | 1 +
 hw/dma/pl080.c | 1 +
 hw/dma/pl330.c | 1 +
 hw/dma/rc4030.c| 1 +
 hw/gpio/imx_gpio.c | 1 +
 hw/gpio/pl061.c| 1 +
 hw/i2c/imx_i2c.c   | 1 +
 hw/i2c/versatile_i2c.c | 1 +
 hw/input/pl050.c   | 1 +
 hw/intc/allwinner-a10-pic.c| 1 +
 hw/intc/arm_gic.c  | 1 +
 hw/intc/arm_gicv2m.c   | 1 +
 hw/intc/armv7m_nvic.c  | 1 +
 hw/intc/bcm2835_ic.c   | 1 +
 hw/intc/bcm2836_control.c  | 1 +
 hw/intc/i8259.c| 1 +
 hw/intc/imx_avic.c | 1 +
 hw/intc/openpic.c  | 1 +
 hw/intc/pl190.c| 1 +
 hw/misc/arm11scu.c | 1 +
 hw/misc/arm_integrator_debug.c | 1 +
 hw/misc/arm_l2x0.c | 1 +
 hw/misc/arm_sysctl.c   | 1 +
 hw/misc/bcm2835_mbox.c | 1 +
 hw/misc/bcm2835_property.c | 1 +
 hw/misc/imx25_ccm.c| 1 +
 hw/misc/imx31_ccm.c| 1 +
 hw/misc/imx6_ccm.c | 1 +
 hw/misc/imx6_src.c | 1 +
 hw/misc/imx_ccm.c  | 1 +
 hw/misc/macio/cuda.c   | 1 +
 hw/misc/macio/mac_dbdma.c  | 1 +
 hw/misc/mips_cmgcr.c   | 1 +
 hw/misc/mips_cpc.c | 1 +
 hw/misc/mips_itu.c | 1 +
 hw/misc/stm32f2xx_syscfg.c | 1 +
 hw/misc/zynq-xadc.c| 1 +
 hw/misc/zynq_slcr.c| 1 +
 hw/net/allwinner_emac.c| 1 +
 hw/net/fsl_etsec/etsec.c   | 1 +
 hw/net/fsl_etsec/rings.c   | 2 +-
 hw/net/imx_fec.c   | 1 +
 hw/net/lan9118.c   | 1 +
 hw/net/spapr_llan.c| 1 +
 hw/pci-host/apb.c  | 1 +
 hw/pci-host/versatile.c| 1 +
 hw/ppc/spapr.c | 1 +
 hw/ppc/spapr_hcall.c   | 1 +
 hw/ppc/spapr_iommu.c   | 1 +
 hw/ppc/spapr_rtas.c| 1 +
 hw/ppc/spapr_vio.c | 1 +
 hw/sd/pl181.c  | 1 +
 hw/sd/sd.c | 1 +
 hw/sd/sdhci.c  | 1 +
 hw/ssi/imx_spi.c   | 1 +
 hw/ssi/pl022.c | 1 +
 hw/timer/allwinner-a10-pit.c   | 1 +
 hw/timer/arm_timer.c   | 1 +
 hw/timer/digic-timer.c | 1 +
 hw/timer/imx_epit.c| 1 +
 hw/timer/imx_gpt.c | 1 +
 hw/timer/pl031.c   | 1 +
 hw/timer/stm32f2xx_timer.c | 1 +
 hw/watchdog/wdt_diag288.c  | 1 +
 include/hw/hw.h| 1 -
 monitor.c  | 1 +
 target-arm/arm-powerctl.c  | 1 +
 target-arm/kvm.c   | 1 +
 target-arm/kvm32.c | 1 +
 vl.c   | 1 +
 90 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/hw/arm/ast2400.c b/hw/arm/ast2400.c
index 03f9938..5510a8a 100644
--- a/hw/arm/ast2400.c
+++ b/hw/arm/ast2400.c
@@ -17,6 +17,7 @@
 #include "exec/address-spaces.h"
 #include "hw/arm/ast2400.h"
 #include "hw/char/serial.h"
+#include "qemu/log.h"
 
 #define AST2400_UART_5_BASE  0x00184000
 #define AST2400_IOMEM_SIZE   0x0020
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 6131c34..d4eb141 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -37,6 +37,7 @@
 #include "hw/loader.h"
 #include "sysemu/block-backend.h"
 #include "hw/sysbus.h"
+#include "qemu/log.h"
 #include "exec/address-spaces.h"
 
 /* Nokia N8x0 support */
diff --git a/hw/arm/palmetto-bmc.c b/hw/arm/palmetto-bmc.c
index 89ebd92..a51d960 100644
--- a/hw/arm/palmetto-bmc.c
+++ b/hw/arm/palmetto-bmc.c
@@ -17,6 +17,7 @@
 #include "hw/arm/arm.h"
 #include "hw/arm/ast2400.h"
 #include "hw/boards.h"
+#include "qemu/log.h"
 
 static struct arm_boot_info palmetto_bmc_binfo = {
 .loader_start = AST2400_SDRAM_BASE,
diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c
index 8c9626e..576a8eb 100644
--- a/hw/arm/pxa2xx_gpio.c
+++ b/hw/arm/pxa2xx_gpio.c
@@ -12,6 +12,7 @@
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/arm/pxa.h"
+#include "qemu/log.h"
 
 #define PXA2XX_GPIO_BANKS  4
 
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index f90b9fd..4459171 100644
--- 

Re: [Qemu-devel] [PATCH 46/50] hw: explicitly include qemu/log.h

[Alex Bennée]

Paolo Bonzini  writes:

> Move the inclusion out of hw/hw.h, most files do not need it.

This failed when I applied the series to 4113b05

>
> Signed-off-by: Paolo Bonzini 
> ---
>  hw/arm/ast2400.c   | 1 +
>  hw/arm/nseries.c   | 1 +
>  hw/arm/palmetto-bmc.c  | 1 +
>  hw/arm/pxa2xx_gpio.c   | 1 +
>  hw/arm/stellaris.c | 1 +
>  hw/arm/strongarm.c | 1 +
>  hw/arm/xlnx-ep108.c| 1 +
>  hw/audio/pl041.c   | 1 +
>  hw/block/m25p80.c  | 1 +
>  hw/block/pflash_cfi01.c| 1 +
>  hw/char/bcm2835_aux.c  | 1 +
>  hw/char/cadence_uart.c | 4 
>  hw/char/digic-uart.c   | 1 +
>  hw/char/imx_serial.c   | 1 +
>  hw/char/pl011.c| 1 +
>  hw/char/stm32f2xx_usart.c  | 1 +
>  hw/display/bcm2835_fb.c| 1 +
>  hw/display/cg3.c   | 1 +
>  hw/display/pl110.c | 1 +
>  hw/display/virtio-gpu.c| 1 +
>  hw/dma/bcm2835_dma.c   | 1 +
>  hw/dma/pl080.c | 1 +
>  hw/dma/pl330.c | 1 +
>  hw/dma/rc4030.c| 1 +
>  hw/gpio/imx_gpio.c | 1 +
>  hw/gpio/pl061.c| 1 +
>  hw/i2c/imx_i2c.c   | 1 +
>  hw/i2c/versatile_i2c.c | 1 +
>  hw/input/pl050.c   | 1 +
>  hw/intc/allwinner-a10-pic.c| 1 +
>  hw/intc/arm_gic.c  | 1 +
>  hw/intc/arm_gicv2m.c   | 1 +
>  hw/intc/armv7m_nvic.c  | 1 +
>  hw/intc/bcm2835_ic.c   | 1 +
>  hw/intc/bcm2836_control.c  | 1 +
>  hw/intc/i8259.c| 1 +
>  hw/intc/imx_avic.c | 1 +
>  hw/intc/openpic.c  | 1 +
>  hw/intc/pl190.c| 1 +
>  hw/misc/arm11scu.c | 1 +
>  hw/misc/arm_integrator_debug.c | 1 +
>  hw/misc/arm_l2x0.c | 1 +
>  hw/misc/arm_sysctl.c   | 1 +
>  hw/misc/bcm2835_mbox.c | 1 +
>  hw/misc/bcm2835_property.c | 1 +
>  hw/misc/imx25_ccm.c| 1 +
>  hw/misc/imx31_ccm.c| 1 +
>  hw/misc/imx6_ccm.c | 1 +
>  hw/misc/imx_ccm.c  | 1 +
>  hw/misc/macio/cuda.c   | 1 +
>  hw/misc/macio/mac_dbdma.c  | 1 +
>  hw/misc/mips_cmgcr.c   | 1 +
>  hw/misc/mips_cpc.c | 1 +
>  hw/misc/mips_itu.c | 1 +
>  hw/misc/stm32f2xx_syscfg.c | 1 +
>  hw/misc/zynq-xadc.c| 1 +
>  hw/misc/zynq_slcr.c| 1 +
>  hw/net/allwinner_emac.c| 1 +
>  hw/net/fsl_etsec/etsec.c   | 1 +
>  hw/net/fsl_etsec/rings.c   | 2 +-
>  hw/net/imx_fec.c   | 1 +
>  hw/net/lan9118.c   | 1 +
>  hw/net/spapr_llan.c| 1 +
>  hw/pci-host/apb.c  | 1 +
>  hw/pci-host/versatile.c| 1 +
>  hw/ppc/spapr.c | 1 +
>  hw/ppc/spapr_hcall.c   | 1 +
>  hw/ppc/spapr_iommu.c   | 1 +
>  hw/ppc/spapr_rtas.c| 1 +
>  hw/ppc/spapr_vio.c | 1 +
>  hw/sd/pl181.c  | 1 +
>  hw/sd/sd.c | 1 +
>  hw/sd/sdhci.c  | 1 +
>  hw/ssi/pl022.c | 1 +
>  hw/timer/allwinner-a10-pit.c   | 1 +
>  hw/timer/arm_timer.c   | 1 +
>  hw/timer/digic-timer.c | 1 +
>  hw/timer/imx_epit.c| 1 +
>  hw/timer/imx_gpt.c | 1 +
>  hw/timer/pl031.c   | 1 +
>  hw/timer/stm32f2xx_timer.c | 1 +
>  hw/watchdog/wdt_diag288.c  | 1 +
>  include/hw/hw.h| 1 -
>  monitor.c  | 1 +
>  vl.c   | 1 +
>  85 files changed, 87 insertions(+), 2 deletions(-)
>
> diff --git a/hw/arm/ast2400.c b/hw/arm/ast2400.c
> index 03f9938..5510a8a 100644
> --- a/hw/arm/ast2400.c
> +++ b/hw/arm/ast2400.c
> @@ -17,6 +17,7 @@
>  #include "exec/address-spaces.h"
>  #include "hw/arm/ast2400.h"
>  #include "hw/char/serial.h"
> +#include "qemu/log.h"
>
>  #define AST2400_UART_5_BASE  0x00184000
>  #define AST2400_IOMEM_SIZE   0x0020
> diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
> index 43a78c2..6ed3dd3 100644
> --- a/hw/arm/nseries.c
> +++ b/hw/arm/nseries.c
> @@ -37,6 +37,7 @@
>  #include "hw/loader.h"
>  #include "sysemu/block-backend.h"
>  #include "hw/sysbus.h"
> +#include "qemu/log.h"
>  #include "exec/address-spaces.h"
>
>  /* Nokia N8x0 support */
> diff --git a/hw/arm/palmetto-bmc.c b/hw/arm/palmetto-bmc.c
> index 89ebd92..a51d960 100644
> --- a/hw/arm/palmetto-bmc.c
> +++ b/hw/arm/palmetto-bmc.c
> @@ -17,6 +17,7 @@
>  #include "hw/arm/arm.h"
>  #include "hw/arm/ast2400.h"
>  #include "hw/boards.h"
> +#include "qemu/log.h"
>
>  static struct arm_boot_info palmetto_bmc_binfo = {
>  .loader_start = AST2400_SDRAM_BASE,
> diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c
> index 8c9626e..576a8eb 100644
> --- a/hw/arm/pxa2xx_gpio.c
> +++ b/hw/arm/pxa2xx_gpio.c
> @@ -12,6 +12,7 @@
>  #include "hw/hw.h"
>  #include "hw/sysbus.h"
>  #include 

[Qemu-devel] [PATCH 46/50] hw: explicitly include qemu/log.h

[Paolo Bonzini]

Move the inclusion out of hw/hw.h, most files do not need it.

Signed-off-by: Paolo Bonzini 
---
 hw/arm/ast2400.c   | 1 +
 hw/arm/nseries.c   | 1 +
 hw/arm/palmetto-bmc.c  | 1 +
 hw/arm/pxa2xx_gpio.c   | 1 +
 hw/arm/stellaris.c | 1 +
 hw/arm/strongarm.c | 1 +
 hw/arm/xlnx-ep108.c| 1 +
 hw/audio/pl041.c   | 1 +
 hw/block/m25p80.c  | 1 +
 hw/block/pflash_cfi01.c| 1 +
 hw/char/bcm2835_aux.c  | 1 +
 hw/char/cadence_uart.c | 4 
 hw/char/digic-uart.c   | 1 +
 hw/char/imx_serial.c   | 1 +
 hw/char/pl011.c| 1 +
 hw/char/stm32f2xx_usart.c  | 1 +
 hw/display/bcm2835_fb.c| 1 +
 hw/display/cg3.c   | 1 +
 hw/display/pl110.c | 1 +
 hw/display/virtio-gpu.c| 1 +
 hw/dma/bcm2835_dma.c   | 1 +
 hw/dma/pl080.c | 1 +
 hw/dma/pl330.c | 1 +
 hw/dma/rc4030.c| 1 +
 hw/gpio/imx_gpio.c | 1 +
 hw/gpio/pl061.c| 1 +
 hw/i2c/imx_i2c.c   | 1 +
 hw/i2c/versatile_i2c.c | 1 +
 hw/input/pl050.c   | 1 +
 hw/intc/allwinner-a10-pic.c| 1 +
 hw/intc/arm_gic.c  | 1 +
 hw/intc/arm_gicv2m.c   | 1 +
 hw/intc/armv7m_nvic.c  | 1 +
 hw/intc/bcm2835_ic.c   | 1 +
 hw/intc/bcm2836_control.c  | 1 +
 hw/intc/i8259.c| 1 +
 hw/intc/imx_avic.c | 1 +
 hw/intc/openpic.c  | 1 +
 hw/intc/pl190.c| 1 +
 hw/misc/arm11scu.c | 1 +
 hw/misc/arm_integrator_debug.c | 1 +
 hw/misc/arm_l2x0.c | 1 +
 hw/misc/arm_sysctl.c   | 1 +
 hw/misc/bcm2835_mbox.c | 1 +
 hw/misc/bcm2835_property.c | 1 +
 hw/misc/imx25_ccm.c| 1 +
 hw/misc/imx31_ccm.c| 1 +
 hw/misc/imx6_ccm.c | 1 +
 hw/misc/imx_ccm.c  | 1 +
 hw/misc/macio/cuda.c   | 1 +
 hw/misc/macio/mac_dbdma.c  | 1 +
 hw/misc/mips_cmgcr.c   | 1 +
 hw/misc/mips_cpc.c | 1 +
 hw/misc/mips_itu.c | 1 +
 hw/misc/stm32f2xx_syscfg.c | 1 +
 hw/misc/zynq-xadc.c| 1 +
 hw/misc/zynq_slcr.c| 1 +
 hw/net/allwinner_emac.c| 1 +
 hw/net/fsl_etsec/etsec.c   | 1 +
 hw/net/fsl_etsec/rings.c   | 2 +-
 hw/net/imx_fec.c   | 1 +
 hw/net/lan9118.c   | 1 +
 hw/net/spapr_llan.c| 1 +
 hw/pci-host/apb.c  | 1 +
 hw/pci-host/versatile.c| 1 +
 hw/ppc/spapr.c | 1 +
 hw/ppc/spapr_hcall.c   | 1 +
 hw/ppc/spapr_iommu.c   | 1 +
 hw/ppc/spapr_rtas.c| 1 +
 hw/ppc/spapr_vio.c | 1 +
 hw/sd/pl181.c  | 1 +
 hw/sd/sd.c | 1 +
 hw/sd/sdhci.c  | 1 +
 hw/ssi/pl022.c | 1 +
 hw/timer/allwinner-a10-pit.c   | 1 +
 hw/timer/arm_timer.c   | 1 +
 hw/timer/digic-timer.c | 1 +
 hw/timer/imx_epit.c| 1 +
 hw/timer/imx_gpt.c | 1 +
 hw/timer/pl031.c   | 1 +
 hw/timer/stm32f2xx_timer.c | 1 +
 hw/watchdog/wdt_diag288.c  | 1 +
 include/hw/hw.h| 1 -
 monitor.c  | 1 +
 vl.c   | 1 +
 85 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/hw/arm/ast2400.c b/hw/arm/ast2400.c
index 03f9938..5510a8a 100644
--- a/hw/arm/ast2400.c
+++ b/hw/arm/ast2400.c
@@ -17,6 +17,7 @@
 #include "exec/address-spaces.h"
 #include "hw/arm/ast2400.h"
 #include "hw/char/serial.h"
+#include "qemu/log.h"
 
 #define AST2400_UART_5_BASE  0x00184000
 #define AST2400_IOMEM_SIZE   0x0020
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 43a78c2..6ed3dd3 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -37,6 +37,7 @@
 #include "hw/loader.h"
 #include "sysemu/block-backend.h"
 #include "hw/sysbus.h"
+#include "qemu/log.h"
 #include "exec/address-spaces.h"
 
 /* Nokia N8x0 support */
diff --git a/hw/arm/palmetto-bmc.c b/hw/arm/palmetto-bmc.c
index 89ebd92..a51d960 100644
--- a/hw/arm/palmetto-bmc.c
+++ b/hw/arm/palmetto-bmc.c
@@ -17,6 +17,7 @@
 #include "hw/arm/arm.h"
 #include "hw/arm/ast2400.h"
 #include "hw/boards.h"
+#include "qemu/log.h"
 
 static struct arm_boot_info palmetto_bmc_binfo = {
 .loader_start = AST2400_SDRAM_BASE,
diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c
index 8c9626e..576a8eb 100644
--- a/hw/arm/pxa2xx_gpio.c
+++ b/hw/arm/pxa2xx_gpio.c
@@ -12,6 +12,7 @@
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/arm/pxa.h"
+#include "qemu/log.h"
 
 #define PXA2XX_GPIO_BANKS  4
 
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index c1766f8..54f7010 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -17,6 +17,7 @@
 #include "hw/i2c/i2c.h"
 #include "net/net.h"
 #include "hw/boards.h"
+#include "qemu/log.h"
 #include "exec/address-spaces.h"