Changeset 49324 in vbox for trunk

Timestamp:

Oct 29, 2013 10:05:21 PM (11 years ago)

Author:

vboxsync

Message:

Make the TurnResetIntoPowerOff setting configurable during runtime

Location:

trunk/src/VBox

Files:

• Main/include/ConsoleImpl.h (modified) (1 diff)
• Main/src-client/ConsoleImpl.cpp (modified) (3 diffs)
• VMM/VMMR3/VMMR3.def (modified) (1 diff)

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

@@ -221 +221 @@
     HRESULT onBandwidthGroupChange(IBandwidthGroup *aBandwidthGroup);
     HRESULT onStorageDeviceChange(IMediumAttachment *aMediumAttachment, BOOL aRemove, BOOL aSilent);
+    HRESULT onExtraDataChange(IN_BSTR aMachineId, IN_BSTR aKey, IN_BSTR aVal);
 
     HRESULT getGuestProperty(IN_BSTR aKey, BSTR *aValue, LONG64 *aTimestamp, BSTR *aFlags);

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

@@ -347 +347 @@
             }
 
+            case VBoxEventType_OnExtraDataChanged:
+            {
+                ComPtr<IExtraDataChangedEvent> pEDCEv = aEvent;
+                Bstr strMachineId;
+                Bstr strKey;
+                Bstr strVal;
+                HRESULT hrc = S_OK;
+
+                hrc = pEDCEv->COMGETTER(MachineId)(strMachineId.asOutParam());
+                if (FAILED(hrc)) break;
+
+                hrc = pEDCEv->COMGETTER(Key)(strKey.asOutParam());
+                if (FAILED(hrc)) break;
+
+                hrc = pEDCEv->COMGETTER(Value)(strVal.asOutParam());
+                if (FAILED(hrc)) break;
+
+                mConsole->onExtraDataChange(strMachineId.raw(), strKey.raw(), strVal.raw());
+                break;
+            }
+
             default:
               AssertFailed();
@@ -574 +595 @@
             eventTypes.push_back(VBoxEventType_OnNATRedirect);
             eventTypes.push_back(VBoxEventType_OnHostPCIDevicePlug);
+            eventTypes.push_back(VBoxEventType_OnExtraDataChanged);
             rc = pES->RegisterListener(aVmListener, ComSafeArrayAsInParam(eventTypes), true);
             AssertComRC(rc);
@@ -5354 +5376 @@
     LogFlowThisFunc(("Leaving rc=%#x\n", rc));
     return rc;
+}
+
+HRESULT Console::onExtraDataChange(IN_BSTR aMachineId, IN_BSTR aKey, IN_BSTR aVal)
+{
+    LogFlowThisFunc(("\n"));
+
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+
+    if (!aMachineId)
+        return S_OK;
+
+    HRESULT hrc = S_OK;
+    Bstr idMachine(aMachineId);
+    Bstr idSelf;
+    hrc = mMachine->COMGETTER(Id)(idSelf.asOutParam());
+    if (   FAILED(hrc)
+        || idMachine != idSelf)
+        return hrc;
+
+    /* don't do anything if the VM isn't running */
+    SafeVMPtrQuiet ptrVM(this);
+    if (ptrVM.isOk())
+    {
+        Bstr strKey(aKey);
+        Bstr strVal(aVal);
+
+        if (strKey == "VBoxInternal2/TurnResetIntoPowerOff")
+        {
+            int vrc = VMR3SetPowerOffInsteadOfReset(ptrVM.rawUVM(), strVal == "1");
+            AssertRC(vrc);
+        }
+
+        ptrVM.release();
+    }
+
+    /* notify console callbacks on success */
+    if (SUCCEEDED(hrc))
+        fireExtraDataChangedEvent(mEventSource, aMachineId, aKey, aVal);
+
+    LogFlowThisFunc(("Leaving hrc=%#x\n", hrc));
+    return hrc;
 }
 

trunk/src/VBox/VMM/VMMR3/VMMR3.def

@@ -358 +358 @@
     VMR3SetCpuExecutionCap
     VMR3SetError
+    VMR3SetPowerOffInsteadOfReset
     VMR3Suspend
     VMR3Teleport