Changeset 5060 in vbox

Timestamp:

Sep 26, 2007 5:14:35 PM (17 years ago)

Author:

vboxsync

Message:

Added custom line speed setting to XML/COM/CFGM. Hope I haven't forgotten anything.

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -851 +851 @@
         hrc = networkAdapter->COMGETTER(CableConnected)(&fCableConnected);          H();
         rc = CFGMR3InsertInteger(pCfg, "CableConnected", fCableConnected ? 1 : 0);  RC_CHECK();
+
+        /*
+         * Line speed to report from custom drivers
+         */
+        ULONG ulLineSpeed;
+        hrc = networkAdapter->COMGETTER(LineSpeed)(&ulLineSpeed);                   H();
+        rc = CFGMR3InsertInteger(pCfg, "LineSpeed", ulLineSpeed);                   RC_CHECK();
 
         /*

trunk/src/VBox/Main/MachineImpl.cpp

@@ -4375 +4375 @@
             bool cableConnected;
             CFGLDRQueryBool (adapterNode, "cable", &cableConnected);
+            /* line speed (defaults to 100 Mbps) */
+            uint32_t lineSpeed = 100000;
+            CFGLDRQueryUInt32 (adapterNode, "speed", &lineSpeed);
             /* tracing (defaults to false) */
             bool traceEnabled;
@@ -4384 +4387 @@
             mNetworkAdapters [slot]->COMSETTER(MACAddress) (macAddr);
             mNetworkAdapters [slot]->COMSETTER(CableConnected) (cableConnected);
+            mNetworkAdapters [slot]->COMSETTER(LineSpeed) (lineSpeed);
             mNetworkAdapters [slot]->COMSETTER(TraceEnabled) (traceEnabled);
             mNetworkAdapters [slot]->COMSETTER(TraceFile) (traceFile);
@@ -6214 +6218 @@
             CFGLDRSetBool (networkAdapterNode, "cable",
                            !!mNetworkAdapters [slot]->data()->mCableConnected);
+
+            CFGLDRSetUInt32 (networkAdapterNode, "speed", 
+                             mNetworkAdapters [slot]->data()->mLineSpeed);
 
             if (mNetworkAdapters [slot]->data()->mTraceEnabled)

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -664 +664 @@
         mData.backup();
         mData->mCableConnected = aConnected;
+
+        /* leave the lock before informing callbacks */
+        alock.unlock();
+
+        mParent->onNetworkAdapterChange (this);
+    }
+
+    return S_OK;
+}
+
+STDMETHODIMP NetworkAdapter::COMGETTER(LineSpeed) (ULONG *aSpeed)
+{
+    if (!aSpeed)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    *aSpeed = mData->mLineSpeed;
+
+    return S_OK;
+}
+
+STDMETHODIMP NetworkAdapter::COMSETTER(LineSpeed) (ULONG aSpeed)
+{
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    /* the machine needs to be mutable */
+    Machine::AutoMutableStateDependency adep (mParent);
+    CheckComRCReturnRC (adep.rc());
+
+    AutoLock alock (this);
+
+    if (aSpeed != mData->mLineSpeed)
+    {
+        mData.backup();
+        mData->mLineSpeed = aSpeed;
 
         /* leave the lock before informing callbacks */

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

@@ -7106 +7106 @@
     </attribute>
 
+    <attribute name="lineSpeed" type="unsigned long">
+      <desc>
+        Line speed reported by custom drivers, in units of 1 kbps.
+      </desc>
+    </attribute>
+
     <attribute name="traceEnabled" type="boolean">
       <desc>

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

@@ -37 +37 @@
             : mSlot (0), mEnabled (FALSE)
             , mAttachmentType (NetworkAttachmentType_NoNetworkAttachment)
-            ,  mCableConnected (TRUE), mTraceEnabled (FALSE)
+            ,  mCableConnected (TRUE), mLineSpeed (0), mTraceEnabled (FALSE)
 #ifdef RT_OS_WINDOWS
             , mHostInterface ("") // cannot be null
@@ -55 +55 @@
                     mAttachmentType == that.mAttachmentType &&
                     mCableConnected == that.mCableConnected &&
+                    mLineSpeed == that.mLineSpeed &&
                     mTraceEnabled == that.mTraceEnabled &&
                     mHostInterface == that.mHostInterface &&
@@ -71 +72 @@
         NetworkAttachmentType_T mAttachmentType;
         BOOL mCableConnected;
+        ULONG mLineSpeed;
         BOOL mTraceEnabled;
         Bstr mTraceFile;
@@ -131 +133 @@
     STDMETHOD(COMGETTER(TraceEnabled)) (BOOL *aEnabled);
     STDMETHOD(COMSETTER(TraceEnabled)) (BOOL aEnabled);
+    STDMETHOD(COMGETTER(LineSpeed)) (ULONG *aSpeed);
+    STDMETHOD(COMSETTER(LineSpeed)) (ULONG aSpeed);
     STDMETHOD(COMGETTER(TraceFile)) (BSTR *aTraceFile);
     STDMETHOD(COMSETTER(TraceFile)) (INPTR BSTR aTraceFile);

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

@@ -531 +531 @@
   </xsd:attribute>
   <xsd:attribute name="cable" type="xsd:boolean" use="required"/>
+  <xsd:attribute name="speed" type="xsd:unsignedInt"/>
   <xsd:attribute name="trace" type="xsd:boolean" default="false"/>
   <xsd:attribute name="tracefile" type="xsd:string"/>