* [PATCH] WHPX: Fix WHPX build break
@ 2020-10-22 0:27 Sunil Muthuswamy
2020-10-22 1:16 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Sunil Muthuswamy @ 2020-10-22 0:27 UTC (permalink / raw)
To: Paolo Bonzini, Stefan Weil, Philippe Mathieu-Daudé; +Cc: qemu-devel
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'))
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] WHPX: Fix WHPX build break
2020-10-22 0:27 [PATCH] WHPX: Fix WHPX build break Sunil Muthuswamy
@ 2020-10-22 1:16 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2020-10-22 1:16 UTC (permalink / raw)
To: Sunil Muthuswamy, Stefan Weil, Philippe Mathieu-Daudé; +Cc: qemu-devel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-22 1:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-22 0:27 [PATCH] WHPX: Fix WHPX build break Sunil Muthuswamy
2020-10-22 1:16 ` Paolo Bonzini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.