Changeset 2563 in vbox

Timestamp:

May 9, 2007 3:46:16 PM (18 years ago)

Author:

vboxsync

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

21029

Message:

Added release logging to the Linux TAP code (removed superfluous debug log statements)

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (13 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -5731 +5731 @@
     {
         int iErr = errno;
-        Log(("Failed to start the TAP interface setup script %s, error text: %s\n",
-              szCommand, strerror(iErr)));
         LogRel(("Failed to start the TAP interface setup script %s, error text: %s\n",
               szCommand, strerror(iErr)));
@@ -5757 +5755 @@
         {
             pclose(pfScriptHandle);
-            Log(("The TAP interface setup script did not return the name of a TAP device.\n"));
             LogRel(("The TAP interface setup script did not return the name of a TAP device.\n"));
             LogFlowThisFunc(("rc=E_FAIL\n"));
@@ -5769 +5766 @@
     if (!WIFEXITED(rc))
     {
-        Log(("The TAP interface setup script terminated abnormally.\n"));
         LogRel(("The TAP interface setup script terminated abnormally.\n"));
         LogFlowThisFunc(("rc=E_FAIL\n"));
@@ -5776 +5772 @@
     if (WEXITSTATUS(rc) != 0)
     {
-        Log(("The TAP interface setup script returned a non-zero exit code.\n"));
         LogRel(("The TAP interface setup script returned a non-zero exit code.\n"));
         LogFlowThisFunc(("rc=E_FAIL\n"));
@@ -5877 +5872 @@
                 if (rcVBox != 0)
                 {
-                    Log(("Failed to open the host network interface %ls\n", tapDeviceName.raw()));
                     LogRel(("Failed to open the host network interface %ls\n", tapDeviceName.raw()));
                     rc = setError(E_FAIL, tr ("Failed to open the host network interface %ls"),
@@ -5890 +5884 @@
                     if (tapDeviceName.isEmpty())
                     {
-                        Log(("No setup application was supplied for the TAP interface.\n"));
                         LogRel(("No setup application was supplied for the TAP interface.\n"));
                         rc = setError(E_FAIL, tr ("No setup application was supplied for the host networking interface"));
@@ -5914 +5907 @@
                     if (rcVBox != 0)
                     {
-                        Log(("Failed to open the host network interface %ls returned by the setup script", tapDeviceName.raw()));
                         LogRel(("Failed to open the host network interface %ls returned by the setup script", tapDeviceName.raw()));
                         rc = setError(E_FAIL, tr ("Failed to open the host network interface %ls returned by the setup script"), tapDeviceName.raw());
@@ -5938 +5930 @@
                     else
                     {
-                        Log(("Configuration error: Failed to configure /dev/net/tun non blocking. Error: %s\n", strerror(errno)));
-                        LogRel(("Configuration error: Failed to configure /dev/net/tun non blocking. Error: %s\n", strerror(errno)));
+                        int iErr = errno;
+
+                        LogRel(("Configuration error: Failed to configure /dev/net/tun non blocking. Error: %s\n", strerror(iErr)));
                         rcVBox = VERR_HOSTIF_BLOCKING;
                         rc = setError(E_FAIL, tr ("could not set up the host networking device for non blocking access: %s"),
@@ -5949 +5942 @@
         else
         {
-            Log(("Configuration error: Failed to open /dev/net/tun rc=%Vrc\n", rcVBox));
             LogRel(("Configuration error: Failed to open /dev/net/tun rc=%Vrc\n", rcVBox));
             switch (rcVBox)
@@ -5973 +5965 @@
         if (VBOX_FAILURE(rcVBox) && SUCCEEDED(rc))
         {
-            Log(("General failure attaching to host interface\n"));
             LogRel(("General failure attaching to host interface\n"));
             rc = setError(E_FAIL, tr ("General failure attaching to host interface"));
@@ -6050 +6041 @@
             if (rcCommand == -1)
             {
-                Log(("Failed to execute the clean up script for the TAP interface"));
                 LogRel(("Failed to execute the clean up script for the TAP interface"));
                 rc = setError(E_FAIL, tr ("Failed to execute the clean up script for the TAP interface"));
@@ -6056 +6046 @@
             if (!WIFEXITED(rc))
             {
-                Log(("The TAP interface clean up script terminated abnormally.\n"));
                 LogRel(("The TAP interface clean up script terminated abnormally.\n"));
                 rc = setError(E_FAIL, tr ("The TAP interface clean up script terminated abnormally"));
@@ -6062 +6051 @@
             if (WEXITSTATUS(rc) != 0)
             {
-                Log(("The TAP interface clean up script returned a non-zero exit code.\n"));
                 LogRel(("The TAP interface clean up script returned a non-zero exit code.\n"));
                 rc = setError(E_FAIL, tr ("The TAP interface clean up script returned a non-zero exit code"));