VirtualBox

Changeset 65338 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Jan 16, 2017 2:11:15 PM (8 years ago)
Author:
vboxsync
Message:

Remove the old, unused I/O APIC code and related define.

Location:
trunk/src/VBox
Files:
1 deleted
15 edited

Legend:

Unmodified
Added
Removed

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

    r65151 r65338  
    120120        VBOX_HGCM_HOST_CODE \
    121121        $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
    122         $(if $(VBOX_WITH_NEW_IOAPIC),VBOX_WITH_NEW_IOAPIC,) \
    123122        $(if $(VBOX_BIOS_DMI_FALLBACK),VBOX_BIOS_DMI_FALLBACK,) \
    124123        VBOX_WITH_DMI_CHASSIS \
    … …  
    159158        PC/DevDMA.cpp \
    160159        PC/DevHPET.cpp \
    161         $(if $(VBOX_WITH_NEW_IOAPIC),PC/DevIoApic.cpp,) \
     160        PC/DevIoApic.cpp \
    162161        Storage/DevFdc.cpp \
    163162        Serial/DevSerial.cpp \
    … …  
    929928        Input/PS2M.cpp \
    930929        PC/DevACPI.cpp \
    931         $(if $(VBOX_WITH_NEW_IOAPIC),PC/DevIoApic.cpp,) \
     930        PC/DevIoApic.cpp \
    932931        PC/DevPit-i8254.cpp \
    933932        PC/DevPIC.cpp \
    … …  
    10481047 VBoxDD2_DEFS            = \
    10491048        IN_VBOXDD2 \
    1050         $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,) \
    1051         $(if $(VBOX_WITH_NEW_IOAPIC),VBOX_WITH_NEW_IOAPIC,)
     1049        $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,)
    10521050 VBoxDD2_INCS           := \
    10531051        build \
    … …  
    10551053 VBoxDD2_SOURCES         = \
    10561054        build/VBoxDD2.cpp  \
    1057         PC/DevLPC.cpp \
    1058         $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic_Old.cpp)
     1055        PC/DevLPC.cpp
    10591056 VBoxDD2_LIBS            = \
    10601057        $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
    … …  
    10921089        Input/PS2M.cpp \
    10931090        PC/DevACPI.cpp \
    1094         $(if $(VBOX_WITH_NEW_IOAPIC),PC/DevIoApic.cpp,) \
     1091        PC/DevIoApic.cpp \
    10951092        PC/DevPit-i8254.cpp \
    10961093        PC/DevPIC.cpp \
    … …  
    12161213  VBoxDD2RC_INCS           = build
    12171214  VBoxDD2RC_SOURCES        = \
    1218         $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic_Old.cpp) \
    12191215        build/VBoxDD2R0.cpp # Dummy to prevent linking errors.
    12201216  if1of ($(VBOX_LDR_FMT32), pe lx)
    … …  
    12341230 VBoxDD2R0_INCS           = build
    12351231 VBoxDD2R0_SOURCES        = \
    1236         build/VBoxDD2R0.cpp \
    1237         $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic_Old.cpp)
     1232        build/VBoxDD2R0.cpp
    12381233 if1of ($(VBOX_LDR_FMT), pe lx)
    12391234  VBoxDD2R0_LIBS          = \

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

    r65057 r65338  
    6666    if (RT_FAILURE(rc))
    6767        return rc;
    68 #ifdef VBOX_WITH_NEW_IOAPIC
    6968    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceIOAPIC);
    7069    if (RT_FAILURE(rc))
    7170        return rc;
    72 #endif
    7371    rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePS2KeyboardMouse);
    7472    if (RT_FAILURE(rc))

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

    r65057 r65338  
    3535extern const PDMDEVREG g_DevicePcArch;
    3636extern const PDMDEVREG g_DevicePcBios;
    37 #ifdef VBOX_WITH_NEW_IOAPIC
    3837extern const PDMDEVREG g_DeviceIOAPIC;
    39 #endif
    4038extern const PDMDEVREG g_DevicePS2KeyboardMouse;
    4139extern const PDMDEVREG g_DeviceI8254;

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

    r64626 r65338  
    6161    LogFlow(("VBoxDevicesRegister: u32Version=%#x\n", u32Version));
    6262    AssertReleaseMsg(u32Version == VBOX_VERSION, ("u32Version=%#x VBOX_VERSION=%#x\n", u32Version, VBOX_VERSION));
    63     int rc;
    6463
    65 #ifndef VBOX_WITH_NEW_IOAPIC
    66     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceIOAPIC);
    67     if (RT_FAILURE(rc))
    68         return rc;
    69 #endif
    70     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceLPC);
     64    int rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceLPC);
    7165    if (RT_FAILURE(rc))
    7266        return rc;

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

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

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

    r64626 r65338  
    3535        $(if $(VBOX_WITH_HGSMI),VBOX_WITH_HGSMI,) \
    3636        $(if $(VBOX_WITH_LSILOGIC),VBOX_WITH_LSILOGIC,) \
    37         $(if $(VBOX_WITH_NEW_IOAPIC),VBOX_WITH_NEW_IOAPIC,) \
    3837        $(if $(VBOX_WITH_NVME_IMPL),VBOX_WITH_NVME_IMPL,) \
    3938        $(if $(VBOX_WITH_PCI_PASSTHROUGH_IMPL),VBOX_WITH_PCI_PASSTHROUGH_IMPL,) \

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

    r65303 r65338  
    5959# include "../../VMM/VMMR3/APIC.cpp"
    6060#undef LOG_GROUP
    61 #ifdef VBOX_WITH_NEW_IOAPIC
    62 # include "../PC/DevIoApic.cpp"
    63 #else
    64 # include "../PC/DevIoApic_Old.cpp"
    65 #endif
     61#include "../PC/DevIoApic.cpp"
    6662#undef LOG_GROUP
    6763#include "../PC/DevHPET.cpp"
    … …  
    328324#endif
    329325    CHECK_MEMBER_ALIGNMENT(E1KSTATE, StatReceiveBytes, 8);
    330 #ifdef VBOX_WITH_NEW_IOAPIC
    331326    CHECK_MEMBER_ALIGNMENT(IOAPIC, au64RedirTable, 8);
    332327# ifdef VBOX_WITH_STATISTICS
    333328    CHECK_MEMBER_ALIGNMENT(IOAPIC, StatMmioReadRZ, 8);
    334329# endif
    335 #else
    336 # ifdef VBOX_WITH_STATISTICS
    337     CHECK_MEMBER_ALIGNMENT(IOAPIC, StatMMIOReadGC, 8);
    338     CHECK_MEMBER_ALIGNMENT(IOAPIC, StatMMIOReadGC, 8);
    339 # endif
    340 #endif
    341330    CHECK_MEMBER_ALIGNMENT(LSILOGISCSI, GCPhysMMIOBase, 8);
    342331    CHECK_MEMBER_ALIGNMENT(LSILOGISCSI, aMessage, 8);

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

    r65303 r65338  
    6161# include "../../VMM/VMMR3/APIC.cpp"
    6262#undef LOG_GROUP
    63 #ifdef VBOX_WITH_NEW_IOAPIC
    64 # include "../PC/DevIoApic.cpp"
    65 #else
    66 # include "../PC/DevIoApic_Old.cpp"
    67 #endif
     63#include "../PC/DevIoApic.cpp"
    6864#undef LOG_GROUP
    6965#include "../Storage/DevATA.cpp"
    … …  
    775771# endif /* VBOX_WITH_STATISTICS */
    776772
    777 #ifdef VBOX_WITH_NEW_IOAPIC
    778773    /* PC/DevIoApic.cpp */
    779774    GEN_CHECK_SIZE(IOAPIC);
    … …  
    799794    GEN_CHECK_OFF(IOAPIC, StatSetEoiR3);
    800795# endif
    801 #else
    802     /* PC/DevIoApic_Old.cpp */
    803     GEN_CHECK_SIZE(IOAPIC);
    804     GEN_CHECK_OFF(IOAPIC, id);
    805     GEN_CHECK_OFF(IOAPIC, ioregsel);
    806     GEN_CHECK_OFF(IOAPIC, irr);
    807     GEN_CHECK_OFF(IOAPIC, ioredtbl);
    808     GEN_CHECK_OFF(IOAPIC, ioredtbl[1]);
    809     GEN_CHECK_OFF(IOAPIC, ioredtbl[IOAPIC_NUM_PINS - 1]);
    810     GEN_CHECK_OFF(IOAPIC, pDevInsR3);
    811     GEN_CHECK_OFF(IOAPIC, pIoApicHlpR3);
    812     GEN_CHECK_OFF(IOAPIC, pDevInsR0);
    813     GEN_CHECK_OFF(IOAPIC, pIoApicHlpR0);
    814     GEN_CHECK_OFF(IOAPIC, pDevInsRC);
    815     GEN_CHECK_OFF(IOAPIC, pIoApicHlpRC);
    816 # ifdef VBOX_WITH_STATISTICS
    817     GEN_CHECK_OFF(IOAPIC, StatMMIOReadGC);
    818     GEN_CHECK_OFF(IOAPIC, StatSetIrqHC);
    819 # endif
    820 #endif /* VBOX_WITH_NEW_IOAPIC */
    821796
    822797    /* Storage/DevATA.cpp */

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

    r64626 r65338  
    8787ifeq ($(KBUILD_TARGET),amd64)
    8888 VMM_COMMON_DEFS += VBOX_WITH_MORE_RING0_MEM_MAPPINGS
    89 endif
    90 ifdef VBOX_WITH_NEW_IOAPIC
    91  VMM_COMMON_DEFS += VBOX_WITH_NEW_IOAPIC
    9289endif
    9390

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

    r64852 r65338  
    180180    {
    181181        Assert(pVM->pdm.s.IoApic.CTX_SUFF(pfnSetIrq));
    182 #ifdef VBOX_WITH_NEW_IOAPIC
    183182        pVM->pdm.s.IoApic.CTX_SUFF(pfnSetIrq)(pVM->pdm.s.IoApic.CTX_SUFF(pDevIns), u8Irq, u8Level, uTagSrc);
    184 #else
    185         pdmLock(pVM);
    186         pVM->pdm.s.IoApic.CTX_SUFF(pfnSetIrq)(pVM->pdm.s.IoApic.CTX_SUFF(pDevIns), u8Irq, u8Level, uTagSrc);
    187         pdmUnlock(pVM);
    188 #endif
    189183        return VINF_SUCCESS;
    190184    }
    … …  
    229223    {
    230224        Assert(pVM->pdm.s.IoApic.CTX_SUFF(pfnSendMsi));
    231 #ifdef VBOX_WITH_NEW_IOAPIC
    232225        pVM->pdm.s.IoApic.CTX_SUFF(pfnSendMsi)(pVM->pdm.s.IoApic.CTX_SUFF(pDevIns), GCAddr, uValue, uTagSrc);
    233 #else
    234         pdmLock(pVM);
    235         pVM->pdm.s.IoApic.CTX_SUFF(pfnSendMsi)(pVM->pdm.s.IoApic.CTX_SUFF(pDevIns), GCAddr, uValue, uTagSrc);
    236         pdmUnlock(pVM);
    237 #endif
    238226        return VINF_SUCCESS;
    239227    }

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

    r64655 r65338  
    571571
    572572    if (pVM->pdm.s.IoApic.pDevInsR0)
    573     {
    574 #ifdef VBOX_WITH_NEW_IOAPIC
    575573        pVM->pdm.s.IoApic.pfnSetIrqR0(pVM->pdm.s.IoApic.pDevInsR0, iIrq, iLevel, uTagSrc);
    576 #else
    577         pdmLock(pVM);
    578         pVM->pdm.s.IoApic.pfnSetIrqR0(pVM->pdm.s.IoApic.pDevInsR0, iIrq, iLevel, uTagSrc);
    579         pdmUnlock(pVM);
    580 #endif
    581     }
    582574    else if (pVM->pdm.s.IoApic.pDevInsR3)
    583575    {
    … …  
    607599    PVM pVM = pDevIns->Internal.s.pVMR0;
    608600    if (pVM->pdm.s.IoApic.pDevInsR0)
    609     {
    610 #ifdef VBOX_WITH_NEW_IOAPIC
    611601        pVM->pdm.s.IoApic.pfnSendMsiR0(pVM->pdm.s.IoApic.pDevInsR0, GCPhys, uValue, uTagSrc);
    612 #else
    613         pdmLock(pVM);
    614         pVM->pdm.s.IoApic.pfnSendMsiR0(pVM->pdm.s.IoApic.pDevInsR0, GCPhys, uValue, uTagSrc);
    615         pdmUnlock(pVM);
    616 #endif
    617     }
    618602    else
    619603        AssertFatalMsgFailed(("Lazy bastards!"));

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

    r65299 r65338  
    29462946        return VERR_INVALID_PARAMETER;
    29472947    }
    2948     if (!pIoApicReg->pfnSetIrqR3 || !pIoApicReg->pfnSendMsiR3
    2949 #ifdef VBOX_WITH_NEW_IOAPIC
    2950         || !pIoApicReg->pfnSetEoiR3
    2951 #endif
    2952         )
     2948    if (!pIoApicReg->pfnSetIrqR3 || !pIoApicReg->pfnSendMsiR3 || !pIoApicReg->pfnSetEoiR3)
    29532949    {
    29542950        Assert(pIoApicReg->pfnSetIrqR3);

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

    r64655 r65338  
    556556
    557557    if (pVM->pdm.s.IoApic.pDevInsRC)
    558     {
    559 #ifdef VBOX_WITH_NEW_IOAPIC
    560558        pVM->pdm.s.IoApic.pfnSetIrqRC(pVM->pdm.s.IoApic.pDevInsRC, iIrq, iLevel, uTagSrc);
    561 #else
    562         pdmLock(pVM);
    563         pVM->pdm.s.IoApic.pfnSetIrqRC(pVM->pdm.s.IoApic.pDevInsRC, iIrq, iLevel, uTagSrc);
    564         pdmUnlock(pVM);
    565 #endif
    566     }
    567559    else if (pVM->pdm.s.IoApic.pDevInsR3)
    568560    {
    … …  
    593585
    594586    if (pVM->pdm.s.IoApic.pDevInsRC)
    595     {
    596 #ifdef VBOX_WITH_NEW_IOAPIC
    597587        pVM->pdm.s.IoApic.pfnSendMsiRC(pVM->pdm.s.IoApic.pDevInsRC, GCPhys, uValue, uTagSrc);
    598 #else
    599         pdmLock(pVM);
    600         pVM->pdm.s.IoApic.pfnSendMsiRC(pVM->pdm.s.IoApic.pDevInsRC, GCPhys, uValue, uTagSrc);
    601         pdmUnlock(pVM);
    602 #endif
    603     }
    604588    else
    605589        AssertFatalMsgFailed(("Lazy bastarts!"));

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

    r64626 r65338  
    4545VBoxVMMPreload_TEMPLATE  := $(if $(VBOX_WITH_HARDENING),VBoxR3Dll,VBOXR3EXE)
    4646VBoxVMMPreload_SOURCES    = VBoxVMMPreload.cpp
    47 VBoxVMMPreload_DEFS       = \
    48         $(if $(VBOX_WITH_NEW_IOAPIC),VBOX_WITH_NEW_IOAPIC,)
    4947VBoxVMMPreload_LIBS = $(LIB_RUNTIME)
    5048ifdef VBOX_WITH_HARDENING

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

    r64626 r65338  
    4848    { "VMMR0.r0",       true,  NULL },
    4949    { "VBoxDDR0.r0",    true,  NULL },
    50 #if !defined(VBOX_WITH_NEW_IOAPIC)
    51     { "VBoxDD2R0.r0",   true,  NULL },
    52 #endif
    5350};
    5451
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