Changeset 94842 in vbox

Timestamp:

May 5, 2022 10:38:40 AM (3 years ago)

Author:

vboxsync

Message:

VMM/IEM: Arm build fixes. bugref:9898

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllCImplVmxInstr.cpp (modified) (3 diffs)
• include/IEMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp

@@ -9848 +9848 @@
 
 
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
 
 /**
@@ -9854 +9855 @@
  * @remarks The @a uUser argument is currently unused.
  */
-PGM_ALL_CB2_DECL(VBOXSTRICTRC) iemVmxApicAccessPageHandler(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhysFault, void *pvPhys,
-                                                           void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType,
-                                                           PGMACCESSORIGIN enmOrigin, uint64_t uUser)
+DECLCALLBACK(VBOXSTRICTRC) iemVmxApicAccessPageHandler(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhysFault, void *pvPhys,
+                                                       void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType,
+                                                       PGMACCESSORIGIN enmOrigin, uint64_t uUser)
 {
     RT_NOREF3(pvPhys, enmOrigin, uUser);
@@ -10011 +10012 @@
 # endif /* !IN_RING3 */
 
+#endif /* VBOX_WITH_NESTED_HWVIRT_VMX */
+

trunk/src/VBox/VMM/include/IEMInternal.h

@@ -994 +994 @@
 /** @} */
 
-PGM_ALL_CB2_PROTO(FNPGMPHYSHANDLER) iemVmxApicAccessPageHandler;
+DECLCALLBACK(FNPGMPHYSHANDLER)      iemVmxApicAccessPageHandler;
 # ifndef IN_RING3
 DECLCALLBACK(FNPGMRZPHYSPFHANDLER)  iemVmxApicAccessPagePfHandler;
@@ -3051 +3051 @@
 IEM_CIMPL_PROTO_0(iemCImpl_skinit);
 IEM_CIMPL_PROTO_0(iemCImpl_svm_pause);
+#endif
+
 IEM_CIMPL_PROTO_0(iemCImpl_vmmcall);
-#endif
-
 IEM_CIMPL_PROTO_1(iemCImpl_Hypercall, uint16_t, uDisOpcode);