From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46896)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1aswtR-0007za-7S
	for qemu-devel@nongnu.org; Wed, 20 Apr 2016 14:30:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1aswtM-00024f-HW
	for qemu-devel@nongnu.org; Wed, 20 Apr 2016 14:30:29 -0400
Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:35217)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1aswtL-00023k-TS
	for qemu-devel@nongnu.org; Wed, 20 Apr 2016 14:30:24 -0400
Received: by mail-wm0-x231.google.com with SMTP id e201so60670436wme.0
	for <qemu-devel@nongnu.org>; Wed, 20 Apr 2016 11:30:23 -0700 (PDT)
References: <1460147350-7601-1-git-send-email-pbonzini@redhat.com>
	<1460147350-7601-47-git-send-email-pbonzini@redhat.com>
From: Alex =?utf-8?Q?Benn=C3=A9e?= <alex.bennee@linaro.org>
In-reply-to: <1460147350-7601-47-git-send-email-pbonzini@redhat.com>
Date: Wed, 20 Apr 2016 19:30:21 +0100
Message-ID: <87d1pkuo8y.fsf@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH 46/50] hw: explicitly include qemu/log.h
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org


Paolo Bonzini <pbonzini@redhat.com> 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 <pbonzini@redhat.com>
> ---
>  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       0x00200000
> 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"
>  #include "sysemu/sysemu.h"
>
> diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
> index 1eeb1ab..aa5ddbf 100644
> --- a/hw/arm/strongarm.c
> +++ b/hw/arm/strongarm.c
> @@ -38,6 +38,7 @@
>  #include "sysemu/sysemu.h"
>  #include "hw/ssi/ssi.h"
>  #include "qemu/cutils.h"
> +#include "qemu/log.h"
>
>  //#define DEBUG
>
> diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-ep108.c
> index 5f48018..40f7cc1 100644
> --- a/hw/arm/xlnx-ep108.c
> +++ b/hw/arm/xlnx-ep108.c
> @@ -23,6 +23,7 @@
>  #include "hw/boards.h"
>  #include "qemu/error-report.h"
>  #include "exec/address-spaces.h"
> +#include "qemu/log.h"
>
>  typedef struct XlnxEP108 {
>      XlnxZynqMPState soc;
> diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c
> index 4717bc9..6e9c104 100644
> --- a/hw/audio/pl041.c
> +++ b/hw/audio/pl041.c
> @@ -22,6 +22,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/sysbus.h"
> +#include "qemu/log.h"
>
>  #include "pl041.h"
>  #include "lm4549.h"
> diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
> index 906b712..05f864f 100644
> --- a/hw/block/m25p80.c
> +++ b/hw/block/m25p80.c
> @@ -27,6 +27,7 @@
>  #include "sysemu/blockdev.h"
>  #include "hw/ssi/ssi.h"
>  #include "qemu/bitops.h"
> +#include "qemu/log.h"
>
>  #ifndef M25P80_ERR_DEBUG
>  #define M25P80_ERR_DEBUG 0
> diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
> index c475c2a..43cb0b6 100644
> --- a/hw/block/pflash_cfi01.c
> +++ b/hw/block/pflash_cfi01.c
> @@ -45,6 +45,7 @@
>  #include "qemu/bitops.h"
>  #include "exec/address-spaces.h"
>  #include "qemu/host-utils.h"
> +#include "qemu/log.h"
>  #include "hw/sysbus.h"
>
>  #define PFLASH_BUG(fmt, ...) \
> diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c
> index 0394d11..319f165 100644
> --- a/hw/char/bcm2835_aux.c
> +++ b/hw/char/bcm2835_aux.c
> @@ -22,6 +22,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/char/bcm2835_aux.h"
> +#include "qemu/log.h"
>
>  #define AUX_IRQ         0x0
>  #define AUX_ENABLES     0x4
> diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
> index 486591b..0e53210 100644
> --- a/hw/char/cadence_uart.c
> +++ b/hw/char/cadence_uart.c
> @@ -17,6 +17,10 @@
>   */
>
>  #include "qemu/osdep.h"
> +#include "hw/sysbus.h"
> +#include "sysemu/char.h"
> +#include "qemu/timer.h"
> +#include "qemu/log.h"
>  #include "hw/char/cadence_uart.h"
>
>  #ifdef CADENCE_UART_ERR_DEBUG
> diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c
> index d3bc533..0e44878 100644
> --- a/hw/char/digic-uart.c
> +++ b/hw/char/digic-uart.c
> @@ -30,6 +30,7 @@
>  #include "hw/hw.h"
>  #include "hw/sysbus.h"
>  #include "sysemu/char.h"
> +#include "qemu/log.h"
>
>  #include "hw/char/digic-uart.h"
>
> diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c
> index 6df74ac..44856d6 100644
> --- a/hw/char/imx_serial.c
> +++ b/hw/char/imx_serial.c
> @@ -22,6 +22,7 @@
>  #include "hw/char/imx_serial.h"
>  #include "sysemu/sysemu.h"
>  #include "sysemu/char.h"
> +#include "qemu/log.h"
>
>  #ifndef DEBUG_IMX_UART
>  #define DEBUG_IMX_UART 0
> diff --git a/hw/char/pl011.c b/hw/char/pl011.c
> index 210c87b..6876ea6 100644
> --- a/hw/char/pl011.c
> +++ b/hw/char/pl011.c
> @@ -10,6 +10,7 @@
>  #include "qemu/osdep.h"
>  #include "hw/sysbus.h"
>  #include "sysemu/char.h"
> +#include "qemu/log.h"
>
>  #define TYPE_PL011 "pl011"
>  #define PL011(obj) OBJECT_CHECK(PL011State, (obj), TYPE_PL011)
> diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c
> index a94d61c..72305ec 100644
> --- a/hw/char/stm32f2xx_usart.c
> +++ b/hw/char/stm32f2xx_usart.c
> @@ -24,6 +24,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/char/stm32f2xx_usart.h"
> +#include "qemu/log.h"
>
>  #ifndef STM_USART_ERR_DEBUG
>  #define STM_USART_ERR_DEBUG 0
> diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
> index 506f1d3..7eab927 100644
> --- a/hw/display/bcm2835_fb.c
> +++ b/hw/display/bcm2835_fb.c
> @@ -29,6 +29,7 @@
>  #include "hw/display/framebuffer.h"
>  #include "ui/pixel_ops.h"
>  #include "hw/misc/bcm2835_mbox_defs.h"
> +#include "qemu/log.h"
>
>  #define DEFAULT_VCRAM_SIZE 0x4000000
>  #define BCM2835_FB_OFFSET  0x00100000
> diff --git a/hw/display/cg3.c b/hw/display/cg3.c
> index eb0e71a..1174220 100644
> --- a/hw/display/cg3.c
> +++ b/hw/display/cg3.c
> @@ -31,6 +31,7 @@
>  #include "ui/console.h"
>  #include "hw/sysbus.h"
>  #include "hw/loader.h"
> +#include "qemu/log.h"
>
>  /* Change to 1 to enable debugging */
>  #define DEBUG_CG3 0
> diff --git a/hw/display/pl110.c b/hw/display/pl110.c
> index d589959..c069c0b 100644
> --- a/hw/display/pl110.c
> +++ b/hw/display/pl110.c
> @@ -12,6 +12,7 @@
>  #include "ui/console.h"
>  #include "framebuffer.h"
>  #include "ui/pixel_ops.h"
> +#include "qemu/log.h"
>
>  #define PL110_CR_EN   0x001
>  #define PL110_CR_BGR  0x100
> diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
> index ddf3bfb..50978a6 100644
> --- a/hw/display/virtio-gpu.c
> +++ b/hw/display/virtio-gpu.c
> @@ -19,6 +19,7 @@
>  #include "hw/virtio/virtio.h"
>  #include "hw/virtio/virtio-gpu.h"
>  #include "hw/virtio/virtio-bus.h"
> +#include "qemu/log.h"
>
>  static struct virtio_gpu_simple_resource*
>  virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id);
> diff --git a/hw/dma/bcm2835_dma.c b/hw/dma/bcm2835_dma.c
> index 5421175..5d144a2 100644
> --- a/hw/dma/bcm2835_dma.c
> +++ b/hw/dma/bcm2835_dma.c
> @@ -6,6 +6,7 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  #include "hw/dma/bcm2835_dma.h"
> +#include "qemu/log.h"
>
>  /* DMA CS Control and Status bits */
>  #define BCM2708_DMA_ACTIVE      (1 << 0)
> diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
> index 9318108..3bed5c3 100644
> --- a/hw/dma/pl080.c
> +++ b/hw/dma/pl080.c
> @@ -10,6 +10,7 @@
>  #include "qemu/osdep.h"
>  #include "hw/sysbus.h"
>  #include "exec/address-spaces.h"
> +#include "qemu/log.h"
>
>  #define PL080_MAX_CHANNELS 8
>  #define PL080_CONF_E    0x1
> diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
> index ea89ecb..c0bd9fe 100644
> --- a/hw/dma/pl330.c
> +++ b/hw/dma/pl330.c
> @@ -19,6 +19,7 @@
>  #include "qapi/error.h"
>  #include "qemu/timer.h"
>  #include "sysemu/dma.h"
> +#include "qemu/log.h"
>
>  #ifndef PL330_ERR_DEBUG
>  #define PL330_ERR_DEBUG 0
> diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
> index a06c235..2f2576f 100644
> --- a/hw/dma/rc4030.c
> +++ b/hw/dma/rc4030.c
> @@ -27,6 +27,7 @@
>  #include "hw/mips/mips.h"
>  #include "hw/sysbus.h"
>  #include "qemu/timer.h"
> +#include "qemu/log.h"
>  #include "exec/address-spaces.h"
>  #include "trace.h"
>
> diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c
> index ed7e247..f3574aa 100644
> --- a/hw/gpio/imx_gpio.c
> +++ b/hw/gpio/imx_gpio.c
> @@ -19,6 +19,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/gpio/imx_gpio.h"
> +#include "qemu/log.h"
>
>  #ifndef DEBUG_IMX_GPIO
>  #define DEBUG_IMX_GPIO 0
> diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c
> index 29dc7fc..44faeb2 100644
> --- a/hw/gpio/pl061.c
> +++ b/hw/gpio/pl061.c
> @@ -10,6 +10,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/sysbus.h"
> +#include "qemu/log.h"
>
>  //#define DEBUG_PL061 1
>
> diff --git a/hw/i2c/imx_i2c.c b/hw/i2c/imx_i2c.c
> index a01e43e..7830056 100644
> --- a/hw/i2c/imx_i2c.c
> +++ b/hw/i2c/imx_i2c.c
> @@ -21,6 +21,7 @@
>  #include "qemu/osdep.h"
>  #include "hw/i2c/imx_i2c.h"
>  #include "hw/i2c/i2c.h"
> +#include "qemu/log.h"
>
>  #ifndef DEBUG_IMX_I2C
>  #define DEBUG_IMX_I2C 0
> diff --git a/hw/i2c/versatile_i2c.c b/hw/i2c/versatile_i2c.c
> index fee3bc7..0bce524 100644
> --- a/hw/i2c/versatile_i2c.c
> +++ b/hw/i2c/versatile_i2c.c
> @@ -24,6 +24,7 @@
>  #include "qemu/osdep.h"
>  #include "hw/sysbus.h"
>  #include "bitbang_i2c.h"
> +#include "qemu/log.h"
>
>  #define TYPE_VERSATILE_I2C "versatile_i2c"
>  #define VERSATILE_I2C(obj) \
> diff --git a/hw/input/pl050.c b/hw/input/pl050.c
> index 3092b0f..be9cd57 100644
> --- a/hw/input/pl050.c
> +++ b/hw/input/pl050.c
> @@ -10,6 +10,7 @@
>  #include "qemu/osdep.h"
>  #include "hw/sysbus.h"
>  #include "hw/input/ps2.h"
> +#include "qemu/log.h"
>
>  #define TYPE_PL050 "pl050"
>  #define PL050(obj) OBJECT_CHECK(PL050State, (obj), TYPE_PL050)
> diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c
> index dc971a1..11f1366 100644
> --- a/hw/intc/allwinner-a10-pic.c
> +++ b/hw/intc/allwinner-a10-pic.c
> @@ -20,6 +20,7 @@
>  #include "hw/devices.h"
>  #include "sysemu/sysemu.h"
>  #include "hw/intc/allwinner-a10-pic.h"
> +#include "qemu/log.h"
>
>  static void aw_a10_pic_update(AwA10PICState *s)
>  {
> diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
> index f551241..62429b1 100644
> --- a/hw/intc/arm_gic.c
> +++ b/hw/intc/arm_gic.c
> @@ -23,6 +23,7 @@
>  #include "gic_internal.h"
>  #include "qapi/error.h"
>  #include "qom/cpu.h"
> +#include "qemu/log.h"
>
>  //#define DEBUG_GIC
>
> diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c
> index 589d315..3922fbc 100644
> --- a/hw/intc/arm_gicv2m.c
> +++ b/hw/intc/arm_gicv2m.c
> @@ -30,6 +30,7 @@
>  #include "hw/sysbus.h"
>  #include "hw/pci/msi.h"
>  #include "sysemu/kvm.h"
> +#include "qemu/log.h"
>
>  #define TYPE_ARM_GICV2M "arm-gicv2m"
>  #define ARM_GICV2M(obj) OBJECT_CHECK(ARMGICv2mState, (obj), TYPE_ARM_GICV2M)
> diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
> index 4d584ef..890d5d7 100644
> --- a/hw/intc/armv7m_nvic.c
> +++ b/hw/intc/armv7m_nvic.c
> @@ -19,6 +19,7 @@
>  #include "hw/arm/arm.h"
>  #include "exec/address-spaces.h"
>  #include "gic_internal.h"
> +#include "qemu/log.h"
>
>  typedef struct {
>      GICState gic;
> diff --git a/hw/intc/bcm2835_ic.c b/hw/intc/bcm2835_ic.c
> index 80513b2..00d2530 100644
> --- a/hw/intc/bcm2835_ic.c
> +++ b/hw/intc/bcm2835_ic.c
> @@ -14,6 +14,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/intc/bcm2835_ic.h"
> +#include "qemu/log.h"
>
>  #define GPU_IRQS 64
>  #define ARM_IRQS 8
> diff --git a/hw/intc/bcm2836_control.c b/hw/intc/bcm2836_control.c
> index d027181..cfa5bc7 100644
> --- a/hw/intc/bcm2836_control.c
> +++ b/hw/intc/bcm2836_control.c
> @@ -15,6 +15,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/intc/bcm2836_control.h"
> +#include "qemu/log.h"
>
>  #define REG_GPU_ROUTE           0x0c
>  #define REG_TIMERCONTROL        0x40
> diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c
> index bb43669..c2607a5 100644
> --- a/hw/intc/i8259.c
> +++ b/hw/intc/i8259.c
> @@ -27,6 +27,7 @@
>  #include "hw/isa/isa.h"
>  #include "monitor/monitor.h"
>  #include "qemu/timer.h"
> +#include "qemu/log.h"
>  #include "hw/isa/i8259_internal.h"
>
>  /* debug PIC */
> diff --git a/hw/intc/imx_avic.c b/hw/intc/imx_avic.c
> index 7027655..63e5340 100644
> --- a/hw/intc/imx_avic.c
> +++ b/hw/intc/imx_avic.c
> @@ -17,6 +17,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/intc/imx_avic.h"
> +#include "qemu/log.h"
>
>  #ifndef DEBUG_IMX_AVIC
>  #define DEBUG_IMX_AVIC 0
> diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
> index 2d37693..4349e45 100644
> --- a/hw/intc/openpic.c
> +++ b/hw/intc/openpic.c
> @@ -44,6 +44,7 @@
>  #include "qapi/error.h"
>  #include "qemu/bitops.h"
>  #include "qapi/qmp/qerror.h"
> +#include "qemu/log.h"
>
>  //#define DEBUG_OPENPIC
>
> diff --git a/hw/intc/pl190.c b/hw/intc/pl190.c
> index 5ecbc4a..ed0a98c 100644
> --- a/hw/intc/pl190.c
> +++ b/hw/intc/pl190.c
> @@ -9,6 +9,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/sysbus.h"
> +#include "qemu/log.h"
>
>  /* The number of virtual priority levels.  16 user vectors plus the
>     unvectored IRQ.  Chained interrupts would require an additional level
> diff --git a/hw/misc/arm11scu.c b/hw/misc/arm11scu.c
> index 5e54b49..7042ce1 100644
> --- a/hw/misc/arm11scu.c
> +++ b/hw/misc/arm11scu.c
> @@ -10,6 +10,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/misc/arm11scu.h"
> +#include "qemu/log.h"
>
>  static uint64_t mpcore_scu_read(void *opaque, hwaddr offset,
>                                  unsigned size)
> diff --git a/hw/misc/arm_integrator_debug.c b/hw/misc/arm_integrator_debug.c
> index 902605f..8a5f295 100644
> --- a/hw/misc/arm_integrator_debug.c
> +++ b/hw/misc/arm_integrator_debug.c
> @@ -19,6 +19,7 @@
>  #include "hw/sysbus.h"
>  #include "exec/address-spaces.h"
>  #include "hw/misc/arm_integrator_debug.h"
> +#include "qemu/log.h"
>
>  #define INTEGRATOR_DEBUG(obj) \
>      OBJECT_CHECK(IntegratorDebugState, (obj), TYPE_INTEGRATOR_DEBUG)
> diff --git a/hw/misc/arm_l2x0.c b/hw/misc/arm_l2x0.c
> index 7e179f1..4442227 100644
> --- a/hw/misc/arm_l2x0.c
> +++ b/hw/misc/arm_l2x0.c
> @@ -20,6 +20,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/sysbus.h"
> +#include "qemu/log.h"
>
>  /* L2C-310 r3p2 */
>  #define CACHE_ID 0x410000c8
> diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
> index 34d90d5..8524008 100644
> --- a/hw/misc/arm_sysctl.c
> +++ b/hw/misc/arm_sysctl.c
> @@ -14,6 +14,7 @@
>  #include "hw/sysbus.h"
>  #include "hw/arm/primecell.h"
>  #include "sysemu/sysemu.h"
> +#include "qemu/log.h"
>
>  #define LOCK_VALUE 0xa05f
>
> diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c
> index 263280f..e97cc81 100644
> --- a/hw/misc/bcm2835_mbox.c
> +++ b/hw/misc/bcm2835_mbox.c
> @@ -11,6 +11,7 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  #include "hw/misc/bcm2835_mbox.h"
> +#include "qemu/log.h"
>
>  #define MAIL0_PEEK   0x90
>  #define MAIL0_SENDER 0x94
> diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
> index 530411f..21a18c8 100644
> --- a/hw/misc/bcm2835_property.c
> +++ b/hw/misc/bcm2835_property.c
> @@ -8,6 +8,7 @@
>  #include "hw/misc/bcm2835_property.h"
>  #include "hw/misc/bcm2835_mbox_defs.h"
>  #include "sysemu/dma.h"
> +#include "qemu/log.h"
>
>  /* https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface */
>
> diff --git a/hw/misc/imx25_ccm.c b/hw/misc/imx25_ccm.c
> index 225604d..5cd8c0a 100644
> --- a/hw/misc/imx25_ccm.c
> +++ b/hw/misc/imx25_ccm.c
> @@ -13,6 +13,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/misc/imx25_ccm.h"
> +#include "qemu/log.h"
>
>  #ifndef DEBUG_IMX25_CCM
>  #define DEBUG_IMX25_CCM 0
> diff --git a/hw/misc/imx31_ccm.c b/hw/misc/imx31_ccm.c
> index 80c1647..1c03e52 100644
> --- a/hw/misc/imx31_ccm.c
> +++ b/hw/misc/imx31_ccm.c
> @@ -13,6 +13,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/misc/imx31_ccm.h"
> +#include "qemu/log.h"
>
>  #define CKIH_FREQ 26000000 /* 26MHz crystal input */
>
> diff --git a/hw/misc/imx6_ccm.c b/hw/misc/imx6_ccm.c
> index 4e1d49d..ec58eef 100644
> --- a/hw/misc/imx6_ccm.c
> +++ b/hw/misc/imx6_ccm.c
> @@ -12,6 +12,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/misc/imx6_ccm.h"
> +#include "qemu/log.h"
>
>  #ifndef DEBUG_IMX6_CCM
>  #define DEBUG_IMX6_CCM 0
> diff --git a/hw/misc/imx_ccm.c b/hw/misc/imx_ccm.c
> index 986d890..7f239a4 100644
> --- a/hw/misc/imx_ccm.c
> +++ b/hw/misc/imx_ccm.c
> @@ -13,6 +13,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/misc/imx_ccm.h"
> +#include "qemu/log.h"
>
>  #ifndef DEBUG_IMX_CCM
>  #define DEBUG_IMX_CCM 0
> diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
> index c7472aa..0648979 100644
> --- a/hw/misc/macio/cuda.c
> +++ b/hw/misc/macio/cuda.c
> @@ -29,6 +29,7 @@
>  #include "qemu/timer.h"
>  #include "sysemu/sysemu.h"
>  #include "qemu/cutils.h"
> +#include "qemu/log.h"
>
>  /* XXX: implement all timer modes */
>
> diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c
> index 6051f17..5632743 100644
> --- a/hw/misc/macio/mac_dbdma.c
> +++ b/hw/misc/macio/mac_dbdma.c
> @@ -41,6 +41,7 @@
>  #include "hw/isa/isa.h"
>  #include "hw/ppc/mac_dbdma.h"
>  #include "qemu/main-loop.h"
> +#include "qemu/log.h"
>
>  /* debug DBDMA */
>  //#define DEBUG_DBDMA
> diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c
> index 37be239..40f3464 100644
> --- a/hw/misc/mips_cmgcr.c
> +++ b/hw/misc/mips_cmgcr.c
> @@ -11,6 +11,7 @@
>
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
> +#include "qemu/log.h"
>  #include "hw/hw.h"
>  #include "hw/sysbus.h"
>  #include "sysemu/sysemu.h"
> diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c
> index 05688b7..e6a35dd 100644
> --- a/hw/misc/mips_cpc.c
> +++ b/hw/misc/mips_cpc.c
> @@ -20,6 +20,7 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  #include "cpu.h"
> +#include "qemu/log.h"
>  #include "hw/sysbus.h"
>
>  #include "hw/misc/mips_cpc.h"
> diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c
> index c75ce7b..8aa5dee 100644
> --- a/hw/misc/mips_itu.c
> +++ b/hw/misc/mips_itu.c
> @@ -20,6 +20,7 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  #include "cpu.h"
> +#include "qemu/log.h"
>  #include "hw/hw.h"
>  #include "hw/sysbus.h"
>  #include "sysemu/sysemu.h"
> diff --git a/hw/misc/stm32f2xx_syscfg.c b/hw/misc/stm32f2xx_syscfg.c
> index d0d7076..7c45833 100644
> --- a/hw/misc/stm32f2xx_syscfg.c
> +++ b/hw/misc/stm32f2xx_syscfg.c
> @@ -24,6 +24,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/misc/stm32f2xx_syscfg.h"
> +#include "qemu/log.h"
>
>  #ifndef STM_SYSCFG_ERR_DEBUG
>  #define STM_SYSCFG_ERR_DEBUG 0
> diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c
> index 71fbccd..1490610 100644
> --- a/hw/misc/zynq-xadc.c
> +++ b/hw/misc/zynq-xadc.c
> @@ -18,6 +18,7 @@
>  #include "hw/misc/zynq-xadc.h"
>  #include "qemu/timer.h"
>  #include "sysemu/sysemu.h"
> +#include "qemu/log.h"
>
>  enum {
>      CFG                = 0x000 / 4,
> diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c
> index b1b7591..7891219 100644
> --- a/hw/misc/zynq_slcr.c
> +++ b/hw/misc/zynq_slcr.c
> @@ -19,6 +19,7 @@
>  #include "qemu/timer.h"
>  #include "hw/sysbus.h"
>  #include "sysemu/sysemu.h"
> +#include "qemu/log.h"
>
>  #ifndef ZYNQ_SLCR_ERR_DEBUG
>  #define ZYNQ_SLCR_ERR_DEBUG 0
> diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c
> index 16d4b63..d575023 100644
> --- a/hw/net/allwinner_emac.c
> +++ b/hw/net/allwinner_emac.c
> @@ -21,6 +21,7 @@
>  #include "net/net.h"
>  #include "qemu/fifo8.h"
>  #include "hw/net/allwinner_emac.h"
> +#include "qemu/log.h"
>  #include <zlib.h>
>
>  static uint8_t padding[60];
> diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
> index 1e35f7f..98250e0 100644
> --- a/hw/net/fsl_etsec/etsec.c
> +++ b/hw/net/fsl_etsec/etsec.c
> @@ -33,6 +33,7 @@
>  #include "hw/ptimer.h"
>  #include "etsec.h"
>  #include "registers.h"
> +#include "qemu/log.h"
>
>  /* #define HEX_DUMP */
>  /* #define DEBUG_REGISTER */
> diff --git a/hw/net/fsl_etsec/rings.c b/hw/net/fsl_etsec/rings.c
> index ed1de7d..79d2f14 100644
> --- a/hw/net/fsl_etsec/rings.c
> +++ b/hw/net/fsl_etsec/rings.c
> @@ -23,7 +23,7 @@
>   */
>  #include "qemu/osdep.h"
>  #include "net/checksum.h"
> -
> +#include "qemu/log.h"
>  #include "etsec.h"
>  #include "registers.h"
>
> diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c
> index e60e338..9055ea8 100644
> --- a/hw/net/imx_fec.c
> +++ b/hw/net/imx_fec.c
> @@ -24,6 +24,7 @@
>  #include "qemu/osdep.h"
>  #include "hw/net/imx_fec.h"
>  #include "sysemu/dma.h"
> +#include "qemu/log.h"
>
>  /* For crc32 */
>  #include <zlib.h>
> diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
> index 08dc474..2052073 100644
> --- a/hw/net/lan9118.c
> +++ b/hw/net/lan9118.c
> @@ -16,6 +16,7 @@
>  #include "hw/devices.h"
>  #include "sysemu/sysemu.h"
>  #include "hw/ptimer.h"
> +#include "qemu/log.h"
>  /* For crc32 */
>  #include <zlib.h>
>
> diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c
> index db97da3..a8266f8 100644
> --- a/hw/net/spapr_llan.c
> +++ b/hw/net/spapr_llan.c
> @@ -28,6 +28,7 @@
>  #include "qemu-common.h"
>  #include "cpu.h"
>  #include "hw/hw.h"
> +#include "qemu/log.h"
>  #include "net/net.h"
>  #include "hw/qdev.h"
>  #include "hw/ppc/spapr.h"
> diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c
> index aaef7bb..babbbef 100644
> --- a/hw/pci-host/apb.c
> +++ b/hw/pci-host/apb.c
> @@ -36,6 +36,7 @@
>  #include "hw/pci-host/apb.h"
>  #include "sysemu/sysemu.h"
>  #include "exec/address-spaces.h"
> +#include "qemu/log.h"
>
>  /* debug APB */
>  //#define DEBUG_APB
> diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
> index 339ec2c..0792c45 100644
> --- a/hw/pci-host/versatile.c
> +++ b/hw/pci-host/versatile.c
> @@ -13,6 +13,7 @@
>  #include "hw/pci/pci_bus.h"
>  #include "hw/pci/pci_host.h"
>  #include "exec/address-spaces.h"
> +#include "qemu/log.h"
>
>  /* Old and buggy versions of QEMU used the wrong mapping from
>   * PCI IRQs to system interrupt lines. Unfortunately the Linux
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index e7be21e..32404cf 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -29,6 +29,7 @@
>  #include "sysemu/sysemu.h"
>  #include "sysemu/numa.h"
>  #include "hw/hw.h"
> +#include "qemu/log.h"
>  #include "hw/fw-path-provider.h"
>  #include "elf.h"
>  #include "net/net.h"
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index 4426a50..c5fecb5 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -1,6 +1,7 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  #include "sysemu/sysemu.h"
> +#include "qemu/log.h"
>  #include "cpu.h"
>  #include "helper_regs.h"
>  #include "hw/ppc/spapr.h"
> diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
> index 7dd4588..722db91 100644
> --- a/hw/ppc/spapr_iommu.c
> +++ b/hw/ppc/spapr_iommu.c
> @@ -18,6 +18,7 @@
>   */
>  #include "qemu/osdep.h"
>  #include "hw/hw.h"
> +#include "qemu/log.h"
>  #include "sysemu/kvm.h"
>  #include "hw/qdev.h"
>  #include "kvm_ppc.h"
> diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
> index 5352767..9c9fe55 100644
> --- a/hw/ppc/spapr_rtas.c
> +++ b/hw/ppc/spapr_rtas.c
> @@ -26,6 +26,7 @@
>   */
>  #include "qemu/osdep.h"
>  #include "cpu.h"
> +#include "qemu/log.h"
>  #include "sysemu/sysemu.h"
>  #include "sysemu/char.h"
>  #include "hw/qdev.h"
> diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
> index 6b20b40..d084aed 100644
> --- a/hw/ppc/spapr_vio.c
> +++ b/hw/ppc/spapr_vio.c
> @@ -22,6 +22,7 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  #include "hw/hw.h"
> +#include "qemu/log.h"
>  #include "sysemu/sysemu.h"
>  #include "hw/boards.h"
>  #include "hw/loader.h"
> diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c
> index e87abb2..eb783c6 100644
> --- a/hw/sd/pl181.c
> +++ b/hw/sd/pl181.c
> @@ -12,6 +12,7 @@
>  #include "sysemu/blockdev.h"
>  #include "hw/sysbus.h"
>  #include "hw/sd/sd.h"
> +#include "qemu/log.h"
>
>  //#define DEBUG_PL181 1
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index b66e5d2..3372870 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -39,6 +39,7 @@
>  #include "hw/qdev-properties.h"
>  #include "qemu/error-report.h"
>  #include "qemu/timer.h"
> +#include "qemu/log.h"
>
>  //#define DEBUG_SD 1
>
> diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
> index d28b587..01fbf22 100644
> --- a/hw/sd/sdhci.c
> +++ b/hw/sd/sdhci.c
> @@ -30,6 +30,7 @@
>  #include "qemu/timer.h"
>  #include "qemu/bitops.h"
>  #include "sdhci-internal.h"
> +#include "qemu/log.h"
>
>  /* host controller debug messages */
>  #ifndef SDHC_DEBUG
> diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c
> index 564a0d3..c136801 100644
> --- a/hw/ssi/pl022.c
> +++ b/hw/ssi/pl022.c
> @@ -10,6 +10,7 @@
>  #include "qemu/osdep.h"
>  #include "hw/sysbus.h"
>  #include "hw/ssi/ssi.h"
> +#include "qemu/log.h"
>
>  //#define DEBUG_PL022 1
>
> diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c
> index 51cdc98..3385e5d 100644
> --- a/hw/timer/allwinner-a10-pit.c
> +++ b/hw/timer/allwinner-a10-pit.c
> @@ -19,6 +19,7 @@
>  #include "hw/sysbus.h"
>  #include "sysemu/sysemu.h"
>  #include "hw/timer/allwinner-a10-pit.h"
> +#include "qemu/log.h"
>
>  static void a10_pit_update_irq(AwA10PITState *s)
>  {
> diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
> index f1ede5f..111a16d 100644
> --- a/hw/timer/arm_timer.c
> +++ b/hw/timer/arm_timer.c
> @@ -14,6 +14,7 @@
>  #include "hw/qdev.h"
>  #include "hw/ptimer.h"
>  #include "qemu/main-loop.h"
> +#include "qemu/log.h"
>
>  /* Common timer implementation.  */
>
> diff --git a/hw/timer/digic-timer.c b/hw/timer/digic-timer.c
> index 5b97e1e..0f21faf 100644
> --- a/hw/timer/digic-timer.c
> +++ b/hw/timer/digic-timer.c
> @@ -30,6 +30,7 @@
>  #include "hw/sysbus.h"
>  #include "hw/ptimer.h"
>  #include "qemu/main-loop.h"
> +#include "qemu/log.h"
>
>  #include "hw/timer/digic-timer.h"
>
> diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c
> index f5836e2..eddf348 100644
> --- a/hw/timer/imx_epit.c
> +++ b/hw/timer/imx_epit.c
> @@ -16,6 +16,7 @@
>  #include "hw/timer/imx_epit.h"
>  #include "hw/misc/imx_ccm.h"
>  #include "qemu/main-loop.h"
> +#include "qemu/log.h"
>
>  #ifndef DEBUG_IMX_EPIT
>  #define DEBUG_IMX_EPIT 0
> diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c
> index ab2e213..3c2f01a 100644
> --- a/hw/timer/imx_gpt.c
> +++ b/hw/timer/imx_gpt.c
> @@ -16,6 +16,7 @@
>  #include "hw/timer/imx_gpt.h"
>  #include "hw/misc/imx_ccm.h"
>  #include "qemu/main-loop.h"
> +#include "qemu/log.h"
>
>  #ifndef DEBUG_IMX_GPT
>  #define DEBUG_IMX_GPT 0
> diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c
> index 38e0cb5..dbbeb9b 100644
> --- a/hw/timer/pl031.c
> +++ b/hw/timer/pl031.c
> @@ -16,6 +16,7 @@
>  #include "qemu/timer.h"
>  #include "sysemu/sysemu.h"
>  #include "qemu/cutils.h"
> +#include "qemu/log.h"
>
>  //#define DEBUG_PL031
>
> diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c
> index 55dacbb..bf0fb28 100644
> --- a/hw/timer/stm32f2xx_timer.c
> +++ b/hw/timer/stm32f2xx_timer.c
> @@ -24,6 +24,7 @@
>
>  #include "qemu/osdep.h"
>  #include "hw/timer/stm32f2xx_timer.h"
> +#include "qemu/log.h"
>
>  #ifndef STM_TIMER_ERR_DEBUG
>  #define STM_TIMER_ERR_DEBUG 0
> diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c
> index f54a35a..a7b64e2 100644
> --- a/hw/watchdog/wdt_diag288.c
> +++ b/hw/watchdog/wdt_diag288.c
> @@ -16,6 +16,7 @@
>  #include "hw/sysbus.h"
>  #include "qemu/timer.h"
>  #include "hw/watchdog/wdt_diag288.h"
> +#include "qemu/log.h"
>
>  static WatchdogTimerModel model = {
>      .wdt_name = TYPE_WDT_DIAG288,
> diff --git a/include/hw/hw.h b/include/hw/hw.h
> index a20321b..029b1e8 100644
> --- a/include/hw/hw.h
> +++ b/include/hw/hw.h
> @@ -11,7 +11,6 @@
>  #include "hw/irq.h"
>  #include "block/aio.h"
>  #include "migration/vmstate.h"
> -#include "qemu/log.h"
>  #include "qemu/module.h"
>
>  typedef void QEMUResetHandler(void *opaque);
> diff --git a/monitor.c b/monitor.c
> index 812383f..a2c1ad2 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -71,6 +71,7 @@
>  #include "trace/simple.h"
>  #endif
>  #include "exec/memory.h"
> +#include "qemu/log.h"
>  #include "qmp-commands.h"
>  #include "hmp.h"
>  #include "qemu/thread.h"
> diff --git a/vl.c b/vl.c
> index b83d275..f366115 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -80,6 +80,7 @@ int main(int argc, char **argv)
>  #include "qemu/timer.h"
>  #include "sysemu/char.h"
>  #include "qemu/bitmap.h"
> +#include "qemu/log.h"
>  #include "sysemu/blockdev.h"
>  #include "hw/block/block.h"
>  #include "migration/block.h"


--
Alex Bennée