Index: /trunk/src/VBox/VMM/EM.cpp =================================================================== --- /trunk/src/VBox/VMM/EM.cpp (revision 29328) +++ /trunk/src/VBox/VMM/EM.cpp (revision 29329) @@ -38,7 +38,4 @@ #include #include -#ifdef VBOX_WITH_VMI -# include -#endif #include #include @@ -1767,14 +1764,4 @@ break; -#ifdef VBOX_WITH_VMI - /* - * Reschedule - parav call. - */ - case VINF_EM_RESCHEDULE_PARAV: - Log2(("EMR3ExecuteVM: VINF_EM_RESCHEDULE_PARAV: %d -> %d (EMSTATE_PARAV)\n", pVCpu->em.s.enmState, EMSTATE_PARAV)); - pVCpu->em.s.enmState = EMSTATE_PARAV; - break; -#endif - /* * Resume. @@ -1977,14 +1964,4 @@ break; -#ifdef VBOX_WITH_VMI - /* - * Execute PARAV function. - */ - case EMSTATE_PARAV: - rc = PARAVCallFunction(pVM); - pVCpu->em.s.enmState = EMSTATE_REM; - break; -#endif - /* * Application processor execution halted until SIPI. Index: /trunk/src/VBox/VMM/EMHandleRCTmpl.h =================================================================== --- /trunk/src/VBox/VMM/EMHandleRCTmpl.h (revision 29328) +++ /trunk/src/VBox/VMM/EMHandleRCTmpl.h (revision 29329) @@ -106,13 +106,4 @@ #endif /* EMHANDLERC_WITH_PATM */ -#ifdef VBOX_WITH_VMI - /* - * PARAV function. - */ - case VINF_EM_RESCHEDULE_PARAV: - rc = PARAVCallFunction(pVM); - break; -#endif - #ifdef EMHANDLERC_WITH_PATM /* Index: /trunk/src/VBox/VMM/EMHwaccm.cpp =================================================================== --- /trunk/src/VBox/VMM/EMHwaccm.cpp (revision 29328) +++ /trunk/src/VBox/VMM/EMHwaccm.cpp (revision 29329) @@ -38,7 +38,4 @@ #include #include -#ifdef VBOX_WITH_VMI -# include -#endif #include #include Index: /trunk/src/VBox/VMM/EMRaw.cpp =================================================================== --- /trunk/src/VBox/VMM/EMRaw.cpp (revision 29328) +++ /trunk/src/VBox/VMM/EMRaw.cpp (revision 29329) @@ -38,7 +38,4 @@ #include #include -#ifdef VBOX_WITH_VMI -# include -#endif #include #include Index: /trunk/src/VBox/VMM/Makefile.kmk =================================================================== --- /trunk/src/VBox/VMM/Makefile.kmk (revision 29328) +++ /trunk/src/VBox/VMM/Makefile.kmk (revision 29329) @@ -44,8 +44,4 @@ VMMR3_DEFS += VBOX_WITH_USB endif -ifdef VBOX_WITH_VMI - VMMR3_DEFS += \ - VBOX_WITH_VMI -endif ifdef VBOX_WITH_PDM_ASYNC_COMPLETION VMMR3_DEFS += VBOX_WITH_PDM_ASYNC_COMPLETION @@ -68,8 +64,4 @@ . \ PATM -ifdef VBOX_WITH_VMI - VMMR3_INCS += \ - PARAV -endif VMMR3_SOURCES = \ @@ -165,9 +157,4 @@ PATM/PATMSSM.cpp \ PATM/VMMAll/PATMAll.cpp -ifdef VBOX_WITH_VMI - VMMR3_SOURCES += \ - PARAV/PARAV.cpp \ - PARAV/PARAVAll.cpp -endif ifdef VBOX_WITH_VUSB VMMR3_SOURCES += PDMUsb.cpp @@ -337,7 +324,4 @@ ifdef VBOX_WITH_MULTI_CORE VMMGC_DEFS += VBOX_WITH_MULTI_CORE - endif - ifdef VBOX_WITH_VMI - VMMGC_DEFS += VBOX_WITH_VMI endif ifeq ($(KBUILD_TARGET_ARCH),x86) @@ -412,9 +396,4 @@ PATM/VMMGC/PATMGC.cpp \ PATM/VMMAll/PATMAll.cpp - ifdef VBOX_WITH_VMI - VMMGC_SOURCES += \ - PARAV/PARAV.cpp \ - PARAV/PARAVAll.cpp - endif ifeq ($(VBOX_LDR_FMT32),pe) VMMGC_SOURCES += VMMGC/VMMGC.def Index: /trunk/src/VBox/VMM/VM.cpp =================================================================== --- /trunk/src/VBox/VMM/VM.cpp (revision 29328) +++ /trunk/src/VBox/VMM/VM.cpp (revision 29329) @@ -59,7 +59,4 @@ #include #include -#ifdef VBOX_WITH_VMI -# include -#endif #include #include @@ -849,60 +846,50 @@ if (RT_SUCCESS(rc)) { -#ifdef VBOX_WITH_VMI - rc = PARAVR3Init(pVM); + rc = IOMR3Init(pVM); if (RT_SUCCESS(rc)) { -#endif - rc = IOMR3Init(pVM); + rc = EMR3Init(pVM); if (RT_SUCCESS(rc)) { - rc = EMR3Init(pVM); + rc = DBGFR3Init(pVM); if (RT_SUCCESS(rc)) { - rc = DBGFR3Init(pVM); + rc = PDMR3Init(pVM); if (RT_SUCCESS(rc)) { - rc = PDMR3Init(pVM); + rc = PGMR3InitDynMap(pVM); + if (RT_SUCCESS(rc)) + rc = MMR3HyperInitFinalize(pVM); + if (RT_SUCCESS(rc)) + rc = PATMR3InitFinalize(pVM); + if (RT_SUCCESS(rc)) + rc = PGMR3InitFinalize(pVM); + if (RT_SUCCESS(rc)) + rc = SELMR3InitFinalize(pVM); + if (RT_SUCCESS(rc)) + rc = TMR3InitFinalize(pVM); + if (RT_SUCCESS(rc)) + rc = VMMR3InitFinalize(pVM); + if (RT_SUCCESS(rc)) + rc = REMR3InitFinalize(pVM); + if (RT_SUCCESS(rc)) + rc = vmR3InitDoCompleted(pVM, VMINITCOMPLETED_RING3); if (RT_SUCCESS(rc)) { - rc = PGMR3InitDynMap(pVM); - if (RT_SUCCESS(rc)) - rc = MMR3HyperInitFinalize(pVM); - if (RT_SUCCESS(rc)) - rc = PATMR3InitFinalize(pVM); - if (RT_SUCCESS(rc)) - rc = PGMR3InitFinalize(pVM); - if (RT_SUCCESS(rc)) - rc = SELMR3InitFinalize(pVM); - if (RT_SUCCESS(rc)) - rc = TMR3InitFinalize(pVM); - if (RT_SUCCESS(rc)) - rc = VMMR3InitFinalize(pVM); - if (RT_SUCCESS(rc)) - rc = REMR3InitFinalize(pVM); - if (RT_SUCCESS(rc)) - rc = vmR3InitDoCompleted(pVM, VMINITCOMPLETED_RING3); - if (RT_SUCCESS(rc)) - { - LogFlow(("vmR3InitRing3: returns %Rrc\n", VINF_SUCCESS)); - return VINF_SUCCESS; - } - int rc2 = PDMR3Term(pVM); - AssertRC(rc2); + LogFlow(("vmR3InitRing3: returns %Rrc\n", VINF_SUCCESS)); + return VINF_SUCCESS; } - int rc2 = DBGFR3Term(pVM); + int rc2 = PDMR3Term(pVM); AssertRC(rc2); } - int rc2 = EMR3Term(pVM); + int rc2 = DBGFR3Term(pVM); AssertRC(rc2); } - int rc2 = IOMR3Term(pVM); + int rc2 = EMR3Term(pVM); AssertRC(rc2); } -#ifdef VBOX_WITH_VMI - int rc2 = PARAVR3Term(pVM); + int rc2 = IOMR3Term(pVM); AssertRC(rc2); } -#endif int rc2 = PATMR3Term(pVM); AssertRC(rc2); Index: /trunk/src/VBox/VMM/testcase/Makefile.kmk =================================================================== --- /trunk/src/VBox/VMM/testcase/Makefile.kmk (revision 29328) +++ /trunk/src/VBox/VMM/testcase/Makefile.kmk (revision 29329) @@ -128,8 +128,4 @@ ifdef VBOX_WITH_R0_LOGGING tstVMStructSize_DEFS += VBOX_WITH_R0_LOGGING -endif -ifdef VBOX_WITH_VMI - tstVMStructSize_DEFS += VBOX_WITH_VMI - tstVMStructSize_INCS += $(VBOX_PATH_VMM_SRC)/PARAV endif Index: /trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp =================================================================== --- /trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp (revision 29328) +++ /trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp (revision 29329) @@ -43,7 +43,4 @@ #include "HWACCMInternal.h" #include "PATMInternal.h" -#ifdef VBOX_WITH_VMI -# include "PARAVInternal.h" -#endif #include "VMMInternal.h" #include "DBGFInternal.h" @@ -220,7 +217,4 @@ CHECK_PADDING_VM(8, vm); CHECK_PADDING_VM(8, cfgm); -#ifdef VBOX_WITH_VMI - CHECK_PADDING_VM(8, parav); -#endif PRINT_OFFSET(VMCPU, cpum);