Changeset 108748 in vbox for trunk/src

Timestamp:

Mar 26, 2025 7:48:57 AM (3 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168173

Message:

VMM/GICR3Nem-win.cpp: Adapt to the latest Hyper-V API changes in Windows 11 build 27813, bugref:10392

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• GICR3Nem-win.cpp (modified) (7 diffs)
• NEMR3Native-win-armv8.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/GICR3Nem-win.cpp

@@ -81 +81 @@
 /*
  * The following definitions appeared in build 27744 allow interacting with the GIC controller,
- * (there is no official SDK for this yet).
+ * since 27813 the API is public with some changes and available under:
+ *      https://github.com/MicrosoftDocs/Virtualization-Documentation/blob/main/virtualization/api/hypervisor-platform/headers/WinHvPlatformDefs.h .
  */
 /** @todo Better way of defining these which doesn't require casting later on when calling APIs. */
@@ -177 +178 @@
 #define MY_WHV_LOCAL_INTERRUPT_CONTROLLER_STATE_VERSION 1
 
-#define MY_WHV_VIRTUAL_PROCESSOR_STATE_TYPE_LOCAL_INTERRUPT_CTRL  (WHV_VIRTUAL_PROCESSOR_STATE_TYPE)0x00001000
-#define MY_WHV_VIRTUAL_PROCESSOR_STATE_TYPE_GLOBAL_INTERRUPT_CTRL (WHV_VIRTUAL_PROCESSOR_STATE_TYPE)0x00001003
+#define WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN    RT_BIT_32(31)
+#define WHV_VIRTUAL_PROCESSOR_STATE_TYPE_ANY_VP RT_BIT_32(30)
+
+#define WHvVirtualProcessorStateTypeInterruptControllerState  (WHV_VIRTUAL_PROCESSOR_STATE_TYPE)(0 | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN)
+#define WHvVirtualProcessorStateTypeGlobalInterruptState      (WHV_VIRTUAL_PROCESSOR_STATE_TYPE)(6 | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_PFN | WHV_VIRTUAL_PROCESSOR_STATE_TYPE_ANY_VP)
 
 
@@ -372 +376 @@
      */
     uint32_t cbWritten = 0;
-    HRESULT hrc = WHvGetVirtualProcessorState(pThis->hPartition, WHV_ANY_VP, MY_WHV_VIRTUAL_PROCESSOR_STATE_TYPE_GLOBAL_INTERRUPT_CTRL,
+    HRESULT hrc = WHvGetVirtualProcessorState(pThis->hPartition, WHV_ANY_VP, WHvVirtualProcessorStateTypeGlobalInterruptState,
                                               NULL, 0, &cbWritten);
     AssertLogRelMsgReturn(hrc == WHV_E_INSUFFICIENT_BUFFER,
@@ -385 +389 @@
                           VERR_NO_MEMORY);
 
-    hrc = WHvGetVirtualProcessorState(pThis->hPartition, WHV_ANY_VP, MY_WHV_VIRTUAL_PROCESSOR_STATE_TYPE_GLOBAL_INTERRUPT_CTRL,
+    hrc = WHvGetVirtualProcessorState(pThis->hPartition, WHV_ANY_VP, WHvVirtualProcessorStateTypeGlobalInterruptState,
                                       pState, cbState, &cbWritten);
     AssertLogRelMsg(SUCCEEDED(hrc),
@@ -417 +421 @@
         MY_WHV_LOCAL_INTERRUPT_CONTROLLER_STATE LocalState;
 
-        hrc = WHvGetVirtualProcessorState(pThis->hPartition, idCpu, MY_WHV_VIRTUAL_PROCESSOR_STATE_TYPE_LOCAL_INTERRUPT_CTRL,
+        hrc = WHvGetVirtualProcessorState(pThis->hPartition, idCpu, WHvVirtualProcessorStateTypeInterruptControllerState,
                                           &LocalState, sizeof(LocalState), &cbWritten);
         AssertLogRelMsgReturn(SUCCEEDED(hrc),
@@ -494 +498 @@
     AssertRCReturnStmt(rc, RTMemTmpFree(pState), rc);
 
-    HRESULT hrc = WHvSetVirtualProcessorState(pThis->hPartition, WHV_ANY_VP, MY_WHV_VIRTUAL_PROCESSOR_STATE_TYPE_GLOBAL_INTERRUPT_CTRL,
+    HRESULT hrc = WHvSetVirtualProcessorState(pThis->hPartition, WHV_ANY_VP, WHvVirtualProcessorStateTypeGlobalInterruptState,
                                               pState, cbState);
     RTMemTmpFree(pState);
@@ -517 +521 @@
         LocalState.bVersion = MY_WHV_LOCAL_INTERRUPT_CONTROLLER_STATE_VERSION;
 
-        hrc = WHvSetVirtualProcessorState(pThis->hPartition, idCpu, MY_WHV_VIRTUAL_PROCESSOR_STATE_TYPE_LOCAL_INTERRUPT_CTRL,
+        hrc = WHvSetVirtualProcessorState(pThis->hPartition, idCpu, WHvVirtualProcessorStateTypeInterruptControllerState,
                                           &LocalState, sizeof(LocalState));
         AssertLogRelMsgReturn(SUCCEEDED(hrc),

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win-armv8.cpp

@@ -656 +656 @@
     RTGCPHYS GCPhysMmioBaseIts = 0;
     rc = CFGMR3QueryU64(pGicCfg, "ItsMmioBase", &GCPhysMmioBaseIts);
-    if (RT_FAILURE(rc))
+    if (RT_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
         return VMSetError(pVM, rc, RT_SRC_POS,
                           "Configuration error: Failed to get the \"ItsMmioBase\" value\n");
+    rc = VINF_SUCCESS;
 
     /*