VirtualBox

Ignore:
Timestamp:
Jul 20, 2018 11:00:53 AM (6 years ago)
Author:
vboxsync
Message:

PGM: Moving guest and shadow mode Enter and Exit function to PGMAll. bugref:9044

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

    r73253 r73261  
    533533        PGM_GST_NAME_REAL(ModifyPage),
    534534        PGM_GST_NAME_REAL(GetPDE),
    535 #ifdef IN_RING3
    536535        PGM_GST_NAME_REAL(Enter),
    537536        PGM_GST_NAME_REAL(Exit),
     537#ifdef IN_RING3
    538538        PGM_GST_NAME_REAL(Relocate),
    539 #else
    540         NULL, NULL, NULL,
    541539#endif
    542540    },
     
    546544        PGM_GST_NAME_PROT(ModifyPage),
    547545        PGM_GST_NAME_PROT(GetPDE),
    548 #ifdef IN_RING3
    549546        PGM_GST_NAME_PROT(Enter),
    550547        PGM_GST_NAME_PROT(Exit),
     548#ifdef IN_RING3
    551549        PGM_GST_NAME_PROT(Relocate),
    552 #else
    553         NULL, NULL, NULL,
    554550#endif
    555551    },
     
    559555        PGM_GST_NAME_32BIT(ModifyPage),
    560556        PGM_GST_NAME_32BIT(GetPDE),
    561 #ifdef IN_RING3
    562557        PGM_GST_NAME_32BIT(Enter),
    563558        PGM_GST_NAME_32BIT(Exit),
     559#ifdef IN_RING3
    564560        PGM_GST_NAME_32BIT(Relocate),
    565 #else
    566         NULL, NULL, NULL,
    567561#endif
    568562    },
     
    572566        PGM_GST_NAME_PAE(ModifyPage),
    573567        PGM_GST_NAME_PAE(GetPDE),
    574 #ifdef IN_RING3
    575568        PGM_GST_NAME_PAE(Enter),
    576569        PGM_GST_NAME_PAE(Exit),
     570#ifdef IN_RING3
    577571        PGM_GST_NAME_PAE(Relocate),
    578 #else
    579         NULL, NULL, NULL,
    580572#endif
    581573    },
     
    586578        PGM_GST_NAME_AMD64(ModifyPage),
    587579        PGM_GST_NAME_AMD64(GetPDE),
    588 # ifdef IN_RING3
    589580        PGM_GST_NAME_AMD64(Enter),
    590581        PGM_GST_NAME_AMD64(Exit),
     582# ifdef IN_RING3
    591583        PGM_GST_NAME_AMD64(Relocate),
    592 # else
    593         NULL, NULL, NULL,
    594584# endif
    595585    },
     
    610600        PGM_SHW_NAME_32BIT(GetPage),
    611601        PGM_SHW_NAME_32BIT(ModifyPage),
    612 #ifdef IN_RING3
    613602        PGM_SHW_NAME_32BIT(Enter),
    614603        PGM_SHW_NAME_32BIT(Exit),
     604#ifdef IN_RING3
    615605        PGM_SHW_NAME_32BIT(Relocate),
    616 #else
    617         NULL, NULL, NULL,
    618606#endif
    619607    },
     
    622610        PGM_SHW_NAME_PAE(GetPage),
    623611        PGM_SHW_NAME_PAE(ModifyPage),
    624 #ifdef IN_RING3
    625612        PGM_SHW_NAME_PAE(Enter),
    626613        PGM_SHW_NAME_PAE(Exit),
     614#ifdef IN_RING3
    627615        PGM_SHW_NAME_PAE(Relocate),
    628 #else
    629         NULL, NULL, NULL,
    630616#endif
    631617    },
     
    635621        PGM_SHW_NAME_AMD64(GetPage),
    636622        PGM_SHW_NAME_AMD64(ModifyPage),
    637 # ifdef IN_RING3
    638623        PGM_SHW_NAME_AMD64(Enter),
    639624        PGM_SHW_NAME_AMD64(Exit),
     625# ifdef IN_RING3
    640626        PGM_SHW_NAME_AMD64(Relocate),
    641 # else
    642         NULL, NULL, NULL,
    643627# endif
    644628    },
     
    647631        PGM_SHW_NAME_NESTED_32BIT(GetPage),
    648632        PGM_SHW_NAME_NESTED_32BIT(ModifyPage),
    649 # ifdef IN_RING3
    650633        PGM_SHW_NAME_NESTED_32BIT(Enter),
    651634        PGM_SHW_NAME_NESTED_32BIT(Exit),
     635# ifdef IN_RING3
    652636        PGM_SHW_NAME_NESTED_32BIT(Relocate),
    653 # else
    654         NULL, NULL, NULL,
    655637# endif
    656638    },
     
    659641        PGM_SHW_NAME_NESTED_PAE(GetPage),
    660642        PGM_SHW_NAME_NESTED_PAE(ModifyPage),
    661 # ifdef IN_RING3
    662643        PGM_SHW_NAME_NESTED_PAE(Enter),
    663644        PGM_SHW_NAME_NESTED_PAE(Exit),
     645# ifdef IN_RING3
    664646        PGM_SHW_NAME_NESTED_PAE(Relocate),
    665 # else
    666         NULL, NULL, NULL,
    667647# endif
    668648    },
     
    671651        PGM_SHW_NAME_NESTED_AMD64(GetPage),
    672652        PGM_SHW_NAME_NESTED_AMD64(ModifyPage),
    673 # ifdef IN_RING3
    674653        PGM_SHW_NAME_NESTED_AMD64(Enter),
    675654        PGM_SHW_NAME_NESTED_AMD64(Exit),
     655# ifdef IN_RING3
    676656        PGM_SHW_NAME_NESTED_AMD64(Relocate),
    677 # else
    678         NULL, NULL, NULL,
    679657# endif
    680658    },
     
    683661        PGM_SHW_NAME_EPT(GetPage),
    684662        PGM_SHW_NAME_EPT(ModifyPage),
    685 # ifdef IN_RING3
    686663        PGM_SHW_NAME_EPT(Enter),
    687664        PGM_SHW_NAME_EPT(Exit),
     665# ifdef IN_RING3
    688666        PGM_SHW_NAME_EPT(Relocate),
    689 # else
    690         NULL, NULL, NULL,
    691667# endif
    692668    },
Note: See TracChangeset for help on using the changeset viewer.

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