Changeset 40418 in vbox for trunk/src/VBox/Main/include

Timestamp:

Mar 9, 2012 10:00:56 PM (13 years ago)

Author:

vboxsync

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

76749

Message:

Main: Extended IMachine and the settings XML with three tracing related properties.

Location:

trunk/src/VBox/Main/include

Files:

• MachineImpl.h (modified) (6 diffs)
• VirtualBoxBase.h (modified) (3 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VirtualBox COM class implementation
+ * Implementation of IMachine in VBoxSVC - Header.
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -297 +297 @@
         typedef std::list<ComObjPtr<PciDeviceAttachment> > PciDeviceAssignmentList;
         PciDeviceAssignmentList mPciDeviceAssignments;
+
+        settings::Debugging  mDebugging;
     };
 
@@ -468 +470 @@
     STDMETHOD(COMGETTER(PciDeviceAssignments))(ComSafeArrayOut(IPciDeviceAttachment *, aAssignments));
     STDMETHOD(COMGETTER(BandwidthControl))(IBandwidthControl **aBandwidthControl);
+    STDMETHOD(COMGETTER(TracingEnabled))(BOOL *pfEnabled);
+    STDMETHOD(COMSETTER(TracingEnabled))(BOOL fEnabled);
+    STDMETHOD(COMGETTER(TracingConfig))(BSTR *pbstrConfig);
+    STDMETHOD(COMSETTER(TracingConfig))(IN_BSTR bstrConfig);
+    STDMETHOD(COMGETTER(AllowTracingToAccessVM))(BOOL *pfAllow);
+    STDMETHOD(COMSETTER(AllowTracingToAccessVM))(BOOL fAllow);
 
     // IMachine methods
@@ -786 +794 @@
                          const Guid &aCurSnapshotId,
                          Snapshot *aParentSnapshot);
-    HRESULT loadHardware(const settings::Hardware &data);
+    HRESULT loadHardware(const settings::Hardware &data, const settings::Debugging *pDbg);
+    HRESULT loadDebugging(const settings::Debugging *pDbg);
     HRESULT loadStorageControllers(const settings::Storage &data,
                                    const Guid *puuidRegistry,
@@ -826 +835 @@
     void copyMachineDataToSettings(settings::MachineConfigFile &config);
     HRESULT saveAllSnapshots(settings::MachineConfigFile &config);
-    HRESULT saveHardware(settings::Hardware &data);
+    HRESULT saveHardware(settings::Hardware &data, settings::Debugging *pDbg);
     HRESULT saveStorageControllers(settings::Storage &data);
     HRESULT saveStorageDevices(ComObjPtr<StorageController> aStorageController,
@@ -1195 +1204 @@
                  IN_GUID aSnapshotId,
                  const Utf8Str &aStateFilePath);
-    HRESULT init(Machine *aMachine,
-                 const settings::Hardware &hardware,
-                 const settings::Storage &storage,
-                 IN_GUID aSnapshotId,
-                 const Utf8Str &aStateFilePath);
+    HRESULT initFromSettings(Machine *aMachine,
+                             const settings::Hardware &hardware,
+                             const settings::Debugging *pDbg,
+                             const settings::Storage &storage,
+                             IN_GUID aSnapshotId,
+                             const Utf8Str &aStateFilePath);
     void uninit();
 

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

@@ -351 +351 @@
 
 /**
- * Checks that the string argument is not a NULL or empty string and returns
- * E_INVALIDARG + extended error info on failure.
- * @param arg   Input string argument (BSTR etc.).
- */
-#define CheckComArgStrNotEmptyOrNull(arg) \
-    do { \
-        if (RT_UNLIKELY((arg) == NULL || *(arg) == '\0')) \
-            return setError(E_INVALIDARG, \
-                tr("Argument %s is empty or NULL"), #arg); \
+ * Checks that a string input argument is valid (not NULL or obviously invalid
+ * pointer), returning E_INVALIDARG + extended error info if invalid.
+ * @param a_bstrIn  Input string argument (IN_BSTR).
+ */
+#define CheckComArgStr(a_bstrIn) \
+    do { \
+        IN_BSTR const bstrInCheck = (a_bstrIn); /* type check */ \
+        if (RT_UNLIKELY(!RT_VALID_PTR(bstrInCheck))) \
+            return setError(E_INVALIDARG, tr("Argument %s is an invalid pointer"), #a_bstrIn); \
+    } while (0)
+/**
+ * Checks that the string argument is not a NULL, a invalid pointer or an empty
+ * string, returning E_INVALIDARG + extended error info on failure.
+ * @param a_bstrIn  Input string argument (BSTR etc.).
+ */
+#define CheckComArgStrNotEmptyOrNull(a_bstrIn) \
+    do { \
+        IN_BSTR const bstrInCheck = (a_bstrIn); /* type check */ \
+        if (RT_UNLIKELY(!RT_VALID_PTR(bstrInCheck) || *(bstrInCheck) == '\0')) \
+            return setError(E_INVALIDARG, tr("Argument %s is empty or an invalid pointer"), #a_bstrIn); \
     } while (0)
 
@@ -959 +970 @@
      *  Stores the current data pointer in the backup area, allocates new data
      *  using the copy constructor on current data and makes new data active.
+     *
+     *  @deprecated Use backupEx to avoid throwing wild out-of-memory exceptions.
      */
     void backup()
@@ -969 +982 @@
             this->mData = pNewData;
         }
+    }
+
+    /**
+     *  Stores the current data pointer in the backup area, allocates new data
+     *  using the copy constructor on current data and makes new data active.
+     *
+     *  @returns S_OK, E_OUTOFMEMORY or E_FAIL (internal error).
+     */
+    HRESULT backupEx()
+    {
+        AssertMsgReturn(this->mData, ("data must not be NULL"), E_FAIL);
+        if (this->mData && !mBackupData)
+        {
+            try
+            {
+                D *pNewData = new D(*this->mData);
+                mBackupData = this->mData;
+                this->mData = pNewData;
+            }
+            catch (std::bad_alloc &)
+            {
+                return E_OUTOFMEMORY;
+            }
+        }
+        return S_OK;
     }