summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>2015-03-12 02:32:10 +0000
committervboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>2015-03-12 02:32:10 +0000
commit4c311c695dac3dda03ab6e74b3245253f20ecf98 (patch)
tree49481eddaab5c6c53911f728513e64d9907eb241
parent91849847e6f200888c64eb448463606a3f52a968 (diff)
downloadVirtualBox-svn-4c311c695dac3dda03ab6e74b3245253f20ecf98.tar.gz
PATM,VMM,err.h: Added VERR_PATM_IPE_TRAP_IN_PATCH_CODE for getting a guru that's more to the point.
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@54728 cfe28804-0f27-0410-a406-dd0f0b0b656f
-rw-r--r--include/VBox/err.h2
-rw-r--r--src/VBox/VMM/VMMR3/PATM.cpp2
-rw-r--r--src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp1
3 files changed, 4 insertions, 1 deletions
diff --git a/include/VBox/err.h b/include/VBox/err.h
index a1a089c1d52..be377047fab 100644
--- a/include/VBox/err.h
+++ b/include/VBox/err.h
@@ -371,6 +371,8 @@
#define VINF_PATCH_CONTINUE (1430)
/** The patch manager is not used because we're using HM and VT-x/AMD-V. */
#define VERR_PATM_HM_IPE (-1431)
+/** Unexpected trap in patch code. */
+#define VERR_PATM_IPE_TRAP_IN_PATCH_CODE (-1432)
/** @} */
diff --git a/src/VBox/VMM/VMMR3/PATM.cpp b/src/VBox/VMM/VMMR3/PATM.cpp
index 9ffc5a546ff..c345d265055 100644
--- a/src/VBox/VMM/VMMR3/PATM.cpp
+++ b/src/VBox/VMM/VMMR3/PATM.cpp
@@ -6541,7 +6541,7 @@ VMMR3_INT_DECL(int) PATMR3HandleTrap(PVM pVM, PCPUMCTX pCtx, RTRCPTR pEip, RTGCP
else
AssertLogRelMsg(pVM->patm.s.pGCStateHC->fPIF == 1,
("Crash in patch code %RRv (%RRv) esp=%RX32\n%s\n", pEip, pNewEip, CPUMGetGuestESP(pVCpu), szBuf));
- EMR3FatalError(pVCpu, VERR_INTERNAL_ERROR);
+ EMR3FatalError(pVCpu, VERR_PATM_IPE_TRAP_IN_PATCH_CODE);
}
/* From here on, we must have a valid patch to guest translation. */
diff --git a/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp b/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp
index 0685f24059e..1d034480a27 100644
--- a/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp
+++ b/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp
@@ -600,6 +600,7 @@ VMMR3DECL(void) VMMR3FatalDump(PVM pVM, PVMCPU pVCpu, int rcErr)
case VERR_IEM_INSTR_NOT_IMPLEMENTED:
case VERR_IEM_ASPECT_NOT_IMPLEMENTED:
+ case VERR_PATM_IPE_TRAP_IN_PATCH_CODE:
{
DBGFR3Info(pVM->pUVM, "cpumguest", NULL, pHlp);
DBGFR3Info(pVM->pUVM, "cpumguestinstr", NULL, pHlp);