VirtualBox

Changeset 64626 in vbox for trunk/src/VBox/VMM/VMMR3


Ignore:
Timestamp:
Nov 10, 2016 10:31:39 AM (8 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
111851
Message:

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

Location:
trunk/src/VBox/VMM/VMMR3
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • 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);
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