Changeset 64996 in vbox

Timestamp:

Dec 22, 2016 7:41:00 AM (8 years ago)

Author:

vboxsync

Message:

bugref:8527. added Unattended object as class member into MachineImpl class

Location:

trunk/src/VBox/Main

Files:

• include/MachineImpl.h (modified) (3 diffs)
• src-server/MachineImpl.cpp (modified) (4 diffs)

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

@@ -40 +40 @@
 #include "PerformanceImpl.h"
 #include "ThreadTask.h"
+#include "UnattendedImpl.h"
+
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
@@ -772 +774 @@
     const ComObjPtr<BIOSSettings>      mBIOSSettings;
     const ComObjPtr<BandwidthControl>  mBandwidthControl;
+    const ComObjPtr<Unattended>       mUnattended;
 
     typedef std::vector<ComObjPtr<NetworkAdapter> > NetworkAdapterVector;
@@ -977 +980 @@
     HRESULT getVMProcessPriority(com::Utf8Str &aVMProcessPriority);
     HRESULT setVMProcessPriority(const com::Utf8Str &aVMProcessPriority);
+    HRESULT getUnattended(ComPtr<IUnattended> &aUnattended);
 
     // wrapped IMachine methods

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -7161 +7161 @@
 }
 
+HRESULT Machine::getUnattended(ComPtr<IUnattended> &aUnattended)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    aUnattended = mUnattended;
+
+    return S_OK;
+}
+
 HRESULT Machine::cloneTo(const ComPtr<IMachine> &aTarget, CloneMode_T aMode, const std::vector<CloneOptions_T> &aOptions,
                          ComPtr<IProgress> &aProgress)
@@ -8386 +8395 @@
     mBandwidthControl->init(this);
 
+    /* create the unattended object (always present) */
+    unconst(mUnattended).createObject();
+    mUnattended->init(this);
+
     return S_OK;
 }
@@ -8461 +8474 @@
         mBIOSSettings->uninit();
         unconst(mBIOSSettings).setNull();
+    }
+
+    if (mUnattended)
+    {
+        mUnattended->uninit();
+        unconst(mUnattended).setNull();
     }
 
@@ -12510 +12529 @@
     mBandwidthControl->init(this, aMachine->mBandwidthControl);
 
+    /* create another unattended object that will be mutable */
+    unconst(mUnattended).createObject();
+    mUnattended->init(this, aMachine->mUnattended);
+
     /* default is to delete saved state on Saved -> PoweredOff transition */
     mRemoveSavedState = true;