Re: [Qemu-devel] [PATCH v2 22/29] Include hw/boards.h a bit less

[Philippe Mathieu-Daudé]

On 8/6/19 5:14 PM, Markus Armbruster wrote:
> hw/boards.h pulls in almost 60 headers.  The less we include it into
> headers, the better.  As a first step, drop superfluous inclusions,
> and downgrade some more to what's actually needed.  Gets rid of just
> one inclusion into a header.
> 
> Cc: Eduardo Habkost <address@hidden>
> Cc: Marcel Apfelbaum <address@hidden>
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
>  backends/cryptodev-builtin.c    | 1 -
>  backends/cryptodev-vhost-user.c | 1 -
>  backends/cryptodev.c            | 1 -
>  hw/acpi/ich9.c                  | 1 +
>  hw/alpha/dp264.c                | 1 -
>  hw/alpha/typhoon.c              | 1 +
>  hw/arm/boot.c                   | 1 -
>  hw/arm/exynos4210.c             | 2 +-
>  hw/arm/fsl-imx25.c              | 1 -
>  hw/arm/fsl-imx31.c              | 1 -
>  hw/arm/msf2-soc.c               | 1 -
>  hw/arm/nrf51_soc.c              | 1 -
>  hw/arm/omap1.c                  | 1 +
>  hw/arm/omap2.c                  | 1 +
>  hw/arm/smmuv3.c                 | 1 -
>  hw/arm/virt.c                   | 1 +
>  hw/core/numa.c                  | 2 ++
>  hw/i386/pc_piix.c               | 1 -
>  hw/i386/pc_q35.c                | 1 -
>  hw/i386/pc_sysfw.c              | 1 -
>  hw/ppc/e500plat.c               | 1 -
>  hw/ppc/mpc8544ds.c              | 1 -
>  hw/ppc/pnv.c                    | 1 +
>  hw/ppc/ppc405_uc.c              | 1 -
>  hw/ppc/spapr_cpu_core.c         | 1 -
>  hw/ppc/spapr_vio.c              | 1 -
>  hw/riscv/boot.c                 | 2 +-
>  hw/s390x/s390-stattrib.c        | 1 -
>  hw/xtensa/xtensa_memory.c       | 1 -
>  include/hw/mem/pc-dimm.h        | 1 -
>  monitor/qmp-cmds.c              | 1 -
>  target/alpha/machine.c          | 1 -
>  target/arm/machine.c            | 1 -
>  target/arm/monitor.c            | 1 -
>  target/hppa/machine.c           | 1 -
>  target/i386/hax-all.c           | 1 -
>  target/i386/hvf/hvf.c           | 1 -
>  target/i386/hvf/x86_task.c      | 1 -
>  target/i386/machine.c           | 1 -
>  target/i386/whpx-all.c          | 1 -
>  target/lm32/machine.c           | 1 -
>  target/moxie/machine.c          | 1 -
>  target/openrisc/machine.c       | 1 -
>  target/ppc/machine.c            | 1 -
>  target/sparc/machine.c          | 1 -
>  45 files changed, 10 insertions(+), 38 deletions(-)
[...]
> diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c
> index bcacdd1d8f..34a9f6f7a9 100644
> --- a/target/i386/hax-all.c
> +++ b/target/i386/hax-all.c
> @@ -33,7 +33,6 @@
>  #include "sysemu/reset.h"
>  #include "sysemu/sysemu.h"
>  #include "qemu/main-loop.h"
> -#include "hw/boards.h"
>  
>  #define DEBUG_HAX 0

include/sysemu/hax.h misses to include "hw/boards.h":

target/i386/hax-all.c: In function 'hax_accel_init':
target/i386/hax-all.c:354:26: error: dereferencing pointer to incomplete
type 'MachineState {aka struct MachineState}'
     int ret = hax_init(ms->ram_size);
                          ^