Changeset 46304 in vbox for trunk/include/VBox/vmm/hm_svm.h

Timestamp:

May 29, 2013 9:13:19 AM (12 years ago)

Author:

vboxsync

Message:

VMM/HM: AMD-V bits and clean up.

File:

• trunk/include/VBox/vmm/hm_svm.h (modified) (18 diffs)

trunk/include/VBox/vmm/hm_svm.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -269 +269 @@
 
 
-/** @name SVM_VMCB.u64ExitInfo2
+/** @name SVMVMCB.u64ExitInfo2
  * @{
  */
@@ -282 +282 @@
 /** @} */
 
-/** @name SVM_VMCB.ctrl.u32InterceptCtrl1
+/** @name SVMVMCB.ctrl.u32InterceptCtrl1
  * @{
  */
@@ -352 +352 @@
 
 
-/** @name SVM_VMCB.ctrl.u32InterceptCtrl2
+/** @name SVMVMCB.ctrl.u32InterceptCtrl2
  * @{
  */
@@ -385 +385 @@
 /** @} */
 
-/** @name SVM_VMCB.ctrl.u64NestedPaging
+/** @name SVMVMCB.ctrl.u64NestedPaging
  * @{
  */
@@ -391 +391 @@
 /** @} */
 
-/** @name SVM_VMCB.ctrl.u64IntShadow
+/** @name SVMVMCB.ctrl.u64IntShadow
  * @{
  */
@@ -398 +398 @@
 
 
-/** @name SVM_INTCTRL.u3Type
+/** @name SVMINTCTRL.u3Type
  * @{
  */
@@ -412 +412 @@
 
 
-/** @name SVM_VMCB.ctrl.TLBCtrl.n.u8TLBFlush
+/** @name SVMVMCB.ctrl.TLBCtrl.n.u8TLBFlush
  * @{
  */
@@ -470 +470 @@
     } n;
     uint64_t    au64[1];
-} SVM_EVENT;
+} SVMEVENT;
 #pragma pack()
 
@@ -494 +494 @@
     } n;
     uint64_t    au64[1];
-} SVM_INTCTRL;
+} SVMINTCTRL;
 #pragma pack()
 
@@ -511 +511 @@
     } n;
     uint64_t    au64[1];
-} SVM_TLBCTRL;
+} SVMTLBCTRL;
 #pragma pack()
 
@@ -537 +537 @@
     } n;
     uint32_t    au32[1];
-} SVM_IOIO_EXIT;
+} SVMIOIOEXIT;
 #pragma pack()
 
@@ -551 +551 @@
     } n;
     uint64_t    au64[1];
-} SVM_NPCTRL;
+} SVMNPCTRL;
 #pragma pack()
 
@@ -558 +558 @@
  */
 #pragma pack(1)
-typedef struct _SVM_VMCB
+typedef struct SVMVMCB
 {
     /** Control Area. */
@@ -588 +588 @@
         uint64_t    u64TSCOffset;
         /** Offset 0x58 - TLB control field. */
-        SVM_TLBCTRL TLBCtrl;
+        SVMTLBCTRL  TLBCtrl;
         /** Offset 0x60 - Interrupt control field. */
-        SVM_INTCTRL IntCtrl;
+        SVMINTCTRL  IntCtrl;
         /** Offset 0x68 - Interrupt shadow. */
         uint64_t    u64IntShadow;
@@ -600 +600 @@
         uint64_t    u64ExitInfo2;
         /** Offset 0x88 - Exit Interrupt info. */
-        SVM_EVENT   ExitIntInfo;
+        SVMEVENT    ExitIntInfo;
         /** Offset 0x90 - Nested Paging. */
-        SVM_NPCTRL  NestedPaging;
+        SVMNPCTRL   NestedPaging;
         /** Offset 0x98-0xA7 - Reserved. */
         uint8_t     u8Reserved2[0xA8-0x98];
         /** Offset 0xA8 - Event injection. */
-        SVM_EVENT   EventInject;
+        SVMEVENT    EventInject;
         /** Offset 0xB0 - Host CR3 for nested paging. */
         uint64_t    u64NestedPagingCR3;
@@ -715 +715 @@
     /** Offset 0x698-0xFFF- Reserved. */
     uint8_t     u8Reserved10[0x1000-0x698];
-} SVM_VMCB;
+} SVMVMCB;
 #pragma pack()
