儲存庫 vbox 的更動 46367

時間撮記:

2013-6-3 下午04:34:26 (11 年 以前)

作者:

vboxsync

訊息:

Control VBoxSVC release logging. Xtracker id: 6787

位置:

trunk

檔案:

• include/VBox/settings.h (修改) (1 筆差異)
• src/VBox/Main/idl/VirtualBox.xidl (修改) (2 筆差異)
• src/VBox/Main/include/SystemPropertiesImpl.h (修改) (2 筆差異)
• src/VBox/Main/src-server/SystemPropertiesImpl.cpp (修改) (4 筆差異)
• src/VBox/Main/xml/Settings.cpp (修改) (2 筆差異)

trunk/include/VBox/settings.h

@@ -267 +267 @@
     com::Utf8Str            strDefaultAdditionsISO;
     com::Utf8Str            strDefaultFrontend;
+    com::Utf8Str            strLoggingLevel;
     uint32_t                ulLogHistoryCount;
 };

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

@@ -8475 +8475 @@
     name="ISystemProperties"
     extends="$unknown"
-    uuid="413ea94c-efd9-491e-81fc-5df0c4d864bb"
+    uuid="55699910-cc50-11e2-8b8b-0800200c9a66"
     wsmap="managed"
     >
@@ -8565 +8565 @@
           <link to="IVirtualBox::openMachine"/>
         </see>
+      </desc>
+    </attribute>
+
+    <attribute name="loggingLevel" type="wstring">
+      <desc>
+        Specifies the logging level in current use by VirtualBox. 
       </desc>
     </attribute>

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

@@ -70 +70 @@
     STDMETHOD(COMGETTER(ParallelPortCount))(ULONG *count);
     STDMETHOD(COMGETTER(MaxBootPosition))(ULONG *aMaxBootPosition);
+    STDMETHOD(COMGETTER(LoggingLevel))(BSTR *aLoggingLevel);
+    STDMETHOD(COMSETTER(LoggingLevel))(IN_BSTR aLoggingLevel);
     STDMETHOD(COMGETTER(DefaultMachineFolder))(BSTR *aDefaultMachineFolder);
     STDMETHOD(COMSETTER(DefaultMachineFolder))(IN_BSTR aDefaultMachineFolder);
@@ -125 +127 @@
     HRESULT getUserHomeDirectory(Utf8Str &strPath);
     HRESULT setDefaultMachineFolder(const Utf8Str &aPath);
+    HRESULT setLoggingLevel(const Utf8Str &aLoggingLevel);
     HRESULT setDefaultHardDiskFormat(const Utf8Str &aFormat);
 

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

@@ -91 +91 @@
 
     setDefaultMachineFolder(Utf8Str::Empty);
+    setLoggingLevel(Utf8Str::Empty);
     setDefaultHardDiskFormat(Utf8Str::Empty);
 
@@ -609 +610 @@
     {
         // VirtualBox::saveSettings() needs vbox write lock
+        AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
+        rc = mParent->saveSettings();
+    }
+
+    return rc;
+}
+
+STDMETHODIMP SystemProperties::COMGETTER(LoggingLevel)(BSTR *aLoggingLevel)
+{
+    CheckComArgOutPointerValid(aLoggingLevel);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    m->strLoggingLevel.cloneTo(aLoggingLevel);
+
+    return S_OK;
+}
+
+
+STDMETHODIMP SystemProperties::COMSETTER(LoggingLevel)(IN_BSTR aLoggingLevel)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    HRESULT rc = setLoggingLevel(aLoggingLevel);
+    alock.release();
+
+    if (SUCCEEDED(rc))
+    {
         AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
         rc = mParent->saveSettings();
@@ -1041 +1075 @@
     if (FAILED(rc)) return rc;
 
+    rc = setLoggingLevel(data.strLoggingLevel);
+    if (FAILED(rc)) return rc;
+
     rc = setDefaultHardDiskFormat(data.strDefaultHardDiskFormat);
     if (FAILED(rc)) return rc;
@@ -1206 +1243 @@
     m->strDefaultMachineFolder = path;
 
+    return S_OK;
+}
+
+HRESULT SystemProperties::setLoggingLevel(const Utf8Str &aLoggingLevel)
+{
+    m->strLoggingLevel = aLoggingLevel;
     return S_OK;
 }

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1387 +1387 @@
                     {
                         pelmGlobalChild->getAttributeValue("defaultMachineFolder", systemProperties.strDefaultMachineFolder);
+                        pelmGlobalChild->getAttributeValue("LoggingLevel", systemProperties.strLoggingLevel);
                         pelmGlobalChild->getAttributeValue("defaultHardDiskFormat", systemProperties.strDefaultHardDiskFormat);
                         if (!pelmGlobalChild->getAttributeValue("VRDEAuthLibrary", systemProperties.strVRDEAuthLibrary))
@@ -1532 +1533 @@
     if (systemProperties.strDefaultMachineFolder.length())
         pelmSysProps->setAttribute("defaultMachineFolder", systemProperties.strDefaultMachineFolder);
+    if (systemProperties.strLoggingLevel.length())
+        pelmSysProps->setAttribute("LoggingLevel", systemProperties.strLoggingLevel);
     if (systemProperties.strDefaultHardDiskFormat.length())
         pelmSysProps->setAttribute("defaultHardDiskFormat", systemProperties.strDefaultHardDiskFormat);