Add environment var to remove debug messages.

    - Add printkd function.
    - Create HOSTBOOT_DEBUG env var for printk.
    - Update trace interfaces to utilize HOSTBOOT_DEBUG.
    - Fix compile errors due to unused variables.

Change-Id: Ib18c3ecd51ca333e0118949bf35476e9c5aa46a7
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/273
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

6 files changed, 41 insertions, 38 deletions

diff --git a/src/usr/cxxtest/test/cxxtesttest.H b/src/usr/cxxtest/test/cxxtesttest.H
index 145dd046f..0c925aea3 100644
--- a/src/usr/cxxtest/test/cxxtesttest.H
+++ b/src/usr/cxxtest/test/cxxtesttest.H
@@ -52,8 +52,11 @@ public:
     void testCxxTestTrace(void)
     {
         int32_t     l_dec   =   1234567890;
+        l_dec--; l_dec++;
         uint32_t    l_hex    =  0x12345678;
+        l_hex--; l_hex++;
         uint64_t    l_bighex =  0x1234567890abcdef;
+        l_bighex--; l_bighex++;
 
         TS_TRACE( "CxxTest Trace dec=%d",      l_dec );
         TS_TRACE( "CxxTest Trace hex=0x%x",    l_hex );
diff --git a/src/usr/example/test/exampletest.H b/src/usr/example/test/exampletest.H
index 8e89cb03d..c08a30db5 100644
--- a/src/usr/example/test/exampletest.H
+++ b/src/usr/example/test/exampletest.H
@@ -102,7 +102,9 @@ public:
     void testExampleForceTrace(void)
     {
         uint32_t i_32test   =   0xdeadbeef;
+        i_32test--; i_32test++;
         uint64_t i_64test   =   0xbadc0ffee0ddf00d;
+        i_64test--; i_64test++;
 
         TS_TRACE("Run TS_TRACE() as part of the example test\n" );
 
diff --git a/src/usr/initservice/initsvcunittesttask2/tasktest2.H b/src/usr/initservice/initsvcunittesttask2/tasktest2.H
index 3d3099da7..9dc1434d0 100644
--- a/src/usr/initservice/initsvcunittesttask2/tasktest2.H
+++ b/src/usr/initservice/initsvcunittesttask2/tasktest2.H
@@ -33,7 +33,6 @@
 // Includes
 /******************************************************************************/
 #include <stdint.h>
-#include <kernel/console.H>     // printk
 #include <util/singleton.H>
 
 namespace   INITSERVICE
diff --git a/src/usr/testcore/kernel/ptmgrtest.H b/src/usr/testcore/kernel/ptmgrtest.H
index 3a60483c5..9d1793710 100644
--- a/src/usr/testcore/kernel/ptmgrtest.H
+++ b/src/usr/testcore/kernel/ptmgrtest.H
@@ -57,11 +57,11 @@ const pte_test_t TEST_DATA[] = {
     { 0x0000000040001FF8,  0x0000000000040001,  109,  true,   false }, // just before a page boundary
 
     //2 addresses in the same page
-    { 0x0000000090000040,  0x0000000000090000,  110,  true,   false  },    
-    { 0x0000000090000100,  0x0000000000090000,  110,  true,   false  },    
+    { 0x0000000090000040,  0x0000000000090000,  110,  true,   false  },
+    { 0x0000000090000100,  0x0000000000090000,  110,  true,   false  },
 
     //Out of range address (too big) ??
-    { 0x0040000000000000,  0x0000000000004000,  111,  true,   false  }, 
+    { 0x0040000000000000,  0x0000000000004000,  111,  true,   false  },
 
     //Several addresses with the same PTEG, enough to overflow a PTEG
     { 0x0000000080803000,  0x0000000000080803,  112,  false,  true  }, // 2TB+8MB+12K
@@ -84,7 +84,7 @@ class ptmgrtest : public CxxTest::TestSuite
         VA_RANGE_FINISH = 0x0000000085800000,
 
         PN_RANGE_START  = 107,
-        PN_RANGE_FINISH = 115,   
+        PN_RANGE_FINISH = 115,
     };
 
   public:
@@ -96,7 +96,7 @@ class ptmgrtest : public CxxTest::TestSuite
     void test_hash40( void )
     {
         TS_TRACE( ">> test_hash40 <<" );
-        printk( ">> test_hash40 <<\n" );
+        printkd( ">> test_hash40 <<\n" );
         uint64_t fails, total = 0;
 
         // Initialize the Page Table
@@ -110,12 +110,12 @@ class ptmgrtest : public CxxTest::TestSuite
             if( TEST_DATA[x].hash != hash )
             {
                 TS_FAIL( "ptmgrtest::test_hash40> ERROR : Hash mismatch" );
-                printk( "VA=0x%.16lX, Exp: %.16lX, Act: %.16lX\n", TEST_DATA[x].va, TEST_DATA[x].hash, hash );
+                printkd( "VA=0x%.16lX, Exp: %.16lX, Act: %.16lX\n", TEST_DATA[x].va, TEST_DATA[x].hash, hash );
                 fails++;
             }
             else
             {
-                PASS_TRACE( "ptmgrtest::test_hash40> PASS : 0x%.16lX", TEST_DATA[x].va );                
+                PASS_TRACE( "ptmgrtest::test_hash40> PASS : 0x%.16lX", TEST_DATA[x].va );
             }
             total++;
         }
@@ -123,7 +123,7 @@ class ptmgrtest : public CxxTest::TestSuite
         delete ptmgr;
 
         TS_TRACE( "ptmgrtest::test_hash40> fails=%d/%d", fails, total );
-        printk( "ptmgrtest::test_hash40> fails=%ld/%ld\n", fails, total );
+        printkd( "ptmgrtest::test_hash40> fails=%ld/%ld\n", fails, total );
     }
 
     /**
@@ -135,7 +135,7 @@ class ptmgrtest : public CxxTest::TestSuite
     void test_addEntry( void )
     {
         TS_TRACE( ">> test_addEntry <<" );
-        printk( ">> test_addEntry <<\n" );
+        printkd( ">> test_addEntry <<\n" );
         uint64_t fails = 0;
         uint64_t total = 0;
         uint64_t status = 0;
@@ -217,7 +217,7 @@ class ptmgrtest : public CxxTest::TestSuite
         delete ptmgr;
 
         TS_TRACE( "ptmgrtest::test_addEntry> fails=%d/%d", fails, total );
-        printk( "ptmgrtest::test_addEntry> fails=%ld/%ld\n", fails, total );
+        printkd( "ptmgrtest::test_addEntry> fails=%ld/%ld\n", fails, total );
     }
 
     /**
@@ -228,12 +228,12 @@ class ptmgrtest : public CxxTest::TestSuite
     void test_delEntry( void )
     {
         TS_TRACE( ">> test_delEntry <<" );
-        printk( ">> test_delEntry <<\n" );
+        printkd( ">> test_delEntry <<\n" );
         uint64_t fails = 0;
         uint64_t total = 0;
         uint64_t ignored = 0;
 
-        // 1) Initialize the Page Table 
+        // 1) Initialize the Page Table
         PageTableManager* ptmgr = new PageTableManager(true);
 
         // 2) Populate the Page Table
@@ -249,7 +249,7 @@ class ptmgrtest : public CxxTest::TestSuite
             if( status & PageTableManager::PTE_VALID )
             {
                 TS_FAIL( "ptmgrtest::test_delEntry> ERROR : entry still present!" );
-                printk( "VA = %.16lX\n", TEST_DATA[x].va );
+                printkd( "VA = %.16lX\n", TEST_DATA[x].va );
                 PageTableManager::printPTE( TEST_DATA[x].va, true );
                 fails++;
             }
@@ -266,7 +266,7 @@ class ptmgrtest : public CxxTest::TestSuite
         delete ptmgr;
 
         TS_TRACE( "ptmgrtest::test_delEntry> fails=%d/%d", fails, total );
-        printk( "ptmgrtest::test_delEntry> fails=%ld/%ld\n", fails, total );
+        printkd( "ptmgrtest::test_delEntry> fails=%ld/%ld\n", fails, total );
     }
 
     /**
@@ -277,13 +277,13 @@ class ptmgrtest : public CxxTest::TestSuite
      */
     void test_delRangeVA( void )
     {
-        TS_TRACE( ">> test_delRangeVA <<" );        
-        printk( ">> test_delRangeVA <<\n" );        
+        TS_TRACE( ">> test_delRangeVA <<" );
+        printkd( ">> test_delRangeVA <<\n" );
         uint64_t fails = 0;
         uint64_t total = 0;
         uint64_t ignored = 0;
 
-        // 1) Initialize the Page Table 
+        // 1) Initialize the Page Table
         PageTableManager* ptmgr = new PageTableManager(true);
 
         // 2) Populate the Page Table
@@ -302,14 +302,14 @@ class ptmgrtest : public CxxTest::TestSuite
                 if( (status & PageTableManager::PTE_VALID) && TEST_DATA[x].delrangeva )
                 {
                     TS_FAIL( "ptmgrtest::test_delRangeVA> ERROR1 : entry still present" );
-                    printk( "addr = %.16lX\n", TEST_DATA[x].va );
+                    printkd( "addr = %.16lX\n", TEST_DATA[x].va );
                     PageTableManager::printPTE( TEST_DATA[x].va, false );
                     fails++;
                 }
                 else if( !(status & PageTableManager::PTE_VALID) && !TEST_DATA[x].delrangeva )
                 {
                     TS_FAIL( "ptmgrtest::test_delRangeVA> ERROR2 : deleted a wrong entry" );
-                    printk( "addr = %.16lX\n", TEST_DATA[x].va );
+                    printkd( "addr = %.16lX\n", TEST_DATA[x].va );
                     PageTableManager::printPTE( TEST_DATA[x].va, false );
                     fails++;
                 }
@@ -326,7 +326,7 @@ class ptmgrtest : public CxxTest::TestSuite
         delete ptmgr;
 
         TS_TRACE( "ptmgrtest::test_delRangeVA> fails=%d/%d", fails, total );
-        printk( "ptmgrtest::test_delRangeVA> fails=%ld/%ld\n", fails, total );
+        printkd( "ptmgrtest::test_delRangeVA> fails=%ld/%ld\n", fails, total );
     }
 
     /**
@@ -337,13 +337,13 @@ class ptmgrtest : public CxxTest::TestSuite
      */
     void test_delRangePN( void )
     {
-        TS_TRACE( ">> test_delRangePN <<" );        
-        printk( ">> test_delRangePN <<\n" );        
+        TS_TRACE( ">> test_delRangePN <<" );
+        printkd( ">> test_delRangePN <<\n" );
         uint64_t fails = 0;
         uint64_t total = 0;
         uint64_t pagenum = 0;
 
-        // 1) Initialize the Page Table 
+        // 1) Initialize the Page Table
         PageTableManager* ptmgr = new PageTableManager(true);
 
         // 2) Populate the Page Table
@@ -364,7 +364,7 @@ class ptmgrtest : public CxxTest::TestSuite
                     && (pagenum <= PN_RANGE_FINISH) )
                 {
                     TS_FAIL( "ptmgrtest::test_delRangePN> ERROR1 : entry still present" );
-                    printk( "addr = %.16lX, page=%ld\n", TEST_DATA[x].va, pagenum );
+                    printkd( "addr = %.16lX, page=%ld\n", TEST_DATA[x].va, pagenum );
                     PageTableManager::printPTE( TEST_DATA[x].va, false );
                     fails++;
                 }
@@ -373,7 +373,7 @@ class ptmgrtest : public CxxTest::TestSuite
                          && (pagenum > PN_RANGE_FINISH) )
                 {
                     TS_FAIL( "ptmgrtest::test_delRangePN> ERROR2 : deleted a wrong entry" );
-                    printk( "addr = %.16lX, page=%ld\n", TEST_DATA[x].va, pagenum );
+                    printkd( "addr = %.16lX, page=%ld\n", TEST_DATA[x].va, pagenum );
                     PageTableManager::printPTE( TEST_DATA[x].va, false );
                     fails++;
                 }
