Changeset 97150 in vbox
- Timestamp:
- Oct 14, 2022 7:12:10 AM (2 years ago)
- svn:sync-xref-src-repo-rev:
- 154123
- Location:
- trunk
- Files:
-
- 5 edited
-
include/VBox/vmm/cpum.mac (modified) (1 diff)
-
include/VBox/vmm/cpumctx.h (modified) (3 diffs)
-
src/VBox/VMM/VMMR3/CPUM.cpp (modified) (2 diffs)
-
src/VBox/VMM/include/CPUMInternal.mac (modified) (1 diff)
-
src/VBox/VMM/testcase/tstVMStructSize.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/vmm/cpum.mac
r96407 r97150 300 300 .hwvirt.vmx.abMsrBitmap resb 0x1000 301 301 .hwvirt.vmx.abIoBitmap resb 0x1000+0x1000 302 .hwvirt.vmx.abVirtApicPage resb 0x1000303 302 alignb 8 304 303 .hwvirt.vmx.GCPhysVmxon resq 1 -
trunk/include/VBox/vmm/cpumctx.h
r97069 r97150 586 586 * access the guest memory directly as needed? */ 587 587 uint8_t abIoBitmap[VMX_V_IO_BITMAP_A_SIZE + VMX_V_IO_BITMAP_B_SIZE]; 588 /** 0x11000 - The virtual-APIC page. 589 * @note This is used by VT-x hardware... */ 590 uint8_t abVirtApicPage[VMX_V_VIRT_APIC_SIZE]; 591 592 /** 0x12000 - Guest physical address of the VMXON region. */ 588 589 /** 0x11000 - Guest physical address of the VMXON region. */ 593 590 RTGCPHYS GCPhysVmxon; 594 /** 0x1 2008 - Guest physical address of the current VMCS pointer. */591 /** 0x11008 - Guest physical address of the current VMCS pointer. */ 595 592 RTGCPHYS GCPhysVmcs; 596 /** 0x1 2010 - Guest physical address of the shadow VMCS pointer. */593 /** 0x11010 - Guest physical address of the shadow VMCS pointer. */ 597 594 RTGCPHYS GCPhysShadowVmcs; 598 /** 0x1 2018 - Last emulated VMX instruction/VM-exit diagnostic. */595 /** 0x11018 - Last emulated VMX instruction/VM-exit diagnostic. */ 599 596 VMXVDIAG enmDiag; 600 /** 0x1 201c - VMX abort reason. */597 /** 0x1101c - VMX abort reason. */ 601 598 VMXABORT enmAbort; 602 /** 0x1 2020 - Last emulated VMX instruction/VM-exit diagnostic auxiliary info.599 /** 0x11020 - Last emulated VMX instruction/VM-exit diagnostic auxiliary info. 603 600 * (mainly used for info. that's not part of the VMCS). */ 604 601 uint64_t uDiagAux; 605 /** 0x1 2028 - VMX abort auxiliary info. */602 /** 0x11028 - VMX abort auxiliary info. */ 606 603 uint32_t uAbortAux; 607 /** 0x1 202c - Whether the guest is in VMX root mode. */604 /** 0x1102c - Whether the guest is in VMX root mode. */ 608 605 bool fInVmxRootMode; 609 /** 0x1 202d - Whether the guest is in VMX non-root mode. */606 /** 0x1102d - Whether the guest is in VMX non-root mode. */ 610 607 bool fInVmxNonRootMode; 611 /** 0x1 202e - Whether the injected events are subjected to event intercepts. */608 /** 0x1102e - Whether the injected events are subjected to event intercepts. */ 612 609 bool fInterceptEvents; 613 /** 0x1 202f - Whether blocking of NMI (or virtual-NMIs) was in effect in VMX610 /** 0x1102f - Whether blocking of NMI (or virtual-NMIs) was in effect in VMX 614 611 * non-root mode before execution of IRET. */ 615 612 bool fNmiUnblockingIret; 616 /** 0x1 2030 - Guest TSC timestamp of the first PAUSE instruction that is613 /** 0x11030 - Guest TSC timestamp of the first PAUSE instruction that is 617 614 * considered to be the first in a loop. */ 618 615 uint64_t uFirstPauseLoopTick; 619 /** 0x1 2038 - Guest TSC timestamp of the previous PAUSE instruction. */616 /** 0x11038 - Guest TSC timestamp of the previous PAUSE instruction. */ 620 617 uint64_t uPrevPauseTick; 621 /** 0x1 2040 - Guest TSC timestamp of VM-entry (used for VMX-preemption618 /** 0x11040 - Guest TSC timestamp of VM-entry (used for VMX-preemption 622 619 * timer). */ 623 620 uint64_t uEntryTick; 624 /** 0x1 2048 - Virtual-APIC write offset (until trap-like VM-exit). */621 /** 0x11048 - Virtual-APIC write offset (until trap-like VM-exit). */ 625 622 uint16_t offVirtApicWrite; 626 /** 0x1 204a - Whether virtual-NMI blocking is in effect. */623 /** 0x1104a - Whether virtual-NMI blocking is in effect. */ 627 624 bool fVirtNmiBlocking; 628 /** 0x1 204b - Padding. */625 /** 0x1104b - Padding. */ 629 626 uint8_t abPadding0[5]; 630 /** 0x1 2050 - Guest VMX MSRs. */627 /** 0x11050 - Guest VMX MSRs. */ 631 628 VMXMSRS Msrs; 632 629 } vmx; 633 630 } CPUM_UNION_NM(s); 634 631 635 /** 0x1 2130 - Hardware virtualization type currently in use. */632 /** 0x11130 - Hardware virtualization type currently in use. */ 636 633 CPUMHWVIRT enmHwvirt; 637 /** 0x1 2134 - Global interrupt flag - AMD only (always true on Intel). */634 /** 0x11134 - Global interrupt flag - AMD only (always true on Intel). */ 638 635 bool fGif; 639 636 bool afPadding1[3]; 640 /** 0x1 2138 - A subset of guest force flags that are saved while running the637 /** 0x11138 - A subset of guest force flags that are saved while running the 641 638 * nested-guest. */ 642 639 #ifdef VMCPU_WITH_64_BIT_FFS … … 647 644 #endif 648 645 #if 0 649 /** 0x1 2140 - Pad to 64 byte boundary. */646 /** 0x11140 - Pad to 64 byte boundary. */ 650 647 uint8_t abPadding0[8+16+32]; 651 648 #endif … … 721 718 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.abMsrBitmap, X86_PAGE_SIZE); 722 719 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.abIoBitmap, X86_PAGE_SIZE); 723 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.abVirtApicPage, X86_PAGE_SIZE);724 720 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.Msrs, 8); 725 721 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.abIoBitmap, 0x7000); 726 722 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.fInterceptEvents, 0xa0d4); 727 723 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.abIoBitmap, 0xf000); 728 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.fVirtNmiBlocking, 0x1 204a);729 AssertCompileMemberOffset(CPUMCTX, hwvirt.enmHwvirt, 0x1 2130);730 AssertCompileMemberOffset(CPUMCTX, hwvirt.fGif, 0x1 2134);731 AssertCompileMemberOffset(CPUMCTX, hwvirt.fLocalForcedActions, 0x1 2138);724 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.fVirtNmiBlocking, 0x1104a); 725 AssertCompileMemberOffset(CPUMCTX, hwvirt.enmHwvirt, 0x11130); 726 AssertCompileMemberOffset(CPUMCTX, hwvirt.fGif, 0x11134); 727 AssertCompileMemberOffset(CPUMCTX, hwvirt.fLocalForcedActions, 0x11138); 732 728 AssertCompileMembersAtSameOffset(CPUMCTX, CPUM_UNION_STRUCT_NM(g,qw.) rax, CPUMCTX, CPUM_UNION_NM(g.) aGRegs); 733 729 AssertCompileMembersAtSameOffset(CPUMCTX, CPUM_UNION_STRUCT_NM(g,qw.) rax, CPUMCTX, CPUM_UNION_STRUCT_NM(g,qw2.) r0); -
trunk/src/VBox/VMM/VMMR3/CPUM.cpp
r97146 r97150 1114 1114 AssertCompile(sizeof(pCtx->hwvirt.vmx.abIoBitmap) == (VMX_V_IO_BITMAP_A_PAGES + VMX_V_IO_BITMAP_B_PAGES) * X86_PAGE_SIZE); 1115 1115 AssertCompile(sizeof(pCtx->hwvirt.vmx.abIoBitmap) == VMX_V_IO_BITMAP_A_SIZE + VMX_V_IO_BITMAP_B_SIZE); 1116 AssertCompile(sizeof(pCtx->hwvirt.vmx.abVirtApicPage) == VMX_V_VIRT_APIC_PAGES * X86_PAGE_SIZE);1117 AssertCompile(sizeof(pCtx->hwvirt.vmx.abVirtApicPage) == VMX_V_VIRT_APIC_SIZE);1118 1116 1119 1117 /* Initialize non-zero values. */ … … 1144 1142 RT_ZERO(pCtx->hwvirt.vmx.abMsrBitmap); 1145 1143 RT_ZERO(pCtx->hwvirt.vmx.abIoBitmap); 1146 RT_ZERO(pCtx->hwvirt.vmx.abVirtApicPage);1147 1144 1148 1145 pCtx->hwvirt.vmx.GCPhysVmxon = NIL_RTGCPHYS; -
trunk/src/VBox/VMM/include/CPUMInternal.mac
r96407 r97150 267 267 .Guest.hwvirt.vmx.abMsrBitmap resb 0x1000 268 268 .Guest.hwvirt.vmx.abIoBitmap resb 0x1000+0x1000 269 .Guest.hwvirt.vmx.abVirtApicPage resb 0x1000270 269 alignb 8 271 270 .Guest.hwvirt.vmx.GCPhysVmxon resq 1 -
trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp
r96979 r97150 272 272 CHECK_MEMBER_ALIGNMENT(VMCPU, cpum.s.Guest.hwvirt.vmx.abMsrBitmap, 4096); 273 273 CHECK_MEMBER_ALIGNMENT(VMCPU, cpum.s.Guest.hwvirt.vmx.abIoBitmap, 4096); 274 CHECK_MEMBER_ALIGNMENT(VMCPU, cpum.s.Guest.hwvirt.vmx.abVirtApicPage, 4096);275 274 276 275 PVM pVM = NULL; NOREF(pVM);
Note:
See TracChangeset
for help on using the changeset viewer.
