1. Patchew
  2. QEMU
  3. [RFC 0/9] WHPX support for Arm
  4. View patch

[RFC 1/9] whpx: Move around files before introducing AArch64 support

Mohamed Mediouni posted 9 patches 3 months, 2 weeks ago
Maintainers: Peter Maydell <peter.maydell@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Sunil Muthuswamy <sunilmut@microsoft.com>
There is a newer version of this series
[RFC 1/9] whpx: Move around files before introducing AArch64 support
Posted by Mohamed Mediouni 3 months, 2 weeks ago 
Switch to a design where we can share whpx code between x86 and AArch64 when it makes sense to do so.

Signed-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>
---
 accel/meson.build                                     | 1 +
 accel/whpx/meson.build                                | 6 ++++++
 {target/i386 => accel}/whpx/whpx-accel-ops.c          | 8 ++++++--
 {target/i386/whpx => include/system}/whpx-accel-ops.h | 0
 {target/i386/whpx => include/system}/whpx-internal.h  | 7 ++++++-
 target/i386/whpx/meson.build                          | 1 -
 target/i386/whpx/whpx-all.c                           | 4 ++--
 7 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 accel/whpx/meson.build
 rename {target/i386 => accel}/whpx/whpx-accel-ops.c (96%)
 rename {target/i386/whpx => include/system}/whpx-accel-ops.h (100%)
 rename {target/i386/whpx => include/system}/whpx-internal.h (98%)

diff --git a/accel/meson.build b/accel/meson.build
index 25b0f100b5..de927a3b37 100644
--- a/accel/meson.build
+++ b/accel/meson.build
@@ -6,6 +6,7 @@ user_ss.add(files('accel-user.c'))
 subdir('tcg')
 if have_system
   subdir('hvf')
+  subdir('whpx')
   subdir('qtest')
   subdir('kvm')
   subdir('xen')
diff --git a/accel/whpx/meson.build b/accel/whpx/meson.build
new file mode 100644
index 0000000000..659efb13c9
--- /dev/null
+++ b/accel/whpx/meson.build
@@ -0,0 +1,6 @@
+whpx_ss = ss.source_set()
+whpx_ss.add(files(
+  'whpx-accel-ops.c',
+))
+
+specific_ss.add_all(when: 'CONFIG_WHPX', if_true: whpx_ss)
\ No newline at end of file
diff --git a/target/i386/whpx/whpx-accel-ops.c b/accel/whpx/whpx-accel-ops.c
similarity index 96%
rename from target/i386/whpx/whpx-accel-ops.c
rename to accel/whpx/whpx-accel-ops.c
index da58805b1a..364d99b660 100644
--- a/target/i386/whpx/whpx-accel-ops.c
+++ b/accel/whpx/whpx-accel-ops.c
@@ -16,8 +16,8 @@
 #include "qemu/guest-random.h"
 
 #include "system/whpx.h"
-#include "whpx-internal.h"
-#include "whpx-accel-ops.h"
+#include "system/whpx-internal.h"
+#include "system/whpx-accel-ops.h"
 
 static void *whpx_cpu_thread_fn(void *arg)
 {
@@ -80,7 +80,11 @@ static void whpx_kick_vcpu_thread(CPUState *cpu)
 
 static bool whpx_vcpu_thread_is_idle(CPUState *cpu)
 {
+#ifndef __aarch64__
     return !whpx_apic_in_platform();
+#else
+    return 0;
+#endif
 }
 
 static void whpx_accel_ops_class_init(ObjectClass *oc, const void *data)
diff --git a/target/i386/whpx/whpx-accel-ops.h b/include/system/whpx-accel-ops.h
similarity index 100%
rename from target/i386/whpx/whpx-accel-ops.h
rename to include/system/whpx-accel-ops.h
diff --git a/target/i386/whpx/whpx-internal.h b/include/system/whpx-internal.h
similarity index 98%
rename from target/i386/whpx/whpx-internal.h
rename to include/system/whpx-internal.h
index 6633e9c4ca..af1e46a491 100644
--- a/target/i386/whpx/whpx-internal.h
+++ b/include/system/whpx-internal.h
@@ -3,8 +3,9 @@
 
 #include <windows.h>
 #include <winhvplatform.h>
+#ifdef __x86_64__
 #include <winhvemulation.h>
-
+#endif
 typedef enum WhpxBreakpointState {
     WHPX_BP_CLEARED = 0,
     WHPX_BP_SET_PENDING,
@@ -97,12 +98,16 @@ void whpx_apic_get(DeviceState *s);
 
 /* Define function typedef */
 LIST_WINHVPLATFORM_FUNCTIONS(WHP_DEFINE_TYPE)
+#ifdef __x86_64__
 LIST_WINHVEMULATION_FUNCTIONS(WHP_DEFINE_TYPE)
+#endif
 LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_DEFINE_TYPE)
 
 struct WHPDispatch {
     LIST_WINHVPLATFORM_FUNCTIONS(WHP_DECLARE_MEMBER)
+#ifdef __x86_64__
     LIST_WINHVEMULATION_FUNCTIONS(WHP_DECLARE_MEMBER)
+#endif
     LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_DECLARE_MEMBER)
 };
 
