Changeset 80060 in vbox for trunk/src

Timestamp:

Jul 30, 2019 8:30:13 AM (5 years ago)

Author:

vboxsync

Message:

VMM: Kicking out raw-mode - CPUM*Hyper*(). bugref:9517

File:

• trunk/src/VBox/VMM/VMMR3/CPUMDbg.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/CPUMDbg.cpp

@@ -667 +667 @@
 }
 
-
-
-/*
- *
- * Hypervisor register access functions.
- *
- */
-
-/**
- * @interface_method_impl{DBGFREGDESC,pfnGet}
- */
-static DECLCALLBACK(int) cpumR3RegHyperGet_drX(void *pvUser, PCDBGFREGDESC pDesc, PDBGFREGVAL pValue)
-{
-    PVMCPU pVCpu = (PVMCPU)pvUser;
-    VMCPU_ASSERT_EMT(pVCpu);
-
-    uint64_t    u64Value;
-    switch (pDesc->offRegister)
-    {
-        case 0: u64Value = CPUMGetHyperDR0(pVCpu); break;
-        case 1: u64Value = CPUMGetHyperDR1(pVCpu); break;
-        case 2: u64Value = CPUMGetHyperDR2(pVCpu); break;
-        case 3: u64Value = CPUMGetHyperDR3(pVCpu); break;
-        case 6: u64Value = CPUMGetHyperDR6(pVCpu); break;
-        case 7: u64Value = CPUMGetHyperDR7(pVCpu); break;
-        default:
-            AssertFailedReturn(VERR_IPE_NOT_REACHED_DEFAULT_CASE);
-    }
-    switch (pDesc->enmType)
-    {
-        case DBGFREGVALTYPE_U64:    pValue->u64 = u64Value; break;
-        case DBGFREGVALTYPE_U32:    pValue->u32 = (uint32_t)u64Value; break;
-        default:
-            AssertFailedReturn(VERR_IPE_NOT_REACHED_DEFAULT_CASE);
-    }
-    return VINF_SUCCESS;
-}
-
-
-/**
- * @interface_method_impl{DBGFREGDESC,pfnGet}
- */
-static DECLCALLBACK(int) cpumR3RegHyperSet_drX(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask)
-{
-    /* Not settable, prevents killing your host. */
-    NOREF(pvUser); NOREF(pDesc); NOREF(pValue); NOREF(pfMask);
-    return VERR_ACCESS_DENIED;
-}
 
 
@@ -1289 +1241 @@
 
 /**
- * The hypervisor (raw-mode) register descriptors.
- */
-static DBGFREGDESC const g_aCpumRegHyperDescs[] =
-{
-    CPU_REG_EX_AS("dr0",            DR0,            U64, 0,                     cpumR3RegHyperGet_drX,  cpumR3RegHyperSet_drX,  NULL,                       NULL                    ),
-    CPU_REG_EX_AS("dr1",            DR1,            U64, 1,                     cpumR3RegHyperGet_drX,  cpumR3RegHyperSet_drX,  NULL,                       NULL                    ),
-    CPU_REG_EX_AS("dr2",            DR2,            U64, 2,                     cpumR3RegHyperGet_drX,  cpumR3RegHyperSet_drX,  NULL,                       NULL                    ),
-    CPU_REG_EX_AS("dr3",            DR3,            U64, 3,                     cpumR3RegHyperGet_drX,  cpumR3RegHyperSet_drX,  NULL,                       NULL                    ),
-    CPU_REG_EX_AS("dr6",            DR6,            U32, 6,                     cpumR3RegHyperGet_drX,  cpumR3RegHyperSet_drX,  NULL,                       g_aCpumRegFields_dr6    ),
-    CPU_REG_EX_AS("dr7",            DR7,            U32, 7,                     cpumR3RegHyperGet_drX,  cpumR3RegHyperSet_drX,  NULL,                       g_aCpumRegFields_dr7    ),
-    DBGFREGDESC_TERMINATOR()
-};
-
-
-/**
  * Initializes the debugger related sides of the CPUM component.
  *
@@ -1317 +1254 @@
         int rc = DBGFR3RegRegisterCpu(pVM, &pVM->aCpus[iCpu], g_aCpumRegGstDescs, true /*fGuestRegs*/);
         AssertLogRelRCReturn(rc, rc);
-        rc = DBGFR3RegRegisterCpu(pVM, &pVM->aCpus[iCpu], g_aCpumRegHyperDescs, false /*fGuestRegs*/);
-        AssertLogRelRCReturn(rc, rc);
     }