Changeset 72343 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

May 25, 2018 1:24:28 PM (7 years ago)

Author:

vboxsync

Message:

VMM,ConsoleImpl2: NEM and 64-bit guests. Sync NXE state with PGM. bugref:9044

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• HMAll.cpp (modified) (1 diff)
• NEMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/HMAll.cpp

@@ -358 +358 @@
 
 /**
- * Checks if this VM is long-mode capable.
+ * Checks if this VM is using HM and is long-mode capable.
+ *
+ * Use VMR3IsLongModeAllowed() instead of this, when possible.
  *
  * @returns true if long mode is allowed, false otherwise.
  * @param   pVM         The cross context VM structure.
- */
-/** @todo NEM: Check users of HMIsLongModeAllowed */
+ * @sa      VMR3IsLongModeAllowed, NEMHCIsLongModeAllowed
+ */
 VMM_INT_DECL(bool) HMIsLongModeAllowed(PVM pVM)
 {

trunk/src/VBox/VMM/VMMAll/NEMAll.cpp

@@ -25 +25 @@
 #include <VBox/vmm/vm.h>
 
+
+/**
+ * Checks if this VM is in NEM mode and is long-mode capable.
+ *
+ * Use VMR3IsLongModeAllowed() instead of this, when possible.
+ *
+ * @returns true if long mode is allowed, false otherwise.
+ * @param   pVM         The cross context VM structure.
+ * @sa      VMR3IsLongModeAllowed, HMIsLongModeAllowed
+ */
+VMM_INT_DECL(bool) NEMHCIsLongModeAllowed(PVM pVM)
+{
+    return pVM->nem.s.fAllow64BitGuests && VM_IS_NEM_ENABLED(pVM);
+}