diff --git a/target/i386/whpx/meson.build b/target/i386/whpx/meson.build
index 9c54aaad39..c3aaaff9fd 100644
--- a/target/i386/whpx/meson.build
+++ b/target/i386/whpx/meson.build
@@ -1,5 +1,4 @@
 i386_system_ss.add(when: 'CONFIG_WHPX', if_true: files(
   'whpx-all.c',
   'whpx-apic.c',
-  'whpx-accel-ops.c',
 ))
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index b72dcff3c8..5a431fc3c7 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -31,8 +31,8 @@
 #include "accel/accel-cpu-target.h"
 #include <winerror.h>
 
-#include "whpx-internal.h"
-#include "whpx-accel-ops.h"
+#include "system/whpx-internal.h"
+#include "system/whpx-accel-ops.h"
 
 #include <winhvplatform.h>
 #include <winhvemulation.h>
-- 
2.39.5 (Apple Git-154)
Re: [RFC 1/9] whpx: Move around files before introducing AArch64 support
Posted by Richard Henderson 3 months, 2 weeks ago 
On 7/31/25 15:27, Mohamed Mediouni wrote:
> --- /dev/null
> +++ b/accel/whpx/meson.build
> @@ -0,0 +1,6 @@
> +whpx_ss = ss.source_set()
> +whpx_ss.add(files(
> +  'whpx-accel-ops.c',
> +))
> +
> +specific_ss.add_all(when: 'CONFIG_WHPX', if_true: whpx_ss)
> \ No newline at end of file

Add the newline.

> diff --git a/target/i386/whpx/whpx-accel-ops.c b/accel/whpx/whpx-accel-ops.c
> similarity index 96%
> rename from target/i386/whpx/whpx-accel-ops.c
> rename to accel/whpx/whpx-accel-ops.c
> index da58805b1a..364d99b660 100644
> --- a/target/i386/whpx/whpx-accel-ops.c
> +++ b/accel/whpx/whpx-accel-ops.c
> @@ -16,8 +16,8 @@
>   #include "qemu/guest-random.h"
>   
>   #include "system/whpx.h"
> -#include "whpx-internal.h"
> -#include "whpx-accel-ops.h"
> +#include "system/whpx-internal.h"
> +#include "system/whpx-accel-ops.h"
>   
>   static void *whpx_cpu_thread_fn(void *arg)
>   {
> @@ -80,7 +80,11 @@ static void whpx_kick_vcpu_thread(CPUState *cpu)
>   
>   static bool whpx_vcpu_thread_is_idle(CPUState *cpu)
>   {
> +#ifndef __aarch64__
>       return !whpx_apic_in_platform();
> +#else
> +    return 0;
> +#endif
>   }

Better as code movement only.
Save new code for a subsequent patch.

> --- a/target/i386/whpx/whpx-internal.h
> +++ b/include/system/whpx-internal.h
> @@ -3,8 +3,9 @@
>   
>   #include <windows.h>
>   #include <winhvplatform.h>
> +#ifdef __x86_64__
>   #include <winhvemulation.h>
> -
> +#endif
>   typedef enum WhpxBreakpointState {
>       WHPX_BP_CLEARED = 0,
>       WHPX_BP_SET_PENDING,
> @@ -97,12 +98,16 @@ void whpx_apic_get(DeviceState *s);
>   
>   /* Define function typedef */
>   LIST_WINHVPLATFORM_FUNCTIONS(WHP_DEFINE_TYPE)
> +#ifdef __x86_64__
>   LIST_WINHVEMULATION_FUNCTIONS(WHP_DEFINE_TYPE)
> +#endif
>   LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_DEFINE_TYPE)
>   
>   struct WHPDispatch {
>       LIST_WINHVPLATFORM_FUNCTIONS(WHP_DECLARE_MEMBER)
> +#ifdef __x86_64__
>       LIST_WINHVEMULATION_FUNCTIONS(WHP_DECLARE_MEMBER)
> +#endif
>       LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_DECLARE_MEMBER)
>   };

Likewise.


r~
Re: [RFC 1/9] whpx: Move around files before introducing AArch64 support
Posted by Philippe Mathieu-Daudé 3 months, 2 weeks ago 
Hi Mohamed,

On 31/7/25 07:27, Mohamed Mediouni wrote:
> Switch to a design where we can share whpx code between x86 and AArch64 when it makes sense to do so.
> 
> Signed-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>
> ---
>   accel/meson.build                                     | 1 +
>   accel/whpx/meson.build                                | 6 ++++++
>   {target/i386 => accel}/whpx/whpx-accel-ops.c          | 8 ++++++--
>   {target/i386/whpx => include/system}/whpx-accel-ops.h | 0
>   {target/i386/whpx => include/system}/whpx-internal.h  | 7 ++++++-
>   target/i386/whpx/meson.build                          | 1 -
>   target/i386/whpx/whpx-all.c                           | 4 ++--
>   7 files changed, 21 insertions(+), 6 deletions(-)
>   create mode 100644 accel/whpx/meson.build
>   rename {target/i386 => accel}/whpx/whpx-accel-ops.c (96%)
>   rename {target/i386/whpx => include/system}/whpx-accel-ops.h (100%)
>   rename {target/i386/whpx => include/system}/whpx-internal.h (98%)

Missing updates in MAINTAINERS, otherwise:

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.