[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/28] target/i386: Fix broken build with WHPX enabled
From: |
Alex Bennée |
Subject: |
[PULL 21/28] target/i386: Fix broken build with WHPX enabled |
Date: |
Thu, 26 Sep 2019 19:35:46 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
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 <address@hidden>
Reviewed-by: Stefan Weil <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Message-Id: <address@hidden>
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"
--
2.20.1
- [PULL 17/28] tests/tcg: add generic version of float_convs, (continued)
- [PULL 17/28] tests/tcg: add generic version of float_convs, Alex Bennée, 2019/09/26
- [PULL 26/28] docker: remove unused debian-sid, Alex Bennée, 2019/09/26
- [PULL 19/28] configure: preserve PKG_CONFIG for subdir builds, Alex Bennée, 2019/09/26
- [PULL 22/28] docker: remove debian8-mxe definitions, Alex Bennée, 2019/09/26
- [PULL 25/28] docker: remove unused debian-ports, Alex Bennée, 2019/09/26
- [PULL 27/28] docker: move tests from python2 to python3, Alex Bennée, 2019/09/26
- [PULL 18/28] tests/tcg: add simple record/replay smoke test for aarch64, Alex Bennée, 2019/09/26
- [PULL 23/28] docker: remove unused debian8 partial image, Alex Bennée, 2019/09/26
- [PULL 28/28] tests/docker: remove debian-powerpc-user-cross, Alex Bennée, 2019/09/26
- [PULL 20/28] docs/devel: add "check-tcg" to testing.rst, Alex Bennée, 2019/09/26
- [PULL 21/28] target/i386: Fix broken build with WHPX enabled,
Alex Bennée <=
- [PULL 15/28] tests/tcg: re-enable linux-test for ppc64abi32, Alex Bennée, 2019/09/26
- [PULL 16/28] tests/tcg: add float_madds test to multiarch, Alex Bennée, 2019/09/26
- Re: [PULL 00/28] testing updates (docker,podman,tcg,alpha), Peter Maydell, 2019/09/27