| Message ID | 20190918121101.30690-1-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | target/i386: Fix broken build with WHPX enabled | expand |
Am 18.09.2019 um 14:11 schrieb Philippe Mathieu-Daudé: > 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.maratos@gmail.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@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" Thank you for fixing this. Reviewed-by: Stefan Weil <sw@weilnetz.de>
Ah I though these would be enabled by default for x86 hosts. I guess we need another build entry in .Travis even if we can't test it there. On Wed, 18 Sep 2019, 13:11 Philippe Mathieu-Daudé, <philmd@redhat.com> 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.maratos@gmail.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@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" > -- > 2.20.1 > > >
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"
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.maratos@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- target/i386/whpx-all.c | 1 + 1 file changed, 1 insertion(+)