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

[Richard Henderson]

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~