From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PULL 03/30] accel: Re-enable WHPX cross-build on case sensitive filesystems
Date: Wed, 28 Jun 2023 17:52:46 +0200 [thread overview]
Message-ID: <20230628155313.71594-4-philmd@linaro.org> (raw)
In-Reply-To: <20230628155313.71594-1-philmd@linaro.org>
Since MinGW commit 395dcfdea ("rename hyper-v headers and def
files to lower case") [*], WinHvPlatform.h and WinHvEmulation.h
got respectively renamed as winhvplatform.h / winhvemulation.h.
The mingw64-headers package included in the Fedora version we
use for CI does include this commit; and meson fails to detect
these present-but-renamed headers while cross-building (on
case-sensitive filesystems).
Use the renamed header in order to detect and successfully
cross-build with the WHPX accelerator.
Note, on Windows hosts, the libraries are still named as
WinHvPlatform.dll and WinHvEmulation.dll, so we don't bother
renaming the definitions used by load_whp_dispatch_fns() in
target/i386/whpx/whpx-all.c.
[*] https://sourceforge.net/p/mingw-w64/mingw-w64/ci/395dcfdea
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230624142211.8888-3-philmd@linaro.org>
---
meson.build | 4 ++--
target/i386/whpx/whpx-internal.h | 4 ++--
target/i386/whpx/whpx-all.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index 1631e60a3b..a9ba0bfab3 100644
--- a/meson.build
+++ b/meson.build
@@ -661,8 +661,8 @@ endif
if get_option('whpx').allowed() and targetos == 'windows'
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'))
+ elif cc.has_header('winhvplatform.h', required: get_option('whpx')) and \
+ cc.has_header('winhvemulation.h', required: get_option('whpx'))
accelerators += 'CONFIG_WHPX'
endif
endif
diff --git a/target/i386/whpx/whpx-internal.h b/target/i386/whpx/whpx-internal.h
index 06429d8ccd..6633e9c4ca 100644
--- a/target/i386/whpx/whpx-internal.h
+++ b/target/i386/whpx/whpx-internal.h
@@ -2,8 +2,8 @@
#define TARGET_I386_WHPX_INTERNAL_H
#include <windows.h>
-#include <WinHvPlatform.h>
-#include <WinHvEmulation.h>
+#include <winhvplatform.h>
+#include <winhvemulation.h>
typedef enum WhpxBreakpointState {
WHPX_BP_CLEARED = 0,
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index 52af81683c..7fa68d49e5 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -31,8 +31,8 @@
#include "whpx-internal.h"
#include "whpx-accel-ops.h"
-#include <WinHvPlatform.h>
-#include <WinHvEmulation.h>
+#include <winhvplatform.h>
+#include <winhvemulation.h>
#define HYPERV_APIC_BUS_FREQUENCY (200000000ULL)
--
2.38.1
next prev parent reply other threads:[~2023-06-28 15:58 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-28 15:52 [PULL 00/30] Accelerator patches for 2023-06-28 Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 01/30] MAINTAINERS: Update Roman Bolshakov email address Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 02/30] docs/devel/testing: Update the 'Docker Debugging' section Philippe Mathieu-Daudé
2023-06-28 15:52 ` Philippe Mathieu-Daudé [this message]
2023-06-28 15:52 ` [PULL 04/30] accel: Document generic accelerator headers Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 05/30] accel: Remove unused hThread variable on TCG/WHPX Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 06/30] accel: Fix a leak on Windows HAX Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 07/30] accel: Destroy HAX vCPU threads once done Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 08/30] accel: Rename 'hax_vcpu' as 'accel' in CPUState Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 09/30] accel: Rename HAX 'struct hax_vcpu_state' -> AccelCPUState Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 10/30] accel: Move HAX hThread to accelerator context Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 11/30] accel: Remove NVMM unreachable error path Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 12/30] accel: Rename NVMM 'struct qemu_vcpu' -> AccelCPUState Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 13/30] accel: Inline NVMM get_qemu_vcpu() Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 14/30] accel: Remove WHPX unreachable error path Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 15/30] accel: Rename WHPX 'struct whpx_vcpu' -> AccelCPUState Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 16/30] accel: Inline WHPX get_whpx_vcpu() Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 17/30] accel: Rename 'cpu_state' -> 'cs' Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 18/30] accel: Rename HVF 'struct hvf_vcpu_state' -> AccelCPUState Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 19/30] accel/kvm: Re-include "exec/memattrs.h" header Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 20/30] accel/kvm: Declare kvm_direct_msi_allowed in stubs Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 21/30] hw/intc/arm_gic: Un-inline GIC*/ITS class_name() helpers Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 22/30] hw/intc/arm_gic: Rename 'first_cpu' argument Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 23/30] hw/arm/sbsa-ref: Include missing 'sysemu/kvm.h' header Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 24/30] target/arm: Restrict KVM-specific fields from ArchCPU Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 25/30] target/ppc: " Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 26/30] target/riscv: " Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 27/30] target/i386/WHPX: Fix error message when fail to set ProcessorCount Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 28/30] exec/memory: Add symbolic value for memory listener priority for accel Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 29/30] exec/memory: Add symbol for memory listener priority for device backend Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 30/30] exec/memory: Add symbol for the min value of memory listener priority Philippe Mathieu-Daudé
2023-06-29 11:15 ` [PULL 00/30] Accelerator patches for 2023-06-28 Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230628155313.71594-4-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=berrange@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).