@@ -390,7 +390,7 @@ class ptmgrtest : public CxxTest::TestSuite
         delete ptmgr;
 
         TS_TRACE( "ptmgrtest::test_delRangePN> fails=%d/%d", fails, total );
-        printk( "ptmgrtest::test_delRangePN> fails=%ld/%ld\n", fails, total );
+        printkd( "ptmgrtest::test_delRangePN> fails=%ld/%ld\n", fails, total );
     }
 
     //@todo - Test LRU
diff --git a/src/usr/testcore/kernel/slbtest.H b/src/usr/testcore/kernel/slbtest.H
index e82617f66..82a8d26b0 100644
--- a/src/usr/testcore/kernel/slbtest.H
+++ b/src/usr/testcore/kernel/slbtest.H
@@ -57,28 +57,28 @@ class slbtest: public CxxTest::TestSuite
         {
             int rc = 0;
             uint64_t ra = 2*1024*1024;
-            printk("Map Device @ ra = 0x%lX using mmio_map\n",ra);
+            printkd("Map Device @ ra = 0x%lX using mmio_map\n",ra);
             uint64_t* virtAddrMMIO = static_cast<uint64_t*>
                                 (mmio_map(reinterpret_cast<void*>(ra), 1));
             if (virtAddrMMIO == NULL)
             {
                 TS_FAIL("Failed to map using mmio_map\n");
             }
-            printk("Unmap Device @ va = %p using mmio_unmap\n",virtAddrMMIO);
+            printkd("Unmap Device @ va = %p using mmio_unmap\n",virtAddrMMIO);
             rc = mmio_unmap(reinterpret_cast<void*>(virtAddrMMIO), 1);
             if (rc != 0)
             {
                 TS_FAIL("Failed to unmap using mmio_unmap\n");
             }
 
-            printk("Map Device @ ra = 0x%lX using dev_map\n",ra);
+            printkd("Map Device @ ra = 0x%lX using dev_map\n",ra);
             uint64_t* virtAddrDEV = static_cast<uint64_t*>
                      (mmio_dev_map(reinterpret_cast<void*>(ra), THIRTYTWO_GB));
             if (virtAddrDEV == NULL)
             {
                 TS_FAIL("Failed to map using mmio_dev_map\n");
             }
-            printk("Unmap Device @ va = %p using dev_unmap\n",virtAddrDEV);
+            printkd("Unmap Device @ va = %p using dev_unmap\n",virtAddrDEV);
             rc = mmio_dev_unmap(reinterpret_cast<void*>(virtAddrDEV));
             if (rc != 0)
             {
@@ -92,7 +92,7 @@ class slbtest: public CxxTest::TestSuite
             msg_q_t mq = msg_q_create(); //Create empty message queue
             uint64_t va = 0xC800000000; //800GB
             uint64_t size = 0x100000; //1MB
-            printk("Allocate 1MB block with empty msgq @ vaddr = 800GB within base segment\n");
+            printkd("Allocate 1MB block with empty msgq @ vaddr = 800GB within base segment\n");
             rc = mm_alloc_block(mq,reinterpret_cast<void*>(va),size);
             if (rc != 0)
             {
@@ -101,7 +101,7 @@ class slbtest: public CxxTest::TestSuite
             msg_q_t mq2 = msg_q_create(); //Create empty message queue
             uint64_t va2 = 0xE100000000; //900GB
             uint64_t size2 = 0x100000; //1MB
-            printk("Allocate 1MB block with empty msgq @ vaddr = 900GB within base segment\n");
+            printkd("Allocate 1MB block with empty msgq @ vaddr = 900GB within base segment\n");
             rc = mm_alloc_block(mq2,reinterpret_cast<void*>(va2),size2);
             if (rc != 0)
             {
diff --git a/src/usr/vfs/vfsrp.C b/src/usr/vfs/vfsrp.C
index d450339be..76cfd2c0e 100644
--- a/src/usr/vfs/vfsrp.C
+++ b/src/usr/vfs/vfsrp.C
@@ -21,7 +21,7 @@
 //
 //  IBM_PROLOG_END
 /**
- * @file vfsrp.C 
+ * @file vfsrp.C
  * @brief Virtual File system Extended image support
  */
 
@@ -70,7 +70,7 @@ void VfsRp::init( void * i_taskArgs )
     errlHndl_t err = NULL;
     err = Singleton<VfsRp>::instance()._init();
     INITSERVICE::TaskArgs::TaskArgs* args = (INITSERVICE::TaskArgs::TaskArgs*)i_taskArgs;
-    if(err) 
+    if(err)
     {
         args->postErrorLog(err);
     }
@@ -187,9 +187,8 @@ void VfsRp::msgHandler()
 
             case VFS_MSG_EXEC:
                 {
-                    msg_t * msg1 = (msg_t *) msg->data[0];
                     TRACDCOMP(g_trac_vfs, "VFS: Got exec request of %s",
-                           (const char*)msg1->data[0]);
+                           (const char*)((msg_t*)msg->data[0])->data[0]);
 
                     // run in own task so page faults can be handled
                     task_create(exec, msg);
@@ -290,7 +289,7 @@ void VfsRp::_exec(msg_t * i_msg)
     //  The TOC for the extended image sits at the start of the image and is
     //  not location dependant, so just use the one pointed to by iv_pnor_vaddr
     //  to avoid having to copy it to this block
-    VfsSystemModule * module = 
+    VfsSystemModule * module =
         vfs_find_module((VfsSystemModule *)(iv_pnor_vaddr +
                                             VFS_EXTENDED_MODULE_TABLE_OFFSET),
                         (const char*) msg1->data[0]);