Skip to content

Commit

Permalink
fixed compilation with BX_SUPPORT_VMX=1 (x86_64 = 0)
Browse files Browse the repository at this point in the history
  • Loading branch information
Shwartsman committed Nov 28, 2023
1 parent 6e1e04e commit 685a033
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bochs/cpu/event.cc
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ void BX_CPU_C::HandleExtInterrupt(void)
#endif

Bit8u vector = interrupt_acknowledge();
#if BX_SUPPORT_VMX
#if BX_SUPPORT_VMX >= 2
if (BX_CPU_THIS_PTR in_vmx_guest) {
if (VMX_Posted_Interrupt_Processing(vector)) return;
}
Expand Down
2 changes: 1 addition & 1 deletion bochs/cpu/paging.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2358,7 +2358,7 @@ bool BX_CPU_C::dbg_xlate_linear2phy(bx_address laddr, bx_phy_address *phy, bx_ad
if (! (pt_address & 0x1)) {
offset_mask = 0x3fffffff;
goto page_fault;
}
}
offset_mask >>= 18;
pt_address &= BX_CONST64(0x000ffffffffff000);
level = 1;
Expand Down

1 comment on commit 685a033

@vruppert
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is still a compilation failure in case x86-64 is present and VMX = 1.

Please sign in to comment.