On 20/09/19 13:33, Philippe Mathieu-Daudé wrote:
> The WHPX build is broken since commit 12e9493df92 which removed the
> "hw/boards.h" where MachineState is declared:
>
> $ ./configure \
> --enable-hax --enable-whpx
>
> $ make x86_64-softmmu/all
> [...]
> CC x86_64-softmmu/target/i386/whpx-all.o
> target/i386/whpx-all.c: In function 'whpx_accel_init':
> target/i386/whpx-all.c:1378:25: error: dereferencing pointer to
> incomplete type 'MachineState' {aka 'struct MachineState'}
> whpx->mem_quota = ms->ram_size;
> ^~
> make[1]: *** [rules.mak:69: target/i386/whpx-all.o] Error 1
> CC x86_64-softmmu/trace/generated-helpers.o
> make[1]: Target 'all' not remade because of errors.
> make: *** [Makefile:471: x86_64-softmmu/all] Error 2
>
> Restore this header, partially reverting commit 12e9493df92.
>
> Fixes: 12e9493df92
> Reported-by: Ilias Maratos <i.mara...@gmail.com>
> Reviewed-by: Stefan Weil <s...@weilnetz.de>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> target/i386/whpx-all.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c
> index 0c15241ae4..def0c28480 100644
> --- a/target/i386/whpx-all.c
> +++ b/target/i386/whpx-all.c
> @@ -18,6 +18,7 @@
> #include "sysemu/cpus.h"
> #include "sysemu/runstate.h"
> #include "qemu/main-loop.h"
> +#include "hw/boards.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> #include "migration/blocker.h"
>
Queued, thanks.
Paolo
