Changeset 94012 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 1, 2022 8:52:20 AM (3 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10092 Remove unused functions CheckPageFaultReturnNP, CheckPageFaultReturnRSVD and CheckPageFaultReturnProt.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -2401 +2401 @@
 #endif /* PGM_SHW_TYPE != PGM_TYPE_NONE */
 #if PGM_WITH_PAGING(PGM_GST_TYPE, PGM_SHW_TYPE) && PGM_SHW_TYPE != PGM_TYPE_NONE
-
-/**
- * CheckPageFault helper for returning a page fault indicating a non-present
- * (NP) entry in the page translation structures.
- *
- * @returns VINF_EM_RAW_GUEST_TRAP.
- * @param   pVCpu           The cross context virtual CPU structure.
- * @param   uErr            The error code of the shadow fault.  Corrections to
- *                          TRPM's copy will be made if necessary.
- * @param   GCPtrPage       For logging.
- * @param   uPageFaultLevel For logging.
- */
-DECLINLINE(int) PGM_BTH_NAME(CheckPageFaultReturnNP)(PVMCPUCC pVCpu, uint32_t uErr, RTGCPTR GCPtrPage, unsigned uPageFaultLevel)
-{
-    STAM_COUNTER_INC(&pVCpu->pgm.s.Stats.CTX_MID_Z(Stat,DirtyTrackRealPF));
-    AssertMsg(!(uErr & X86_TRAP_PF_P), ("%#x\n", uErr));
-    AssertMsg(!(uErr & X86_TRAP_PF_RSVD), ("%#x\n", uErr));
-    if (uErr & (X86_TRAP_PF_RSVD | X86_TRAP_PF_P))
-        TRPMSetErrorCode(pVCpu, uErr & ~(X86_TRAP_PF_RSVD | X86_TRAP_PF_P));
-
-    Log(("CheckPageFault: real page fault (notp) at %RGv (%d)\n", GCPtrPage, uPageFaultLevel));
-    RT_NOREF_PV(GCPtrPage); RT_NOREF_PV(uPageFaultLevel);
-    return VINF_EM_RAW_GUEST_TRAP;
-}
-
-
-/**
- * CheckPageFault helper for returning a page fault indicating a reserved bit
- * (RSVD) error in the page translation structures.
- *
- * @returns VINF_EM_RAW_GUEST_TRAP.
- * @param   pVCpu           The cross context virtual CPU structure.
- * @param   uErr            The error code of the shadow fault.  Corrections to
- *                          TRPM's copy will be made if necessary.
- * @param   GCPtrPage       For logging.
- * @param   uPageFaultLevel For logging.
- */
-DECLINLINE(int) PGM_BTH_NAME(CheckPageFaultReturnRSVD)(PVMCPUCC pVCpu, uint32_t uErr, RTGCPTR GCPtrPage, unsigned uPageFaultLevel)
-{
-    STAM_COUNTER_INC(&pVCpu->pgm.s.Stats.CTX_MID_Z(Stat,DirtyTrackRealPF));
-    if ((uErr & (X86_TRAP_PF_RSVD | X86_TRAP_PF_P)) != (X86_TRAP_PF_RSVD | X86_TRAP_PF_P))
-        TRPMSetErrorCode(pVCpu, uErr | X86_TRAP_PF_RSVD | X86_TRAP_PF_P);
-
-    Log(("CheckPageFault: real page fault (rsvd) at %RGv (%d)\n", GCPtrPage, uPageFaultLevel));
-    RT_NOREF_PV(GCPtrPage); RT_NOREF_PV(uPageFaultLevel);
-    return VINF_EM_RAW_GUEST_TRAP;
-}
-
-
-/**
- * CheckPageFault helper for returning a page protection fault (P).
- *
- * @returns VINF_EM_RAW_GUEST_TRAP.
- * @param   pVCpu           The cross context virtual CPU structure.
- * @param   uErr            The error code of the shadow fault.  Corrections to
- *                          TRPM's copy will be made if necessary.
- * @param   GCPtrPage       For logging.
- * @param   uPageFaultLevel For logging.
- */
-DECLINLINE(int) PGM_BTH_NAME(CheckPageFaultReturnProt)(PVMCPUCC pVCpu, uint32_t uErr, RTGCPTR GCPtrPage, unsigned uPageFaultLevel)
-{
-    STAM_COUNTER_INC(&pVCpu->pgm.s.Stats.CTX_MID_Z(Stat,DirtyTrackRealPF));
-    AssertMsg(uErr & (X86_TRAP_PF_RW | X86_TRAP_PF_US | X86_TRAP_PF_ID), ("%#x\n", uErr));
-    if ((uErr & (X86_TRAP_PF_P | X86_TRAP_PF_RSVD)) != X86_TRAP_PF_P)
-        TRPMSetErrorCode(pVCpu, (uErr & ~X86_TRAP_PF_RSVD) | X86_TRAP_PF_P);
-
-    Log(("CheckPageFault: real page fault (prot) at %RGv (%d)\n", GCPtrPage, uPageFaultLevel));
-    RT_NOREF_PV(GCPtrPage); RT_NOREF_PV(uPageFaultLevel);
-    return VINF_EM_RAW_GUEST_TRAP;
-}
-
 
 /**