VirtualBox

Changeset 13703

Show
Ignore:
Timestamp:
10/31/08 01:20:53 (2 months ago)
Author:
vboxsync
Message:

VMM++: VINF_EM_DBG_RING0_ASSERTION -> VERR_VMM_RING0_ASSERTION, lumping it together with VERR_TRPM_DONT_PANIC and VERR_TRPM_PANIC. (just left the space in VINF_EM_ there as it may come in handy later.)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/include/VBox/err.h

    r13702 r13703  
    101101 * resolved there it will enter guru meditation. */ 
    102102#define VINF_EM_DBG_HYPER_ASSERTION         1103 
    103 /** Hit a ring-0 assertion on EMT. 
    104  * EM will enter guru mediation state when. */ 
    105 #define VINF_EM_DBG_RING0_ASSERTION         1104 
    106103/** Indicating that the VM should be suspended for debugging because 
    107104 * the developer wants to inspect the VM state. */ 
    …… 
    765762/** Reason for leaving GC: Calling host function. */ 
    766763#define VINF_VMM_CALL_HOST                  2700 
     764/** Reason for leaving R0: Hit a ring-0 assertion on EMT. */ 
     765#define VERR_VMM_RING0_ASSERTION            (-2701) 
    767766/** @} */ 
    768767 

  • trunk/include/VBox/err.mac

    r13702 r13703  
    1919%define VINF_EM_DBG_HYPER_BREAKPOINT    1102 
    2020%define VINF_EM_DBG_HYPER_ASSERTION    1103 
    21 %define VINF_EM_DBG_RING0_ASSERTION    1104 
    2221%define VINF_EM_DBG_STOP    1105 
    2322%define VINF_EM_DBG_STEPPED    1106 
    …… 
    243242%define VINF_IOM_HC_MMIO_READ_WRITE    2625 
    244243%define VINF_VMM_CALL_HOST    2700 
     244%define VERR_VMM_RING0_ASSERTION    (-2701) 
    245245%define VERR_PDM_NO_SUCH_LUN    (-2800) 
    246246%define VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES    (-2801) 

  • trunk/src/VBox/VMM/EM.cpp

    r13702 r13703  
    645645             * Guru meditation. 
    646646             */ 
    647             case VINF_EM_DBG_RING0_ASSERTION: /** @todo Make a guru meditation event! */ 
    648                 rc = DBGFR3EventSrc(pVM, DBGFEVENT_DEV_STOP, "VINF_EM_DBG_RING0_ASSERTION", 0, NULL, NULL); 
     647            case VERR_VMM_RING0_ASSERTION: /** @todo Make a guru meditation event! */ 
     648                rc = DBGFR3EventSrc(pVM, DBGFEVENT_DEV_STOP, "VERR_VMM_RING0_ASSERTION", 0, NULL, NULL); 
    649649                break; 
    650650            case VERR_REM_TOO_MANY_TRAPS: /** @todo Make a guru meditation event! */ 
    …… 
    674674                case VINF_EM_DBG_HYPER_BREAKPOINT: 
    675675                case VINF_EM_DBG_HYPER_ASSERTION: 
    676                 case VINF_EM_DBG_RING0_ASSERTION: 
    677676                    break; 
    678677 
    …… 
    708707                        case VINF_EM_DBG_HYPER_BREAKPOINT: 
    709708                        case VINF_EM_DBG_HYPER_ASSERTION: 
    710                         case VINF_EM_DBG_RING0_ASSERTION: 
     709                        case VERR_TRPM_PANIC: 
     710                        case VERR_TRPM_DONT_PANIC: 
     711                        case VERR_VMM_RING0_ASSERTION: 
    711712                            return rcLast; 
    712713                    } 
    …… 
    723724                case VERR_TRPM_PANIC: 
    724725                case VERR_TRPM_DONT_PANIC: 
     726                case VERR_VMM_RING0_ASSERTION: 
    725727                case VERR_INTERNAL_ERROR: 
    726728                    return rc; 
    …… 
    23722374        case VERR_TRPM_DONT_PANIC: 
    23732375        case VERR_TRPM_PANIC: 
    2374         case VINF_EM_DBG_RING0_ASSERTION: 
     2376        case VERR_VMM_RING0_ASSERTION: 
    23752377            break; 
    23762378 
    …… 
    34673469                 * Guru mediations. 
    34683470                 */ 
    3469                 case VINF_EM_DBG_RING0_ASSERTION: 
     3471                case VERR_VMM_RING0_ASSERTION: 
    34703472                    Log(("EMR3ExecuteVM: %Rrc: %d -> %d (EMSTATE_GURU_MEDITATION)\n", rc, pVM->em.s.enmState, EMSTATE_GURU_MEDITATION)); 
    34713473                    pVM->em.s.enmState = EMSTATE_GURU_MEDITATION; 

  • trunk/src/VBox/VMM/VMM.cpp

    r13702 r13703  
    19661966        } 
    19671967        rc = vmmR3ServiceCallHostRequest(pVM); 
    1968         if (VBOX_FAILURE(rc) || rc == VINF_EM_DBG_RING0_ASSERTION) 
     1968        if (VBOX_FAILURE(rc)) 
    19691969            return rc; 
    19701970        /* Resume R0 */ 
    …… 
    22372237            LogRel((pVM->vmm.s.szRing0AssertMsg1)); 
    22382238            LogRel((pVM->vmm.s.szRing0AssertMsg2)); 
    2239             return VINF_EM_DBG_RING0_ASSERTION; 
     2239            return VERR_VMM_RING0_ASSERTION; 
    22402240 
    22412241        default: 

  • trunk/src/VBox/VMM/VMMGuruMeditation.cpp

    r13702 r13703  
    227227         * Hypervisor errors. 
    228228         */ 
    229         case VINF_EM_DBG_RING0_ASSERTION: 
     229        case VERR_VMM_RING0_ASSERTION: 
    230230        case VINF_EM_DBG_HYPER_ASSERTION: 
    231231        { 
    232             bool fIsRing0 = rcErr == VINF_EM_DBG_RING0_ASSERTION; 
     232            bool fIsRing0 = rcErr == VERR_VMM_RING0_ASSERTION; 
    233233            const char *pszMsg1 = fIsRing0 ? pVM->vmm.s.szRing0AssertMsg1 : VMMR3GetGCAssertMsg1(pVM); 
    234234            while (pszMsg1 && *pszMsg1 == '\n') 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy