VirtualBox

Changeset 73287 in vbox


Ignore:
Timestamp:
Jul 21, 2018 4:50:51 AM (7 years ago)
Author:
vboxsync
Message:

VMM: Reordering some STAT counters, spaces and nits.

Location:
trunk/src/VBox/VMM
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r73140 r73287  
    120120}
    121121
    122 #ifdef VBOX_WITH_NESTED_HWVIRT_SVM
     122# ifdef VBOX_WITH_NESTED_HWVIRT_SVM
    123123/**
    124124 * Notification callback for when a \#VMEXIT happens outside SVM R0 code (e.g.
    … …  
    172172    ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_ALL_GUEST);
    173173}
    174 #endif
     174# endif
    175175
    176176/**

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

    r73280 r73287  
    43804380        ASMSetFlags(pSvmTransient->fEFlags);
    43814381        VMMRZCallRing3Enable(pVCpu);
    4382         STAM_COUNTER_INC(&pVCpu->hm.s.StatPendingHostIrq);
     4382        STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchPendingHostIrq);
    43834383        return VINF_EM_RAW_INTERRUPT;
    43844384    }
    … …  
    44934493        ASMSetFlags(pSvmTransient->fEFlags);
    44944494        VMMRZCallRing3Enable(pVCpu);
    4495         STAM_COUNTER_INC(&pVCpu->hm.s.StatPendingHostIrq);
     4495        STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchPendingHostIrq);
    44964496        return VINF_EM_RAW_INTERRUPT;
    44974497    }

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

    r73280 r73287  
    83348334        }
    83358335
    8336         STAM_COUNTER_INC(&pVCpu->hm.s.StatPendingHostIrq);
     8336        STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchPendingHostIrq);
    83378337        rcStrict = VINF_EM_RAW_INTERRUPT;
    83388338    }

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

    r73274 r73287  
    10011001        HM_REG_COUNTER(&pVCpu->hm.s.StatSwitchTprMaskedIrq,     "/HM/CPU%d/Switch/TprMaskedIrq", "PDMGetInterrupt() signals TPR masks pending Irq.");
    10021002        HM_REG_COUNTER(&pVCpu->hm.s.StatSwitchGuestIrq,         "/HM/CPU%d/Switch/IrqPending", "PDMGetInterrupt() cleared behind our back!?!.");
    1003         HM_REG_COUNTER(&pVCpu->hm.s.StatPendingHostIrq,         "/HM/CPU%d/Switch/PendingHostIrq", "Exit to ring-3 due to pending host interrupt before executing guest code.");
     1003        HM_REG_COUNTER(&pVCpu->hm.s.StatSwitchPendingHostIrq,   "/HM/CPU%d/Switch/PendingHostIrq", "Exit to ring-3 due to pending host interrupt before executing guest code.");
    10041004        HM_REG_COUNTER(&pVCpu->hm.s.StatSwitchHmToR3FF,         "/HM/CPU%d/Switch/HmToR3FF", "Exit to ring-3 due to pending timers, EMT rendezvous, critical section etc.");
    10051005        HM_REG_COUNTER(&pVCpu->hm.s.StatSwitchExitToR3,         "/HM/CPU%d/Switch/ExitToR3", "Exit to ring-3 (total).");
    … …  
    10411041        HM_REG_COUNTER(&pVCpu->hm.s.StatDRxIoCheck,             "/HM/CPU%d/Debug/IOCheck", "Checking for I/O breakpoint.");
    10421042
    1043         HM_REG_COUNTER(&pVCpu->hm.s.StatExportMinimal,          "/HM/CPU%d/Load/Minimal", "VM-entry exporting minimal guest-state.");
    1044         HM_REG_COUNTER(&pVCpu->hm.s.StatExportFull,             "/HM/CPU%d/Load/Full", "VM-entry exporting the full guest-state.");
    1045         HM_REG_COUNTER(&pVCpu->hm.s.StatLoadGuestFpu,           "/HM/CPU%d/Load/GuestFpu", "VM-entry loading the guest-FPU state.");
     1043        HM_REG_COUNTER(&pVCpu->hm.s.StatExportMinimal,          "/HM/CPU%d/Export/Minimal", "VM-entry exporting minimal guest-state.");
     1044        HM_REG_COUNTER(&pVCpu->hm.s.StatExportFull,             "/HM/CPU%d/Export/Full", "VM-entry exporting the full guest-state.");
     1045        HM_REG_COUNTER(&pVCpu->hm.s.StatLoadGuestFpu,           "/HM/CPU%d/Export/GuestFpu", "VM-entry loading the guest-FPU state.");
    10461046
    10471047        HM_REG_COUNTER(&pVCpu->hm.s.StatVmxCheckBadRmSelBase,   "/HM/CPU%d/VMXCheck/RMSelBase", "Could not use VMX due to unsuitable real-mode selector base.");

  • trunk/src/VBox/VMM/include/HMInternal.h

    r73264 r73287  
    687687    /** Whether we're using the hyper DR7 or guest DR7. */
    688688    bool                        fUsingHyperDR7;
    689     /** Set if XCR0 needs to be loaded and saved when entering and exiting guest
    690      * code execution. */
     689    /** Set if XCR0 needs to be saved/restored when entering/exiting guest code
     690     * execution. */
    691691    bool                        fLoadSaveGuestXcr0;
    692692
    … …  
    934934    STAMPROFILEADV          StatLoadGuestFpuState;
    935935    STAMPROFILEADV          StatInGC;
    936 
    937936#if HC_ARCH_BITS == 32 && defined(VBOX_ENABLE_64_BITS_GUESTS)
    938937    STAMPROFILEADV          StatWorldSwitch3264;
    … …  
    10021001    STAMCOUNTER             StatExitMtf;
    10031002    STAMCOUNTER             StatExitApicAccess;
    1004     STAMCOUNTER             StatPendingHostIrq;
     1003    STAMCOUNTER             StatExitReasonNpf;
     1004
     1005    STAMCOUNTER             StatNestedExitReasonNpf;
    10051006
    10061007    STAMCOUNTER             StatFlushPage;
    … …  
    10191020    STAMCOUNTER             StatTlbShootdownFlush;
    10201021
     1022    STAMCOUNTER             StatSwitchPendingHostIrq;
    10211023    STAMCOUNTER             StatSwitchTprMaskedIrq;
    10221024    STAMCOUNTER             StatSwitchGuestIrq;
    … …  
    10341036    STAMCOUNTER             StatTscIntercept;
    10351037
    1036     STAMCOUNTER             StatExitReasonNpf;
    10371038    STAMCOUNTER             StatDRxArmed;
    10381039    STAMCOUNTER             StatDRxContextSwitch;
    … …  
    10461047    STAMCOUNTER             StatVmxCheckBadRmSelLimit;
    10471048    STAMCOUNTER             StatVmxCheckRmOk;
    1048 
    10491049    STAMCOUNTER             StatVmxCheckBadSel;
    10501050    STAMCOUNTER             StatVmxCheckBadRpl;
    … …  
    10531053    STAMCOUNTER             StatVmxCheckPmOk;
    10541054
    1055     STAMCOUNTER             StatNestedExitReasonNpf;
    1056 
    10571055#if HC_ARCH_BITS == 32 && defined(VBOX_ENABLE_64_BITS_GUESTS)
    10581056    STAMCOUNTER             StatFpu64SwitchBack;
    10591057    STAMCOUNTER             StatDebug64SwitchBack;
    10601058#endif
    1061 
    10621059#ifdef VBOX_WITH_STATISTICS
    10631060    R3PTRTYPE(PSTAMCOUNTER) paStatExitReason;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette