VirtualBox

Changeset 64626 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Nov 10, 2016 10:31:39 AM (8 years ago)
Author:
vboxsync
Message:

Recompiler, VMM, Devices: Purge the old APIC and the VBOX_WITH_NEW_APIC define.

Location:
trunk/src/VBox
Files:
2 deleted
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Makefile.kmk

    r64509 r64626  
    10431043        IN_VBOXDD2 \
    10441044        $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,) \
    1045         $(if $(VBOX_WITH_NEW_APIC),VBOX_WITH_NEW_APIC,) \
    10461045        $(if $(VBOX_WITH_NEW_IOAPIC),VBOX_WITH_NEW_IOAPIC,)
    10471046 VBoxDD2_INCS           := \
    … …  
    10511050        build/VBoxDD2.cpp  \
    10521051        PC/DevLPC.cpp \
    1053         $(if $(VBOX_WITH_NEW_APIC),,PC/DevAPIC.cpp) \
    1054         $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic_Old.cpp)
     1052        $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic_Old.cpp)
    10551053 VBoxDD2_LIBS            = \
    10561054        $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
    … …  
    12131211  VBoxDD2RC_SOURCES        = \
    12141212        $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic_Old.cpp) \
    1215         $(if $(VBOX_WITH_NEW_APIC),,PC/DevAPIC.cpp) \
    12161213        build/VBoxDD2R0.cpp # Dummy to prevent linking errors.
    12171214  if1of ($(VBOX_LDR_FMT32), pe lx)
    … …  
    12321229 VBoxDD2R0_SOURCES        = \
    12331230        build/VBoxDD2R0.cpp \
    1234         $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic_Old.cpp) \
    1235         $(if $(VBOX_WITH_NEW_APIC),,PC/DevAPIC.cpp)
     1231        $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic_Old.cpp)
    12361232 if1of ($(VBOX_LDR_FMT), pe lx)
    12371233  VBoxDD2R0_LIBS          = \

  • trunk/src/VBox/Devices/build/VBoxDD2.cpp

    r62516 r64626  
    6363    int rc;
    6464
    65 #ifndef VBOX_WITH_NEW_APIC
    66     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceAPIC);
    67     if (RT_FAILURE(rc))
    68         return rc;
    69 #endif
    7065#ifndef VBOX_WITH_NEW_IOAPIC
    7166    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceIOAPIC);

  • trunk/src/VBox/Devices/build/VBoxDD2.h

    r62516 r64626  
    6161#endif /* !IN_VBOXDD2 */
    6262
    63 #ifndef VBOX_WITH_NEW_APIC
    64 extern const PDMDEVREG g_DeviceAPIC;
    65 #endif
    6663#ifndef VBOX_WITH_NEW_IOAPIC
    6764extern const PDMDEVREG g_DeviceIOAPIC;

  • trunk/src/VBox/Devices/testcase/Makefile.kmk

    r62576 r64626  
    3535        $(if $(VBOX_WITH_HGSMI),VBOX_WITH_HGSMI,) \
    3636        $(if $(VBOX_WITH_LSILOGIC),VBOX_WITH_LSILOGIC,) \
    37         $(if $(VBOX_WITH_NEW_APIC),VBOX_WITH_NEW_APIC,) \
    3837        $(if $(VBOX_WITH_NEW_IOAPIC),VBOX_WITH_NEW_IOAPIC,) \
    3938        $(if $(VBOX_WITH_NVME_IMPL),VBOX_WITH_NVME_IMPL,) \
    … …  
    7675        $(VBOX_PATH_DEVICES_SRC)/Bus \
    7776        $(VBOX_DEVICES_TEST_OUT_DIR)
    78  ifdef VBOX_WITH_NEW_APIC
    7977 tstDeviceStructSizeRC_INCS     += $(VBOX_PATH_VMM_DEVICES_SRC)
    80  endif
    8178endif # VBOX_WITH_RAW_MODE
    8279
    … …  
    9895 tstDeviceStructSize.cpp_DEPS = $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeRC.h
    9996endif
    100 ifdef VBOX_WITH_NEW_APIC
    10197 tstDeviceStructSize_INCS     += $(VBOX_PATH_VMM_DEVICES_SRC)
    102 endif
    10398
    10499#

  • trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

    r64596 r64626  
    5757#include "../PC/DevRTC.cpp"
    5858# undef LOG_GROUP
    59 #ifdef VBOX_WITH_NEW_APIC
    6059# include "../../VMM/VMMR3/APIC.cpp"
    61 #else
    62 # include "../PC/DevAPIC.cpp"
    63 #endif
    6460#undef LOG_GROUP
    6561#ifdef VBOX_WITH_NEW_IOAPIC
    … …  
    289285    CHECK_MEMBER_ALIGNMENT(AHCI, lock, 8);
    290286    CHECK_MEMBER_ALIGNMENT(AHCIPort, StatDMA, 8);
    291 #ifdef VBOX_WITH_NEW_APIC
     287
    292288    CHECK_MEMBER_ALIGNMENT(APICDEV, pDevInsR0, 8);
    293289    CHECK_MEMBER_ALIGNMENT(APICDEV, pDevInsRC, 8);
    294 #else
    295 # ifdef VBOX_WITH_STATISTICS
    296     CHECK_MEMBER_ALIGNMENT(APICDeviceInfo, StatMMIOReadGC, 8);
    297 # endif
    298 #endif
     290
    299291    CHECK_MEMBER_ALIGNMENT(ATADevState, cTotalSectors, 8);
    300292    CHECK_MEMBER_ALIGNMENT(ATADevState, StatATADMA, 8);

  • trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

    r64572 r64626  
    5959#include "../PC/DevRTC.cpp"
    6060# undef LOG_GROUP
    61 #ifdef VBOX_WITH_NEW_APIC
    6261# include "../../VMM/VMMR3/APIC.cpp"
    63 #else
    64 # include "../PC/DevAPIC.cpp"
    65 #endif
    6662#undef LOG_GROUP
    6763#ifdef VBOX_WITH_NEW_IOAPIC
    … …  
    693689    GEN_CHECK_OFF(RTCSTATE, CurHintPeriod);
    694690
    695 #ifdef VBOX_WITH_NEW_APIC
    696691    GEN_CHECK_SIZE(APIC);
    697692    GEN_CHECK_OFF(APIC, pApicDevR0);
    … …  
    752747    GEN_CHECK_OFF(APICCPU, StatIcrFullWrite);
    753748# endif /* VBOX_WITH_STATISTICS */
    754 #else
    755     /* PC/DevAPIC.cpp */
    756     GEN_CHECK_SIZE(APICState);
    757     GEN_CHECK_OFF(APICState, apicbase);
    758     GEN_CHECK_OFF(APICState, id);
    759     GEN_CHECK_OFF(APICState, arb_id);
    760     GEN_CHECK_OFF(APICState, tpr);
    761     GEN_CHECK_OFF(APICState, spurious_vec);
    762     GEN_CHECK_OFF(APICState, log_dest);
    763     GEN_CHECK_OFF(APICState, dest_mode);
    764     GEN_CHECK_OFF(APICState, isr);
    765     GEN_CHECK_OFF(APICState, isr.au32Bitmap[1]);
    766     GEN_CHECK_OFF(APICState, tmr);
    767     GEN_CHECK_OFF(APICState, tmr.au32Bitmap[1]);
    768     GEN_CHECK_OFF(APICState, irr);
    769     GEN_CHECK_OFF(APICState, irr.au32Bitmap[1]);
    770     GEN_CHECK_OFF(APICState, lvt);
    771     GEN_CHECK_OFF(APICState, lvt[1]);
    772     GEN_CHECK_OFF(APICState, lvt[APIC_LVT_NB - 1]);
    773     GEN_CHECK_OFF(APICState, esr);
    774     GEN_CHECK_OFF(APICState, icr);
    775     GEN_CHECK_OFF(APICState, icr[1]);
    776     GEN_CHECK_OFF(APICState, divide_conf);
    777     GEN_CHECK_OFF(APICState, count_shift);
    778     GEN_CHECK_OFF(APICState, initial_count);
    779     GEN_CHECK_OFF(APICState, initial_count_load_time);
    780     GEN_CHECK_OFF(APICState, next_time);
    781     GEN_CHECK_OFF(APICState, pTimerR3);
    782     GEN_CHECK_OFF(APICState, pTimerR0);
    783     GEN_CHECK_OFF(APICState, pTimerRC);
    784     GEN_CHECK_OFF(APICState, fTimerArmed);
    785     GEN_CHECK_OFF(APICState, uHintedInitialCount);
    786     GEN_CHECK_OFF(APICState, uHintedCountShift);
    787     GEN_CHECK_OFF(APICState, pszDesc);
    788 # ifdef VBOX_WITH_STATISTICS
    789     GEN_CHECK_OFF(APICState, StatTimerSetInitialCount);
    790     GEN_CHECK_OFF(APICState, StatTimerSetLvtNoRelevantChange);
    791 # endif
    792 
    793     GEN_CHECK_SIZE(APICDeviceInfo);
    794     GEN_CHECK_OFF(APICDeviceInfo, pDevInsR3);
    795     GEN_CHECK_OFF(APICDeviceInfo, pApicHlpR3);
    796     GEN_CHECK_OFF(APICDeviceInfo, paLapicsR3);
    797     GEN_CHECK_OFF(APICDeviceInfo, pCritSectR3);
    798     GEN_CHECK_OFF(APICDeviceInfo, pDevInsR0);
    799     GEN_CHECK_OFF(APICDeviceInfo, pApicHlpR0);
    800     GEN_CHECK_OFF(APICDeviceInfo, paLapicsR0);
    801     GEN_CHECK_OFF(APICDeviceInfo, pCritSectR0);
    802     GEN_CHECK_OFF(APICDeviceInfo, pDevInsRC);
    803     GEN_CHECK_OFF(APICDeviceInfo, pApicHlpRC);
    804     GEN_CHECK_OFF(APICDeviceInfo, paLapicsRC);
    805     GEN_CHECK_OFF(APICDeviceInfo, pCritSectRC);
    806     GEN_CHECK_OFF(APICDeviceInfo, enmMode);
    807     GEN_CHECK_OFF(APICDeviceInfo, cTPRPatchAttempts);
    808     GEN_CHECK_OFF(APICDeviceInfo, cCpus);
    809 # ifdef VBOX_WITH_STATISTICS
    810     GEN_CHECK_OFF(APICDeviceInfo, StatMMIOReadGC);
    811     GEN_CHECK_OFF(APICDeviceInfo, StatMMIOWriteHC);
    812 # endif
    813 #endif  /* VBOX_WITH_NEW_APIC */
    814749
    815750#ifdef VBOX_WITH_NEW_IOAPIC

  • trunk/src/VBox/VMM/Makefile.kmk

    r64559 r64626  
    8888 VMM_COMMON_DEFS += VBOX_WITH_MORE_RING0_MEM_MAPPINGS
    8989endif
    90 ifdef VBOX_WITH_NEW_APIC
    91  VMM_COMMON_DEFS += VBOX_WITH_NEW_APIC
    92 endif
    9390ifdef VBOX_WITH_NEW_IOAPIC
    9491 VMM_COMMON_DEFS += VBOX_WITH_NEW_IOAPIC
    … …  
    145142VBoxVMM_SOURCES  = \
    146143        VBoxVMM.d \
     144        VMMR3/APIC.cpp \
    147145        VMMR3/CFGM.cpp \
    148146        VMMR3/CPUM.cpp \
    … …  
    225223        VMMR3/PATMR3Dbg.cpp \
    226224       ,) \
     225        VMMAll/APICAll.cpp \
    227226        VMMAll/CPUMAllRegs.cpp \
    228227        VMMAll/CPUMAllMsrs.cpp \
    … …  
    282281        VMMAll/PDMAllNetShaper.cpp
    283282endif
    284 ifdef VBOX_WITH_NEW_APIC
    285  VBoxVMM_SOURCES += \
    286         VMMR3/APIC.cpp \
    287         VMMAll/APICAll.cpp
    288 endif
    289283ifdef VBOX_WITH_REM
    290284 VBoxVMM_SOURCES += \
    … …  
    542536        VMMRZ/PGMRZDynMap.cpp \
    543537        VMMRZ/VMMRZ.cpp \
     538        VMMAll/APICAll.cpp \
    544539        VMMAll/CPUMAllRegs.cpp \
    545540        VMMAll/CPUMAllMsrs.cpp \
    … …  
    587582  VMMRC_SOURCES += $(VMMRCImp_0_OUTDIR)/VMMRC.def
    588583 endif
    589  ifdef VBOX_WITH_NEW_APIC
    590   VMMRC_SOURCES += \
    591         VMMAll/APICAll.cpp
    592  endif
    593584 ifdef VBOX_WITH_REM
    594585  VMMRC_SOURCES += \
    … …  
    691682        VMMRZ/DBGFRZ.cpp \
    692683        VMMRZ/VMMRZ.cpp \
     684        VMMAll/APICAll.cpp \
    693685        VMMAll/CPUMAllRegs.cpp \
    694686        VMMAll/CPUMAllMsrs.cpp \
    … …  
    741733        VMMAll/PDMAllNetShaper.cpp
    742734 endif
    743  ifdef VBOX_WITH_NEW_APIC
    744   VMMR0_SOURCES += \
    745         VMMAll/APICAll.cpp
    746  endif
    747735 ifdef VBOX_WITH_REM
    748736  VMMR0_SOURCES += \

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

    r62245 r64626  
    4646#include "../include/DBGFInternal.h"
    4747#include "../include/GIMInternal.h"
    48 #ifdef VBOX_WITH_NEW_APIC
    49 # include "../include/APICInternal.h"
    50 #endif
     48#include "../include/APICInternal.h"
    5149#include "../include/STAMInternal.h"
    5250#include "../include/VMInternal.h"

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

    r64597 r64626  
    2626#include <VBox/vmm/vm.h>
    2727#include <VBox/err.h>
    28 #ifdef VBOX_WITH_NEW_APIC
    29 # include <VBox/vmm/apic.h>
    30 #endif
     28#include <VBox/vmm/apic.h>
    3129
    3230#include <VBox/log.h>
    … …  
    5654{
    5755    PVM pVM = pVCpu->CTX_SUFF(pVM);
    58 
    59 #ifndef VBOX_WITH_NEW_APIC
    60     pdmLock(pVM);
    61 #endif
    6256
    6357    /*
    … …  
    7872            if (rc == VINF_SUCCESS)
    7973                VBOXVMM_PDM_IRQ_GET(pVCpu, RT_LOWORD(uTagSrc), RT_HIWORD(uTagSrc), uVector);
    80 #ifndef VBOX_WITH_NEW_APIC
    81             pdmUnlock(pVM);
    82 #endif
    8374            return rc;
    8475        }
    … …  
    8778    }
    8879
    89 #ifdef VBOX_WITH_NEW_APIC
    9080    pdmLock(pVM);
    91 #endif
    9281
    9382    /*
    … …  
    295284    {
    296285        Assert(pVM->pdm.s.Apic.CTX_SUFF(pfnSetBaseMsr));
    297 #ifndef VBOX_WITH_NEW_APIC
    298         pdmLock(pVM);
    299 #endif
    300286        VBOXSTRICTRC rcStrict = pVM->pdm.s.Apic.CTX_SUFF(pfnSetBaseMsr)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu, u64Base);
    301287
    … …  
    305291        pCtx->msrApicBase = pVM->pdm.s.Apic.CTX_SUFF(pfnGetBaseMsr)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu);
    306292
    307 #ifndef VBOX_WITH_NEW_APIC
    308         pdmUnlock(pVM);
    309 #endif
    310293        return rcStrict;
    311294    }
    … …  
    336319    {
    337320        Assert(pVM->pdm.s.Apic.CTX_SUFF(pfnGetBaseMsr));
    338 #ifdef VBOX_WITH_NEW_APIC
    339321        VMCPU_ASSERT_EMT_OR_NOT_RUNNING(pVCpu);
    340322        *pu64Base = pVM->pdm.s.Apic.CTX_SUFF(pfnGetBaseMsr)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu);
    341 #else
    342         pdmLock(pVM);
    343         *pu64Base = pVM->pdm.s.Apic.CTX_SUFF(pfnGetBaseMsr)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu);
    344         pdmUnlock(pVM);
    345 #endif
    346323        return VINF_SUCCESS;
    347324    }
    … …  
    374351    {
    375352        Assert(pVM->pdm.s.Apic.CTX_SUFF(pfnSetTpr));
    376 #ifdef VBOX_WITH_NEW_APIC
    377353        pVM->pdm.s.Apic.CTX_SUFF(pfnSetTpr)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu, u8TPR);
    378 #else
    379         pdmLock(pVM);
    380         pVM->pdm.s.Apic.CTX_SUFF(pfnSetTpr)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu, u8TPR);
    381         pdmUnlock(pVM);
    382 #endif
    383354        return VINF_SUCCESS;
    384355    }

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

    r62606 r64626  
    3030#include <VBox/vmm/tm.h>
    3131#include <VBox/vmm/gim.h>
    32 #ifdef VBOX_WITH_NEW_APIC
    33 # include <VBox/vmm/apic.h>
    34 #endif
     32#include <VBox/vmm/apic.h>
    3533#include "HMInternal.h"
    3634#include <VBox/vmm/vm.h>
    … …  
    26282626    PSVMVMCB pVmcb        = (PSVMVMCB)pVCpu->hm.s.svm.pvVmcb;
    26292627
    2630 #ifdef VBOX_WITH_NEW_APIC
    26312628    if (VMCPU_FF_TEST_AND_CLEAR(pVCpu, VMCPU_FF_UPDATE_APIC))
    26322629        APICUpdatePendingInterrupts(pVCpu);
    2633 #endif
    26342630
    26352631    SVMEVENT Event;

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

    r64068 r64626  
    3232#include <VBox/vmm/tm.h>
    3333#include <VBox/vmm/gim.h>
     34#include <VBox/vmm/apic.h>
    3435#ifdef VBOX_WITH_REM
    3536# include <VBox/vmm/rem.h>
    36 #endif
    37 #ifdef VBOX_WITH_NEW_APIC
    38 # include <VBox/vmm/apic.h>
    3937#endif
    4038#include "HMInternal.h"
    … …  
    23292327    }
    23302328
    2331 #ifdef VBOX_WITH_NEW_APIC
    23322329#if 0
    23332330    /* Enable posted-interrupt processing. */
    … …  
    23382335        val |= VMX_VMCS_CTRL_PIN_EXEC_POSTED_INTR;
    23392336    }
    2340 #endif
    23412337#endif
    23422338
    … …  
    25082504            val |= VMX_VMCS_CTRL_PROC_EXEC2_UNRESTRICTED_GUEST;         /* Enable Unrestricted Execution. */
    25092505
    2510 #ifdef VBOX_WITH_NEW_APIC
    25112506#if 0
    25122507        if (pVM->hm.s.fVirtApicRegs)
    … …  
    25182513            val |= VMX_VMCS_CTRL_PROC_EXEC2_VIRT_INTR_DELIVERY;         /* Enable virtual-interrupt delivery. */
    25192514        }
    2520 #endif
    25212515#endif
    25222516
    … …  
    75417535    Assert(!TRPMHasTrap(pVCpu));
    75427536
    7543 #ifdef VBOX_WITH_NEW_APIC
    75447537    if (VMCPU_FF_TEST_AND_CLEAR(pVCpu, VMCPU_FF_UPDATE_APIC))
    75457538        APICUpdatePendingInterrupts(pVCpu);
    7546 #endif
    75477539
    75487540    /*

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

    r63560 r64626  
    3434# include <VBox/vmm/pdmpci.h>
    3535#endif
    36 #ifdef VBOX_WITH_NEW_APIC
    37 # include <VBox/vmm/apic.h>
    38 #endif
     36#include <VBox/vmm/apic.h>
    3937
    4038#include <VBox/vmm/gvmm.h>

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

    r64066 r64626  
    11591159     */
    11601160    PDMApicGetBaseMsr(pVCpu, &pCtx->msrApicBase, true /* fIgnoreErrors */);
    1161 #ifdef VBOX_WITH_NEW_APIC
    11621161    LogRel(("CPUM%u: Cached APIC base MSR = %#RX64\n", pVCpu->idCpu, pVCpu->cpum.s.Guest.msrApicBase));
    1163 #endif
    11641162}
    11651163
    … …  
    16111609        /* Cache the local APIC base from the APIC device. During init. this is done in CPUMR3ResetCpu(). */
    16121610        PDMApicGetBaseMsr(pVCpu, &pVCpu->cpum.s.Guest.msrApicBase, true /* fIgnoreErrors */);
    1613 #ifdef VBOX_WITH_NEW_APIC
    16141611        LogRel(("CPUM%u: Cached APIC base MSR = %#RX64\n", idCpu, pVCpu->cpum.s.Guest.msrApicBase));
    1615 #endif
    16161612
    16171613        /* During init. this is done in CPUMR3InitCompleted(). */
    … …  
    25352531                PVMCPU pVCpu = &pVM->aCpus[i];
    25362532                PDMApicGetBaseMsr(pVCpu, &pVCpu->cpum.s.Guest.msrApicBase, true /* fIgnoreErrors */);
    2537 #ifdef VBOX_WITH_NEW_APIC
    25382533                LogRel(("CPUM%u: Cached APIC base MSR = %#RX64\n", i, pVCpu->cpum.s.Guest.msrApicBase));
    2539 #endif
    25402534            }
    25412535            break;

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

    r63560 r64626  
    5050# include <VBox/vmm/rem.h>
    5151#endif
    52 #ifdef VBOX_WITH_NEW_APIC
    53 # include <VBox/vmm/apic.h>
    54 #endif
     52#include <VBox/vmm/apic.h>
    5553#include <VBox/vmm/tm.h>
    5654#include <VBox/vmm/mm.h>
    … …  
    19331931            TMR3TimerQueuesDo(pVM);
    19341932
    1935 #ifdef VBOX_WITH_NEW_APIC
    19361933        /*
    19371934         * Pick up asynchronously posted interrupts into the APIC.
    … …  
    19391936        if (VMCPU_FF_TEST_AND_CLEAR(pVCpu, VMCPU_FF_UPDATE_APIC))
    19401937            APICUpdatePendingInterrupts(pVCpu);
    1941 #endif
    19421938
    19431939        /*
    … …  
    26022598                        if (rc == VINF_SUCCESS)
    26032599                        {
    2604 #ifdef VBOX_WITH_NEW_APIC
    26052600                            if (VMCPU_FF_TEST_AND_CLEAR(pVCpu, VMCPU_FF_UPDATE_APIC))
    26062601                                APICUpdatePendingInterrupts(pVCpu);
    2607 #endif
     2602
    26082603                            if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC
    26092604                                                         | VMCPU_FF_INTERRUPT_NMI  | VMCPU_FF_INTERRUPT_SMI | VMCPU_FF_UNHALT))

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

    r64146 r64626  
    13791379        pVM->hm.s.vmx.fVpid = pVM->hm.s.vmx.fAllowVpid;
    13801380
    1381 #ifdef VBOX_WITH_NEW_APIC
    13821381#if 0
    13831382    /*
    … …  
    13961395        && (pVM->hm.s.vmx.Msrs.VmxExit.n.allowed1 & VMX_VMCS_CTRL_EXIT_ACK_EXT_INT))
    13971396        pVM->hm.s.fPostedIntrs = true;
    1398 #endif
    13991397#endif
    14001398

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

    r64373 r64626  
    2828#include <VBox/vmm/hm.h>
    2929#include <VBox/vmm/cfgm.h>
    30 #ifdef VBOX_WITH_NEW_APIC
    31 # include <VBox/vmm/apic.h>
    32 #endif
     30#include <VBox/vmm/apic.h>
    3331#ifdef VBOX_WITH_REM
    3432# include <VBox/vmm/rem.h>
    … …  
    504502    RegCB.pCfgNode         = NULL;
    505503
    506 #ifdef VBOX_WITH_NEW_APIC
    507504    /*
    508505     * Load the internal VMM APIC device.
    … …  
    510507    int rc2 = pdmR3DevReg_Register(&RegCB.Core, &g_DeviceAPIC);
    511508    AssertRCReturn(rc2, rc2);
    512 #endif
    513509
    514510    /*

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

    r63648 r64626  
    6161# include <VBox/vmm/rem.h>
    6262#endif
    63 #ifdef VBOX_WITH_NEW_APIC
    64 # include <VBox/vmm/apic.h>
    65 #endif
     63#include <VBox/vmm/apic.h>
    6664#include <VBox/vmm/tm.h>
    6765#include <VBox/vmm/stam.h>

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

    r63560 r64626  
    120120#include <VBox/vmm/csam.h>
    121121#include <VBox/vmm/patm.h>
    122 #ifdef VBOX_WITH_NEW_APIC
    123 # include <VBox/vmm/apic.h>
    124 #endif
     122#include <VBox/vmm/apic.h>
    125123#ifdef VBOX_WITH_REM
    126124# include <VBox/vmm/rem.h>
    … …  
    14861484    PGMR3ResetCpu(pVM, pVCpu);
    14871485    PDMR3ResetCpu(pVCpu);   /* Only clears pending interrupts force flags */
    1488 #ifdef VBOX_WITH_NEW_APIC
    14891486    APICR3InitIpi(pVCpu);
    1490 #endif
    14911487    TRPMR3ResetCpu(pVCpu);
    14921488    CPUMR3ResetCpu(pVM, pVCpu);

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

    r62606 r64626  
    2828#include <VBox/vmm/em.h>
    2929#include <VBox/vmm/gim.h>
    30 #ifdef VBOX_WITH_NEW_APIC
    31 # include <VBox/vmm/apic.h>
    32 #endif
     30#include <VBox/vmm/apic.h>
    3331#include <VBox/vmm/csam.h>
    3432#include <VBox/vmm/patm.h>
    … …  
    229227        else
    230228        {
    231 #ifdef VBOX_WITH_NEW_APIC
    232229            /* APIC needs updating. */
    233230            if (VMCPU_FF_TEST_AND_CLEAR(pVCpu, VMCPU_FF_UPDATE_APIC))
    234231                APICUpdatePendingInterrupts(pVCpu);
    235 #endif
     232
    236233            if (VMCPU_FF_TEST_AND_CLEAR(pVCpu, VMCPU_FF_CPUM))
    237234                CPUMRCProcessForceFlag(pVCpu);

  • trunk/src/VBox/VMM/testcase/Makefile.kmk

    r63996 r64626  
    151151  tstVMStructRC_DEFS    += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    152152 endif
    153  ifdef VBOX_WITH_NEW_APIC
    154   tstVMStructRC_DEFS    += VBOX_WITH_NEW_APIC
    155  endif
    156153 tstVMStructRC_SOURCES   = tstVMStructRC.cpp
    157154 tstVMStructRC_INCS      = \
    … …  
    179176 tstVMStructSize_DEFS  += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    180177endif
    181 ifdef VBOX_WITH_NEW_APIC
    182  tstVMStructSize_DEFS  += VBOX_WITH_NEW_APIC
    183 endif
    184178
    185179tstAsmStructs_TEMPLATE  = VBOXR3AUTOTST
    … …  
    193187ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    194188 tstAsmStructs_DEFS    += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    195 endif
    196 ifdef VBOX_WITH_NEW_APIC
    197  tstAsmStructs_DEFS    += VBOX_WITH_NEW_APIC
    198189endif
    199190tstAsmStructs_INCS      = \
    … …  
    211202 ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    212203  tstAsmStructsRC_DEFS  += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    213  endif
    214  ifdef VBOX_WITH_NEW_APIC
    215   tstAsmStructsRC_DEFS  += VBOX_WITH_NEW_APIC
    216204 endif
    217205 tstAsmStructsRC_INCS    = \
    … …  
    496484  tstVMStructDTrace_DEFS  += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    497485 endif
    498  ifdef VBOX_WITH_NEW_APIC
    499   tstVMStructDTrace_DEFS  += VBOX_WITH_NEW_APIC
    500  endif
    501486
    502487
    … …  
    540525                        $(DEFS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
    541526                        $(if $(VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI),VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI,) \
    542                         $(if $(VBOX_WITH_NEW_APIC),VBOX_WITH_NEW_APIC,) \
    543527                ) \
    544528                -f $(if $(eq $(KBUILD_TARGET),darwin),macho,elf) \

  • trunk/src/VBox/VMM/testcase/tstVMStruct.h

    r64373 r64626  
    13821382#endif
    13831383
    1384 #ifdef VBOX_WITH_NEW_APIC
    13851384    GEN_CHECK_SIZE(APIC);
    13861385    GEN_CHECK_OFF(APIC, pApicDevR0);
    … …  
    14051404    GEN_CHECK_OFF(APICCPU, pTimerRC);
    14061405    GEN_CHECK_OFF(APICCPU, TimerCritSect);
    1407 #endif
    14081406
    14091407    GEN_CHECK_SIZE(VM);
    … …  
    14741472    GEN_CHECK_OFF(VM, vm);
    14751473    GEN_CHECK_OFF(VM, cfgm);
    1476 #ifdef VBOX_WITH_NEW_APIC
    14771474    GEN_CHECK_OFF(VM, apic);
    1478 #endif
    14791475    GEN_CHECK_OFF(VM, aCpus);
    14801476
    … …  
    15041500    GEN_CHECK_OFF(VMCPU, dbgf);
    15051501    GEN_CHECK_OFF(VMCPU, gim);
    1506 #ifdef VBOX_WITH_NEW_APIC
    15071502    GEN_CHECK_OFF(VMCPU, apic);
    1508 #endif
    15091503    GEN_CHECK_OFF(VMCPU, pgm);
    15101504    GEN_CHECK_OFF(VMCPU, cpum);

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

    r64545 r64626  
    4444#include "REMInternal.h"
    4545#include "HMInternal.h"
    46 #ifdef VBOX_WITH_NEW_APIC
    47 # include "APICInternal.h"
    48 #endif
     46#include "APICInternal.h"
    4947#include "VMMInternal.h"
    5048#include "DBGFInternal.h"

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

    r64545 r64626  
    7272#include "REMInternal.h"
    7373#include "HMInternal.h"
    74 #ifdef VBOX_WITH_NEW_APIC
    75 # include "APICInternal.h"
    76 #endif
     74#include "APICInternal.h"
    7775#include "PATMInternal.h"
    7876#include "VMMInternal.h"

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

    r64545 r64626  
    4747#include "DBGFInternal.h"
    4848#include "GIMInternal.h"
    49 #ifdef VBOX_WITH_NEW_APIC
    50 # include "APICInternal.h"
    51 #endif
     49#include "APICInternal.h"
    5250#include "STAMInternal.h"
    5351#include "VMInternal.h"
    … …  
    239237    CHECK_PADDING_VM(8, vm);
    240238    CHECK_PADDING_VM(8, cfgm);
    241 #ifdef VBOX_WITH_NEW_APIC
    242239    CHECK_PADDING_VM(8, apic);
    243 #endif
    244240
    245241    PRINT_OFFSET(VMCPU, cpum);
    … …  
    254250    CHECK_PADDING_VMCPU(64, dbgf);
    255251    CHECK_PADDING_VMCPU(64, gim);
    256 #ifdef VBOX_WITH_NEW_APIC
    257252    CHECK_PADDING_VMCPU(64, apic);
    258 #endif
     253
    259254    PRINT_OFFSET(VMCPU, pgm);
    260255    CHECK_PADDING_VMCPU(4096, pgm);

  • trunk/src/VBox/VMM/tools/Makefile.kmk

    r63710 r64626  
    4646VBoxVMMPreload_SOURCES    = VBoxVMMPreload.cpp
    4747VBoxVMMPreload_DEFS       = \
    48         $(if $(VBOX_WITH_NEW_APIC),VBOX_WITH_NEW_APIC,) \
    4948        $(if $(VBOX_WITH_NEW_IOAPIC),VBOX_WITH_NEW_IOAPIC,)
    5049VBoxVMMPreload_LIBS = $(LIB_RUNTIME)

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

    r63710 r64626  
    4848    { "VMMR0.r0",       true,  NULL },
    4949    { "VBoxDDR0.r0",    true,  NULL },
    50 #if !defined(VBOX_WITH_NEW_APIC) || !defined(VBOX_WITH_NEW_IOAPIC)
     50#if !defined(VBOX_WITH_NEW_IOAPIC)
    5151    { "VBoxDD2R0.r0",   true,  NULL },
    5252#endif
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