[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/17] WHPX: Fix WHPX build break
From: |
Paolo Bonzini |
Subject: |
[PULL 13/17] WHPX: Fix WHPX build break |
Date: |
Mon, 26 Oct 2020 09:51:27 -0400 |
From: Sunil Muthuswamy <sunilmut@microsoft.com>
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>
Message-Id:
<SN4PR2101MB0880D706A85793DDFC411304C01D0@SN4PR2101MB0880.namprd21.prod.outlook.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 342b8bcab5..61919c024a 100644
--- a/meson.build
+++ b/meson.build
@@ -204,7 +204,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.26.2
- [PULL 03/17] do not use colons in test names, (continued)
- [PULL 03/17] do not use colons in test names, Paolo Bonzini, 2020/10/26
- [PULL 08/17] Makefile: separate meson rerun from the rest of the ninja invocation, Paolo Bonzini, 2020/10/26
- [PULL 04/17] hw/core/qdev-clock: add a reference on aliased clocks, Paolo Bonzini, 2020/10/26
- [PULL 05/17] qtest: unbreak non-TCG builds in bios-tables-test, Paolo Bonzini, 2020/10/26
- [PULL 02/17] meson: rewrite curses/iconv test, Paolo Bonzini, 2020/10/26
- [PULL 07/17] Remove deprecated -no-kvm option, Paolo Bonzini, 2020/10/26
- [PULL 06/17] replay: do not build if TCG is not available, Paolo Bonzini, 2020/10/26
- [PULL 17/17] machine: move SMP initialization from vl.c, Paolo Bonzini, 2020/10/26
- [PULL 12/17] configure: move install_blobs from configure to meson, Paolo Bonzini, 2020/10/26
- [PULL 15/17] machine: remove deprecated -machine enforce-config-section option, Paolo Bonzini, 2020/10/26
- [PULL 13/17] WHPX: Fix WHPX build break,
Paolo Bonzini <=
- [PULL 11/17] configure: remove unused variable from config-host.mak, Paolo Bonzini, 2020/10/26
- [PULL 01/17] build: fix macOS --enable-modules build, Paolo Bonzini, 2020/10/26
[PULL 14/17] win32: boot broken when bind & data dir are the same, Paolo Bonzini, 2020/10/26
[PULL 09/17] configure: allow configuring localedir, Paolo Bonzini, 2020/10/26
[PULL 16/17] machine: move UP defaults to class_base_init, Paolo Bonzini, 2020/10/26
[PULL 10/17] configure: move directory options from config-host.mak to meson, Paolo Bonzini, 2020/10/26