Index: /trunk/include/VBox/err.h
===================================================================
--- /trunk/include/VBox/err.h	(revision 45427)
+++ /trunk/include/VBox/err.h	(revision 45428)
@@ -238,8 +238,5 @@
 #define VINF_EM_RAW_EMULATE_DBG_STEP        1151
 /** Patch TPR access instruction. */
-#define VINF_EM_HM_PATCH_TPR_INSTR      1152
-/** The EMInterpretDisasOne / EMInterpretDisasOneEx methods failed to
- * disassemble the instruction. */
-#define VERR_EM_INTERNAL_DISAS_ERROR        (-1153)
+#define VINF_EM_HM_PATCH_TPR_INSTR          1152
 /** Unexpected guest mapping conflict detected. */
 #define VERR_EM_UNEXPECTED_MAPPING_CONFLICT (-1154)
@@ -1969,6 +1966,4 @@
 /** Invalid parameter index. */
 #define VERR_DIS_INVALID_PARAMETER                  (-4204)
-/** Reading opcode bytes failed. */
-#define VERR_DIS_MEM_READ                           (-4205)
 /** The instruction is too long. */
 #define VERR_DIS_TOO_LONG_INSTR                     (-4206)
Index: /trunk/src/VBox/Disassembler/DisasmCore.cpp
===================================================================
--- /trunk/src/VBox/Disassembler/DisasmCore.cpp	(revision 45427)
+++ /trunk/src/VBox/Disassembler/DisasmCore.cpp	(revision 45428)
@@ -293,5 +293,5 @@
     {
         Log(("disReadMore failed with rc=%Rrc!!\n", rc));
-        pDis->rc = VERR_DIS_MEM_READ;
+        pDis->rc = rc;
     }
 }
@@ -2608,5 +2608,5 @@
     {
         Log(("Initial read failed with rc=%Rrc!!\n", rc));
-        pDis->rc = VERR_DIS_MEM_READ;
+        pDis->rc = rc;
     }
 }
Index: /trunk/src/VBox/VMM/VMMAll/EMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/EMAll.cpp	(revision 45427)
+++ /trunk/src/VBox/VMM/VMMAll/EMAll.cpp	(revision 45428)
@@ -461,6 +461,6 @@
     if (RT_SUCCESS(rc))
         return VINF_SUCCESS;
-    AssertMsgFailed(("DISCoreOne failed to GCPtrInstr=%RGv rc=%Rrc\n", GCPtrInstr, rc));
-    return VERR_EM_INTERNAL_DISAS_ERROR;
+    AssertMsg(rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT, ("DISCoreOne failed to GCPtrInstr=%RGv rc=%Rrc\n", GCPtrInstr, rc));
+    return rc;
 }
 
Index: /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp	(revision 45427)
+++ /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp	(revision 45428)
@@ -120,6 +120,4 @@
                 }
             }
-            else if (RT_UNLIKELY(rc == VERR_EM_INTERNAL_DISAS_ERROR))
-                return rc;
             break;
         }