Changeset 45528 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 12, 2013 5:32:57 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

85008

Message:

VBOX_WITH_RAW_MODE changes.

File:

• trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp

@@ -295 +295 @@
         return autoCaller.rc();
 
+#ifdef VBOX_WITH_RAW_MODE
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -301 +302 @@
         *aEnabled = PATMR3IsEnabled (ptrVM.rawUVM());
     else
+#endif
         *aEnabled = false;
 
@@ -319 +321 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
+#ifdef VBOX_WITH_RAW_MODE
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -336 +339 @@
         return setError(VBOX_E_VM_ERROR, tr("PATMR3AllowPatching returned %Rrc"), vrc);
 
+#else  /* !VBOX_WITH_RAW_MODE */
+    if (aEnable)
+        return setError(VBOX_E_VM_ERROR, tr("PATM not present"), VERR_NOT_SUPPORTED);
+#endif /* !VBOX_WITH_RAW_MODE */
     return S_OK;
 }
@@ -352 +359 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
+#ifdef VBOX_WITH_RAW_MODE
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -359 +367 @@
         *aEnabled = CSAMR3IsEnabled(ptrVM.rawUVM());
     else
+#endif /* VBOX_WITH_RAW_MODE */
         *aEnabled = false;
 
@@ -377 +386 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
+#ifdef VBOX_WITH_RAW_MODE
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -394 +404 @@
         return setError(VBOX_E_VM_ERROR, tr("CSAMR3SetScanningEnabled returned %Rrc"), vrc);
 
+#else  /* !VBOX_WITH_RAW_MODE */
+    if (aEnable)
+        return setError(VBOX_E_VM_ERROR, tr("CASM not present"), VERR_NOT_SUPPORTED);
+#endif /* !VBOX_WITH_RAW_MODE */
     return S_OK;
 }