Re: [PATCH] WHPX: Fix WHPX build break

[Paolo Bonzini]

On 22/10/20 02:27, Sunil Muthuswamy wrote:
> With upstream commit#8a19980e3fc4, logic was introduced to only
> allow WHPX build on x64. But, the logic checks for the cpu family
> and not the cpu. On my fedora container build, the cpu family is
> x86 and the cpu is x86_64. Fixing the build break by checking for
> the cpu, instead of the cpu family.
> 
> Signed-off-by: Sunil Muthuswamy <sunilmut@microsoft.com>
> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index 7627a0ae46..2d84e90495 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -198,7 +198,7 @@ else
>    have_xen_pci_passthrough = false
>  endif
>  if not get_option('whpx').disabled() and targetos == 'windows'
> -  if get_option('whpx').enabled() and cpu != 'x86_64'
> +  if get_option('whpx').enabled() and host_machine.cpu() != 'x86_64'
>      error('WHPX requires 64-bit host')
>    elif cc.has_header('WinHvPlatform.h', required: get_option('whpx')) and \
>         cc.has_header('WinHvEmulation.h', required: get_option('whpx'))
> 

Queued, thanks.

Paolo