Index: /trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp	(revision 19985)
+++ /trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp	(revision 19986)
@@ -2907,45 +2907,4 @@
 
         LogFlow(("EPT Page fault %x at %RGp error code %x\n", (uint32_t)exitQualification, GCPhys, errCode));
-
-        /* Shortcut for APIC TPR reads and writes. */
-        if ((GCPhys & 0xfff) == 0x080)
-        {
-            RTGCPHYS GCPhysApicBase;
-            PDMApicGetBase(pVM, &GCPhysApicBase);
-            if (GCPhys == GCPhysApicBase + 0x80)
-            {
-                DISCPUSTATE Cpu;
-                uint32_t    cbOp;
-                Cpu.mode = SELMGetCpuModeFromSelector(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid);
-
-                rc = EMInterpretDisasOne(pVM, pVCpu, CPUMCTX2CORE(pCtx), &Cpu, &cbOp);
-                if (    rc == VINF_SUCCESS
-                    &&  Cpu.pCurInstr->opcode == OP_MOV)
-                {
-                    if (    (errCode & X86_TRAP_PF_RW)
-                        &&  (Cpu.param2.flags == USE_REG_GEN32))
-                    {
-                        uint32_t val;
-
-                        DISFetchReg32(CPUMCTX2CORE(pCtx), Cpu.param2.base.reg_gen, &val);
-
-                        rc = PDMApicSetTPR(pVM, val >> 4);
-                        goto ResumeExecution;
-                    }
-                    else
-                    if (Cpu.param1.flags == USE_REG_GEN32)
-                    {
-                        uint8_t u8TPR;
-                        bool    fPending;
-
-                        rc = PDMApicGetTPR(pVM, &u8TPR, &fPending);
-                        AssertRC(rc);
-                        
-                        DISWriteReg32(CPUMCTX2CORE(pCtx), Cpu.param1.base.reg_gen, u8TPR << 4);
-                        goto ResumeExecution;
-                    }
-                }
-            }
-        }
 
         /* GCPhys contains the guest physical address of the page fault. */