Changeset 72328 in vbox for trunk/src/VBox

Timestamp:

May 24, 2018 7:29:45 PM (7 years ago)

Author:

vboxsync

Message:

Main: Added read-only ExecutionEngine attribute to IMachineDebugger to expose VM::bMainExecutionEngine to API clients. bugref:9044

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• include/MachineDebuggerImpl.h (modified) (1 diff)
• src-client/MachineDebuggerImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -18314 +18314 @@
   -->
 
+  <enum
+    name="VMExecutionEngine"
+    uuid="56029577-31f7-44d2-3334-7ecbf95294b6"
+    >
+    <desc>
+      The main execution engine of a VM.
+    </desc>
+    <const name="NotSet"            value="0">
+      <desc>Has not yet been set (try again later).</desc>
+    </const>
+    <const name="RawMode"           value="1">
+      <desc>Raw-mode.</desc>
+    </const>
+    <const name="HwVirt"            value="2">
+      <desc>Hardware assisted virtualization thru HM.</desc>
+    </const>
+    <const name="NativeApi"         value="3">
+      <desc>Hardware assisted virtualization thru native API (NEM).</desc>
+    </const>
+  </enum>
+
   <interface
     name="IMachineDebugger" extends="$unknown"
-    uuid="9c0f5269-47ae-ee34-c2fe-53a16e388925"
+    uuid="8b1a74a7-086a-46cc-1229-6a85ad31b7ba"
     wsmap="managed"
     reservedMethods="16" reservedAttributes="15"
@@ -18732 +18753 @@
     </attribute>
 
+    <attribute name="executionEngine" type="VMExecutionEngine" readonly="yes">
+      <desc>Gets the main execution engine of the VM.</desc>
+    </attribute>
+
     <attribute name="HWVirtExEnabled" type="boolean" readonly="yes">
       <desc>
         Flag indicating whether the VM is currently making use of CPU hardware
         virtualization extensions.
+
+        Superseeded by mainExecutionMode.
       </desc>
     </attribute>

trunk/src/VBox/Main/include/MachineDebuggerImpl.h

@@ -66 +66 @@
     HRESULT getLogRelGroups(com::Utf8Str &aLogRelGroups);
     HRESULT getLogRelDestinations(com::Utf8Str &aLogRelDestinations);
+    HRESULT getExecutionEngine(VMExecutionEngine_T *apenmEngine);
     HRESULT getHWVirtExEnabled(BOOL *aHWVirtExEnabled);
     HRESULT getHWVirtExNestedPagingEnabled(BOOL *aHWVirtExNestedPagingEnabled);

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

@@ -532 +532 @@
 
 /**
+ * Return the main execution engine of the VM.
+ *
+ * @returns COM status code
+ * @param   apenmEngine     Address of the result variable.
+ */
+HRESULT MachineDebugger::getExecutionEngine(VMExecutionEngine_T *apenmEngine)
+{
+    *apenmEngine = VMExecutionEngine_NotSet;
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    Console::SafeVMPtrQuiet ptrVM(mParent);
+    if (ptrVM.isOk())
+    {
+        uint8_t bEngine = UINT8_MAX;
+        int rc = EMR3QueryMainExecutionEngine(ptrVM.rawUVM(), &bEngine);
+        if (RT_SUCCESS(rc))
+            switch (bEngine)
+            {
+                case VM_EXEC_ENGINE_NOT_SET:    *apenmEngine = VMExecutionEngine_NotSet; break;
+                case VM_EXEC_ENGINE_RAW_MODE:   *apenmEngine = VMExecutionEngine_RawMode; break;
+                case VM_EXEC_ENGINE_HW_VIRT:    *apenmEngine = VMExecutionEngine_HwVirt; break;
+                case VM_EXEC_ENGINE_NATIVE_API: *apenmEngine = VMExecutionEngine_NativeApi; break;
+                default: AssertMsgFailed(("bEngine=%d\n", bEngine));
+            }
+    }
+
+    return S_OK;
+}
+
+/**
  * Returns the current hardware virtualization flag.
  *
@@ -539 +569 @@
 HRESULT MachineDebugger::getHWVirtExEnabled(BOOL *aHWVirtExEnabled)
 {
+    *aHWVirtExEnabled = false;
+
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
     Console::SafeVMPtrQuiet ptrVM(mParent);
-
     if (ptrVM.isOk())
-        *aHWVirtExEnabled = HMR3IsEnabled(ptrVM.rawUVM());
-    else
-        *aHWVirtExEnabled = false;
+    {
+        uint8_t bEngine = UINT8_MAX;
+        int rc = EMR3QueryMainExecutionEngine(ptrVM.rawUVM(), &bEngine);
+        *aHWVirtExEnabled = RT_SUCCESS(rc) && bEngine == VM_EXEC_ENGINE_HW_VIRT;
+    }
 
     return S_OK;