Changeset 5171 in vbox

Timestamp:

Oct 5, 2007 4:49:56 PM (18 years ago)

Author:

vboxsync

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

25072

Message:

Added PXEDebug option scaffolding.

Location:

trunk/src/VBox/Main

Files:

• BIOSSettingsImpl.cpp (modified) (1 diff)
• ConsoleImpl2.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (1 diff)
• include/BIOSSettingsImpl.h (modified) (4 diffs)
• xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Main/BIOSSettingsImpl.cpp

@@ -373 +373 @@
 }
 
+STDMETHODIMP BIOSSettings::COMGETTER(PXEDebugEnabled)(BOOL *enabled)
+{
+    if (!enabled)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    *enabled = mData->mPXEDebugEnabled;
+
+    return S_OK;
+}
+
+STDMETHODIMP BIOSSettings::COMSETTER(PXEDebugEnabled)(BOOL enable)
+{
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    /* the machine needs to be mutable */
+    Machine::AutoMutableStateDependency adep (mParent);
+    CheckComRCReturnRC (adep.rc());
+
+    AutoLock alock (this);
+
+    mData.backup();
+    mData->mPXEDebugEnabled = enable;
+
+    return S_OK;
+}
+
 STDMETHODIMP BIOSSettings::COMGETTER(TimeOffset)(LONG64 *offset)
 {

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -170 +170 @@
     hrc = biosSettings->COMGETTER(IOAPICEnabled)(&fIOAPIC);                          H();
 
+    BOOL fPXEDebug;
+    hrc = biosSettings->COMGETTER(PXEDebugEnabled)(&fPXEDebug);                      H();
+
     /*
      * PDM config.
@@ -222 +225 @@
     rc = CFGMR3InsertString(pCfg,   "FloppyDevice",         "i82078");              RC_CHECK();
     rc = CFGMR3InsertInteger(pCfg,  "IOAPIC",               fIOAPIC);               RC_CHECK();
+    rc = CFGMR3InsertInteger(pCfg,  "PXEDebug",             fPXEDebug);             RC_CHECK();
     rc = CFGMR3InsertBytes(pCfg,    "UUID", pUuid, sizeof(*pUuid));                 RC_CHECK();
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -4226 +4226 @@
             }
 
+            /* PXE debug logging (optional) */
+            {
+                CFGNODE pxedebugNode = 0;
+                CFGLDRGetChildNode (biosNode, "PXEDebug", 0, &pxedebugNode);
+                if (pxedebugNode)
+                {
+                    bool enabled;
+                    CFGLDRQueryBool (pxedebugNode, "enabled", &enabled);
+                    mBIOSSettings->COMSETTER(PXEDebugEnabled)(enabled);
+                    CFGLDRReleaseNode (pxedebugNode);
+                }
+            }
+
             /* time offset (optional) */
             {
@@ -6153 +6166 @@
             CFGLDRSetInt64 (timeOffsetNode, "value", timeOffset);
             CFGLDRReleaseNode (timeOffsetNode);
+
+            /* PXE debug flag (optional) */
+            CFGNODE pxedebugNode = 0;
+            CFGLDRCreateChildNode (biosNode, "PXEDebug", &pxedebugNode);
+            mBIOSSettings->COMGETTER(PXEDebugEnabled)(&fSet);
+            CFGLDRSetBool (pxedebugNode, "enabled", !!fSet);
+            CFGLDRReleaseNode (pxedebugNode);
+
         }
         CFGLDRReleaseNode(biosNode);

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

@@ -2068 +2068 @@
     </attribute>
 
+    <attribute name="PXEDebugEnabled" type="boolean">
+      <desc>
+        PXE debug logging flag. If set, VirtualBox will write extensive
+        PXE trace information to the release log.
+      </desc>
+    </attribute>
+
   </interface>
 

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

@@ -41 +41 @@
             mACPIEnabled = true;
             mIOAPICEnabled = false;
+            mPXEDebugEnabled = false;
             mTimeOffset = 0;
         }
@@ -54 +55 @@
                     mACPIEnabled     == that.mACPIEnabled &&
                     mIOAPICEnabled   == that.mIOAPICEnabled &&
+                    mPXEDebugEnabled == that.mPXEDebugEnabled &&
                     mTimeOffset      == that.mTimeOffset);
         }
@@ -64 +66 @@
         BOOL               mACPIEnabled;
         BOOL               mIOAPICEnabled;
+        BOOL               mPXEDebugEnabled;
         LONG64             mTimeOffset;
     };
@@ -101 +104 @@
     STDMETHOD(COMGETTER(IOAPICEnabled))(BOOL *enabled);
     STDMETHOD(COMSETTER(IOAPICEnabled))(BOOL enable);
+    STDMETHOD(COMGETTER(PXEDebugEnabled))(BOOL *enabled);
+    STDMETHOD(COMSETTER(PXEDebugEnabled))(BOOL enable);
     STDMETHOD(COMGETTER)(TimeOffset)(LONG64 *offset);
     STDMETHOD(COMSETTER)(TimeOffset)(LONG64 offset);

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -465 +465 @@
       </xsd:complexType>
     </xsd:element>
+    <xsd:element name="PXEDebug" minOccurs="0">
+      <xsd:complexType>
+          <xsd:attribute name="enabled" type="xsd:boolean" default="false"/>
+      </xsd:complexType>
+    </xsd:element>
   </xsd:all>
 </xsd:complexType>