Changeset 70980 in vbox for trunk/src/VBox/VMM

Timestamp:

Feb 13, 2018 1:41:24 AM (7 years ago)

Author:

vboxsync

Message:

NEM: Working on the EM loops. bugref:9044 [build fix]

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• EMR3Nem.cpp (modified) (1 diff)
• NEMR3.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/EMR3Nem.cpp

@@ -467 +467 @@
         {
             rcStrict = emR3ForcedActions(pVM, pVCpu, VBOXSTRICTRC_TODO(rcStrict));
-            VBOXVMM_EM_FF_ALL_RET(pVCpu, rcStrict);
+            VBOXVMM_EM_FF_ALL_RET(pVCpu, VBOXSTRICTRC_VAL(rcStrict));
             if (   rcStrict != VINF_SUCCESS
                 && rcStrict != VINF_EM_RESCHEDULE_HM)

trunk/src/VBox/VMM/VMMR3/NEMR3.cpp

@@ -239 +239 @@
 {
     Assert(VM_IS_NEM_ENABLED(pVM));
+#ifdef VBOX_WITH_NATIVE_NEM
     return nemR3NativeRunGC(pVM, pVCpu);
+#else
+    NOREF(pVM); NOREF(pVCpu);
+    return VERR_INTERNAL_ERROR_3;
+#endif
 }
 
@@ -246 +251 @@
 {
     Assert(VM_IS_NEM_ENABLED(pVM));
+#ifdef VBOX_WITH_NATIVE_NEM
     return nemR3NativeCanExecuteGuest(pVM, pVCpu, pCtx);
+#else
+    NOREF(pVM); NOREF(pVCpu); NOREF(pCtx);
+    return false;
+#endif
 }
 
@@ -253 +263 @@
 {
     Assert(VM_IS_NEM_ENABLED(pVM));
+#ifdef VBOX_WITH_NATIVE_NEM
     return nemR3NativeSetSingleInstruction(pVM, pVCpu, fEnable);
+#else
+    NOREF(pVM); NOREF(pVCpu); NOREF(fEnable);
+    return false;
+#endif
 }