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 <moha...@unpredictable.fr>
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
MAINTAINERS | 2 +
accel/meson.build | 1 +
accel/whpx/meson.build | 6 +
{target/i386 => accel}/whpx/whpx-accel-ops.c | 4 +-
.../whpx => include/system}/whpx-accel-ops.h | 0
target/i386/whpx/meson.build | 1 -
target/i386/whpx/whpx-all.c | 4 +-
target/i386/whpx/whpx-internal.h | 119 ------------------
8 files changed, 13 insertions(+), 124 deletions(-)
create mode 100644 accel/whpx/meson.build
rename {target/i386 => accel}/whpx/whpx-accel-ops.c (97%)
rename {target/i386/whpx => include/system}/whpx-accel-ops.h (100%)
delete mode 100644 target/i386/whpx/whpx-internal.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 28cea34271..238065e1c9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -542,9 +542,11 @@ F: include/system/hvf_int.h
WHPX CPUs
M: Sunil Muthuswamy <sunil...@microsoft.com>
S: Supported
+F: accel/whpx/
F: target/i386/whpx/
F: accel/stubs/whpx-stub.c
F: include/system/whpx.h
+F: include/system/whpx-accel-ops.h
X86 Instruction Emulator
M: Cameron Esfahani <di...@apple.com>
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..7b3d6f1c1c
--- /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)
diff --git a/target/i386/whpx/whpx-accel-ops.c b/accel/whpx/whpx-accel-ops.c
similarity index 97%
rename from target/i386/whpx/whpx-accel-ops.c
rename to accel/whpx/whpx-accel-ops.c
index da58805b1a..18488421bc 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)
{
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/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>
diff --git a/target/i386/whpx/whpx-internal.h b/target/i386/whpx/whpx-internal.h
deleted file mode 100644
index 6633e9c4ca..0000000000
--- a/target/i386/whpx/whpx-internal.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#ifndef TARGET_I386_WHPX_INTERNAL_H
-#define TARGET_I386_WHPX_INTERNAL_H
-
-#include <windows.h>
-#include <winhvplatform.h>
-#include <winhvemulation.h>
-
-typedef enum WhpxBreakpointState {
- WHPX_BP_CLEARED = 0,
- WHPX_BP_SET_PENDING,
- WHPX_BP_SET,
- WHPX_BP_CLEAR_PENDING,
-} WhpxBreakpointState;
-
-struct whpx_breakpoint {
- vaddr address;
- WhpxBreakpointState state;
- uint8_t original_instruction;
-};
-
-struct whpx_breakpoint_collection {
- int allocated, used;
- struct whpx_breakpoint data[0];
-};
-
-struct whpx_breakpoints {
- int original_address_count;
- vaddr *original_addresses;
-
- struct whpx_breakpoint_collection *breakpoints;
-};
-
-struct whpx_state {
- uint64_t mem_quota;
- WHV_PARTITION_HANDLE partition;
- uint64_t exception_exit_bitmap;
- int32_t running_cpus;
- struct whpx_breakpoints breakpoints;
- bool step_pending;
-
- bool kernel_irqchip_allowed;
- bool kernel_irqchip_required;
- bool apic_in_platform;
-};
-
-extern struct whpx_state whpx_global;
-void whpx_apic_get(DeviceState *s);
-
-#define WHV_E_UNKNOWN_CAPABILITY 0x80370300L
-
-/* This should eventually come from the Windows SDK */
-#define WHV_E_UNKNOWN_PROPERTY 0x80370302
-
-#define LIST_WINHVPLATFORM_FUNCTIONS(X) \
- X(HRESULT, WHvGetCapability, (WHV_CAPABILITY_CODE CapabilityCode, VOID*
CapabilityBuffer, UINT32 CapabilityBufferSizeInBytes, UINT32*
WrittenSizeInBytes)) \
- X(HRESULT, WHvCreatePartition, (WHV_PARTITION_HANDLE* Partition)) \
- X(HRESULT, WHvSetupPartition, (WHV_PARTITION_HANDLE Partition)) \
- X(HRESULT, WHvDeletePartition, (WHV_PARTITION_HANDLE Partition)) \
- X(HRESULT, WHvGetPartitionProperty, (WHV_PARTITION_HANDLE Partition,
WHV_PARTITION_PROPERTY_CODE PropertyCode, VOID* PropertyBuffer, UINT32
PropertyBufferSizeInBytes, UINT32* WrittenSizeInBytes)) \
- X(HRESULT, WHvSetPartitionProperty, (WHV_PARTITION_HANDLE Partition,
WHV_PARTITION_PROPERTY_CODE PropertyCode, const VOID* PropertyBuffer, UINT32
PropertyBufferSizeInBytes)) \
- X(HRESULT, WHvMapGpaRange, (WHV_PARTITION_HANDLE Partition, VOID*
SourceAddress, WHV_GUEST_PHYSICAL_ADDRESS GuestAddress, UINT64 SizeInBytes,
WHV_MAP_GPA_RANGE_FLAGS Flags)) \
- X(HRESULT, WHvUnmapGpaRange, (WHV_PARTITION_HANDLE Partition,
WHV_GUEST_PHYSICAL_ADDRESS GuestAddress, UINT64 SizeInBytes)) \
- X(HRESULT, WHvTranslateGva, (WHV_PARTITION_HANDLE Partition, UINT32 VpIndex,
WHV_GUEST_VIRTUAL_ADDRESS Gva, WHV_TRANSLATE_GVA_FLAGS TranslateFlags,
WHV_TRANSLATE_GVA_RESULT* TranslationResult, WHV_GUEST_PHYSICAL_ADDRESS* Gpa)) \
- X(HRESULT, WHvCreateVirtualProcessor, (WHV_PARTITION_HANDLE Partition,
UINT32 VpIndex, UINT32 Flags)) \
- X(HRESULT, WHvDeleteVirtualProcessor, (WHV_PARTITION_HANDLE Partition,
UINT32 VpIndex)) \
- X(HRESULT, WHvRunVirtualProcessor, (WHV_PARTITION_HANDLE Partition, UINT32
VpIndex, VOID* ExitContext, UINT32 ExitContextSizeInBytes)) \
- X(HRESULT, WHvCancelRunVirtualProcessor, (WHV_PARTITION_HANDLE Partition,
UINT32 VpIndex, UINT32 Flags)) \
- X(HRESULT, WHvGetVirtualProcessorRegisters, (WHV_PARTITION_HANDLE Partition,
UINT32 VpIndex, const WHV_REGISTER_NAME* RegisterNames, UINT32 RegisterCount,
WHV_REGISTER_VALUE* RegisterValues)) \
- X(HRESULT, WHvSetVirtualProcessorRegisters, (WHV_PARTITION_HANDLE Partition,
UINT32 VpIndex, const WHV_REGISTER_NAME* RegisterNames, UINT32 RegisterCount,
const WHV_REGISTER_VALUE* RegisterValues)) \
-
-/*
- * These are supplemental functions that may not be present
- * on all versions and are not critical for basic functionality.
- */
-#define LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(X) \
- X(HRESULT, WHvSuspendPartitionTime, (WHV_PARTITION_HANDLE Partition)) \
- X(HRESULT, WHvRequestInterrupt, (WHV_PARTITION_HANDLE Partition, \
- WHV_INTERRUPT_CONTROL* Interrupt, UINT32 InterruptControlSize)) \
- X(HRESULT, WHvGetVirtualProcessorInterruptControllerState2, \
- (WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, PVOID State, \
- UINT32 StateSize, UINT32* WrittenSize)) \
- X(HRESULT, WHvSetVirtualProcessorInterruptControllerState2, \
- (WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, PVOID State, \
- UINT32 StateSize)) \
-
-#define LIST_WINHVEMULATION_FUNCTIONS(X) \
- X(HRESULT, WHvEmulatorCreateEmulator, (const WHV_EMULATOR_CALLBACKS*
Callbacks, WHV_EMULATOR_HANDLE* Emulator)) \
- X(HRESULT, WHvEmulatorDestroyEmulator, (WHV_EMULATOR_HANDLE Emulator)) \
- X(HRESULT, WHvEmulatorTryIoEmulation, (WHV_EMULATOR_HANDLE Emulator, VOID*
Context, const WHV_VP_EXIT_CONTEXT* VpContext, const
WHV_X64_IO_PORT_ACCESS_CONTEXT* IoInstructionContext, WHV_EMULATOR_STATUS*
EmulatorReturnStatus)) \
- X(HRESULT, WHvEmulatorTryMmioEmulation, (WHV_EMULATOR_HANDLE Emulator, VOID*
Context, const WHV_VP_EXIT_CONTEXT* VpContext, const WHV_MEMORY_ACCESS_CONTEXT*
MmioInstructionContext, WHV_EMULATOR_STATUS* EmulatorReturnStatus)) \
-
-#define WHP_DEFINE_TYPE(return_type, function_name, signature) \
- typedef return_type (WINAPI *function_name ## _t) signature;
-
-#define WHP_DECLARE_MEMBER(return_type, function_name, signature) \
- function_name ## _t function_name;
-
-/* Define function typedef */
-LIST_WINHVPLATFORM_FUNCTIONS(WHP_DEFINE_TYPE)
-LIST_WINHVEMULATION_FUNCTIONS(WHP_DEFINE_TYPE)
-LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_DEFINE_TYPE)
-
-struct WHPDispatch {
- LIST_WINHVPLATFORM_FUNCTIONS(WHP_DECLARE_MEMBER)
- LIST_WINHVEMULATION_FUNCTIONS(WHP_DECLARE_MEMBER)
- LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_DECLARE_MEMBER)
-};
-
-extern struct WHPDispatch whp_dispatch;
-
-bool init_whp_dispatch(void);
-
-typedef enum WHPFunctionList {
- WINHV_PLATFORM_FNS_DEFAULT,
- WINHV_EMULATION_FNS_DEFAULT,
- WINHV_PLATFORM_FNS_SUPPLEMENTAL
-} WHPFunctionList;
-
-#endif /* TARGET_I386_WHPX_INTERNAL_H */
--
2.39.5 (Apple Git-154)
