VirtualBox

Changeset 12799 in vbox


Ignore:
Timestamp:
Sep 29, 2008 1:35:29 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
37145
Message:

r=bird: cpuid -> idCpu like we use elsewhere (mixed case!).

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/include/VBox/pdmdev.h

    r12689 r12799  
    10551055     *
    10561056     * @param   pDevIns         Device instance of the APIC.
    1057      * @param   cpuid           Virtual CPU to set flag upon.
    1058      */
    1059     DECLRCCALLBACKMEMBER(void, pfnSetInterruptFF,(PPDMDEVINS pDevIns, VMCPUID cpuid));
     1057     * @param   idCpu           Virtual CPU to set flag upon.
     1058     */
     1059    DECLRCCALLBACKMEMBER(void, pfnSetInterruptFF,(PPDMDEVINS pDevIns, VMCPUID idCpu));
    10601060
    10611061    /**
    … …  
    10631063     *
    10641064     * @param   pDevIns         Device instance of the APIC.
    1065      * @param   cpuid           Virtual CPU to clear flag upon.
    1066      */
    1067     DECLRCCALLBACKMEMBER(void, pfnClearInterruptFF,(PPDMDEVINS pDevIns, VMCPUID cpuid));
     1065     * @param   idCpu           Virtual CPU to clear flag upon.
     1066     */
     1067    DECLRCCALLBACKMEMBER(void, pfnClearInterruptFF,(PPDMDEVINS pDevIns, VMCPUID idCpu));
    10681068
    10691069    /**
    … …  
    11231123     *
    11241124     * @param   pDevIns         Device instance of the APIC.
    1125      * @param   cpuid           Virtual CPU to set flag upon.
    1126      */
    1127     DECLR0CALLBACKMEMBER(void, pfnSetInterruptFF,(PPDMDEVINS pDevIns, VMCPUID cpuid));
     1125     * @param   idCpu           Virtual CPU to set flag upon.
     1126     */
     1127    DECLR0CALLBACKMEMBER(void, pfnSetInterruptFF,(PPDMDEVINS pDevIns, VMCPUID idCpu));
    11281128
    11291129    /**
    … …  
    11311131     *
    11321132     * @param   pDevIns         Device instance of the APIC.
    1133      * @param   cpuid           Virtual CPU to clear flag upon.
    1134      */
    1135     DECLR0CALLBACKMEMBER(void, pfnClearInterruptFF,(PPDMDEVINS pDevIns, VMCPUID cpuid));
     1133     * @param   idCpu           Virtual CPU to clear flag upon.
     1134     */
     1135    DECLR0CALLBACKMEMBER(void, pfnClearInterruptFF,(PPDMDEVINS pDevIns, VMCPUID idCpu));
    11361136
    11371137    /**
    … …  
    11901190     *
    11911191     * @param   pDevIns         Device instance of the APIC.
    1192      * @param   cpuid           Virtual CPU to set flag upon.
    1193      */
    1194     DECLR3CALLBACKMEMBER(void, pfnSetInterruptFF,(PPDMDEVINS pDevIns, VMCPUID cpuid));
     1192     * @param   idCpu           Virtual CPU to set flag upon.
     1193     */
     1194    DECLR3CALLBACKMEMBER(void, pfnSetInterruptFF,(PPDMDEVINS pDevIns, VMCPUID idCpu));
    11951195
    11961196    /**
    … …  
    11981198     *
    11991199     * @param   pDevIns         Device instance of the APIC.
    1200      * @param   cpuid           Virtual CPU to clear flag upon.
    1201      */
    1202     DECLR3CALLBACKMEMBER(void, pfnClearInterruptFF,(PPDMDEVINS pDevIns, VMCPUID cpuid));
     1200     * @param   idCpu           Virtual CPU to clear flag upon.
     1201     */
     1202    DECLR3CALLBACKMEMBER(void, pfnClearInterruptFF,(PPDMDEVINS pDevIns, VMCPUID idCpu));
    12031203
    12041204    /**

  • TabularUnified trunk/include/VBox/vm.h

    r12794 r12799  
    217217 */
    218218#if 1
    219 # define VM_FF_SET(pVM, fFlag)           ASMAtomicOrU32(&(pVM)->fForcedActions, (fFlag))
     219# define VM_FF_SET(pVM, fFlag)              ASMAtomicOrU32(&(pVM)->fForcedActions, (fFlag))
    220220#else
    221221# define VM_FF_SET(pVM, fFlag) \
    … …  
    229229 *
    230230 * @param   pVM     VM Handle.
    231  * @param   cpu     Virtual CPU id.
     231 * @param   idCpu   Virtual CPU ID.
    232232 * @param   fFlag   The flag to set.
    233233 */
    234234#ifdef VBOX_WITH_SMP_GUESTS
    235 # define VMCPU_FF_SET(pVM, cpu, fFlag)   ASMAtomicOrU32(&(pVM)->aCpus[cpu].fForcedActions, (fFlag))
    236 #else
    237 # define VMCPU_FF_SET(pVM, cpu, fFlag)   VM_FF_SET(pVM, fFlag)
     235# define VMCPU_FF_SET(pVM, idCpu, fFlag)    ASMAtomicOrU32(&(pVM)->aCpus[idCpu].fForcedActions, (fFlag))
     236#else
     237# define VMCPU_FF_SET(pVM, idCpu, fFlag)    VM_FF_SET(pVM, fFlag)
    238238#endif
    239239
    … …  
    245245 */
    246246#if 1
    247 # define VM_FF_CLEAR(pVM, fFlag)         ASMAtomicAndU32(&(pVM)->fForcedActions, ~(fFlag))
     247# define VM_FF_CLEAR(pVM, fFlag)            ASMAtomicAndU32(&(pVM)->fForcedActions, ~(fFlag))
    248248#else
    249249# define VM_FF_CLEAR(pVM, fFlag) \
    … …  
    257257 *
    258258 * @param   pVM     VM Handle.
    259  * @param   cpu     Virtual CPU id.
     259 * @param   idCpu   Virtual CPU ID.
    260260 * @param   fFlag   The flag to clear.
    261261 */
    262262#ifdef VBOX_WITH_SMP_GUESTS
    263 # define VMCPU_FF_CLEAR(pVM, cpu, fFlag) ASMAtomicAndU32(&(pVM)->aCpus[cpu].fForcedActions, ~(fFlag))
    264 #else
    265 # define VMCPU_FF_CLEAR(pVM, cpu, fFlag) VM_FF_CLEAR(pVM, fFlag)
     263# define VMCPU_FF_CLEAR(pVM, idCpu, fFlag)  ASMAtomicAndU32(&(pVM)->aCpus[idCpu].fForcedActions, ~(fFlag))
     264#else
     265# define VMCPU_FF_CLEAR(pVM, idCpu, fFlag) VM_FF_CLEAR(pVM, fFlag)
    266266#endif
    267267
    … …  
    272272 * @param   fFlag   The flag to check.
    273273 */
    274 #define VM_FF_ISSET(pVM, fFlag)         (((pVM)->fForcedActions & (fFlag)) == (fFlag))
     274#define VM_FF_ISSET(pVM, fFlag)             (((pVM)->fForcedActions & (fFlag)) == (fFlag))
    275275
    276276/** @def VMCPU_FF_ISSET
    … …  
    278278 *
    279279 * @param   pVM     VM Handle.
    280  * @param   cpu     Virtual CPU id.
     280 * @param   idCpu   Virtual CPU ID.
    281281 * @param   fFlag   The flag to check.
    282282 */
    283283#ifdef VBOX_WITH_SMP_GUESTS
    284 #define VMCPU_FF_ISSET(pVM, cpu, fFlag) (((pVM)->aCpus[cpu].fForcedActions & (fFlag)) == (fFlag))
    285 #else
    286 #define VMCPU_FF_ISSET(pVM, cpu, fFlag)  VM_FF_ISSET(pVM, fFlag)
     284# define VMCPU_FF_ISSET(pVM, idCpu, fFlag)  (((pVM)->aCpus[idCpu].fForcedActions & (fFlag)) == (fFlag))
     285#else
     286# define VMCPU_FF_ISSET(pVM, idCpu, fFlag)  VM_FF_ISSET(pVM, fFlag)
    287287#endif
    288288
    … …  
    293293 * @param   fFlags  The flags to check for.
    294294 */
    295 #define VM_FF_ISPENDING(pVM, fFlags)    ((pVM)->fForcedActions & (fFlags))
     295#define VM_FF_ISPENDING(pVM, fFlags)        ((pVM)->fForcedActions & (fFlags))
    296296
    297297/** @def VMCPU_FF_ISPENDING
    … …  
    299299 *
    300300 * @param   pVM     VM Handle.
    301  * @param   cpu     Virtual CPU id.
     301 * @param   idCpu   Virtual CPU ID.
    302302 * @param   fFlags  The flags to check for.
    303303 */
    304304#ifdef VBOX_WITH_SMP_GUESTS
    305 #define VMCPU_FF_ISPENDING(pVM, cpu, fFlags) ((pVM)->aCpus[cpu].fForcedActions & (fFlags))
    306 #else
    307 #define VMCPU_FF_ISPENDING(pVM, cpu, fFlags) VM_FF_ISPENDING(pVM, fFlags)
     305# define VMCPU_FF_ISPENDING(pVM, idCpu, fFlags) ((pVM)->aCpus[idCpu].fForcedActions & (fFlags))
     306#else
     307# define VMCPU_FF_ISPENDING(pVM, idCpu, fFlags) VM_FF_ISPENDING(pVM, fFlags)
    308308#endif
    309309
    … …  
    315315 */
    316316#ifdef IN_GC
    317 # define VM_IS_EMT(pVM)                 true
     317# define VM_IS_EMT(pVM)                     true
    318318#elif defined(IN_RING0)
    319 # define VM_IS_EMT(pVM)                 true
     319# define VM_IS_EMT(pVM)                     true
    320320#else
    321321/** @todo need to rework this macro for the case of multiple emulation threads for SMP */
    322 # define VM_IS_EMT(pVM)                 ((pVM)->NativeThreadEMT == RTThreadNativeSelf())
     322# define VM_IS_EMT(pVM)                     ((pVM)->NativeThreadEMT == RTThreadNativeSelf())
    323323#endif
    324324
    … …  
    327327 */
    328328#ifdef IN_GC
    329 # define VM_ASSERT_EMT(pVM) Assert(VM_IS_EMT(pVM))
     329# define VM_ASSERT_EMT(pVM)                 Assert(VM_IS_EMT(pVM))
    330330#elif defined(IN_RING0)
    331 # define VM_ASSERT_EMT(pVM) Assert(VM_IS_EMT(pVM))
     331# define VM_ASSERT_EMT(pVM)                 Assert(VM_IS_EMT(pVM))
    332332#else
    333333# define VM_ASSERT_EMT(pVM) \
    … …  
    340340 */
    341341#ifdef IN_GC
    342 # define VM_ASSERT_EMT_RETURN(pVM, rc)  AssertReturn(VM_IS_EMT(pVM), (rc))
     342# define VM_ASSERT_EMT_RETURN(pVM, rc)      AssertReturn(VM_IS_EMT(pVM), (rc))
    343343#elif defined(IN_RING0)
    344 # define VM_ASSERT_EMT_RETURN(pVM, rc)  AssertReturn(VM_IS_EMT(pVM), (rc))
     344# define VM_ASSERT_EMT_RETURN(pVM, rc)      AssertReturn(VM_IS_EMT(pVM), (rc))
    345345#else
    346346# define VM_ASSERT_EMT_RETURN(pVM, rc) \

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

    r12772 r12799  
    234234 * @{
    235235 */
    236 static DECLCALLBACK(void) pdmR3ApicHlp_SetInterruptFF(PPDMDEVINS pDevIns, VMCPUID cpuid);
    237 static DECLCALLBACK(void) pdmR3ApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns, VMCPUID cpuid);
     236static DECLCALLBACK(void) pdmR3ApicHlp_SetInterruptFF(PPDMDEVINS pDevIns, VMCPUID idCpu);
     237static DECLCALLBACK(void) pdmR3ApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns, VMCPUID idCpu);
    238238static DECLCALLBACK(void) pdmR3ApicHlp_ChangeFeature(PPDMDEVINS pDevIns, bool fEnabled);
    239239static DECLCALLBACK(int) pdmR3ApicHlp_Lock(PPDMDEVINS pDevIns, int rc);
    … …  
    41254125
    41264126/** @copydoc PDMAPICHLPR3::pfnSetInterruptFF */
    4127 static DECLCALLBACK(void) pdmR3ApicHlp_SetInterruptFF(PPDMDEVINS pDevIns, VMCPUID cpuid)
     4127static DECLCALLBACK(void) pdmR3ApicHlp_SetInterruptFF(PPDMDEVINS pDevIns, VMCPUID idCpu)
    41284128{
    41294129    PDMDEV_ASSERT_DEVINS(pDevIns);
    41304130    PVM pVM = pDevIns->Internal.s.pVMHC;
    41314131    LogFlow(("pdmR3ApicHlp_SetInterruptFF: caller='%s'/%d: VM_FF_INTERRUPT %d -> 1\n",
    4132              pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, VMCPU_FF_ISSET(pVM, cpuid, VM_FF_INTERRUPT_APIC)));
    4133     VMCPU_FF_SET(pVM, cpuid, VM_FF_INTERRUPT_APIC);
     4132             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, VMCPU_FF_ISSET(pVM, idCpu, VM_FF_INTERRUPT_APIC)));
     4133    VMCPU_FF_SET(pVM, idCpu, VM_FF_INTERRUPT_APIC);
    41344134    REMR3NotifyInterruptSet(pVM);
    41354135    VMR3NotifyFF(pVM, true);
    … …  
    41384138
    41394139/** @copydoc PDMAPICHLPR3::pfnClearInterruptFF */
    4140 static DECLCALLBACK(void) pdmR3ApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns, VMCPUID cpuid)
     4140static DECLCALLBACK(void) pdmR3ApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns, VMCPUID idCpu)
    41414141{
    41424142    PDMDEV_ASSERT_DEVINS(pDevIns);
    41434143    LogFlow(("pdmR3ApicHlp_ClearInterruptFF: caller='%s'/%d: VM_FF_INTERRUPT %d -> 0\n",
    4144              pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, VMCPU_FF_ISSET(pDevIns->Internal.s.pVMHC, cpuid, VM_FF_INTERRUPT_APIC)));
    4145     VMCPU_FF_CLEAR(pDevIns->Internal.s.pVMHC, cpuid, VM_FF_INTERRUPT_APIC);
     4144             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, VMCPU_FF_ISSET(pDevIns->Internal.s.pVMHC, idCpu, VM_FF_INTERRUPT_APIC)));
     4145    VMCPU_FF_CLEAR(pDevIns->Internal.s.pVMHC, idCpu, VM_FF_INTERRUPT_APIC);
    41464146    REMR3NotifyInterruptClear(pDevIns->Internal.s.pVMHC);
    41474147}

  • TabularUnified trunk/src/VBox/VMM/VMMGC/PDMGCDevice.cpp

    r12684 r12799  
    9999 * @{
    100100 */
    101 static DECLCALLBACK(void) pdmRCApicHlp_SetInterruptFF(PPDMDEVINS pDevIns, VMCPUID cpuid);
    102 static DECLCALLBACK(void) pdmRCApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns, VMCPUID cpuid);
     101static DECLCALLBACK(void) pdmRCApicHlp_SetInterruptFF(PPDMDEVINS pDevIns, VMCPUID idCpu);
     102static DECLCALLBACK(void) pdmRCApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns, VMCPUID idCpu);
    103103static DECLCALLBACK(void) pdmRCApicHlp_ChangeFeature(PPDMDEVINS pDevIns, bool fEnabled);
    104104static DECLCALLBACK(int) pdmRCApicHlp_Lock(PPDMDEVINS pDevIns, int rc);
    … …  
    395395
    396396/** @copydoc PDMAPICHLPRC::pfnSetInterruptFF */
    397 static DECLCALLBACK(void) pdmRCApicHlp_SetInterruptFF(PPDMDEVINS pDevIns, VMCPUID cpuid)
     397static DECLCALLBACK(void) pdmRCApicHlp_SetInterruptFF(PPDMDEVINS pDevIns, VMCPUID idCpu)
    398398{
    399399    PDMDEV_ASSERT_DEVINS(pDevIns);
    400400    LogFlow(("pdmRCApicHlp_SetInterruptFF: caller=%p/%d: VM_FF_INTERRUPT %d -> 1\n",
    401              pDevIns, pDevIns->iInstance, VMCPU_FF_ISSET(pDevIns->Internal.s.pVMGC, cpuid, VM_FF_INTERRUPT_APIC)));
    402     VMCPU_FF_SET(pDevIns->Internal.s.pVMGC, cpuid, VM_FF_INTERRUPT_APIC);
     401             pDevIns, pDevIns->iInstance, VMCPU_FF_ISSET(pDevIns->Internal.s.pVMGC, idCpu, VM_FF_INTERRUPT_APIC)));
     402    VMCPU_FF_SET(pDevIns->Internal.s.pVMGC, idCpu, VM_FF_INTERRUPT_APIC);
    403403}
    404404
    405405
    406406/** @copydoc PDMAPICHLPRC::pfnClearInterruptFF */
    407 static DECLCALLBACK(void) pdmRCApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns, VMCPUID cpuid)
     407static DECLCALLBACK(void) pdmRCApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns, VMCPUID idCpu)
    408408{
    409409    PDMDEV_ASSERT_DEVINS(pDevIns);
    410410    LogFlow(("pdmRCApicHlp_ClearInterruptFF: caller=%p/%d: VM_FF_INTERRUPT %d -> 0\n",
    411              pDevIns, pDevIns->iInstance, VMCPU_FF_ISSET(pDevIns->Internal.s.pVMGC, cpuid, VM_FF_INTERRUPT_APIC)));
    412     VMCPU_FF_CLEAR(pDevIns->Internal.s.pVMGC, cpuid, VM_FF_INTERRUPT_APIC);
     411             pDevIns, pDevIns->iInstance, VMCPU_FF_ISSET(pDevIns->Internal.s.pVMGC, idCpu, VM_FF_INTERRUPT_APIC)));
     412    VMCPU_FF_CLEAR(pDevIns->Internal.s.pVMGC, idCpu, VM_FF_INTERRUPT_APIC);
    413413}
    414414

  • TabularUnified trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp

    r12684 r12799  
    9999 * @{
    100100 */
    101 static DECLCALLBACK(void) pdmR0ApicHlp_SetInterruptFF(PPDMDEVINS pDevIns, VMCPUID cpuid);
    102 static DECLCALLBACK(void) pdmR0ApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns, VMCPUID cpuid);
     101static DECLCALLBACK(void) pdmR0ApicHlp_SetInterruptFF(PPDMDEVINS pDevIns, VMCPUID idCpu);
     102static DECLCALLBACK(void) pdmR0ApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns, VMCPUID idCpu);
    103103static DECLCALLBACK(void) pdmR0ApicHlp_ChangeFeature(PPDMDEVINS pDevIns, bool fEnabled);
    104104static DECLCALLBACK(int) pdmR0ApicHlp_Lock(PPDMDEVINS pDevIns, int rc);
    … …  
    398398
    399399/** @copydoc PDMAPICHLPR0::pfnSetInterruptFF */
    400 static DECLCALLBACK(void) pdmR0ApicHlp_SetInterruptFF(PPDMDEVINS pDevIns, VMCPUID cpuid)
    401 {
    402     PDMDEV_ASSERT_DEVINS(pDevIns);
    403    
     400static DECLCALLBACK(void) pdmR0ApicHlp_SetInterruptFF(PPDMDEVINS pDevIns, VMCPUID idCpu)
     401{
     402    PDMDEV_ASSERT_DEVINS(pDevIns);
     403
    404404    LogFlow(("pdmR0ApicHlp_SetInterruptFF: caller=%p/%d: VM_FF_INTERRUPT %d -> 1\n",
    405              pDevIns, pDevIns->iInstance, VMCPU_FF_ISSET(pDevIns->Internal.s.pVMHC, cpuid, VM_FF_INTERRUPT_APIC)));
    406     VMCPU_FF_SET(pDevIns->Internal.s.pVMHC, cpuid, VM_FF_INTERRUPT_APIC);
     405             pDevIns, pDevIns->iInstance, VMCPU_FF_ISSET(pDevIns->Internal.s.pVMHC, idCpu, VM_FF_INTERRUPT_APIC)));
     406    VMCPU_FF_SET(pDevIns->Internal.s.pVMHC, idCpu, VM_FF_INTERRUPT_APIC);
    407407}
    408408
    409409
    410410/** @copydoc PDMAPICHLPR0::pfnClearInterruptFF */
    411 static DECLCALLBACK(void) pdmR0ApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns, VMCPUID cpuid)
    412 {
    413     PDMDEV_ASSERT_DEVINS(pDevIns);
    414    
     411static DECLCALLBACK(void) pdmR0ApicHlp_ClearInterruptFF(PPDMDEVINS pDevIns, VMCPUID idCpu)
     412{
     413    PDMDEV_ASSERT_DEVINS(pDevIns);
     414
    415415    LogFlow(("pdmR0ApicHlp_ClearInterruptFF: caller=%p/%d: VM_FF_INTERRUPT %d -> 0\n",
    416              pDevIns, pDevIns->iInstance, VMCPU_FF_ISSET(pDevIns->Internal.s.pVMHC, cpuid, VM_FF_INTERRUPT_APIC)));
    417     VMCPU_FF_CLEAR(pDevIns->Internal.s.pVMHC, cpuid, VM_FF_INTERRUPT_APIC);
     416             pDevIns, pDevIns->iInstance, VMCPU_FF_ISSET(pDevIns->Internal.s.pVMHC, idCpu, VM_FF_INTERRUPT_APIC)));
     417    VMCPU_FF_CLEAR(pDevIns->Internal.s.pVMHC, idCpu, VM_FF_INTERRUPT_APIC);
    418418}
    419419
Note: See TracChangeset for help on using the changeset viewer.

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