diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2010-12-27 16:13:13 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2010-12-27 16:13:13 +0000 |
| commit | 8564dad840b68d84e7f6c8afe5dab9e119134e1c (patch) | |
| tree | ba33e580225e8ba0ce43842a3b1eff6ee85d7d10 /src/VBox/VMM | |
| parent | 51384b4c5b37faba25b8b6ad0da1a398a36d440d (diff) | |
| download | VirtualBox-svn-8564dad840b68d84e7f6c8afe5dab9e119134e1c.tar.gz | |
VMM reorg: Moving the public include files from include/VBox to include/VBox/vmm.
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@35346 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'src/VBox/VMM')
187 files changed, 1048 insertions, 1047 deletions
diff --git a/src/VBox/VMM/PATM/CSAM.cpp b/src/VBox/VMM/PATM/CSAM.cpp index 0ba0179b888..cf6c563eed3 100644 --- a/src/VBox/VMM/PATM/CSAM.cpp +++ b/src/VBox/VMM/PATM/CSAM.cpp @@ -19,29 +19,29 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_CSAM -#include <VBox/cpum.h> -#include <VBox/stam.h> -#include <VBox/patm.h> -#include <VBox/csam.h> -#include <VBox/cpumdis.h> -#include <VBox/pgm.h> -#include <VBox/iom.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/csam.h> +#include <VBox/vmm/cpumdis.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/iom.h> #include <VBox/sup.h> -#include <VBox/mm.h> -#include <VBox/em.h> -#include <VBox/rem.h> -#include <VBox/selm.h> -#include <VBox/trpm.h> -#include <VBox/cfgm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/cfgm.h> #include <VBox/param.h> #include <iprt/avl.h> #include <iprt/asm.h> #include <iprt/thread.h> #include "CSAMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/dbg.h> #include <VBox/err.h> -#include <VBox/ssm.h> +#include <VBox/vmm/ssm.h> #include <VBox/log.h> #include <iprt/assert.h> #include <iprt/string.h> diff --git a/src/VBox/VMM/PATM/CSAMInternal.h b/src/VBox/VMM/PATM/CSAMInternal.h index ec8324baa42..2b594e4749a 100644 --- a/src/VBox/VMM/PATM/CSAMInternal.h +++ b/src/VBox/VMM/PATM/CSAMInternal.h @@ -20,7 +20,7 @@ #include <VBox/cdefs.h> #include <VBox/types.h> -#include <VBox/csam.h> +#include <VBox/vmm/csam.h> #include <VBox/dis.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/PATM/PATM.cpp b/src/VBox/VMM/PATM/PATM.cpp index a3c597cd8c0..74a8ce02151 100644 --- a/src/VBox/VMM/PATM/PATM.cpp +++ b/src/VBox/VMM/PATM/PATM.cpp @@ -21,23 +21,24 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PATM -#include <VBox/patm.h> -#include <VBox/stam.h> -#include <VBox/pgm.h> -#include <VBox/cpum.h> -#include <VBox/cpumdis.h> -#include <VBox/iom.h> -#include <VBox/mm.h> -#include <VBox/ssm.h> -#include <VBox/trpm.h> -#include <VBox/cfgm.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/cpumdis.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/cfgm.h> #include <VBox/param.h> -#include <VBox/selm.h> +#include <VBox/vmm/selm.h> #include <iprt/avl.h> #include "PATMInternal.h" #include "PATMPatch.h" -#include <VBox/vm.h> -#include <VBox/csam.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/csam.h> #include <VBox/dbg.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/PATM/PATMA.asm b/src/VBox/VMM/PATM/PATMA.asm index 590c9b257cf..cebdafc5221 100644 --- a/src/VBox/VMM/PATM/PATMA.asm +++ b/src/VBox/VMM/PATM/PATMA.asm @@ -31,7 +31,7 @@ %include "VBox/asmdefs.mac" %include "VBox/err.mac" %include "VBox/x86.mac" -%include "VBox/vm.mac" +%include "VBox/vmm/vm.mac" %include "PATMA.mac" %ifdef DEBUG diff --git a/src/VBox/VMM/PATM/PATMGuest.cpp b/src/VBox/VMM/PATM/PATMGuest.cpp index fabb24c1662..cd754e58fd1 100644 --- a/src/VBox/VMM/PATM/PATMGuest.cpp +++ b/src/VBox/VMM/PATM/PATMGuest.cpp @@ -19,14 +19,14 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PATM -#include <VBox/patm.h> -#include <VBox/pgm.h> -#include <VBox/iom.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/iom.h> #include <VBox/param.h> #include <iprt/avl.h> #include "PATMInternal.h" -#include <VBox/vm.h> -#include <VBox/csam.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/csam.h> #include <VBox/dbg.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/PATM/PATMInternal.h b/src/VBox/VMM/PATM/PATMInternal.h index cf8424680d5..83c899a4b66 100644 --- a/src/VBox/VMM/PATM/PATMInternal.h +++ b/src/VBox/VMM/PATM/PATMInternal.h @@ -20,10 +20,10 @@ #include <VBox/cdefs.h> #include <VBox/types.h> -#include <VBox/patm.h> -#include <VBox/stam.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/stam.h> #include <VBox/dis.h> -#include <VBox/pgm.h> +#include <VBox/vmm/pgm.h> #include <iprt/avl.h> #include <iprt/param.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/PATM/PATMPatch.cpp b/src/VBox/VMM/PATM/PATMPatch.cpp index 3bd8bf0753b..e92524f6ec8 100644 --- a/src/VBox/VMM/PATM/PATMPatch.cpp +++ b/src/VBox/VMM/PATM/PATMPatch.cpp @@ -21,17 +21,17 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PATM -#include <VBox/patm.h> -#include <VBox/stam.h> -#include <VBox/pgm.h> -#include <VBox/cpum.h> -#include <VBox/mm.h> -#include <VBox/trpm.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/trpm.h> #include <VBox/param.h> #include <iprt/avl.h> #include "PATMInternal.h" -#include <VBox/vm.h> -#include <VBox/csam.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/csam.h> #include <VBox/dbg.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/PATM/PATMSSM.cpp b/src/VBox/VMM/PATM/PATMSSM.cpp index a5c38cf994a..4bfabbe9cb3 100644 --- a/src/VBox/VMM/PATM/PATMSSM.cpp +++ b/src/VBox/VMM/PATM/PATMSSM.cpp @@ -21,17 +21,17 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PATM -#include <VBox/patm.h> -#include <VBox/cpum.h> -#include <VBox/mm.h> -#include <VBox/ssm.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/ssm.h> #include <VBox/param.h> #include <iprt/avl.h> #include "PATMInternal.h" #include "PATMPatch.h" #include "PATMA.h" -#include <VBox/vm.h> -#include <VBox/csam.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/csam.h> #include "internal/pgm.h" #include <VBox/dbg.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp b/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp index 27078ba7912..56a3f426daa 100644 --- a/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp +++ b/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp @@ -20,19 +20,20 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_CSAM -#include <VBox/cpum.h> -#include <VBox/stam.h> -#include <VBox/patm.h> -#include <VBox/csam.h> -#include <VBox/pgm.h> -#include <VBox/mm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/csam.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/mm.h> #include <VBox/sup.h> -#include <VBox/mm.h> +#include <VBox/vmm/mm.h> #include <VBox/param.h> #include <iprt/avl.h> #include "CSAMInternal.h" -#include <VBox/vm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> #include <VBox/dbg.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp b/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp index ad828fffd13..bbc304911bc 100644 --- a/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp +++ b/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp @@ -19,17 +19,17 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PATM -#include <VBox/patm.h> -#include <VBox/cpum.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/cpum.h> #include <VBox/dis.h> #include <VBox/disopcode.h> -#include <VBox/em.h> +#include <VBox/vmm/em.h> #include <VBox/err.h> -#include <VBox/selm.h> -#include <VBox/mm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/mm.h> #include "PATMInternal.h" -#include <VBox/vm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> #include "PATMA.h" #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMAll/CPUMAllA.asm b/src/VBox/VMM/VMMAll/CPUMAllA.asm index 1441b25946b..9840672d2c9 100644 --- a/src/VBox/VMM/VMMAll/CPUMAllA.asm +++ b/src/VBox/VMM/VMMAll/CPUMAllA.asm @@ -19,12 +19,12 @@ ;* Header Files * ;******************************************************************************* %include "VBox/asmdefs.mac" -%include "VBox/vm.mac" +%include "VBox/vmm/vm.mac" %include "VBox/err.mac" -%include "VBox/stam.mac" +%include "VBox/vmm/stam.mac" %include "CPUMInternal.mac" %include "VBox/x86.mac" -%include "VBox/cpum.mac" +%include "VBox/vmm/cpum.mac" %ifdef IN_RING3 %error "The jump table doesn't link on leopard." diff --git a/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp b/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp index 26a95b6f9bf..69d9c9c840a 100644 --- a/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp +++ b/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp @@ -20,19 +20,19 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_CPUM -#include <VBox/cpum.h> -#include <VBox/patm.h> -#include <VBox/dbgf.h> -#include <VBox/pdm.h> -#include <VBox/pgm.h> -#include <VBox/mm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/mm.h> #include "CPUMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/dis.h> #include <VBox/log.h> -#include <VBox/hwaccm.h> -#include <VBox/tm.h> +#include <VBox/vmm/hwaccm.h> +#include <VBox/vmm/tm.h> #include <iprt/assert.h> #include <iprt/asm.h> #include <iprt/asm-amd64-x86.h> diff --git a/src/VBox/VMM/VMMAll/CPUMStack.cpp b/src/VBox/VMM/VMMAll/CPUMStack.cpp index 306ce172a6c..17c3c8cc984 100644 --- a/src/VBox/VMM/VMMAll/CPUMStack.cpp +++ b/src/VBox/VMM/VMMAll/CPUMStack.cpp @@ -19,10 +19,10 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/cpum.h> +#include <VBox/vmm/cpum.h> #include "CPUMInternal.h" -#include <VBox/vm.h> -#include <VBox/mm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/mm.h> /** Disable stack frame pointer generation here. */ #if defined(_MSC_VER) && !defined(DEBUG) diff --git a/src/VBox/VMM/VMMAll/DBGFAll.cpp b/src/VBox/VMM/VMMAll/DBGFAll.cpp index 66938723eec..fc55426981d 100644 --- a/src/VBox/VMM/VMMAll/DBGFAll.cpp +++ b/src/VBox/VMM/VMMAll/DBGFAll.cpp @@ -20,9 +20,9 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_DBGF -#include <VBox/dbgf.h> +#include <VBox/vmm/dbgf.h> #include "DBGFInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMAll/EMAll.cpp b/src/VBox/VMM/VMMAll/EMAll.cpp index 9c39472cea8..558365f448c 100644 --- a/src/VBox/VMM/VMMAll/EMAll.cpp +++ b/src/VBox/VMM/VMMAll/EMAll.cpp @@ -19,20 +19,20 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_EM -#include <VBox/em.h> -#include <VBox/mm.h> -#include <VBox/selm.h> -#include <VBox/patm.h> -#include <VBox/csam.h> -#include <VBox/pgm.h> -#include <VBox/iom.h> -#include <VBox/stam.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/csam.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/stam.h> #include "EMInternal.h" -#include <VBox/vm.h> -#include <VBox/vmm.h> -#include <VBox/hwaccm.h> -#include <VBox/tm.h> -#include <VBox/pdmapi.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/hwaccm.h> +#include <VBox/vmm/tm.h> +#include <VBox/vmm/pdmapi.h> #include <VBox/param.h> #include <VBox/err.h> #include <VBox/dis.h> diff --git a/src/VBox/VMM/VMMAll/FTMAll.cpp b/src/VBox/VMM/VMMAll/FTMAll.cpp index 68b26fd04a1..f5d8b17c3aa 100644 --- a/src/VBox/VMM/VMMAll/FTMAll.cpp +++ b/src/VBox/VMM/VMMAll/FTMAll.cpp @@ -21,8 +21,8 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_FTM #include "FTMInternal.h" -#include <VBox/vm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> #include <VBox/err.h> #include <VBox/param.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMAll/HWACCMAll.cpp b/src/VBox/VMM/VMMAll/HWACCMAll.cpp index 0a1a7bd7e32..34de1bbca5d 100644 --- a/src/VBox/VMM/VMMAll/HWACCMAll.cpp +++ b/src/VBox/VMM/VMMAll/HWACCMAll.cpp @@ -20,13 +20,13 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_HWACCM -#include <VBox/hwaccm.h> -#include <VBox/pgm.h> +#include <VBox/vmm/hwaccm.h> +#include <VBox/vmm/pgm.h> #include "HWACCMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/x86.h> -#include <VBox/hwacc_vmx.h> -#include <VBox/hwacc_svm.h> +#include <VBox/vmm/hwacc_vmx.h> +#include <VBox/vmm/hwacc_svm.h> #include <VBox/err.h> #include <VBox/log.h> #include <iprt/param.h> diff --git a/src/VBox/VMM/VMMAll/IOMAll.cpp b/src/VBox/VMM/VMMAll/IOMAll.cpp index e61bebd2d69..548340aabc4 100644 --- a/src/VBox/VMM/VMMAll/IOMAll.cpp +++ b/src/VBox/VMM/VMMAll/IOMAll.cpp @@ -19,17 +19,17 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_IOM -#include <VBox/iom.h> -#include <VBox/mm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/mm.h> #include <VBox/param.h> #include "IOMInternal.h" -#include <VBox/vm.h> -#include <VBox/vmm.h> -#include <VBox/selm.h> -#include <VBox/trpm.h> -#include <VBox/pdmdev.h> -#include <VBox/pgm.h> -#include <VBox/cpum.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/pdmdev.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/cpum.h> #include <VBox/err.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp b/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp index 077670a1640..8cdab922a49 100644 --- a/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp +++ b/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp @@ -20,22 +20,22 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_IOM -#include <VBox/iom.h> -#include <VBox/cpum.h> -#include <VBox/pgm.h> -#include <VBox/selm.h> -#include <VBox/mm.h> -#include <VBox/em.h> -#include <VBox/pgm.h> -#include <VBox/trpm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/trpm.h> #include "IOMInternal.h" -#include <VBox/vm.h> -#include <VBox/vmm.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/hwaccm.h> #include <VBox/dis.h> #include <VBox/disopcode.h> -#include <VBox/pdmdev.h> +#include <VBox/vmm/pdmdev.h> #include <VBox/param.h> #include <VBox/err.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMAll/MMAll.cpp b/src/VBox/VMM/VMMAll/MMAll.cpp index 3937b748009..6397bdb2d41 100644 --- a/src/VBox/VMM/VMMAll/MMAll.cpp +++ b/src/VBox/VMM/VMMAll/MMAll.cpp @@ -20,10 +20,10 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_MM_HYPER -#include <VBox/mm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/vmm.h> #include "MMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/log.h> #include <iprt/assert.h> #include <iprt/string.h> diff --git a/src/VBox/VMM/VMMAll/MMAllHyper.cpp b/src/VBox/VMM/VMMAll/MMAllHyper.cpp index 43478eb131b..bdd2be3dea0 100644 --- a/src/VBox/VMM/VMMAll/MMAllHyper.cpp +++ b/src/VBox/VMM/VMMAll/MMAllHyper.cpp @@ -20,10 +20,10 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_MM_HYPER_HEAP -#include <VBox/mm.h> -#include <VBox/stam.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/stam.h> #include "MMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/param.h> diff --git a/src/VBox/VMM/VMMAll/MMAllPagePool.cpp b/src/VBox/VMM/VMMAll/MMAllPagePool.cpp index 65221a7573b..9509e13f8ba 100644 --- a/src/VBox/VMM/VMMAll/MMAllPagePool.cpp +++ b/src/VBox/VMM/VMMAll/MMAllPagePool.cpp @@ -21,11 +21,11 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_MM_POOL -#include <VBox/mm.h> -#include <VBox/pgm.h> -#include <VBox/stam.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/stam.h> #include "MMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/param.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMAll/PDMAll.cpp b/src/VBox/VMM/VMMAll/PDMAll.cpp index 0e259c5deef..ff5554d462a 100644 --- a/src/VBox/VMM/VMMAll/PDMAll.cpp +++ b/src/VBox/VMM/VMMAll/PDMAll.cpp @@ -21,9 +21,9 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM #include "PDMInternal.h" -#include <VBox/pdm.h> -#include <VBox/mm.h> -#include <VBox/vm.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp b/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp index 6bef51b3593..462a775e44d 100644 --- a/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp +++ b/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp @@ -21,12 +21,12 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM//_CRITSECT #include "PDMInternal.h" -#include <VBox/pdmcritsect.h> -#include <VBox/mm.h> -#include <VBox/vmm.h> -#include <VBox/vm.h> +#include <VBox/vmm/pdmcritsect.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/hwaccm.h> #include <VBox/log.h> #include <iprt/asm.h> diff --git a/src/VBox/VMM/VMMAll/PDMAllQueue.cpp b/src/VBox/VMM/VMMAll/PDMAllQueue.cpp index 084da02beb0..70d1f6cc7e0 100644 --- a/src/VBox/VMM/VMMAll/PDMAllQueue.cpp +++ b/src/VBox/VMM/VMMAll/PDMAllQueue.cpp @@ -21,12 +21,12 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM_QUEUE #include "PDMInternal.h" -#include <VBox/pdm.h> +#include <VBox/vmm/pdm.h> #ifndef IN_RC -# include <VBox/rem.h> -# include <VBox/mm.h> +# include <VBox/vmm/rem.h> +# include <VBox/vmm/mm.h> #endif -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> #include <iprt/asm.h> diff --git a/src/VBox/VMM/VMMAll/PGMAll.cpp b/src/VBox/VMM/VMMAll/PGMAll.cpp index 7bc04b0e323..352e09202b3 100644 --- a/src/VBox/VMM/VMMAll/PGMAll.cpp +++ b/src/VBox/VMM/VMMAll/PGMAll.cpp @@ -19,22 +19,22 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM -#include <VBox/pgm.h> -#include <VBox/cpum.h> -#include <VBox/selm.h> -#include <VBox/iom.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/iom.h> #include <VBox/sup.h> -#include <VBox/mm.h> -#include <VBox/stam.h> -#include <VBox/csam.h> -#include <VBox/patm.h> -#include <VBox/trpm.h> -#include <VBox/rem.h> -#include <VBox/em.h> -#include <VBox/hwaccm.h> -#include <VBox/hwacc_vmx.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/csam.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/hwaccm.h> +#include <VBox/vmm/hwacc_vmx.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <iprt/assert.h> #include <iprt/asm-amd64-x86.h> diff --git a/src/VBox/VMM/VMMAll/PGMAllHandler.cpp b/src/VBox/VMM/VMMAll/PGMAllHandler.cpp index 4f0643672b2..a1e76e87ee9 100644 --- a/src/VBox/VMM/VMMAll/PGMAllHandler.cpp +++ b/src/VBox/VMM/VMMAll/PGMAllHandler.cpp @@ -20,17 +20,17 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM -#include <VBox/dbgf.h> -#include <VBox/pgm.h> -#include <VBox/iom.h> -#include <VBox/mm.h> -#include <VBox/em.h> -#include <VBox/stam.h> -#include <VBox/rem.h> -#include <VBox/dbgf.h> -#include <VBox/rem.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/rem.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <VBox/log.h> @@ -39,7 +39,7 @@ #include <iprt/string.h> #include <VBox/param.h> #include <VBox/err.h> -#include <VBox/selm.h> +#include <VBox/vmm/selm.h> /******************************************************************************* diff --git a/src/VBox/VMM/VMMAll/PGMAllMap.cpp b/src/VBox/VMM/VMMAll/PGMAllMap.cpp index 0d532e47ce5..0d9fd1009e7 100644 --- a/src/VBox/VMM/VMMAll/PGMAllMap.cpp +++ b/src/VBox/VMM/VMMAll/PGMAllMap.cpp @@ -19,9 +19,9 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM -#include <VBox/pgm.h> +#include <VBox/vmm/pgm.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <VBox/err.h> #include <iprt/asm-amd64-x86.h> diff --git a/src/VBox/VMM/VMMAll/PGMAllPhys.cpp b/src/VBox/VMM/VMMAll/PGMAllPhys.cpp index 324aef074b3..99ac7a2fe29 100644 --- a/src/VBox/VMM/VMMAll/PGMAllPhys.cpp +++ b/src/VBox/VMM/VMMAll/PGMAllPhys.cpp @@ -19,14 +19,14 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM_PHYS -#include <VBox/pgm.h> -#include <VBox/trpm.h> -#include <VBox/vmm.h> -#include <VBox/iom.h> -#include <VBox/em.h> -#include <VBox/rem.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/rem.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <VBox/param.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMAll/PGMAllPool.cpp b/src/VBox/VMM/VMMAll/PGMAllPool.cpp index 39abf14130c..96b1154e88a 100644 --- a/src/VBox/VMM/VMMAll/PGMAllPool.cpp +++ b/src/VBox/VMM/VMMAll/PGMAllPool.cpp @@ -20,18 +20,18 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM_POOL -#include <VBox/pgm.h> -#include <VBox/mm.h> -#include <VBox/em.h> -#include <VBox/cpum.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/cpum.h> #ifdef IN_RC -# include <VBox/patm.h> +# include <VBox/vmm/patm.h> #endif #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <VBox/disopcode.h> -#include <VBox/hwacc_vmx.h> +#include <VBox/vmm/hwacc_vmx.h> #include <VBox/log.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMAll/REMAll.cpp b/src/VBox/VMM/VMMAll/REMAll.cpp index da4e81545fa..d065d9c08c1 100644 --- a/src/VBox/VMM/VMMAll/REMAll.cpp +++ b/src/VBox/VMM/VMMAll/REMAll.cpp @@ -20,11 +20,11 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_REM -#include <VBox/rem.h> -#include <VBox/em.h> -#include <VBox/vmm.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/vmm.h> #include "REMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMAll/SELMAll.cpp b/src/VBox/VMM/VMMAll/SELMAll.cpp index f51479921fc..744991c4ea0 100644 --- a/src/VBox/VMM/VMMAll/SELMAll.cpp +++ b/src/VBox/VMM/VMMAll/SELMAll.cpp @@ -20,18 +20,18 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_SELM -#include <VBox/selm.h> -#include <VBox/stam.h> -#include <VBox/mm.h> -#include <VBox/pgm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/pgm.h> #include "SELMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/x86.h> #include <VBox/err.h> #include <VBox/param.h> #include <iprt/assert.h> #include <VBox/log.h> -#include <VBox/vmm.h> +#include <VBox/vmm/vmm.h> diff --git a/src/VBox/VMM/VMMAll/TMAll.cpp b/src/VBox/VMM/VMMAll/TMAll.cpp index 20c957da3a4..d0994b8b675 100644 --- a/src/VBox/VMM/VMMAll/TMAll.cpp +++ b/src/VBox/VMM/VMMAll/TMAll.cpp @@ -20,13 +20,13 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_TM -#include <VBox/tm.h> -#include <VBox/mm.h> +#include <VBox/vmm/tm.h> +#include <VBox/vmm/mm.h> #ifdef IN_RING3 -# include <VBox/rem.h> +# include <VBox/vmm/rem.h> #endif #include "TMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/param.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMAll/TMAllCpu.cpp b/src/VBox/VMM/VMMAll/TMAllCpu.cpp index d5ed52c903d..5d51f1b3d82 100644 --- a/src/VBox/VMM/VMMAll/TMAllCpu.cpp +++ b/src/VBox/VMM/VMMAll/TMAllCpu.cpp @@ -20,10 +20,10 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_TM -#include <VBox/tm.h> +#include <VBox/vmm/tm.h> #include <iprt/asm-amd64-x86.h> /* for SUPGetCpuHzFromGIP */ #include "TMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/sup.h> #include <VBox/param.h> diff --git a/src/VBox/VMM/VMMAll/TMAllReal.cpp b/src/VBox/VMM/VMMAll/TMAllReal.cpp index 3472f639c51..6bd58114890 100644 --- a/src/VBox/VMM/VMMAll/TMAllReal.cpp +++ b/src/VBox/VMM/VMMAll/TMAllReal.cpp @@ -20,9 +20,9 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_TM -#include <VBox/tm.h> +#include <VBox/vmm/tm.h> #include "TMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <iprt/time.h> diff --git a/src/VBox/VMM/VMMAll/TMAllVirtual.cpp b/src/VBox/VMM/VMMAll/TMAllVirtual.cpp index 12e6ac010f4..eebb6c269d8 100644 --- a/src/VBox/VMM/VMMAll/TMAllVirtual.cpp +++ b/src/VBox/VMM/VMMAll/TMAllVirtual.cpp @@ -20,14 +20,14 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_TM -#include <VBox/tm.h> +#include <VBox/vmm/tm.h> #ifdef IN_RING3 -# include <VBox/rem.h> +# include <VBox/vmm/rem.h> # include <iprt/thread.h> #endif #include "TMInternal.h" -#include <VBox/vm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> #include <VBox/err.h> #include <VBox/log.h> #include <VBox/sup.h> diff --git a/src/VBox/VMM/VMMAll/TRPMAll.cpp b/src/VBox/VMM/VMMAll/TRPMAll.cpp index 7acbcde81db..987a9c88d2c 100644 --- a/src/VBox/VMM/VMMAll/TRPMAll.cpp +++ b/src/VBox/VMM/VMMAll/TRPMAll.cpp @@ -20,17 +20,17 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_TRPM -#include <VBox/trpm.h> -#include <VBox/pgm.h> -#include <VBox/mm.h> -#include <VBox/patm.h> -#include <VBox/selm.h> -#include <VBox/stam.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/stam.h> #include "TRPMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/x86.h> -#include <VBox/em.h> +#include <VBox/vmm/em.h> #include <VBox/log.h> #include <iprt/assert.h> #include <iprt/asm.h> diff --git a/src/VBox/VMM/VMMAll/VMAll.cpp b/src/VBox/VMM/VMMAll/VMAll.cpp index 2ba1573a320..09f6d09cde2 100644 --- a/src/VBox/VMM/VMMAll/VMAll.cpp +++ b/src/VBox/VMM/VMMAll/VMAll.cpp @@ -21,9 +21,9 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_VM #include "VMInternal.h" -#include <VBox/vmm.h> -#include <VBox/mm.h> -#include <VBox/vm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMAll/VMMAll.cpp b/src/VBox/VMM/VMMAll/VMMAll.cpp index d6712518bc1..85baef04d19 100644 --- a/src/VBox/VMM/VMMAll/VMMAll.cpp +++ b/src/VBox/VMM/VMMAll/VMMAll.cpp @@ -20,10 +20,10 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_VMM -#include <VBox/vmm.h> +#include <VBox/vmm/vmm.h> #include "VMMInternal.h" -#include <VBox/vm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> #include <VBox/param.h> #include <iprt/thread.h> #include <iprt/mp.h> diff --git a/src/VBox/VMM/VMMR0/CPUMR0.cpp b/src/VBox/VMM/VMMR0/CPUMR0.cpp index 58e00ac3334..be3d696e4a7 100644 --- a/src/VBox/VMM/VMMR0/CPUMR0.cpp +++ b/src/VBox/VMM/VMMR0/CPUMR0.cpp @@ -20,13 +20,13 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_CPUM -#include <VBox/cpum.h> +#include <VBox/vmm/cpum.h> #include "CPUMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/x86.h> #include <VBox/err.h> #include <VBox/log.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/hwaccm.h> #include <iprt/assert.h> #include <iprt/asm-amd64-x86.h> #ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI diff --git a/src/VBox/VMM/VMMR0/CPUMR0A.asm b/src/VBox/VMM/VMMR0/CPUMR0A.asm index 24f6bb4625e..5e596aa4acf 100644 --- a/src/VBox/VMM/VMMR0/CPUMR0A.asm +++ b/src/VBox/VMM/VMMR0/CPUMR0A.asm @@ -19,12 +19,12 @@ ;* Header Files * ;******************************************************************************* %include "VBox/asmdefs.mac" -%include "VBox/vm.mac" +%include "VBox/vmm/vm.mac" %include "VBox/err.mac" -%include "VBox/stam.mac" +%include "VBox/vmm/stam.mac" %include "CPUMInternal.mac" %include "VBox/x86.mac" -%include "VBox/cpum.mac" +%include "VBox/vmm/cpum.mac" %ifdef IN_RING3 %error "The jump table doesn't link on leopard." diff --git a/src/VBox/VMM/VMMR0/CPUMR0UnusedA.asm b/src/VBox/VMM/VMMR0/CPUMR0UnusedA.asm index c2dd2dbb9be..f9beba65b6f 100644 --- a/src/VBox/VMM/VMMR0/CPUMR0UnusedA.asm +++ b/src/VBox/VMM/VMMR0/CPUMR0UnusedA.asm @@ -19,12 +19,12 @@ ;* Header Files * ;******************************************************************************* %include "VBox/asmdefs.mac" -%include "VBox/vm.mac" +%include "VBox/vmm/vm.mac" %include "VBox/err.mac" -%include "VBox/stam.mac" +%include "VBox/vmm/stam.mac" %include "CPUMInternal.mac" %include "VBox/x86.mac" -%include "VBox/cpum.mac" +%include "VBox/vmm/cpum.mac" %ifdef IN_RING3 %error "The jump table doesn't link on leopard." diff --git a/src/VBox/VMM/VMMR0/GMMR0.cpp b/src/VBox/VMM/VMMR0/GMMR0.cpp index 9462875a5e0..4ef5ace2b62 100644 --- a/src/VBox/VMM/VMMR0/GMMR0.cpp +++ b/src/VBox/VMM/VMMR0/GMMR0.cpp @@ -150,11 +150,11 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_GMM -#include <VBox/vm.h> -#include <VBox/gmm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/gmm.h> #include "GMMR0Internal.h" -#include <VBox/gvm.h> -#include <VBox/pgm.h> +#include <VBox/vmm/gvm.h> +#include <VBox/vmm/pgm.h> #include <VBox/log.h> #include <VBox/param.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMR0/GMMR0Internal.h b/src/VBox/VMM/VMMR0/GMMR0Internal.h index e9385b0169d..1a3b3bf52db 100644 --- a/src/VBox/VMM/VMMR0/GMMR0Internal.h +++ b/src/VBox/VMM/VMMR0/GMMR0Internal.h @@ -18,7 +18,7 @@ #ifndef ___GMMR0Internal_h #define ___GMMR0Internal_h -#include <VBox/gmm.h> +#include <VBox/vmm/gmm.h> #include <iprt/avl.h> /** diff --git a/src/VBox/VMM/VMMR0/GVMMR0.cpp b/src/VBox/VMM/VMMR0/GVMMR0.cpp index 96a0ee8fd42..277105f543f 100644 --- a/src/VBox/VMM/VMMR0/GVMMR0.cpp +++ b/src/VBox/VMM/VMMR0/GVMMR0.cpp @@ -50,12 +50,12 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_GVMM -#include <VBox/gvmm.h> -#include <VBox/gmm.h> +#include <VBox/vmm/gvmm.h> +#include <VBox/vmm/gmm.h> #include "GVMMR0Internal.h" -#include <VBox/gvm.h> -#include <VBox/vm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/gvm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> #include <VBox/param.h> #include <VBox/err.h> #include <iprt/asm.h> diff --git a/src/VBox/VMM/VMMR0/HWACCMR0.cpp b/src/VBox/VMM/VMMR0/HWACCMR0.cpp index 84638d81ca1..08007cce07d 100644 --- a/src/VBox/VMM/VMMR0/HWACCMR0.cpp +++ b/src/VBox/VMM/VMMR0/HWACCMR0.cpp @@ -20,13 +20,13 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_HWACCM -#include <VBox/hwaccm.h> -#include <VBox/pgm.h> +#include <VBox/vmm/hwaccm.h> +#include <VBox/vmm/pgm.h> #include "HWACCMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/x86.h> -#include <VBox/hwacc_vmx.h> -#include <VBox/hwacc_svm.h> +#include <VBox/vmm/hwacc_vmx.h> +#include <VBox/vmm/hwacc_svm.h> #include <VBox/err.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMR0/HWACCMR0A.asm b/src/VBox/VMM/VMMR0/HWACCMR0A.asm index b1a51827e46..8be6fbbbf36 100644 --- a/src/VBox/VMM/VMMR0/HWACCMR0A.asm +++ b/src/VBox/VMM/VMMR0/HWACCMR0A.asm @@ -20,8 +20,8 @@ ;******************************************************************************* %include "VBox/asmdefs.mac" %include "VBox/err.mac" -%include "VBox/hwacc_vmx.mac" -%include "VBox/cpum.mac" +%include "VBox/vmm/hwacc_vmx.mac" +%include "VBox/vmm/cpum.mac" %include "VBox/x86.mac" %include "HWACCMInternal.mac" diff --git a/src/VBox/VMM/VMMR0/HWSVMR0.cpp b/src/VBox/VMM/VMMR0/HWSVMR0.cpp index 06ad58f7141..6ee3b70cf3a 100644 --- a/src/VBox/VMM/VMMR0/HWSVMR0.cpp +++ b/src/VBox/VMM/VMMR0/HWSVMR0.cpp @@ -19,17 +19,17 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_HWACCM -#include <VBox/hwaccm.h> -#include <VBox/pgm.h> -#include <VBox/selm.h> -#include <VBox/iom.h> -#include <VBox/dbgf.h> -#include <VBox/tm.h> -#include <VBox/pdmapi.h> +#include <VBox/vmm/hwaccm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/tm.h> +#include <VBox/vmm/pdmapi.h> #include "HWACCMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/x86.h> -#include <VBox/hwacc_svm.h> +#include <VBox/vmm/hwacc_svm.h> #include <VBox/err.h> #include <VBox/log.h> #include <VBox/dis.h> diff --git a/src/VBox/VMM/VMMR0/HWSVMR0.h b/src/VBox/VMM/VMMR0/HWSVMR0.h index c09b0b2a52e..250ed78c267 100644 --- a/src/VBox/VMM/VMMR0/HWSVMR0.h +++ b/src/VBox/VMM/VMMR0/HWSVMR0.h @@ -20,12 +20,12 @@ #include <VBox/cdefs.h> #include <VBox/types.h> -#include <VBox/em.h> -#include <VBox/stam.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/stam.h> #include <VBox/dis.h> -#include <VBox/hwaccm.h> -#include <VBox/pgm.h> -#include <VBox/hwacc_svm.h> +#include <VBox/vmm/hwaccm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/hwacc_svm.h> RT_C_DECLS_BEGIN diff --git a/src/VBox/VMM/VMMR0/HWVMXR0.cpp b/src/VBox/VMM/VMMR0/HWVMXR0.cpp index 825eec7e225..ce1b9f0ccda 100644 --- a/src/VBox/VMM/VMMR0/HWVMXR0.cpp +++ b/src/VBox/VMM/VMMR0/HWVMXR0.cpp @@ -21,17 +21,17 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_HWACCM #include <iprt/asm-amd64-x86.h> -#include <VBox/hwaccm.h> -#include <VBox/pgm.h> -#include <VBox/dbgf.h> -#include <VBox/selm.h> -#include <VBox/iom.h> -#include <VBox/rem.h> -#include <VBox/tm.h> +#include <VBox/vmm/hwaccm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/tm.h> #include "HWACCMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/x86.h> -#include <VBox/pdmapi.h> +#include <VBox/vmm/pdmapi.h> #include <VBox/err.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMR0/HWVMXR0.h b/src/VBox/VMM/VMMR0/HWVMXR0.h index 8b2f8713974..8c22121c272 100644 --- a/src/VBox/VMM/VMMR0/HWVMXR0.h +++ b/src/VBox/VMM/VMMR0/HWVMXR0.h @@ -20,12 +20,12 @@ #include <VBox/cdefs.h> #include <VBox/types.h> -#include <VBox/em.h> -#include <VBox/stam.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/stam.h> #include <VBox/dis.h> -#include <VBox/hwaccm.h> -#include <VBox/pgm.h> -#include <VBox/hwacc_vmx.h> +#include <VBox/vmm/hwaccm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/hwacc_vmx.h> RT_C_DECLS_BEGIN diff --git a/src/VBox/VMM/VMMR0/PDMR0Device.cpp b/src/VBox/VMM/VMMR0/PDMR0Device.cpp index ff91325ba5b..c350e823514 100644 --- a/src/VBox/VMM/VMMR0/PDMR0Device.cpp +++ b/src/VBox/VMM/VMMR0/PDMR0Device.cpp @@ -21,17 +21,17 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM_DEVICE #include "PDMInternal.h" -#include <VBox/pdm.h> -#include <VBox/pgm.h> -#include <VBox/mm.h> -#include <VBox/vm.h> -#include <VBox/vmm.h> -#include <VBox/patm.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/hwaccm.h> #include <VBox/log.h> #include <VBox/err.h> -#include <VBox/gvmm.h> +#include <VBox/vmm/gvmm.h> #include <iprt/asm.h> #include <iprt/assert.h> #include <iprt/string.h> diff --git a/src/VBox/VMM/VMMR0/PDMR0Driver.cpp b/src/VBox/VMM/VMMR0/PDMR0Driver.cpp index 7bce367b9a6..b4eeea1b945 100644 --- a/src/VBox/VMM/VMMR0/PDMR0Driver.cpp +++ b/src/VBox/VMM/VMMR0/PDMR0Driver.cpp @@ -20,8 +20,8 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM_DRIVER #include "PDMInternal.h" -#include <VBox/pdm.h> -#include <VBox/vm.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/vm.h> #include <VBox/log.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMR0/PGMR0.cpp b/src/VBox/VMM/VMMR0/PGMR0.cpp index 5dbb4a031e8..099b1deb013 100644 --- a/src/VBox/VMM/VMMR0/PGMR0.cpp +++ b/src/VBox/VMM/VMMR0/PGMR0.cpp @@ -19,10 +19,10 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM -#include <VBox/pgm.h> -#include <VBox/gmm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/gmm.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <VBox/log.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp b/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp index 8bc4f00364d..60866cfd3ad 100644 --- a/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp +++ b/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp @@ -19,10 +19,10 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM_SHARED -#include <VBox/pgm.h> -#include <VBox/gmm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/gmm.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <VBox/log.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMR0/TRPMR0.cpp b/src/VBox/VMM/VMMR0/TRPMR0.cpp index 51b9efe437e..8b28530d103 100644 --- a/src/VBox/VMM/VMMR0/TRPMR0.cpp +++ b/src/VBox/VMM/VMMR0/TRPMR0.cpp @@ -20,10 +20,10 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_TRPM -#include <VBox/trpm.h> +#include <VBox/vmm/trpm.h> #include "TRPMInternal.h" -#include <VBox/vm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> #include <VBox/err.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMR0/VMMR0.cpp b/src/VBox/VMM/VMMR0/VMMR0.cpp index 5a0183035f9..1a58b484fdd 100644 --- a/src/VBox/VMM/VMMR0/VMMR0.cpp +++ b/src/VBox/VMM/VMMR0/VMMR0.cpp @@ -19,21 +19,21 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_VMM -#include <VBox/vmm.h> +#include <VBox/vmm/vmm.h> #include <VBox/sup.h> -#include <VBox/trpm.h> -#include <VBox/cpum.h> -#include <VBox/pdmapi.h> -#include <VBox/pgm.h> -#include <VBox/stam.h> -#include <VBox/tm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/tm.h> #include "VMMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> -#include <VBox/gvmm.h> -#include <VBox/gmm.h> +#include <VBox/vmm/gvmm.h> +#include <VBox/vmm/gmm.h> #include <VBox/intnet.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/hwaccm.h> #include <VBox/param.h> #include <VBox/err.h> #include <VBox/version.h> diff --git a/src/VBox/VMM/VMMR3/CFGM.cpp b/src/VBox/VMM/VMMR3/CFGM.cpp index c582ca0c0c2..f47d62311fd 100644 --- a/src/VBox/VMM/VMMR3/CFGM.cpp +++ b/src/VBox/VMM/VMMR3/CFGM.cpp @@ -55,11 +55,11 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_CFGM -#include <VBox/cfgm.h> -#include <VBox/dbgf.h> -#include <VBox/mm.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/mm.h> #include "CFGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/CPUM.cpp b/src/VBox/VMM/VMMR3/CPUM.cpp index 9c7565b7d22..7648526d4ea 100644 --- a/src/VBox/VMM/VMMR3/CPUM.cpp +++ b/src/VBox/VMM/VMMR3/CPUM.cpp @@ -35,17 +35,17 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_CPUM -#include <VBox/cpum.h> -#include <VBox/cpumdis.h> -#include <VBox/pgm.h> -#include <VBox/mm.h> -#include <VBox/selm.h> -#include <VBox/dbgf.h> -#include <VBox/patm.h> -#include <VBox/hwaccm.h> -#include <VBox/ssm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/cpumdis.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/hwaccm.h> +#include <VBox/vmm/ssm.h> #include "CPUMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/param.h> #include <VBox/dis.h> diff --git a/src/VBox/VMM/VMMR3/DBGF.cpp b/src/VBox/VMM/VMMR3/DBGF.cpp index 14017b2ba38..4631143178b 100644 --- a/src/VBox/VMM/VMMR3/DBGF.cpp +++ b/src/VBox/VMM/VMMR3/DBGF.cpp @@ -70,13 +70,13 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_DBGF -#include <VBox/dbgf.h> -#include <VBox/selm.h> -#include <VBox/rem.h> -#include <VBox/em.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/hwaccm.h> #include "DBGFInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/DBGFAddr.cpp b/src/VBox/VMM/VMMR3/DBGFAddr.cpp index adb9d29834a..e50562e48ff 100644 --- a/src/VBox/VMM/VMMR3/DBGFAddr.cpp +++ b/src/VBox/VMM/VMMR3/DBGFAddr.cpp @@ -20,12 +20,12 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_DBGF -#include <VBox/dbgf.h> -#include <VBox/pgm.h> -#include <VBox/selm.h> -#include <VBox/mm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/mm.h> #include "DBGFInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/param.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp b/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp index 8e8e945e409..c6462ab012b 100644 --- a/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp +++ b/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp @@ -37,11 +37,11 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_DBGF -#include <VBox/dbgf.h> -#include <VBox/pdmapi.h> -#include <VBox/mm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/mm.h> #include "DBGFInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/DBGFBp.cpp b/src/VBox/VMM/VMMR3/DBGFBp.cpp index e617cc3b115..76e7c2f3de5 100644 --- a/src/VBox/VMM/VMMR3/DBGFBp.cpp +++ b/src/VBox/VMM/VMMR3/DBGFBp.cpp @@ -20,12 +20,12 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_DBGF -#include <VBox/dbgf.h> -#include <VBox/selm.h> -#include <VBox/rem.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/rem.h> #include "DBGFInternal.h" -#include <VBox/vm.h> -#include <VBox/mm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/mm.h> #include <VBox/err.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp b/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp index c46a9f4538b..2ae2f1667fe 100644 --- a/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp +++ b/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp @@ -53,15 +53,15 @@ #include "DBGFInternal.h" -#include <VBox/cpum.h> +#include <VBox/vmm/cpum.h> #include "CPUMInternal.h" -#include <VBox/dbgf.h> -#include <VBox/dbgfcorefmt.h> -#include <VBox/vm.h> -#include <VBox/pgm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/dbgfcorefmt.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/pgm.h> #include <VBox/err.h> #include <VBox/log.h> -#include <VBox/mm.h> +#include <VBox/vmm/mm.h> #include <VBox/version.h> #include "../../Runtime/include/internal/ldrELF64.h" diff --git a/src/VBox/VMM/VMMR3/DBGFCpu.cpp b/src/VBox/VMM/VMMR3/DBGFCpu.cpp index 344db5c62f7..d2a95114533 100644 --- a/src/VBox/VMM/VMMR3/DBGFCpu.cpp +++ b/src/VBox/VMM/VMMR3/DBGFCpu.cpp @@ -20,10 +20,10 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_DBGF -#include <VBox/dbgf.h> -#include <VBox/cpum.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/cpum.h> #include "DBGFInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> #include <VBox/param.h> diff --git a/src/VBox/VMM/VMMR3/DBGFDisas.cpp b/src/VBox/VMM/VMMR3/DBGFDisas.cpp index 713a9ac9de6..6b447dd8634 100644 --- a/src/VBox/VMM/VMMR3/DBGFDisas.cpp +++ b/src/VBox/VMM/VMMR3/DBGFDisas.cpp @@ -19,16 +19,16 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_DBGF -#include <VBox/dbgf.h> -#include <VBox/selm.h> -#include <VBox/mm.h> -#include <VBox/pgm.h> -#include <VBox/cpum.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/cpum.h> #include "DBGFInternal.h" #include <VBox/dis.h> #include <VBox/err.h> #include <VBox/param.h> -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "internal/pgm.h" #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/DBGFInfo.cpp b/src/VBox/VMM/VMMR3/DBGFInfo.cpp index 708d17af063..64bd6b46956 100644 --- a/src/VBox/VMM/VMMR3/DBGFInfo.cpp +++ b/src/VBox/VMM/VMMR3/DBGFInfo.cpp @@ -20,11 +20,11 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_DBGF_INFO -#include <VBox/dbgf.h> +#include <VBox/vmm/dbgf.h> -#include <VBox/mm.h> +#include <VBox/vmm/mm.h> #include "DBGFInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/DBGFLog.cpp b/src/VBox/VMM/VMMR3/DBGFLog.cpp index 5124e35473d..b7e7b37b329 100644 --- a/src/VBox/VMM/VMMR3/DBGFLog.cpp +++ b/src/VBox/VMM/VMMR3/DBGFLog.cpp @@ -19,9 +19,9 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/vmapi.h> -#include <VBox/vmm.h> -#include <VBox/dbgf.h> +#include <VBox/vmm/vmapi.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/dbgf.h> #include <VBox/log.h> #include <VBox/err.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMR3/DBGFMem.cpp b/src/VBox/VMM/VMMR3/DBGFMem.cpp index 7d9473c930d..b6577ea243c 100644 --- a/src/VBox/VMM/VMMR3/DBGFMem.cpp +++ b/src/VBox/VMM/VMMR3/DBGFMem.cpp @@ -20,15 +20,15 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_DBGF -#include <VBox/dbgf.h> -#include <VBox/pgm.h> -#include <VBox/selm.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/hwaccm.h> #include "DBGFInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> -#include <VBox/mm.h> +#include <VBox/vmm/mm.h> diff --git a/src/VBox/VMM/VMMR3/DBGFModule.cpp b/src/VBox/VMM/VMMR3/DBGFModule.cpp index da7e1768b99..8f96c1f1209 100644 --- a/src/VBox/VMM/VMMR3/DBGFModule.cpp +++ b/src/VBox/VMM/VMMR3/DBGFModule.cpp @@ -34,7 +34,7 @@ */ #if 0 -#include <VBox/dbgf.h> +#include <VBox/vmm/dbgf.h> /** Special segment number that indicates that the offset is a relative diff --git a/src/VBox/VMM/VMMR3/DBGFOS.cpp b/src/VBox/VMM/VMMR3/DBGFOS.cpp index ac5f84a7b98..10da6e38216 100644 --- a/src/VBox/VMM/VMMR3/DBGFOS.cpp +++ b/src/VBox/VMM/VMMR3/DBGFOS.cpp @@ -20,10 +20,10 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_DBGF -#include <VBox/dbgf.h> -#include <VBox/mm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/mm.h> #include "DBGFInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/DBGFReg.cpp b/src/VBox/VMM/VMMR3/DBGFReg.cpp index 09f3ecef2db..3ae3b6a4807 100644 --- a/src/VBox/VMM/VMMR3/DBGFReg.cpp +++ b/src/VBox/VMM/VMMR3/DBGFReg.cpp @@ -20,9 +20,9 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_DBGF -#include <VBox/dbgf.h> +#include <VBox/vmm/dbgf.h> #include "DBGFInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/param.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/DBGFStack.cpp b/src/VBox/VMM/VMMR3/DBGFStack.cpp index 53d08e59ceb..e3666327368 100644 --- a/src/VBox/VMM/VMMR3/DBGFStack.cpp +++ b/src/VBox/VMM/VMMR3/DBGFStack.cpp @@ -20,11 +20,11 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_DBGF -#include <VBox/dbgf.h> -#include <VBox/selm.h> -#include <VBox/mm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/mm.h> #include "DBGFInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> #include <iprt/param.h> diff --git a/src/VBox/VMM/VMMR3/DBGFSym.cpp b/src/VBox/VMM/VMMR3/DBGFSym.cpp index 39471b3d3ad..af84161cad7 100644 --- a/src/VBox/VMM/VMMR3/DBGFSym.cpp +++ b/src/VBox/VMM/VMMR3/DBGFSym.cpp @@ -27,11 +27,11 @@ # define HAVE_DBGHELP /* if doing guest stuff, this can be nice. */ #endif /** @todo Only use DBGHELP for reading modules since it doesn't do all we want (relocations), or is way to slow in some cases (add symbol)! */ -#include <VBox/dbgf.h> -#include <VBox/mm.h> -#include <VBox/pdmapi.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/pdmapi.h> #include "DBGFInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/EM.cpp b/src/VBox/VMM/VMMR3/EM.cpp index ab2efffd779..8486669244f 100644 --- a/src/VBox/VMM/VMMR3/EM.cpp +++ b/src/VBox/VMM/VMMR3/EM.cpp @@ -35,31 +35,31 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_EM -#include <VBox/em.h> -#include <VBox/vmm.h> -#include <VBox/patm.h> -#include <VBox/csam.h> -#include <VBox/selm.h> -#include <VBox/trpm.h> -#include <VBox/iom.h> -#include <VBox/dbgf.h> -#include <VBox/pgm.h> -#include <VBox/rem.h> -#include <VBox/tm.h> -#include <VBox/mm.h> -#include <VBox/ssm.h> -#include <VBox/pdmapi.h> -#include <VBox/pdmcritsect.h> -#include <VBox/pdmqueue.h> -#include <VBox/hwaccm.h> -#include <VBox/patm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/csam.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/tm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/pdmcritsect.h> +#include <VBox/vmm/pdmqueue.h> +#include <VBox/vmm/hwaccm.h> +#include <VBox/vmm/patm.h> #include "EMInternal.h" #include "internal/em.h" -#include <VBox/vm.h> -#include <VBox/cpumdis.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/cpumdis.h> #include <VBox/dis.h> #include <VBox/disopcode.h> -#include <VBox/dbgf.h> +#include <VBox/vmm/dbgf.h> #include <iprt/asm.h> #include <iprt/string.h> diff --git a/src/VBox/VMM/VMMR3/EMHwaccm.cpp b/src/VBox/VMM/VMMR3/EMHwaccm.cpp index 5f67829c243..4e5a7111803 100644 --- a/src/VBox/VMM/VMMR3/EMHwaccm.cpp +++ b/src/VBox/VMM/VMMR3/EMHwaccm.cpp @@ -35,29 +35,29 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_EM -#include <VBox/em.h> -#include <VBox/vmm.h> -#include <VBox/csam.h> -#include <VBox/selm.h> -#include <VBox/trpm.h> -#include <VBox/iom.h> -#include <VBox/dbgf.h> -#include <VBox/pgm.h> -#include <VBox/rem.h> -#include <VBox/tm.h> -#include <VBox/mm.h> -#include <VBox/ssm.h> -#include <VBox/pdmapi.h> -#include <VBox/pdmcritsect.h> -#include <VBox/pdmqueue.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/csam.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/tm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/pdmcritsect.h> +#include <VBox/vmm/pdmqueue.h> +#include <VBox/vmm/hwaccm.h> #include "EMInternal.h" #include "internal/em.h" -#include <VBox/vm.h> -#include <VBox/cpumdis.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/cpumdis.h> #include <VBox/dis.h> #include <VBox/disopcode.h> -#include <VBox/dbgf.h> +#include <VBox/vmm/dbgf.h> #include <iprt/asm.h> diff --git a/src/VBox/VMM/VMMR3/EMRaw.cpp b/src/VBox/VMM/VMMR3/EMRaw.cpp index cdff546c36e..5046a582015 100644 --- a/src/VBox/VMM/VMMR3/EMRaw.cpp +++ b/src/VBox/VMM/VMMR3/EMRaw.cpp @@ -36,30 +36,30 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_EM -#include <VBox/em.h> -#include <VBox/vmm.h> -#include <VBox/patm.h> -#include <VBox/csam.h> -#include <VBox/selm.h> -#include <VBox/trpm.h> -#include <VBox/iom.h> -#include <VBox/dbgf.h> -#include <VBox/pgm.h> -#include <VBox/rem.h> -#include <VBox/tm.h> -#include <VBox/mm.h> -#include <VBox/ssm.h> -#include <VBox/pdmapi.h> -#include <VBox/pdmcritsect.h> -#include <VBox/pdmqueue.h> -#include <VBox/patm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/csam.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/tm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/pdmcritsect.h> +#include <VBox/vmm/pdmqueue.h> +#include <VBox/vmm/patm.h> #include "EMInternal.h" #include "internal/em.h" -#include <VBox/vm.h> -#include <VBox/cpumdis.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/cpumdis.h> #include <VBox/dis.h> #include <VBox/disopcode.h> -#include <VBox/dbgf.h> +#include <VBox/vmm/dbgf.h> #include <VBox/log.h> #include <iprt/asm.h> diff --git a/src/VBox/VMM/VMMR3/FTM.cpp b/src/VBox/VMM/VMMR3/FTM.cpp index 7b4bf391efa..dd2a0a981be 100644 --- a/src/VBox/VMM/VMMR3/FTM.cpp +++ b/src/VBox/VMM/VMMR3/FTM.cpp @@ -21,14 +21,14 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_FTM #include "FTMInternal.h" -#include <VBox/vm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> #include <VBox/err.h> #include <VBox/param.h> -#include <VBox/ssm.h> +#include <VBox/vmm/ssm.h> #include <VBox/log.h> -#include <VBox/pgm.h> -#include <VBox/pdm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/pdm.h> #include <iprt/assert.h> #include <iprt/thread.h> diff --git a/src/VBox/VMM/VMMR3/GMM.cpp b/src/VBox/VMM/VMMR3/GMM.cpp index 18347143c71..b18ed4e406d 100644 --- a/src/VBox/VMM/VMMR3/GMM.cpp +++ b/src/VBox/VMM/VMMR3/GMM.cpp @@ -20,9 +20,9 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_GMM -#include <VBox/gmm.h> -#include <VBox/vmm.h> -#include <VBox/vm.h> +#include <VBox/vmm/gmm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/vm.h> #include <VBox/sup.h> #include <VBox/err.h> #include <VBox/param.h> diff --git a/src/VBox/VMM/VMMR3/HWACCM.cpp b/src/VBox/VMM/VMMR3/HWACCM.cpp index dc22ff35c64..ef411f2fdbd 100644 --- a/src/VBox/VMM/VMMR3/HWACCM.cpp +++ b/src/VBox/VMM/VMMR3/HWACCM.cpp @@ -19,23 +19,23 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_HWACCM -#include <VBox/cpum.h> -#include <VBox/stam.h> -#include <VBox/mm.h> -#include <VBox/pdmapi.h> -#include <VBox/pgm.h> -#include <VBox/ssm.h> -#include <VBox/trpm.h> -#include <VBox/dbgf.h> -#include <VBox/iom.h> -#include <VBox/patm.h> -#include <VBox/csam.h> -#include <VBox/selm.h> -#include <VBox/rem.h> -#include <VBox/hwacc_vmx.h> -#include <VBox/hwacc_svm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/csam.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/hwacc_vmx.h> +#include <VBox/vmm/hwacc_svm.h> #include "HWACCMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/param.h> diff --git a/src/VBox/VMM/VMMR3/IOM.cpp b/src/VBox/VMM/VMMR3/IOM.cpp index 7afe5edb3e0..8fb8a9de17d 100644 --- a/src/VBox/VMM/VMMR3/IOM.cpp +++ b/src/VBox/VMM/VMMR3/IOM.cpp @@ -93,17 +93,17 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_IOM -#include <VBox/iom.h> -#include <VBox/cpum.h> -#include <VBox/pgm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/pgm.h> #include <VBox/sup.h> -#include <VBox/mm.h> -#include <VBox/stam.h> -#include <VBox/dbgf.h> -#include <VBox/pdmapi.h> -#include <VBox/pdmdev.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/pdmdev.h> #include "IOMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/param.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMR3/MM.cpp b/src/VBox/VMM/VMMR3/MM.cpp index a23ba07a804..7b005fe609e 100644 --- a/src/VBox/VMM/VMMR3/MM.cpp +++ b/src/VBox/VMM/VMMR3/MM.cpp @@ -144,14 +144,14 @@ Hypervisor Memory Area (HMA) Layout: Base 00000000a0000000, 0x00800000 bytes * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_MM -#include <VBox/mm.h> -#include <VBox/pgm.h> -#include <VBox/cfgm.h> -#include <VBox/ssm.h> -#include <VBox/gmm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/gmm.h> #include "MMInternal.h" -#include <VBox/vm.h> -#include <VBox/uvm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> #include <VBox/err.h> #include <VBox/param.h> diff --git a/src/VBox/VMM/VMMR3/MMHeap.cpp b/src/VBox/VMM/VMMR3/MMHeap.cpp index 8f266ee75e0..5f503e968d2 100644 --- a/src/VBox/VMM/VMMR3/MMHeap.cpp +++ b/src/VBox/VMM/VMMR3/MMHeap.cpp @@ -20,12 +20,12 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_MM_HEAP -#include <VBox/mm.h> -#include <VBox/stam.h> -#include <VBox/pgm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/pgm.h> #include "MMInternal.h" -#include <VBox/vm.h> -#include <VBox/uvm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> #include <VBox/err.h> #include <VBox/param.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/MMHyper.cpp b/src/VBox/VMM/VMMR3/MMHyper.cpp index 399bcc075b6..a5b1cbff269 100644 --- a/src/VBox/VMM/VMMR3/MMHyper.cpp +++ b/src/VBox/VMM/VMMR3/MMHyper.cpp @@ -20,11 +20,11 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_MM_HYPER -#include <VBox/pgm.h> -#include <VBox/mm.h> -#include <VBox/dbgf.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/dbgf.h> #include "MMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/param.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/MMPagePool.cpp b/src/VBox/VMM/VMMR3/MMPagePool.cpp index 686e8eb8407..e5161320f50 100644 --- a/src/VBox/VMM/VMMR3/MMPagePool.cpp +++ b/src/VBox/VMM/VMMR3/MMPagePool.cpp @@ -19,11 +19,11 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_MM_POOL -#include <VBox/mm.h> -#include <VBox/pgm.h> -#include <VBox/stam.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/stam.h> #include "MMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/param.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/MMUkHeap.cpp b/src/VBox/VMM/VMMR3/MMUkHeap.cpp index c5d3363d2af..91e5bd46768 100644 --- a/src/VBox/VMM/VMMR3/MMUkHeap.cpp +++ b/src/VBox/VMM/VMMR3/MMUkHeap.cpp @@ -20,11 +20,11 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_MM_HEAP -#include <VBox/mm.h> -#include <VBox/stam.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/stam.h> #include "MMInternal.h" -#include <VBox/vm.h> -#include <VBox/uvm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> #include <VBox/err.h> #include <VBox/param.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/PDM.cpp b/src/VBox/VMM/VMMR3/PDM.cpp index a6410e5c3c5..32c2a22bf62 100644 --- a/src/VBox/VMM/VMMR3/PDM.cpp +++ b/src/VBox/VMM/VMMR3/PDM.cpp @@ -251,13 +251,13 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM #include "PDMInternal.h" -#include <VBox/pdm.h> -#include <VBox/mm.h> -#include <VBox/pgm.h> -#include <VBox/ssm.h> -#include <VBox/vm.h> -#include <VBox/uvm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> +#include <VBox/vmm/vmm.h> #include <VBox/param.h> #include <VBox/err.h> #include <VBox/sup.h> diff --git a/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp b/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp index 8b26d85003d..7407626c43c 100644 --- a/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp +++ b/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp @@ -21,11 +21,11 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM_ASYNC_COMPLETION #include "PDMInternal.h" -#include <VBox/pdm.h> -#include <VBox/mm.h> -#include <VBox/rem.h> -#include <VBox/vm.h> -#include <VBox/uvm.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> #include <VBox/err.h> #include <VBox/log.h> @@ -38,7 +38,7 @@ #include <iprt/path.h> #include <iprt/string.h> -#include <VBox/pdmasynccompletion.h> +#include <VBox/vmm/pdmasynccompletion.h> #include "PDMAsyncCompletionInternal.h" /** diff --git a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp index 2e767c1238f..adeaad0afd5 100644 --- a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp +++ b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp @@ -21,13 +21,13 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM_ASYNC_COMPLETION #include "PDMInternal.h" -#include <VBox/pdm.h> -#include <VBox/mm.h> -#include <VBox/vm.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> #include <VBox/dbg.h> -#include <VBox/uvm.h> +#include <VBox/vmm/uvm.h> #include <iprt/asm.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMR3/PDMBlkCache.cpp b/src/VBox/VMM/VMMR3/PDMBlkCache.cpp index 539e0c8e816..a176e6e1a20 100644 --- a/src/VBox/VMM/VMMR3/PDMBlkCache.cpp +++ b/src/VBox/VMM/VMMR3/PDMBlkCache.cpp @@ -29,9 +29,9 @@ #include <iprt/path.h> #include <iprt/string.h> #include <VBox/log.h> -#include <VBox/stam.h> -#include <VBox/uvm.h> -#include <VBox/vm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/uvm.h> +#include <VBox/vmm/vm.h> #include "PDMBlkCacheInternal.h" diff --git a/src/VBox/VMM/VMMR3/PDMCritSect.cpp b/src/VBox/VMM/VMMR3/PDMCritSect.cpp index 2e4a6ceb460..dbbecec7ee5 100644 --- a/src/VBox/VMM/VMMR3/PDMCritSect.cpp +++ b/src/VBox/VMM/VMMR3/PDMCritSect.cpp @@ -21,10 +21,10 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM//_CRITSECT #include "PDMInternal.h" -#include <VBox/pdmcritsect.h> -#include <VBox/mm.h> -#include <VBox/vm.h> -#include <VBox/uvm.h> +#include <VBox/vmm/pdmcritsect.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/PDMDevHlp.cpp b/src/VBox/VMM/VMMR3/PDMDevHlp.cpp index 77b401a0ca1..925e250525a 100644 --- a/src/VBox/VMM/VMMR3/PDMDevHlp.cpp +++ b/src/VBox/VMM/VMMR3/PDMDevHlp.cpp @@ -21,16 +21,16 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM_DEVICE #include "PDMInternal.h" -#include <VBox/pdm.h> -#include <VBox/mm.h> -#include <VBox/pgm.h> -#include <VBox/iom.h> -#include <VBox/rem.h> -#include <VBox/dbgf.h> -#include <VBox/vmapi.h> -#include <VBox/vm.h> -#include <VBox/uvm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/vmapi.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> +#include <VBox/vmm/vmm.h> #include <VBox/version.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp b/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp index 68bc276bde1..9ba4a57b09d 100644 --- a/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp +++ b/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp @@ -21,10 +21,10 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM_DEVICE #include "PDMInternal.h" -#include <VBox/pdm.h> -#include <VBox/rem.h> -#include <VBox/vm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> #include <VBox/log.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMR3/PDMDevice.cpp b/src/VBox/VMM/VMMR3/PDMDevice.cpp index 3f7d512a1c0..3e4a95bdbf2 100644 --- a/src/VBox/VMM/VMMR3/PDMDevice.cpp +++ b/src/VBox/VMM/VMMR3/PDMDevice.cpp @@ -21,15 +21,15 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM_DEVICE #include "PDMInternal.h" -#include <VBox/pdm.h> -#include <VBox/mm.h> -#include <VBox/pgm.h> -#include <VBox/iom.h> -#include <VBox/cfgm.h> -#include <VBox/rem.h> -#include <VBox/dbgf.h> -#include <VBox/vm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> #include <VBox/version.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/PDMDriver.cpp b/src/VBox/VMM/VMMR3/PDMDriver.cpp index 9667b54c260..8df94ee3e5e 100644 --- a/src/VBox/VMM/VMMR3/PDMDriver.cpp +++ b/src/VBox/VMM/VMMR3/PDMDriver.cpp @@ -21,12 +21,12 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM_DRIVER #include "PDMInternal.h" -#include <VBox/pdm.h> -#include <VBox/mm.h> -#include <VBox/cfgm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/vmm.h> #include <VBox/sup.h> -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/version.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMR3/PDMLdr.cpp b/src/VBox/VMM/VMMR3/PDMLdr.cpp index 49f9ba9bb57..28787dd22f1 100644 --- a/src/VBox/VMM/VMMR3/PDMLdr.cpp +++ b/src/VBox/VMM/VMMR3/PDMLdr.cpp @@ -22,15 +22,15 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM_LDR #include "PDMInternal.h" -#include <VBox/pdm.h> -#include <VBox/mm.h> -#include <VBox/vmm.h> -#include <VBox/vm.h> -#include <VBox/uvm.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> #include <VBox/sup.h> #include <VBox/param.h> #include <VBox/err.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/hwaccm.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMR3/PDMQueue.cpp b/src/VBox/VMM/VMMR3/PDMQueue.cpp index 0c89f1c1187..cc690cd28c8 100644 --- a/src/VBox/VMM/VMMR3/PDMQueue.cpp +++ b/src/VBox/VMM/VMMR3/PDMQueue.cpp @@ -21,11 +21,11 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM_QUEUE #include "PDMInternal.h" -#include <VBox/pdm.h> -#include <VBox/mm.h> -#include <VBox/rem.h> -#include <VBox/vm.h> -#include <VBox/uvm.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/PDMThread.cpp b/src/VBox/VMM/VMMR3/PDMThread.cpp index 2e4d2830d89..5b48331fa3d 100644 --- a/src/VBox/VMM/VMMR3/PDMThread.cpp +++ b/src/VBox/VMM/VMMR3/PDMThread.cpp @@ -20,10 +20,10 @@ *******************************************************************************/ ///@todo #define LOG_GROUP LOG_GROUP_PDM_THREAD #include "PDMInternal.h" -#include <VBox/pdm.h> -#include <VBox/mm.h> -#include <VBox/vm.h> -#include <VBox/uvm.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/PDMUsb.cpp b/src/VBox/VMM/VMMR3/PDMUsb.cpp index 15664f266a1..2b23159ca0c 100644 --- a/src/VBox/VMM/VMMR3/PDMUsb.cpp +++ b/src/VBox/VMM/VMMR3/PDMUsb.cpp @@ -21,13 +21,13 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM_DRIVER #include "PDMInternal.h" -#include <VBox/pdm.h> +#include <VBox/vmm/pdm.h> #include <VBox/vusb.h> -#include <VBox/mm.h> -#include <VBox/cfgm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/vmm.h> #include <VBox/sup.h> -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/version.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMR3/PGM.cpp b/src/VBox/VMM/VMMR3/PGM.cpp index 5521765df93..b52800378e3 100644 --- a/src/VBox/VMM/VMMR3/PGM.cpp +++ b/src/VBox/VMM/VMMR3/PGM.cpp @@ -573,20 +573,20 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM -#include <VBox/dbgf.h> -#include <VBox/pgm.h> -#include <VBox/cpum.h> -#include <VBox/iom.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/iom.h> #include <VBox/sup.h> -#include <VBox/mm.h> -#include <VBox/em.h> -#include <VBox/stam.h> -#include <VBox/rem.h> -#include <VBox/selm.h> -#include <VBox/ssm.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/hwaccm.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <VBox/dbg.h> diff --git a/src/VBox/VMM/VMMR3/PGMDbg.cpp b/src/VBox/VMM/VMMR3/PGMDbg.cpp index 0f7479a2ff0..88d77aac5b1 100644 --- a/src/VBox/VMM/VMMR3/PGMDbg.cpp +++ b/src/VBox/VMM/VMMR3/PGMDbg.cpp @@ -19,10 +19,10 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM -#include <VBox/pgm.h> -#include <VBox/stam.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/stam.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <iprt/assert.h> #include <iprt/asm.h> diff --git a/src/VBox/VMM/VMMR3/PGMHandler.cpp b/src/VBox/VMM/VMMR3/PGMHandler.cpp index e55f796afc3..b254af5e3be 100644 --- a/src/VBox/VMM/VMMR3/PGMHandler.cpp +++ b/src/VBox/VMM/VMMR3/PGMHandler.cpp @@ -20,22 +20,22 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM -#include <VBox/dbgf.h> -#include <VBox/pgm.h> -#include <VBox/cpum.h> -#include <VBox/iom.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/iom.h> #include <VBox/sup.h> -#include <VBox/mm.h> -#include <VBox/em.h> -#include <VBox/stam.h> -#include <VBox/csam.h> -#include <VBox/rem.h> -#include <VBox/dbgf.h> -#include <VBox/rem.h> -#include <VBox/selm.h> -#include <VBox/ssm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/csam.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/ssm.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <VBox/dbg.h> @@ -47,7 +47,7 @@ #include <iprt/string.h> #include <VBox/param.h> #include <VBox/err.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/hwaccm.h> /******************************************************************************* diff --git a/src/VBox/VMM/VMMR3/PGMMap.cpp b/src/VBox/VMM/VMMR3/PGMMap.cpp index 832fce8a128..8b41370d1ac 100644 --- a/src/VBox/VMM/VMMR3/PGMMap.cpp +++ b/src/VBox/VMM/VMMR3/PGMMap.cpp @@ -20,10 +20,10 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM -#include <VBox/dbgf.h> -#include <VBox/pgm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/pgm.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/PGMPhys.cpp b/src/VBox/VMM/VMMR3/PGMPhys.cpp index 79edff3ff0c..1381c49e9de 100644 --- a/src/VBox/VMM/VMMR3/PGMPhys.cpp +++ b/src/VBox/VMM/VMMR3/PGMPhys.cpp @@ -20,14 +20,14 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM_PHYS -#include <VBox/pgm.h> -#include <VBox/iom.h> -#include <VBox/mm.h> -#include <VBox/stam.h> -#include <VBox/rem.h> -#include <VBox/pdmdev.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/pdmdev.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <VBox/sup.h> #include <VBox/param.h> diff --git a/src/VBox/VMM/VMMR3/PGMPool.cpp b/src/VBox/VMM/VMMR3/PGMPool.cpp index 05d5c75e5ed..54e6b6bdfdc 100644 --- a/src/VBox/VMM/VMMR3/PGMPool.cpp +++ b/src/VBox/VMM/VMMR3/PGMPool.cpp @@ -96,10 +96,10 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM_POOL -#include <VBox/pgm.h> -#include <VBox/mm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/mm.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/PGMSavedState.cpp b/src/VBox/VMM/VMMR3/PGMSavedState.cpp index f5997501d8c..c00f0c9ef7a 100644 --- a/src/VBox/VMM/VMMR3/PGMSavedState.cpp +++ b/src/VBox/VMM/VMMR3/PGMSavedState.cpp @@ -20,18 +20,18 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM -#include <VBox/pgm.h> -#include <VBox/stam.h> -#include <VBox/ssm.h> -#include <VBox/pdmdrv.h> -#include <VBox/pdmdev.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/pdmdrv.h> +#include <VBox/vmm/pdmdev.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <VBox/param.h> #include <VBox/err.h> -#include <VBox/ftm.h> +#include <VBox/vmm/ftm.h> #include <iprt/asm.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMR3/PGMSharedPage.cpp b/src/VBox/VMM/VMMR3/PGMSharedPage.cpp index 0192b638443..a8a7993bf5c 100644 --- a/src/VBox/VMM/VMMR3/PGMSharedPage.cpp +++ b/src/VBox/VMM/VMMR3/PGMSharedPage.cpp @@ -20,10 +20,10 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM_SHARED -#include <VBox/pgm.h> -#include <VBox/stam.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/stam.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/sup.h> #include <VBox/param.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMR3/SELM.cpp b/src/VBox/VMM/VMMR3/SELM.cpp index 609a167b843..8a3caf34ab9 100644 --- a/src/VBox/VMM/VMMR3/SELM.cpp +++ b/src/VBox/VMM/VMMR3/SELM.cpp @@ -59,16 +59,16 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_SELM -#include <VBox/selm.h> -#include <VBox/cpum.h> -#include <VBox/stam.h> -#include <VBox/mm.h> -#include <VBox/ssm.h> -#include <VBox/pgm.h> -#include <VBox/trpm.h> -#include <VBox/dbgf.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/dbgf.h> #include "SELMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/param.h> diff --git a/src/VBox/VMM/VMMR3/SSM.cpp b/src/VBox/VMM/VMMR3/SSM.cpp index 5cecfb03aed..bc959abb170 100644 --- a/src/VBox/VMM/VMMR3/SSM.cpp +++ b/src/VBox/VMM/VMMR3/SSM.cpp @@ -144,11 +144,11 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_SSM -#include <VBox/ssm.h> -#include <VBox/dbgf.h> -#include <VBox/mm.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/mm.h> #include "SSMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/log.h> #include <VBox/version.h> diff --git a/src/VBox/VMM/VMMR3/STAM.cpp b/src/VBox/VMM/VMMR3/STAM.cpp index 0796dbf1ce5..48e82e33f87 100644 --- a/src/VBox/VMM/VMMR3/STAM.cpp +++ b/src/VBox/VMM/VMMR3/STAM.cpp @@ -48,10 +48,10 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_STAM -#include <VBox/stam.h> +#include <VBox/vmm/stam.h> #include "STAMInternal.h" -#include <VBox/vm.h> -#include <VBox/uvm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> #include <VBox/err.h> #include <VBox/dbg.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/TM.cpp b/src/VBox/VMM/VMMR3/TM.cpp index 297c7e7d89d..a27728523c8 100644 --- a/src/VBox/VMM/VMMR3/TM.cpp +++ b/src/VBox/VMM/VMMR3/TM.cpp @@ -120,18 +120,18 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_TM -#include <VBox/tm.h> -#include <VBox/vmm.h> -#include <VBox/mm.h> -#include <VBox/ssm.h> -#include <VBox/dbgf.h> -#include <VBox/rem.h> -#include <VBox/pdmapi.h> -#include <VBox/iom.h> +#include <VBox/vmm/tm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/iom.h> #include "TMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> -#include <VBox/pdmdev.h> +#include <VBox/vmm/pdmdev.h> #include <VBox/param.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMR3/TRPM.cpp b/src/VBox/VMM/VMMR3/TRPM.cpp index d20db4b0f08..64ad404c966 100644 --- a/src/VBox/VMM/VMMR3/TRPM.cpp +++ b/src/VBox/VMM/VMMR3/TRPM.cpp @@ -73,23 +73,23 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_TRPM -#include <VBox/trpm.h> -#include <VBox/cpum.h> -#include <VBox/selm.h> -#include <VBox/ssm.h> -#include <VBox/pdmapi.h> -#include <VBox/pgm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/pgm.h> #include "internal/pgm.h" -#include <VBox/dbgf.h> -#include <VBox/mm.h> -#include <VBox/stam.h> -#include <VBox/csam.h> -#include <VBox/patm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/csam.h> +#include <VBox/vmm/patm.h> #include "TRPMInternal.h" -#include <VBox/vm.h> -#include <VBox/em.h> -#include <VBox/rem.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/hwaccm.h> #include <VBox/err.h> #include <VBox/param.h> diff --git a/src/VBox/VMM/VMMR3/VBoxVMMDeps.cpp b/src/VBox/VMM/VMMR3/VBoxVMMDeps.cpp index 0983eb8b341..04797a63447 100644 --- a/src/VBox/VMM/VMMR3/VBoxVMMDeps.cpp +++ b/src/VBox/VMM/VMMR3/VBoxVMMDeps.cpp @@ -19,16 +19,16 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/pgm.h> -#include <VBox/pdmapi.h> -#include <VBox/pdmcritsect.h> -#include <VBox/pdmqueue.h> -#include <VBox/vm.h> -#include <VBox/em.h> -#include <VBox/iom.h> -#include <VBox/dbgf.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/pdmcritsect.h> +#include <VBox/vmm/pdmqueue.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/dbgf.h> #include <VBox/dbg.h> -#include <VBox/ftm.h> +#include <VBox/vmm/ftm.h> VMMR3DECL(int) VMMDoTest(PVM pVM); diff --git a/src/VBox/VMM/VMMR3/VM.cpp b/src/VBox/VMM/VMMR3/VM.cpp index 0c85ff28c57..faa4ff7a2ee 100644 --- a/src/VBox/VMM/VMMR3/VM.cpp +++ b/src/VBox/VMM/VMMR3/VM.cpp @@ -42,30 +42,30 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_VM -#include <VBox/cfgm.h> -#include <VBox/vmm.h> -#include <VBox/gvmm.h> -#include <VBox/mm.h> -#include <VBox/cpum.h> -#include <VBox/selm.h> -#include <VBox/trpm.h> -#include <VBox/dbgf.h> -#include <VBox/pgm.h> -#include <VBox/pdmapi.h> -#include <VBox/pdmcritsect.h> -#include <VBox/em.h> -#include <VBox/rem.h> -#include <VBox/tm.h> -#include <VBox/stam.h> -#include <VBox/patm.h> -#include <VBox/csam.h> -#include <VBox/iom.h> -#include <VBox/ssm.h> -#include <VBox/ftm.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/gvmm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/pdmcritsect.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/tm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/csam.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/ftm.h> +#include <VBox/vmm/hwaccm.h> #include "VMInternal.h" -#include <VBox/vm.h> -#include <VBox/uvm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> #include <VBox/sup.h> #include <VBox/dbg.h> diff --git a/src/VBox/VMM/VMMR3/VMEmt.cpp b/src/VBox/VMM/VMMR3/VMEmt.cpp index 684419bada1..1b968d4f3c8 100644 --- a/src/VBox/VMM/VMMR3/VMEmt.cpp +++ b/src/VBox/VMM/VMMR3/VMEmt.cpp @@ -20,15 +20,15 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_VM -#include <VBox/tm.h> -#include <VBox/dbgf.h> -#include <VBox/em.h> -#include <VBox/pdmapi.h> -#include <VBox/rem.h> -#include <VBox/tm.h> +#include <VBox/vmm/tm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/tm.h> #include "VMInternal.h" -#include <VBox/vm.h> -#include <VBox/uvm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMR3/VMM.cpp b/src/VBox/VMM/VMMR3/VMM.cpp index 73b19e73d6f..e6e65430e98 100644 --- a/src/VBox/VMM/VMMR3/VMM.cpp +++ b/src/VBox/VMM/VMMR3/VMM.cpp @@ -50,36 +50,36 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_VMM -#include <VBox/vmm.h> -#include <VBox/vmapi.h> -#include <VBox/pgm.h> -#include <VBox/cfgm.h> -#include <VBox/pdmqueue.h> -#include <VBox/pdmcritsect.h> -#include <VBox/pdmapi.h> -#include <VBox/cpum.h> -#include <VBox/mm.h> -#include <VBox/iom.h> -#include <VBox/trpm.h> -#include <VBox/selm.h> -#include <VBox/em.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/vmapi.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/pdmqueue.h> +#include <VBox/vmm/pdmcritsect.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/em.h> #include <VBox/sup.h> -#include <VBox/dbgf.h> -#include <VBox/csam.h> -#include <VBox/patm.h> -#include <VBox/rem.h> -#include <VBox/ssm.h> -#include <VBox/tm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/csam.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/tm.h> #include "VMMInternal.h" #include "VMMSwitcher.h" -#include <VBox/vm.h> -#include <VBox/ftm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/ftm.h> #include <VBox/err.h> #include <VBox/param.h> #include <VBox/version.h> #include <VBox/x86.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/hwaccm.h> #include <iprt/assert.h> #include <iprt/alloc.h> #include <iprt/asm.h> diff --git a/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp b/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp index 62fd6479449..e11578fa13d 100644 --- a/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp +++ b/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp @@ -19,21 +19,21 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_VMM -#include <VBox/vmm.h> -#include <VBox/pdmapi.h> -#include <VBox/pdmcritsect.h> -#include <VBox/trpm.h> -#include <VBox/dbgf.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/pdmcritsect.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/dbgf.h> #include "VMMInternal.h" -#include <VBox/vm.h> -#include <VBox/mm.h> -#include <VBox/iom.h> -#include <VBox/em.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/em.h> #include <VBox/err.h> #include <VBox/param.h> #include <VBox/version.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/hwaccm.h> #include <iprt/assert.h> #include <iprt/time.h> #include <iprt/stream.h> diff --git a/src/VBox/VMM/VMMR3/VMMSwitcher.cpp b/src/VBox/VMM/VMMR3/VMMSwitcher.cpp index 939fa6ad03e..e12bee2bd11 100644 --- a/src/VBox/VMM/VMMR3/VMMSwitcher.cpp +++ b/src/VBox/VMM/VMMR3/VMMSwitcher.cpp @@ -19,14 +19,14 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_VMM -#include <VBox/vmm.h> -#include <VBox/pgm.h> -#include <VBox/selm.h> -#include <VBox/mm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/mm.h> #include <VBox/sup.h> #include "VMMInternal.h" #include "VMMSwitcher.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/dis.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMR3/VMMTests.cpp b/src/VBox/VMM/VMMR3/VMMTests.cpp index f305022702f..9a6c9aa630d 100644 --- a/src/VBox/VMM/VMMR3/VMMTests.cpp +++ b/src/VBox/VMM/VMMR3/VMMTests.cpp @@ -22,19 +22,19 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_VMM #include <iprt/asm-amd64-x86.h> /* for SUPGetCpuHzFromGIP */ -#include <VBox/vmm.h> -#include <VBox/pdmapi.h> -#include <VBox/cpum.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/cpum.h> #include <VBox/dbg.h> -#include <VBox/mm.h> -#include <VBox/trpm.h> -#include <VBox/selm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/selm.h> #include "VMMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/param.h> #include <VBox/x86.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/hwaccm.h> #include <iprt/assert.h> #include <iprt/asm.h> diff --git a/src/VBox/VMM/VMMR3/VMReq.cpp b/src/VBox/VMM/VMMR3/VMReq.cpp index 50d1701f2ef..99d68559dd5 100644 --- a/src/VBox/VMM/VMMR3/VMReq.cpp +++ b/src/VBox/VMM/VMMR3/VMReq.cpp @@ -20,11 +20,11 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_VM -#include <VBox/mm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/vmm.h> #include "VMInternal.h" -#include <VBox/vm.h> -#include <VBox/uvm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> #include <VBox/err.h> #include <VBox/param.h> diff --git a/src/VBox/VMM/VMMRC/CPUMRC.cpp b/src/VBox/VMM/VMMRC/CPUMRC.cpp index c0b13a5941c..2e5eaf92a4f 100644 --- a/src/VBox/VMM/VMMRC/CPUMRC.cpp +++ b/src/VBox/VMM/VMMRC/CPUMRC.cpp @@ -20,11 +20,11 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_CPUM -#include <VBox/cpum.h> -#include <VBox/vmm.h> -#include <VBox/trpm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/trpm.h> #include "CPUMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <iprt/assert.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMRC/CPUMRCA.asm b/src/VBox/VMM/VMMRC/CPUMRCA.asm index afc18948520..c644d62d3d6 100644 --- a/src/VBox/VMM/VMMRC/CPUMRCA.asm +++ b/src/VBox/VMM/VMMRC/CPUMRCA.asm @@ -18,12 +18,12 @@ ;* Header Files * ;******************************************************************************* %include "VMMRC.mac" -%include "VBox/vm.mac" +%include "VBox/vmm/vm.mac" %include "VBox/err.mac" -%include "VBox/stam.mac" +%include "VBox/vmm/stam.mac" %include "CPUMInternal.mac" %include "VBox/x86.mac" -%include "VBox/cpum.mac" +%include "VBox/vmm/cpum.mac" ;******************************************************************************* diff --git a/src/VBox/VMM/VMMRC/CSAMRC.cpp b/src/VBox/VMM/VMMRC/CSAMRC.cpp index 2c2a6b690a9..ab1481ed543 100644 --- a/src/VBox/VMM/VMMRC/CSAMRC.cpp +++ b/src/VBox/VMM/VMMRC/CSAMRC.cpp @@ -20,19 +20,19 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_CSAM -#include <VBox/cpum.h> -#include <VBox/stam.h> -#include <VBox/patm.h> -#include <VBox/csam.h> -#include <VBox/pgm.h> -#include <VBox/mm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/csam.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/mm.h> #include <VBox/sup.h> -#include <VBox/mm.h> -#include <VBox/rem.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/rem.h> #include <VBox/param.h> #include <iprt/avl.h> #include "CSAMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/dbg.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMRC/HWACCMRCA.asm b/src/VBox/VMM/VMMRC/HWACCMRCA.asm index 448de479d1c..537c590832a 100644 --- a/src/VBox/VMM/VMMRC/HWACCMRCA.asm +++ b/src/VBox/VMM/VMMRC/HWACCMRCA.asm @@ -22,8 +22,8 @@ %define RT_ARCH_AMD64 %include "VBox/asmdefs.mac" %include "VBox/err.mac" -%include "VBox/hwacc_vmx.mac" -%include "VBox/cpum.mac" +%include "VBox/vmm/hwacc_vmx.mac" +%include "VBox/vmm/cpum.mac" %include "VBox/x86.mac" %include "HWACCMInternal.mac" @@ -109,19 +109,19 @@ BEGINPROC VMXGCStartVM64 jnc .vmxon_success mov rax, VERR_VMX_INVALID_VMXON_PTR jmp .vmstart64_vmxon_failed - + .vmxon_success: jnz .vmxon_success2 mov rax, VERR_VMX_GENERIC jmp .vmstart64_vmxon_failed - -.vmxon_success2: + +.vmxon_success2: ; Activate the VMCS pointer vmptrld [rbp + 16 + 8] jnc .vmptrld_success mov rax, VERR_VMX_INVALID_VMCS_PTR jmp .vmstart64_vmxoff_end - + .vmptrld_success: jnz .vmptrld_success2 mov rax, VERR_VMX_GENERIC @@ -158,8 +158,8 @@ BEGINPROC VMXGCStartVM64 mov rdx, rcx mov rcx, 0 jmp .cached_write - -ALIGN(16) + +ALIGN(16) .cached_write: mov eax, [rbx + VMCSCACHE.Write.aField + rcx*4] vmwrite rax, qword [rbx + VMCSCACHE.Write.aFieldVal + rcx*8] @@ -176,7 +176,7 @@ ALIGN(16) ; Save the pCache pointer push xBX %endif - + ; Save the host state that's relevant in the temporary 64 bits mode mov rdx, cr0 mov eax, VMX_VMCS_HOST_CR0 @@ -207,11 +207,11 @@ ALIGN(16) %ifdef VBOX_WITH_CRASHDUMP_MAGIC mov qword [rbx + VMCSCACHE.uPos], 4 %endif - + ; hopefully we can ignore TR (we restore it anyway on the way back to 32 bits mode) - + ;/* First we have to save some final CPU context registers. */ - lea rdx, [.vmlaunch64_done wrt rip] + lea rdx, [.vmlaunch64_done wrt rip] mov rax, VMX_VMCS_HOST_RIP ;/* return address (too difficult to continue after VMLAUNCH?) */ vmwrite rax, rdx ;/* Note: assumes success... */ @@ -325,7 +325,7 @@ ALIGNCODE(16) mov rax, cr8 mov [rdi + VMCSCACHE.TestOut.cr8], rax %endif - + mov ecx, [rdi + VMCSCACHE.Read.cValidEntries] cmp ecx, 0 ; can't happen je .no_cached_reads @@ -549,7 +549,7 @@ BEGINPROC HWACCMSaveGuestFPU64 fxsave [rsi + CPUMCTX.fpu] mov cr0, rcx ; and restore old CR0 again - + mov eax, VINF_SUCCESS ret ENDPROC HWACCMSaveGuestFPU64 diff --git a/src/VBox/VMM/VMMRC/IOMRC.cpp b/src/VBox/VMM/VMMRC/IOMRC.cpp index ca3e7380881..8cac41cd8a3 100644 --- a/src/VBox/VMM/VMMRC/IOMRC.cpp +++ b/src/VBox/VMM/VMMRC/IOMRC.cpp @@ -20,16 +20,16 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_IOM -#include <VBox/iom.h> -#include <VBox/cpum.h> -#include <VBox/pgm.h> -#include <VBox/selm.h> -#include <VBox/mm.h> -#include <VBox/em.h> -#include <VBox/pgm.h> -#include <VBox/trpm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/trpm.h> #include "IOMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/dis.h> #include <VBox/disopcode.h> diff --git a/src/VBox/VMM/VMMRC/MMRamRC.cpp b/src/VBox/VMM/VMMRC/MMRamRC.cpp index a0b37471345..ac50a3b5ce5 100644 --- a/src/VBox/VMM/VMMRC/MMRamRC.cpp +++ b/src/VBox/VMM/VMMRC/MMRamRC.cpp @@ -20,14 +20,14 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_MM -#include <VBox/mm.h> -#include <VBox/cpum.h> -#include <VBox/trpm.h> -#include <VBox/em.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/em.h> #include "MMInternal.h" -#include <VBox/vm.h> -#include <VBox/vmm.h> -#include <VBox/pgm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/pgm.h> #include <iprt/assert.h> #include <VBox/param.h> diff --git a/src/VBox/VMM/VMMRC/PATMRC.cpp b/src/VBox/VMM/VMMRC/PATMRC.cpp index 12647d9fcc5..0d9626b7585 100644 --- a/src/VBox/VMM/VMMRC/PATMRC.cpp +++ b/src/VBox/VMM/VMMRC/PATMRC.cpp @@ -20,24 +20,24 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PATM -#include <VBox/cpum.h> -#include <VBox/stam.h> -#include <VBox/patm.h> -#include <VBox/pgm.h> -#include <VBox/mm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/mm.h> #include <VBox/sup.h> -#include <VBox/mm.h> +#include <VBox/vmm/mm.h> #include <VBox/param.h> #include <iprt/avl.h> #include "PATMInternal.h" #include "PATMA.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/dbg.h> #include <VBox/dis.h> #include <VBox/disopcode.h> -#include <VBox/em.h> +#include <VBox/vmm/em.h> #include <VBox/err.h> -#include <VBox/selm.h> +#include <VBox/vmm/selm.h> #include <VBox/log.h> #include <iprt/assert.h> #include <iprt/asm.h> diff --git a/src/VBox/VMM/VMMRC/PDMRCDevice.cpp b/src/VBox/VMM/VMMRC/PDMRCDevice.cpp index 1fdd69c1f40..ae36f59fa01 100644 --- a/src/VBox/VMM/VMMRC/PDMRCDevice.cpp +++ b/src/VBox/VMM/VMMRC/PDMRCDevice.cpp @@ -21,12 +21,12 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PDM_DEVICE #include "PDMInternal.h" -#include <VBox/pdm.h> -#include <VBox/pgm.h> -#include <VBox/mm.h> -#include <VBox/vm.h> -#include <VBox/vmm.h> -#include <VBox/patm.h> +#include <VBox/vmm/pdm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/patm.h> #include <VBox/log.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMRC/PGMRC.cpp b/src/VBox/VMM/VMMRC/PGMRC.cpp index ff2204fadf6..a39dccc05fd 100644 --- a/src/VBox/VMM/VMMRC/PGMRC.cpp +++ b/src/VBox/VMM/VMMRC/PGMRC.cpp @@ -20,16 +20,16 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM -#include <VBox/pgm.h> -#include <VBox/cpum.h> -#include <VBox/mm.h> -#include <VBox/em.h> -#include <VBox/selm.h> -#include <VBox/iom.h> -#include <VBox/trpm.h> -#include <VBox/rem.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/rem.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <iprt/asm.h> diff --git a/src/VBox/VMM/VMMRC/SELMRC.cpp b/src/VBox/VMM/VMMRC/SELMRC.cpp index ab534420fd9..210e236052c 100644 --- a/src/VBox/VMM/VMMRC/SELMRC.cpp +++ b/src/VBox/VMM/VMMRC/SELMRC.cpp @@ -19,14 +19,14 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_SELM -#include <VBox/selm.h> -#include <VBox/mm.h> -#include <VBox/em.h> -#include <VBox/trpm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/trpm.h> #include "SELMInternal.h" -#include <VBox/vm.h> -#include <VBox/vmm.h> -#include <VBox/pgm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/pgm.h> #include <VBox/param.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/VMMRC/TRPMRC.cpp b/src/VBox/VMM/VMMRC/TRPMRC.cpp index ec36e6702e4..685885729bb 100644 --- a/src/VBox/VMM/VMMRC/TRPMRC.cpp +++ b/src/VBox/VMM/VMMRC/TRPMRC.cpp @@ -20,19 +20,19 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_TRPM -#include <VBox/trpm.h> -#include <VBox/cpum.h> -#include <VBox/vmm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/vmm.h> #include "TRPMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <VBox/x86.h> -#include <VBox/em.h> +#include <VBox/vmm/em.h> #include <iprt/assert.h> #include <iprt/asm.h> #include <VBox/log.h> -#include <VBox/selm.h> +#include <VBox/vmm/selm.h> diff --git a/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp b/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp index 30b1fccda52..825ea872f1c 100644 --- a/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp +++ b/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp @@ -20,19 +20,19 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_TRPM -#include <VBox/selm.h> -#include <VBox/iom.h> -#include <VBox/pgm.h> -#include <VBox/pdmapi.h> -#include <VBox/dbgf.h> -#include <VBox/em.h> -#include <VBox/csam.h> -#include <VBox/patm.h> -#include <VBox/mm.h> -#include <VBox/cpum.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/csam.h> +#include <VBox/vmm/patm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/cpum.h> #include "TRPMInternal.h" -#include <VBox/vm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> #include <VBox/param.h> #include <VBox/err.h> @@ -40,7 +40,7 @@ #include <VBox/disopcode.h> #include <VBox/x86.h> #include <VBox/log.h> -#include <VBox/tm.h> +#include <VBox/vmm/tm.h> #include <iprt/asm.h> #include <iprt/asm-amd64-x86.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm b/src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm index 8c571b9b656..6a529a56e09 100644 --- a/src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm +++ b/src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm @@ -19,12 +19,12 @@ ;******************************************************************************* %include "VMMRC.mac" %include "VBox/x86.mac" -%include "VBox/cpum.mac" -%include "VBox/stam.mac" -%include "VBox/vm.mac" +%include "VBox/vmm/cpum.mac" +%include "VBox/vmm/stam.mac" +%include "VBox/vmm/vm.mac" %include "TRPMInternal.mac" %include "VBox/err.mac" -%include "VBox/trpm.mac" +%include "VBox/vmm/trpm.mac" ;******************************************************************************* diff --git a/src/VBox/VMM/VMMRC/VMMRC.cpp b/src/VBox/VMM/VMMRC/VMMRC.cpp index 916bb370dad..a2a8da2b00c 100644 --- a/src/VBox/VMM/VMMRC/VMMRC.cpp +++ b/src/VBox/VMM/VMMRC/VMMRC.cpp @@ -21,11 +21,11 @@ *******************************************************************************/ #define LOG_GROUP LOG_GROUP_VMM #include <iprt/asm-amd64-x86.h> /* for SUPGetCpuHzFromGIP */ -#include <VBox/vmm.h> -#include <VBox/trpm.h> -#include <VBox/pgm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/pgm.h> #include "VMMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/sup.h> #include <VBox/err.h> #include <VBox/log.h> diff --git a/src/VBox/VMM/VMMRZ/DBGFRZ.cpp b/src/VBox/VMM/VMMRZ/DBGFRZ.cpp index 90307b1e50e..375e41e0ad1 100644 --- a/src/VBox/VMM/VMMRZ/DBGFRZ.cpp +++ b/src/VBox/VMM/VMMRZ/DBGFRZ.cpp @@ -20,11 +20,11 @@ * Header Files * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_DBGF -#include <VBox/dbgf.h> -#include <VBox/selm.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/selm.h> #include <VBox/log.h> #include "DBGFInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp b/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp index 8b4370074d1..b53ed88c0aa 100644 --- a/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp +++ b/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp @@ -20,9 +20,9 @@ * Internal Functions * *******************************************************************************/ #define LOG_GROUP LOG_GROUP_PGM_DYNMAP -#include <VBox/pgm.h> +#include <VBox/vmm/pgm.h> #include "PGMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "PGMInline.h" #include <VBox/err.h> #include <VBox/param.h> diff --git a/src/VBox/VMM/VMMRZ/VMMRZ.cpp b/src/VBox/VMM/VMMRZ/VMMRZ.cpp index b47b665140e..bbbcba34fce 100644 --- a/src/VBox/VMM/VMMRZ/VMMRZ.cpp +++ b/src/VBox/VMM/VMMRZ/VMMRZ.cpp @@ -19,9 +19,9 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/vmm.h> +#include <VBox/vmm/vmm.h> #include "VMMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac b/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac index 96f4a25a3a6..fc7f81db9c1 100644 --- a/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac +++ b/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac @@ -24,9 +24,9 @@ %include "VBox/asmdefs.mac" %include "VBox/apic.mac" %include "VBox/x86.mac" -%include "VBox/cpum.mac" -%include "VBox/stam.mac" -%include "VBox/vm.mac" +%include "VBox/vmm/cpum.mac" +%include "VBox/vmm/stam.mac" +%include "VBox/vmm/vm.mac" %include "CPUMInternal.mac" %include "VMMSwitcher.mac" diff --git a/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac b/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac index 58187fec5f7..609f5c14715 100644 --- a/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac +++ b/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac @@ -27,9 +27,9 @@ %include "VBox/asmdefs.mac" %include "VBox/apic.mac" %include "VBox/x86.mac" -%include "VBox/cpum.mac" -%include "VBox/stam.mac" -%include "VBox/vm.mac" +%include "VBox/vmm/cpum.mac" +%include "VBox/vmm/stam.mac" +%include "VBox/vmm/vm.mac" %include "CPUMInternal.mac" %include "VMMSwitcher.mac" diff --git a/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac b/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac index 456c16dde7c..9a59cc4b192 100644 --- a/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac +++ b/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac @@ -23,9 +23,9 @@ %include "VBox/asmdefs.mac" %include "VBox/apic.mac" %include "VBox/x86.mac" -%include "VBox/cpum.mac" -%include "VBox/stam.mac" -%include "VBox/vm.mac" +%include "VBox/vmm/cpum.mac" +%include "VBox/vmm/stam.mac" +%include "VBox/vmm/vm.mac" %include "CPUMInternal.mac" %include "VMMSwitcher.mac" diff --git a/src/VBox/VMM/include/DBGFInternal.h b/src/VBox/VMM/include/DBGFInternal.h index b6f5f9029d9..c7067efe8f5 100644 --- a/src/VBox/VMM/include/DBGFInternal.h +++ b/src/VBox/VMM/include/DBGFInternal.h @@ -24,7 +24,7 @@ #include <iprt/critsect.h> #include <iprt/string.h> #include <iprt/avl.h> -#include <VBox/dbgf.h> +#include <VBox/vmm/dbgf.h> diff --git a/src/VBox/VMM/include/EMInternal.h b/src/VBox/VMM/include/EMInternal.h index b191a3990e8..f5f0a185fb3 100644 --- a/src/VBox/VMM/include/EMInternal.h +++ b/src/VBox/VMM/include/EMInternal.h @@ -20,11 +20,11 @@ #include <VBox/cdefs.h> #include <VBox/types.h> -#include <VBox/em.h> -#include <VBox/stam.h> -#include <VBox/patm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/patm.h> #include <VBox/dis.h> -#include <VBox/pdmcritsect.h> +#include <VBox/vmm/pdmcritsect.h> #include <iprt/avl.h> #include <setjmp.h> diff --git a/src/VBox/VMM/include/FTMInternal.h b/src/VBox/VMM/include/FTMInternal.h index 76cfd8be3c0..b9f0f2afe62 100644 --- a/src/VBox/VMM/include/FTMInternal.h +++ b/src/VBox/VMM/include/FTMInternal.h @@ -20,9 +20,9 @@ #include <VBox/cdefs.h> #include <VBox/types.h> -#include <VBox/ftm.h> -#include <VBox/stam.h> -#include <VBox/pdmcritsect.h> +#include <VBox/vmm/ftm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/pdmcritsect.h> #include <iprt/avl.h> /** @defgroup grp_ftm_int Internals. diff --git a/src/VBox/VMM/include/HWACCMInternal.h b/src/VBox/VMM/include/HWACCMInternal.h index 445c894e0ff..a4662fa68df 100644 --- a/src/VBox/VMM/include/HWACCMInternal.h +++ b/src/VBox/VMM/include/HWACCMInternal.h @@ -20,13 +20,13 @@ #include <VBox/cdefs.h> #include <VBox/types.h> -#include <VBox/em.h> -#include <VBox/stam.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/stam.h> #include <VBox/dis.h> -#include <VBox/hwaccm.h> -#include <VBox/hwacc_vmx.h> -#include <VBox/pgm.h> -#include <VBox/cpum.h> +#include <VBox/vmm/hwaccm.h> +#include <VBox/vmm/hwacc_vmx.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/cpum.h> #include <iprt/memobj.h> #include <iprt/cpuset.h> #include <iprt/mp.h> diff --git a/src/VBox/VMM/include/IOMInternal.h b/src/VBox/VMM/include/IOMInternal.h index 0cd043b00cd..d175483ec19 100644 --- a/src/VBox/VMM/include/IOMInternal.h +++ b/src/VBox/VMM/include/IOMInternal.h @@ -20,10 +20,10 @@ #include <VBox/cdefs.h> #include <VBox/types.h> -#include <VBox/iom.h> -#include <VBox/stam.h> -#include <VBox/pgm.h> -#include <VBox/pdmcritsect.h> +#include <VBox/vmm/iom.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/pdmcritsect.h> #include <VBox/param.h> #include <iprt/assert.h> #include <iprt/avl.h> diff --git a/src/VBox/VMM/include/MMInternal.h b/src/VBox/VMM/include/MMInternal.h index e41bd895715..2b87efc579b 100644 --- a/src/VBox/VMM/include/MMInternal.h +++ b/src/VBox/VMM/include/MMInternal.h @@ -21,8 +21,8 @@ #include <VBox/cdefs.h> #include <VBox/types.h> #include <VBox/sup.h> -#include <VBox/stam.h> -#include <VBox/pdmcritsect.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/pdmcritsect.h> #include <iprt/assert.h> #include <iprt/avl.h> #include <iprt/critsect.h> diff --git a/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h b/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h index b10764e4a4e..7e951650325 100644 --- a/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h +++ b/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h @@ -18,9 +18,9 @@ #ifndef ___PDMAsyncCompletionFileInternal_h #define ___PDMAsyncCompletionFileInternal_h -#include <VBox/cfgm.h> -#include <VBox/stam.h> -#include <VBox/tm.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/tm.h> #include <iprt/types.h> #include <iprt/file.h> #include <iprt/thread.h> diff --git a/src/VBox/VMM/include/PDMAsyncCompletionInternal.h b/src/VBox/VMM/include/PDMAsyncCompletionInternal.h index 30362572231..19b59e93dda 100644 --- a/src/VBox/VMM/include/PDMAsyncCompletionInternal.h +++ b/src/VBox/VMM/include/PDMAsyncCompletionInternal.h @@ -22,9 +22,9 @@ #include <iprt/memcache.h> #include <iprt/sg.h> #include <VBox/types.h> -#include <VBox/cfgm.h> -#include <VBox/stam.h> -#include <VBox/pdmasynccompletion.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/pdmasynccompletion.h> #include "PDMInternal.h" RT_C_DECLS_BEGIN diff --git a/src/VBox/VMM/include/PDMBlkCacheInternal.h b/src/VBox/VMM/include/PDMBlkCacheInternal.h index d421f5e5454..816b920dd3d 100644 --- a/src/VBox/VMM/include/PDMBlkCacheInternal.h +++ b/src/VBox/VMM/include/PDMBlkCacheInternal.h @@ -18,10 +18,10 @@ #ifndef ___PDMBlkCacheInternal_h #define ___PDMBlkCacheInternal_h -#include <VBox/cfgm.h> -#include <VBox/stam.h> -#include <VBox/tm.h> -#include <VBox/pdmblkcache.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/tm.h> +#include <VBox/vmm/pdmblkcache.h> #include <iprt/types.h> #include <iprt/file.h> #include <iprt/thread.h> diff --git a/src/VBox/VMM/include/PDMInternal.h b/src/VBox/VMM/include/PDMInternal.h index dabac1bcef4..bef074367a5 100644 --- a/src/VBox/VMM/include/PDMInternal.h +++ b/src/VBox/VMM/include/PDMInternal.h @@ -20,12 +20,12 @@ #include <VBox/types.h> #include <VBox/param.h> -#include <VBox/cfgm.h> -#include <VBox/stam.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/stam.h> #include <VBox/vusb.h> -#include <VBox/pdmasynccompletion.h> -#include <VBox/pdmblkcache.h> -#include <VBox/pdmcommon.h> +#include <VBox/vmm/pdmasynccompletion.h> +#include <VBox/vmm/pdmblkcache.h> +#include <VBox/vmm/pdmcommon.h> #include <iprt/assert.h> #include <iprt/critsect.h> #ifdef IN_RING3 @@ -340,10 +340,10 @@ typedef struct PDMTHREADINT #define PDMCRITSECTINT_DECLARED #define PDMTHREADINT_DECLARED #ifdef ___VBox_pdm_h -# error "Invalid header PDM order. Include PDMInternal.h before VBox/pdm.h!" +# error "Invalid header PDM order. Include PDMInternal.h before VBox/vmm/pdm.h!" #endif RT_C_DECLS_END -#include <VBox/pdm.h> +#include <VBox/vmm/pdm.h> RT_C_DECLS_BEGIN /** diff --git a/src/VBox/VMM/include/PGMInline.h b/src/VBox/VMM/include/PGMInline.h index 8530bb95fdc..9c3b942d3ab 100644 --- a/src/VBox/VMM/include/PGMInline.h +++ b/src/VBox/VMM/include/PGMInline.h @@ -21,17 +21,17 @@ #include <VBox/cdefs.h> #include <VBox/types.h> #include <VBox/err.h> -#include <VBox/stam.h> +#include <VBox/vmm/stam.h> #include <VBox/param.h> -#include <VBox/vmm.h> -#include <VBox/mm.h> -#include <VBox/pdmcritsect.h> -#include <VBox/pdmapi.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/pdmcritsect.h> +#include <VBox/vmm/pdmapi.h> #include <VBox/dis.h> -#include <VBox/dbgf.h> +#include <VBox/vmm/dbgf.h> #include <VBox/log.h> -#include <VBox/gmm.h> -#include <VBox/hwaccm.h> +#include <VBox/vmm/gmm.h> +#include <VBox/vmm/hwaccm.h> #include <iprt/asm.h> #include <iprt/assert.h> #include <iprt/avl.h> diff --git a/src/VBox/VMM/include/PGMInternal.h b/src/VBox/VMM/include/PGMInternal.h index 31213c373bb..b4c4cc48844 100644 --- a/src/VBox/VMM/include/PGMInternal.h +++ b/src/VBox/VMM/include/PGMInternal.h @@ -22,18 +22,18 @@ #include <VBox/types.h> #include <VBox/err.h> #include <VBox/dbg.h> -#include <VBox/stam.h> +#include <VBox/vmm/stam.h> #include <VBox/param.h> -#include <VBox/vmm.h> -#include <VBox/mm.h> -#include <VBox/pdmcritsect.h> -#include <VBox/pdmapi.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/pdmcritsect.h> +#include <VBox/vmm/pdmapi.h> #include <VBox/dis.h> -#include <VBox/dbgf.h> +#include <VBox/vmm/dbgf.h> #include <VBox/log.h> -#include <VBox/gmm.h> -#include <VBox/hwaccm.h> -#include <VBox/hwacc_vmx.h> +#include <VBox/vmm/gmm.h> +#include <VBox/vmm/hwaccm.h> +#include <VBox/vmm/hwacc_vmx.h> #include "internal/pgm.h" #include <iprt/asm.h> #include <iprt/assert.h> @@ -184,7 +184,7 @@ #ifndef PGM_PTFLAGS_CSAM_VALIDATED /** Scanned and approved by CSAM (tm). * NOTE: Must be identical to the one defined in CSAMInternal.h!! - * @todo Move PGM_PTFLAGS_* and PGM_PDFLAGS_* to VBox/pgm.h. */ + * @todo Move PGM_PTFLAGS_* and PGM_PDFLAGS_* to VBox/vmm/pgm.h. */ #define PGM_PTFLAGS_CSAM_VALIDATED RT_BIT_64(11) #endif diff --git a/src/VBox/VMM/include/REMInternal.h b/src/VBox/VMM/include/REMInternal.h index 64aad067271..72bea8258c9 100644 --- a/src/VBox/VMM/include/REMInternal.h +++ b/src/VBox/VMM/include/REMInternal.h @@ -18,12 +18,11 @@ #ifndef ___REMInternal_h #define ___REMInternal_h -#include <VBox/cdefs.h> #include <VBox/types.h> -#include <VBox/cpum.h> -#include <VBox/stam.h> -#include <VBox/pgm.h> -#include <VBox/pdmcritsect.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/pdmcritsect.h> #ifdef REM_INCLUDE_CPU_H # include "target-i386/cpu.h" #endif diff --git a/src/VBox/VMM/include/SELMInternal.h b/src/VBox/VMM/include/SELMInternal.h index f9af423c053..b4bdc07ccdf 100644 --- a/src/VBox/VMM/include/SELMInternal.h +++ b/src/VBox/VMM/include/SELMInternal.h @@ -20,8 +20,8 @@ #include <VBox/cdefs.h> #include <VBox/types.h> -#include <VBox/stam.h> -#include <VBox/cpum.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/cpum.h> diff --git a/src/VBox/VMM/include/SSMInternal.h b/src/VBox/VMM/include/SSMInternal.h index 8951e827d01..07ba2a98603 100644 --- a/src/VBox/VMM/include/SSMInternal.h +++ b/src/VBox/VMM/include/SSMInternal.h @@ -20,7 +20,7 @@ #include <VBox/cdefs.h> #include <VBox/types.h> -#include <VBox/ssm.h> +#include <VBox/vmm/ssm.h> #include <iprt/critsect.h> RT_C_DECLS_BEGIN diff --git a/src/VBox/VMM/include/STAMInternal.h b/src/VBox/VMM/include/STAMInternal.h index f7c5e467d1a..efb62f41fd6 100644 --- a/src/VBox/VMM/include/STAMInternal.h +++ b/src/VBox/VMM/include/STAMInternal.h @@ -20,8 +20,8 @@ #include <VBox/cdefs.h> #include <VBox/types.h> -#include <VBox/stam.h> -#include <VBox/gvmm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/gvmm.h> #include <iprt/semaphore.h> diff --git a/src/VBox/VMM/include/TMInternal.h b/src/VBox/VMM/include/TMInternal.h index 3764eba566e..76be028229a 100644 --- a/src/VBox/VMM/include/TMInternal.h +++ b/src/VBox/VMM/include/TMInternal.h @@ -23,8 +23,8 @@ #include <iprt/time.h> #include <iprt/timer.h> #include <iprt/assert.h> -#include <VBox/stam.h> -#include <VBox/pdmcritsect.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/pdmcritsect.h> RT_C_DECLS_BEGIN diff --git a/src/VBox/VMM/include/TRPMInternal.h b/src/VBox/VMM/include/TRPMInternal.h index dd34b585ea9..5512539009c 100644 --- a/src/VBox/VMM/include/TRPMInternal.h +++ b/src/VBox/VMM/include/TRPMInternal.h @@ -20,8 +20,8 @@ #include <VBox/cdefs.h> #include <VBox/types.h> -#include <VBox/stam.h> -#include <VBox/cpum.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/cpum.h> diff --git a/src/VBox/VMM/include/TRPMInternal.mac b/src/VBox/VMM/include/TRPMInternal.mac index 37b5292aac6..98a75230e8f 100644 --- a/src/VBox/VMM/include/TRPMInternal.mac +++ b/src/VBox/VMM/include/TRPMInternal.mac @@ -16,7 +16,7 @@ ; %include "VBox/asmdefs.mac" -%include "VBox/stam.mac" +%include "VBox/vmm/stam.mac" %define TRPM_TRAP_IN_OP_MASK 0xffff %define TRPM_TRAP_IN_MOV_GS 1 diff --git a/src/VBox/VMM/include/VMInternal.h b/src/VBox/VMM/include/VMInternal.h index bee7b59768c..3d19343f907 100644 --- a/src/VBox/VMM/include/VMInternal.h +++ b/src/VBox/VMM/include/VMInternal.h @@ -19,7 +19,7 @@ #define ___VMInternal_h #include <VBox/cdefs.h> -#include <VBox/vmapi.h> +#include <VBox/vmm/vmapi.h> #include <iprt/assert.h> #include <iprt/critsect.h> #include <setjmp.h> diff --git a/src/VBox/VMM/include/VMMInternal.h b/src/VBox/VMM/include/VMMInternal.h index 485f3a2229f..1ccabbb4e15 100644 --- a/src/VBox/VMM/include/VMMInternal.h +++ b/src/VBox/VMM/include/VMMInternal.h @@ -19,7 +19,7 @@ #define ___VMMInternal_h #include <VBox/cdefs.h> -#include <VBox/stam.h> +#include <VBox/vmm/stam.h> #include <VBox/log.h> #include <iprt/critsect.h> diff --git a/src/VBox/VMM/include/VMMSwitcher.h b/src/VBox/VMM/include/VMMSwitcher.h index 2a36ca4a5c5..9616087ca24 100644 --- a/src/VBox/VMM/include/VMMSwitcher.h +++ b/src/VBox/VMM/include/VMMSwitcher.h @@ -18,7 +18,7 @@ #ifndef ___VMMSwitcher_h #define ___VMMSwitcher_h -#include <VBox/vmm.h> +#include <VBox/vmm/vmm.h> /** @name Fixup Types. * @{ diff --git a/src/VBox/VMM/include/internal/em.h b/src/VBox/VMM/include/internal/em.h index e216eeaaa43..d4f7c6e647a 100644 --- a/src/VBox/VMM/include/internal/em.h +++ b/src/VBox/VMM/include/internal/em.h @@ -18,7 +18,7 @@ #ifndef ___EM_include_internal_h #define ___EM_include_internal_h -#include <VBox/em.h> +#include <VBox/vmm/em.h> VMMR3DECL(int) EMR3NotifyResume(PVM pVM); VMMR3DECL(int) EMR3NotifySuspend(PVM pVM); diff --git a/src/VBox/VMM/include/internal/pgm.h b/src/VBox/VMM/include/internal/pgm.h index 94de66050bb..5c5f3e2d11f 100644 --- a/src/VBox/VMM/include/internal/pgm.h +++ b/src/VBox/VMM/include/internal/pgm.h @@ -18,7 +18,7 @@ #ifndef ___PGM_include_internal_h #define ___PGM_include_internal_h -#include <VBox/pgm.h> +#include <VBox/vmm/pgm.h> /** @defgroup grp_pgm_int Internals * @ingroup grp_pgm diff --git a/src/VBox/VMM/include/internal/vm.h b/src/VBox/VMM/include/internal/vm.h index 6731de680a9..f097da77e86 100644 --- a/src/VBox/VMM/include/internal/vm.h +++ b/src/VBox/VMM/include/internal/vm.h @@ -18,7 +18,7 @@ #ifndef ___VM_include_internal_h #define ___VM_include_internal_h -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> VMMR3DECL(int) VMR3SaveFT(PVM pVM, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser, bool *pfSuspended, bool fSkipStateChanges); VMMR3DECL(int) VMR3LoadFromStreamFT(PVM pVM, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser); diff --git a/src/VBox/VMM/testcase/Makefile.kmk b/src/VBox/VMM/testcase/Makefile.kmk index d1229057d2f..509b8a57fcb 100644 --- a/src/VBox/VMM/testcase/Makefile.kmk +++ b/src/VBox/VMM/testcase/Makefile.kmk @@ -329,9 +329,9 @@ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsAsm.mac: \ $(VBOX_PATH_VMM_SRC)/testcase/tstAsmStructsAsm.asm \ $(VBOX_PATH_VMM_SRC)/testcase/tstAsmStructsAsm-lst.sed \ $(DEPTH)/include/iprt/asmdefs.mac \ - $(DEPTH)/include/VBox/cpum.mac \ + $(DEPTH)/include/VBox/vmm/cpum.mac \ + $(DEPTH)/include/VBox/vmm/vm.mac \ $(DEPTH)/include/VBox/sup.mac \ - $(DEPTH)/include/VBox/vm.mac \ $(VBOX_PATH_VMM_SRC)/include/CPUMInternal.mac \ $(VBOX_PATH_VMM_SRC)/include/TRPMInternal.mac \ $(VBOX_PATH_VMM_SRC)/include/HWACCMInternal.mac \ diff --git a/src/VBox/VMM/testcase/tstAnimate.cpp b/src/VBox/VMM/testcase/tstAnimate.cpp index 6924fcd61d7..3b59a9226be 100644 --- a/src/VBox/VMM/testcase/tstAnimate.cpp +++ b/src/VBox/VMM/testcase/tstAnimate.cpp @@ -19,17 +19,17 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/vm.h> -#include <VBox/vmm.h> -#include <VBox/cpum.h> -#include <VBox/cfgm.h> -#include <VBox/em.h> -#include <VBox/pgm.h> -#include <VBox/rem.h> -#include <VBox/ssm.h> -#include <VBox/dbgf.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/em.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/rem.h> +#include <VBox/vmm/ssm.h> +#include <VBox/vmm/dbgf.h> #include <VBox/err.h> -#include <VBox/pdmifs.h> +#include <VBox/vmm/pdmifs.h> #include <VBox/param.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/testcase/tstAsmStructs.cpp b/src/VBox/VMM/testcase/tstAsmStructs.cpp index 5d2783326bf..0546af322cf 100644 --- a/src/VBox/VMM/testcase/tstAsmStructs.cpp +++ b/src/VBox/VMM/testcase/tstAsmStructs.cpp @@ -18,14 +18,14 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/cpum.h> +#include <VBox/vmm/cpum.h> #include "CPUMInternal.h" -#include <VBox/trpm.h> +#include <VBox/vmm/trpm.h> #include "TRPMInternal.h" #include "HWACCMInternal.h" #include "VMMSwitcher.h" #include "VMMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include "tstHelp.h" #include <stdio.h> diff --git a/src/VBox/VMM/testcase/tstAsmStructsAsm.asm b/src/VBox/VMM/testcase/tstAsmStructsAsm.asm index 721b597f57f..85a9098775d 100644 --- a/src/VBox/VMM/testcase/tstAsmStructsAsm.asm +++ b/src/VBox/VMM/testcase/tstAsmStructsAsm.asm @@ -26,8 +26,8 @@ BITS 64 %include "HWACCMInternal.mac" %include "TRPMInternal.mac" %include "VMMInternal.mac" -%include "VBox/cpum.mac" -%include "VBox/vm.mac" +%include "VBox/vmm/cpum.mac" +%include "VBox/vmm/vm.mac" %include "VBox/sup.mac" %include "VMMSwitcher.mac" %ifdef DO_GLOBALS diff --git a/src/VBox/VMM/testcase/tstCFGM.cpp b/src/VBox/VMM/testcase/tstCFGM.cpp index b4bec967c1a..61e7d093834 100644 --- a/src/VBox/VMM/testcase/tstCFGM.cpp +++ b/src/VBox/VMM/testcase/tstCFGM.cpp @@ -21,10 +21,10 @@ * Header Files * *******************************************************************************/ #include <VBox/sup.h> -#include <VBox/cfgm.h> -#include <VBox/mm.h> -#include <VBox/vm.h> -#include <VBox/uvm.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> #include <VBox/err.h> #include <VBox/param.h> diff --git a/src/VBox/VMM/testcase/tstGlobalConfig.cpp b/src/VBox/VMM/testcase/tstGlobalConfig.cpp index 1275b943062..bda7791c3a0 100644 --- a/src/VBox/VMM/testcase/tstGlobalConfig.cpp +++ b/src/VBox/VMM/testcase/tstGlobalConfig.cpp @@ -19,7 +19,7 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/vmm.h> +#include <VBox/vmm/vmm.h> #include <VBox/err.h> #include <iprt/assert.h> #include <iprt/initterm.h> diff --git a/src/VBox/VMM/testcase/tstHelp.h b/src/VBox/VMM/testcase/tstHelp.h index 70e04657cef..56c3997e4cd 100644 --- a/src/VBox/VMM/testcase/tstHelp.h +++ b/src/VBox/VMM/testcase/tstHelp.h @@ -19,7 +19,7 @@ #define ___tstHelp_h #include <VBox/cdefs.h> -#include <VBox/cpum.h> +#include <VBox/vmm/cpum.h> RT_C_DECLS_BEGIN void tstDumpCtx(PCPUMCTX pCtx, const char *pszComment); diff --git a/src/VBox/VMM/testcase/tstInstrEmul.cpp b/src/VBox/VMM/testcase/tstInstrEmul.cpp index e32aeb0fcbe..fb60f78fc01 100644 --- a/src/VBox/VMM/testcase/tstInstrEmul.cpp +++ b/src/VBox/VMM/testcase/tstInstrEmul.cpp @@ -19,9 +19,9 @@ * Header Files * *******************************************************************************/ #include <stdio.h> -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/err.h> -#include <VBox/em.h> +#include <VBox/vmm/em.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/testcase/tstMMHyperHeap.cpp b/src/VBox/VMM/testcase/tstMMHyperHeap.cpp index 1129fff436b..42f2d561f3b 100644 --- a/src/VBox/VMM/testcase/tstMMHyperHeap.cpp +++ b/src/VBox/VMM/testcase/tstMMHyperHeap.cpp @@ -18,10 +18,10 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/mm.h> -#include <VBox/stam.h> -#include <VBox/vm.h> -#include <VBox/uvm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/stam.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> #include <VBox/sup.h> #include <VBox/param.h> #include <VBox/err.h> diff --git a/src/VBox/VMM/testcase/tstMicro.cpp b/src/VBox/VMM/testcase/tstMicro.cpp index f6826d33aa1..172c04c0ed4 100644 --- a/src/VBox/VMM/testcase/tstMicro.cpp +++ b/src/VBox/VMM/testcase/tstMicro.cpp @@ -18,13 +18,13 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/vm.h> -#include <VBox/vmm.h> -#include <VBox/mm.h> -#include <VBox/cpum.h> -#include <VBox/pdmapi.h> -#include <VBox/dbgf.h> -#include <VBox/pgm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/dbgf.h> +#include <VBox/vmm/pgm.h> #include <VBox/err.h> #include <VBox/param.h> diff --git a/src/VBox/VMM/testcase/tstMicroRC.cpp b/src/VBox/VMM/testcase/tstMicroRC.cpp index e2a4b0d449d..d7a6a464c0c 100644 --- a/src/VBox/VMM/testcase/tstMicroRC.cpp +++ b/src/VBox/VMM/testcase/tstMicroRC.cpp @@ -18,9 +18,9 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/vm.h> -#include <VBox/vmm.h> -#include <VBox/selm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/selm.h> #include "tstMicro.h" #include <VBox/err.h> diff --git a/src/VBox/VMM/testcase/tstMicroRCA.asm b/src/VBox/VMM/testcase/tstMicroRCA.asm index ad2f1d064b3..26951a0211d 100644 --- a/src/VBox/VMM/testcase/tstMicroRCA.asm +++ b/src/VBox/VMM/testcase/tstMicroRCA.asm @@ -20,9 +20,9 @@ ;******************************************************************************* %include "VBox/asmdefs.mac" %include "VBox/x86.mac" -%include "VBox/cpum.mac" +%include "VBox/vmm/cpum.mac" %include "VBox/err.mac" -%include "VBox/vm.mac" +%include "VBox/vmm/vm.mac" %include "tstMicro.mac" diff --git a/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp b/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp index 2cfacb14b1c..9b3d3675b72 100644 --- a/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp +++ b/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp @@ -26,14 +26,14 @@ #define LOG_GROUP LOG_GROUP_PDM_ASYNC_COMPLETION #include "VMInternal.h" /* UVM */ -#include <VBox/vm.h> -#include <VBox/uvm.h> -#include <VBox/pdmasynccompletion.h> -#include <VBox/vmm.h> -#include <VBox/cpum.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> +#include <VBox/vmm/pdmasynccompletion.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/cpum.h> #include <VBox/err.h> #include <VBox/log.h> -#include <VBox/pdmapi.h> +#include <VBox/vmm/pdmapi.h> #include <iprt/alloc.h> #include <iprt/asm.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp b/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp index b15e33061c9..6b3049ff466 100644 --- a/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp +++ b/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp @@ -23,15 +23,15 @@ #define LOG_GROUP LOG_GROUP_PDM_ASYNC_COMPLETION #include "VMInternal.h" /* UVM */ -#include <VBox/vm.h> -#include <VBox/uvm.h> -#include <VBox/pdmasynccompletion.h> -#include <VBox/vmm.h> -#include <VBox/cpum.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> +#include <VBox/vmm/pdmasynccompletion.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/cpum.h> #include <VBox/err.h> #include <VBox/log.h> -#include <VBox/pdmapi.h> -#include <VBox/pdmthread.h> +#include <VBox/vmm/pdmapi.h> +#include <VBox/vmm/pdmthread.h> #include <iprt/alloc.h> #include <iprt/asm.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/testcase/tstSSM.cpp b/src/VBox/VMM/testcase/tstSSM.cpp index 4dc669c31ed..0ca24ca3992 100644 --- a/src/VBox/VMM/testcase/tstSSM.cpp +++ b/src/VBox/VMM/testcase/tstSSM.cpp @@ -19,12 +19,12 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/ssm.h> +#include <VBox/vmm/ssm.h> #include "VMInternal.h" /* createFakeVM */ -#include <VBox/vm.h> -#include <VBox/uvm.h> -#include <VBox/mm.h> -#include <VBox/stam.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/stam.h> #include <VBox/log.h> #include <VBox/sup.h> diff --git a/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp b/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp index a98704d81c7..7111360de43 100644 --- a/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp +++ b/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp @@ -19,9 +19,9 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/vm.h> -#include <VBox/vmm.h> -#include <VBox/cpum.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/cpum.h> #include <VBox/err.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/testcase/tstVMM.cpp b/src/VBox/VMM/testcase/tstVMM.cpp index 9b5a2689204..222a4025e8b 100644 --- a/src/VBox/VMM/testcase/tstVMM.cpp +++ b/src/VBox/VMM/testcase/tstVMM.cpp @@ -19,11 +19,11 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/vm.h> -#include <VBox/vmm.h> -#include <VBox/cpum.h> -#include <VBox/tm.h> -#include <VBox/pdmapi.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/tm.h> +#include <VBox/vmm/pdmapi.h> #include <VBox/err.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/testcase/tstVMMFork.cpp b/src/VBox/VMM/testcase/tstVMMFork.cpp index 07c14eaf07e..80ab39ada91 100644 --- a/src/VBox/VMM/testcase/tstVMMFork.cpp +++ b/src/VBox/VMM/testcase/tstVMMFork.cpp @@ -19,8 +19,8 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/vm.h> -#include <VBox/vmm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> #include <VBox/err.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp b/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp index b46adc07733..8cdb78ead92 100644 --- a/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp +++ b/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp @@ -28,7 +28,7 @@ #define IN_VMM_R0 #define IN_RING0 /* pretent we're in Ring-0 to get the prototypes. */ -#include <VBox/vmm.h> +#include <VBox/vmm/vmm.h> #include "VMMInternal.h" diff --git a/src/VBox/VMM/testcase/tstVMREQ.cpp b/src/VBox/VMM/testcase/tstVMREQ.cpp index 5f1f8f8a6f7..4074e19f27b 100644 --- a/src/VBox/VMM/testcase/tstVMREQ.cpp +++ b/src/VBox/VMM/testcase/tstVMREQ.cpp @@ -19,9 +19,9 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/vm.h> -#include <VBox/vmm.h> -#include <VBox/cpum.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/cpum.h> #include <VBox/err.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/testcase/tstVMStructRC.cpp b/src/VBox/VMM/testcase/tstVMStructRC.cpp index 72898b65395..e1226e2fda8 100644 --- a/src/VBox/VMM/testcase/tstVMStructRC.cpp +++ b/src/VBox/VMM/testcase/tstVMStructRC.cpp @@ -50,16 +50,16 @@ AssertCompileSize(RTHCPHYS, 8); * Header Files * *******************************************************************************/ #define IN_TSTVMSTRUCTGC 1 -#include <VBox/cfgm.h> -#include <VBox/cpum.h> -#include <VBox/mm.h> -#include <VBox/pgm.h> -#include <VBox/selm.h> -#include <VBox/trpm.h> -#include <VBox/vmm.h> -#include <VBox/stam.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/stam.h> #include "PDMInternal.h" -#include <VBox/pdm.h> +#include <VBox/vmm/pdm.h> #include "CFGMInternal.h" #include "CPUMInternal.h" #include "MMInternal.h" @@ -77,7 +77,7 @@ AssertCompileSize(RTHCPHYS, 8); #include "CSAMInternal.h" #include "EMInternal.h" #include "REMInternal.h" -#include <VBox/vm.h> +#include <VBox/vmm/vm.h> #include <VBox/param.h> #include <VBox/x86.h> #include <iprt/assert.h> diff --git a/src/VBox/VMM/testcase/tstVMStructSize.cpp b/src/VBox/VMM/testcase/tstVMStructSize.cpp index ef925c81a98..bead7acfa1f 100644 --- a/src/VBox/VMM/testcase/tstVMStructSize.cpp +++ b/src/VBox/VMM/testcase/tstVMStructSize.cpp @@ -20,16 +20,16 @@ /******************************************************************************* * Header Files * *******************************************************************************/ -#include <VBox/cfgm.h> -#include <VBox/cpum.h> -#include <VBox/mm.h> -#include <VBox/pgm.h> -#include <VBox/selm.h> -#include <VBox/trpm.h> -#include <VBox/vmm.h> -#include <VBox/stam.h> +#include <VBox/vmm/cfgm.h> +#include <VBox/vmm/cpum.h> +#include <VBox/vmm/mm.h> +#include <VBox/vmm/pgm.h> +#include <VBox/vmm/selm.h> +#include <VBox/vmm/trpm.h> +#include <VBox/vmm/vmm.h> +#include <VBox/vmm/stam.h> #include "PDMInternal.h" -#include <VBox/pdm.h> +#include <VBox/vmm/pdm.h> #include "CFGMInternal.h" #include "CPUMInternal.h" #include "MMInternal.h" @@ -51,9 +51,9 @@ #include "REMInternal.h" #include "../VMMR0/GMMR0Internal.h" #include "../VMMR0/GVMMR0Internal.h" -#include <VBox/vm.h> -#include <VBox/uvm.h> -#include <VBox/gvm.h> +#include <VBox/vmm/vm.h> +#include <VBox/vmm/uvm.h> +#include <VBox/vmm/gvm.h> #include <VBox/param.h> #include <VBox/x86.h> |