-AssertCompileSize(SVM_VMCB, 0x1000);
-AssertCompileMemberOffset(SVM_VMCB, ctrl.u16InterceptRdCRx, 0x000);
-AssertCompileMemberOffset(SVM_VMCB, ctrl.u16PauseFilterCount,0x03e);
-AssertCompileMemberOffset(SVM_VMCB, ctrl.TLBCtrl,           0x058);
-AssertCompileMemberOffset(SVM_VMCB, ctrl.ExitIntInfo,       0x088);
-AssertCompileMemberOffset(SVM_VMCB, ctrl.EventInject,       0x0A8);
-AssertCompileMemberOffset(SVM_VMCB, ctrl.abInstr,           0x0D1);
-AssertCompileMemberOffset(SVM_VMCB, guest,                  0x400);
-AssertCompileMemberOffset(SVM_VMCB, guest.ES,               0x400);
-AssertCompileMemberOffset(SVM_VMCB, guest.u8Reserved4,      0x4A0);
-AssertCompileMemberOffset(SVM_VMCB, guest.u8CPL,            0x4CB);
-AssertCompileMemberOffset(SVM_VMCB, guest.u8Reserved6,      0x4D8);
-AssertCompileMemberOffset(SVM_VMCB, guest.u8Reserved7,      0x580);
-AssertCompileMemberOffset(SVM_VMCB, guest.u8Reserved9,      0x648);
-AssertCompileMemberOffset(SVM_VMCB, guest.u64GPAT,          0x668);
-AssertCompileMemberOffset(SVM_VMCB, guest.u64LASTEXCPTO,    0x690);
-AssertCompileMemberOffset(SVM_VMCB, u8Reserved10,           0x698);
+/** Pointer to the SVMVMCB structure. */
+typedef SVMVMCB *PSVMVMCB;
+AssertCompileMemberOffset(SVMVMCB, ctrl.u16InterceptRdCRx,   0x000);
+AssertCompileMemberOffset(SVMVMCB, ctrl.u16PauseFilterCount, 0x03e);
+AssertCompileMemberOffset(SVMVMCB, ctrl.TLBCtrl,             0x058);
+AssertCompileMemberOffset(SVMVMCB, ctrl.ExitIntInfo,         0x088);
+AssertCompileMemberOffset(SVMVMCB, ctrl.EventInject,         0x0A8);
+AssertCompileMemberOffset(SVMVMCB, ctrl.abInstr,             0x0D1);
+AssertCompileMemberOffset(SVMVMCB, guest,                    0x400);
+AssertCompileMemberOffset(SVMVMCB, guest.ES,                 0x400);
+AssertCompileMemberOffset(SVMVMCB, guest.TR,                 0x490);
+AssertCompileMemberOffset(SVMVMCB, guest.u64EFER,            0x4D0);
+AssertCompileMemberOffset(SVMVMCB, guest.u64CR4,             0x548);
+AssertCompileMemberOffset(SVMVMCB, guest.u64RIP,             0x578);
+AssertCompileMemberOffset(SVMVMCB, guest.u64RSP,             0x5D8);
+AssertCompileMemberOffset(SVMVMCB, guest.u64CR2,             0x640);
+AssertCompileMemberOffset(SVMVMCB, guest.u8Reserved4,        0x4A0);
+AssertCompileMemberOffset(SVMVMCB, guest.u8CPL,              0x4CB);
+AssertCompileMemberOffset(SVMVMCB, guest.u8Reserved6,        0x4D8);
+AssertCompileMemberOffset(SVMVMCB, guest.u8Reserved7,        0x580);
+AssertCompileMemberOffset(SVMVMCB, guest.u8Reserved9,        0x648);
+AssertCompileMemberOffset(SVMVMCB, guest.u64GPAT,            0x668);
+AssertCompileMemberOffset(SVMVMCB, guest.u64LASTEXCPTO,      0x690);
+AssertCompileMemberOffset(SVMVMCB, u8Reserved10,             0x698);
+AssertCompileSize(SVMVMCB, 0x1000);
 
 #ifdef IN_RING0
@@ -741 +749 @@
 /** @} */
 
-#endif
-
+#endif /* ___VBox_vmm_svm_h */
+