On 18/12/20 09:46, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> When compiling WHPX (on msys2)
>
> FAILED: libqemu-x86_64-softmmu.fa.p/target_i386_whpx_whpx-all.c.obj
> ../target/i386/whpx/whpx-all.c:29:10: fatal error: whp-dispatch.h: No such file or directory
> 29 | #include "whp-dispatch.h"
> | ^~~~~~~~~~~~~~~~
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> include/sysemu/whpx.h | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/include/sysemu/whpx.h b/include/sysemu/whpx.h
> index 9346fd92e9..79ab3d73cf 100644
> --- a/include/sysemu/whpx.h
> +++ b/include/sysemu/whpx.h
> @@ -15,7 +15,9 @@
>
> #ifdef CONFIG_WHPX
>
> -#include "whp-dispatch.h"
> +#include <windows.h>
> +#include <WinHvPlatform.h>
> +#include <WinHvEmulation.h>
>
> struct whpx_state {
> uint64_t mem_quota;
>
This is wrong, just "git mv target/i386/whpx/whp-dispatch.h
include/sysemu" instead (and possibly change the #include line to
sysemu/whp-dispatch.h).
Wrong? It fixes the build. So whatever is in whp-dispatch, it's not exactly necessary. Why should it be included?
Furthermore, I tried your suggestion first. But it fails with other include issues. I can probably solve them differently, but why should whp-dispatch be in include/sysemu?
But I wonder if whp-dispatch.h is needed at all in this file. If we can
just include it in whpx-all.c and whpx-apic.c, that would be much better.
May be, but how does this solve the issue with include/sysemu/whpx.h ?