VirtualBox

Changeset 61632 in vbox for trunk


Ignore:
Timestamp:
Jun 9, 2016 6:06:26 PM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
107980
Message:

GIM: Correct header order to match what is use *everywhere* else in the VMM and what is absolutely necessary for some of the tricks we use (like the CPUM and DBGF read-only data!).

Location:
trunk/src/VBox/VMM
Files:
10 edited

Legend:

Unmodified
Added
Removed

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

    r61559 r61632  
    2121*********************************************************************************************************************************/
    2222#define LOG_GROUP LOG_GROUP_GIM
     23#include <VBox/vmm/gim.h>
     24#include <VBox/vmm/em.h>    /* For EMInterpretDisasCurrent */
    2325#include "GIMInternal.h"
     26#include <VBox/vmm/vm.h>
     27
     28#include <VBox/dis.h>       /* For DISCPUSTATE */
    2429#include <VBox/err.h>
    25 #include <VBox/dis.h>       /* For DISCPUSTATE */
    26 #include <VBox/vmm/em.h>    /* For EMInterpretDisasCurrent */
    27 #include <VBox/vmm/vm.h>
    2830
    2931/* Include all the providers. */

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

    r61631 r61632  
    2121*********************************************************************************************************************************/
    2222#define LOG_GROUP LOG_GROUP_GIM
     23#include <VBox/vmm/gim.h>
    2324#include <VBox/vmm/em.h>
    2425#include <VBox/vmm/hm.h>
    2526#include <VBox/vmm/tm.h>
    2627#include <VBox/vmm/dbgf.h>
     28#include <VBox/vmm/pdmdev.h>
     29#include <VBox/vmm/pdmapi.h>
    2730#include <VBox/vmm/pgm.h>
    2831#include "GIMHvInternal.h"
    … …  
    3033#include <VBox/vmm/vm.h>
    3134
    32 #include <VBox/vmm/pdmdev.h>
    33 #include <VBox/vmm/pdmapi.h>
    3435#include <VBox/err.h>
    3536

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

    r61559 r61632  
    2121*********************************************************************************************************************************/
    2222#define LOG_GROUP LOG_GROUP_GIM
    23 #include "GIMKvmInternal.h"
    24 #include "GIMInternal.h"
    25 
    26 #include <VBox/err.h>
    27 #include <VBox/dis.h>
     23#include <VBox/vmm/gim.h>
    2824#include <VBox/vmm/hm.h>
    2925#include <VBox/vmm/em.h>
    3026#include <VBox/vmm/tm.h>
    31 #include <VBox/vmm/vm.h>
    3227#include <VBox/vmm/pgm.h>
    3328#include <VBox/vmm/pdmdev.h>
    3429#include <VBox/vmm/pdmapi.h>
     30#include "GIMKvmInternal.h"
     31#include "GIMInternal.h"
     32#include <VBox/vmm/vm.h>
     33
     34#include <VBox/dis.h>
     35#include <VBox/err.h>
    3536#include <VBox/sup.h>
    3637

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

    r58122 r61632  
    2121*********************************************************************************************************************************/
    2222#define LOG_GROUP LOG_GROUP_GIM
     23#include <VBox/vmm/gim.h>
    2324#include "GIMInternal.h"
    2425#include "GIMHvInternal.h"
     26#include <VBox/vmm/vm.h>
    2527
    2628#include <VBox/err.h>
    27 #include <VBox/vmm/vm.h>
    2829
    2930

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

    r58122 r61632  
    2121*********************************************************************************************************************************/
    2222#define LOG_GROUP LOG_GROUP_GIM
     23#include <VBox/vmm/gim.h>
     24#include <VBox/vmm/tm.h>
    2325#include "GIMInternal.h"
    2426#include "GIMHvInternal.h"
     27#include <VBox/vmm/vm.h>
    2528
    2629#include <VBox/err.h>
    27 #include <VBox/vmm/gim.h>
    28 #include <VBox/vmm/tm.h>
    29 #include <VBox/vmm/vm.h>
    3030
    3131#include <iprt/spinlock.h>

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

    r58126 r61632  
    2121*********************************************************************************************************************************/
    2222#define LOG_GROUP LOG_GROUP_GIM
     23#include <VBox/vmm/gim.h>
     24#include <VBox/vmm/tm.h>
    2325#include "GIMInternal.h"
    2426#include "GIMKvmInternal.h"
     27#include <VBox/vmm/vm.h>
    2528
    2629#include <VBox/err.h>
    27 #include <VBox/vmm/gim.h>
    28 #include <VBox/vmm/tm.h>
    29 #include <VBox/vmm/vm.h>
    3030
    3131#include <iprt/spinlock.h>

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

    r61544 r61632  
    5151*********************************************************************************************************************************/
    5252#define LOG_GROUP LOG_GROUP_GIM
    53 #include <VBox/log.h>
    54 #include "GIMInternal.h"
    55 #include <VBox/vmm/vm.h>
     53#include <VBox/vmm/gim.h>
    5654#include <VBox/vmm/hm.h>
    5755#include <VBox/vmm/ssm.h>
    5856#include <VBox/vmm/pdmdev.h>
     57#include "GIMInternal.h"
     58#include <VBox/vmm/vm.h>
     59
     60#include <VBox/log.h>
    5961
    6062#include <iprt/err.h>

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

    r61559 r61632  
    2121*********************************************************************************************************************************/
    2222#define LOG_GROUP LOG_GROUP_GIM
     23#include <VBox/vmm/gim.h>
     24#include <VBox/vmm/cpum.h>
     25#include <VBox/vmm/mm.h>
     26#include <VBox/vmm/ssm.h>
     27#include <VBox/vmm/hm.h>
     28#include <VBox/vmm/pdmapi.h>
    2329#include "GIMInternal.h"
     30#include <VBox/vmm/vm.h>
     31
     32#include <VBox/version.h>
    2433
    2534#include <iprt/assert.h>
    … …  
    2938#include <iprt/semaphore.h>
    3039#include <iprt/spinlock.h>
    31 
    32 #include <VBox/vmm/cpum.h>
    33 #include <VBox/vmm/mm.h>
    34 #include <VBox/vmm/ssm.h>
    35 #include <VBox/vmm/vm.h>
    36 #include <VBox/vmm/hm.h>
    37 #include <VBox/vmm/pdmapi.h>
    38 #include <VBox/version.h>
    3940#ifdef DEBUG_ramshankar
    4041# include <iprt/udp.h>

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

    r58564 r61632  
    2121*********************************************************************************************************************************/
    2222#define LOG_GROUP LOG_GROUP_GIM
     23#include <VBox/vmm/gim.h>
     24#include <VBox/vmm/cpum.h>
     25#include <VBox/vmm/hm.h>
     26#include <VBox/vmm/pdmapi.h>
     27#include <VBox/vmm/ssm.h>
    2328#include "GIMInternal.h"
     29#include <VBox/vmm/vm.h>
     30
     31#include <VBox/disopcode.h>
     32#include <VBox/version.h>
    2433
    2534#include <iprt/asm-math.h>
    … …  
    3039#include <iprt/spinlock.h>
    3140
    32 #include <VBox/vmm/cpum.h>
    33 #include <VBox/disopcode.h>
    34 #include <VBox/vmm/ssm.h>
    35 #include <VBox/vmm/vm.h>
    36 #include <VBox/vmm/hm.h>
    37 #include <VBox/vmm/pdmapi.h>
    38 #include <VBox/version.h>
    3941
    4042

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

    r58564 r61632  
    2121*********************************************************************************************************************************/
    2222#define LOG_GROUP LOG_GROUP_GIM
     23#include <VBox/vmm/gim.h>
     24#include <VBox/vmm/cpum.h>
     25#include <VBox/vmm/tm.h>
     26#include <VBox/vmm/pdmapi.h>
    2327#include "GIMInternal.h"
     28#include <VBox/vmm/vm.h>
    2429
    2530#include <iprt/assert.h>
    … …  
    2732#include <iprt/asm-amd64-x86.h>
    2833#include <iprt/string.h>
    29 
    30 #include <VBox/vmm/cpum.h>
    31 #include <VBox/vmm/vm.h>
    32 #include <VBox/vmm/tm.h>
    33 #include <VBox/vmm/pdmapi.h>
    3434
    3535
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette