IPMI: C++11 bad string literal concatenation

Change-Id: I6e19a80eb1918b9b9ceb714c5e90110d17081480
RTC:124186
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/17975
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: WILLIAM G. HOFFA <wghoffa@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

9 files changed, 11 insertions, 11 deletions

diff --git a/src/usr/ipmi/ipmibt.C b/src/usr/ipmi/ipmibt.C
index 9986c15f7..7c68cdc92 100644
--- a/src/usr/ipmi/ipmibt.C
+++ b/src/usr/ipmi/ipmibt.C
@@ -43,7 +43,7 @@
 // Defined in ipmidd.C
 extern trace_desc_t * g_trac_ipmi;
 #define IPMI_TRAC(printf_string,args...) \
-    TRACFCOMP(g_trac_ipmi,"bt: "printf_string,##args)
+    TRACFCOMP(g_trac_ipmi,"bt: " printf_string,##args)
 
 namespace IPMI
 {
diff --git a/src/usr/ipmi/ipmidd.C b/src/usr/ipmi/ipmidd.C
index 45416dd3e..99c4971c7 100644
--- a/src/usr/ipmi/ipmidd.C
+++ b/src/usr/ipmi/ipmidd.C
@@ -59,7 +59,7 @@ trace_desc_t* g_trac_ipmi;
 TRAC_INIT(&g_trac_ipmi, IPMI_COMP_NAME, 6*KILOBYTE, TRACE::BUFFER_SLOW);
 
 #define IPMI_TRAC(printf_string,args...) \
-    TRACFCOMP(g_trac_ipmi,"dd: "printf_string,##args)
+    TRACFCOMP(g_trac_ipmi,"dd: " printf_string,##args)
 
 enum {
     // Registers. These are fixed for LPC/BT so we can hard-wire them
diff --git a/src/usr/ipmi/ipmifru.C b/src/usr/ipmi/ipmifru.C
index e365684f3..4082f5bed 100644
--- a/src/usr/ipmi/ipmifru.C
+++ b/src/usr/ipmi/ipmifru.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -43,7 +43,7 @@
 // Defined in ipmidd.C
 extern trace_desc_t * g_trac_ipmi;
 #define IPMI_TRAC(printf_string,args...) \
-    TRACFCOMP(g_trac_ipmi,"fru: "printf_string,##args)
+    TRACFCOMP(g_trac_ipmi,"fru: " printf_string,##args)
 
 #ifdef CONFIG_BMC_IPMI
 
diff --git a/src/usr/ipmi/ipmimsg.C b/src/usr/ipmi/ipmimsg.C
index 62145cbe4..c41fa0528 100644
--- a/src/usr/ipmi/ipmimsg.C
+++ b/src/usr/ipmi/ipmimsg.C
@@ -40,7 +40,7 @@
 // Defined in ipmidd.C
 extern trace_desc_t * g_trac_ipmi;
 #define IPMI_TRAC(printf_string,args...) \
-    TRACFCOMP(g_trac_ipmi,"msg: "printf_string,##args)
+    TRACFCOMP(g_trac_ipmi,"msg: " printf_string,##args)
 
 namespace IPMI
 {
diff --git a/src/usr/ipmi/ipmipowerstate.C b/src/usr/ipmi/ipmipowerstate.C
index 0d07cf180..95d661a6e 100644
--- a/src/usr/ipmi/ipmipowerstate.C
+++ b/src/usr/ipmi/ipmipowerstate.C
@@ -43,7 +43,7 @@
 // Defined in ipmidd.C
 extern trace_desc_t * g_trac_ipmi;
 #define IPMI_TRAC(printf_string,args...) \
-    TRACFCOMP(g_trac_ipmi,"ps: "printf_string,##args)
+    TRACFCOMP(g_trac_ipmi,"ps: " printf_string,##args)
 
 namespace IPMI
 {
diff --git a/src/usr/ipmi/ipmirp.C b/src/usr/ipmi/ipmirp.C
index 9bb3270f1..1b550386d 100644
--- a/src/usr/ipmi/ipmirp.C
+++ b/src/usr/ipmi/ipmirp.C
@@ -53,7 +53,7 @@
 // Defined in ipmidd.C
 extern trace_desc_t * g_trac_ipmi;
 #define IPMI_TRAC(printf_string,args...) \
-    TRACFCOMP(g_trac_ipmi,"rp: "printf_string,##args)
+    TRACFCOMP(g_trac_ipmi,"rp: " printf_string,##args)
 
 /**
  * setup _start and handle barrier
diff --git a/src/usr/ipmi/ipmisel.C b/src/usr/ipmi/ipmisel.C
index 53d02b43b..6ae3e4b63 100644
--- a/src/usr/ipmi/ipmisel.C
+++ b/src/usr/ipmi/ipmisel.C
@@ -42,7 +42,7 @@
 //Defined in ipmidd.C
 extern trace_desc_t * g_trac_ipmi;
 #define IPMI_TRAC(printf_string,args...) \
-    TRACFCOMP(g_trac_ipmi,"sel: "printf_string,##args)
+    TRACFCOMP(g_trac_ipmi,"sel: " printf_string,##args)
 
 // local functions
 /*
diff --git a/src/usr/ipmi/ipmiwatchdog.C b/src/usr/ipmi/ipmiwatchdog.C
index 354bd5324..75d875878 100644
--- a/src/usr/ipmi/ipmiwatchdog.C
+++ b/src/usr/ipmi/ipmiwatchdog.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -46,7 +46,7 @@
 // Defined in ipmidd.C
 extern trace_desc_t * g_trac_ipmi;
 #define IPMI_TRAC(printf_string,args...) \
-    TRACFCOMP(g_trac_ipmi,"wd: "printf_string,##args)
+    TRACFCOMP(g_trac_ipmi,"wd: " printf_string,##args)
 
 namespace IPMIWATCHDOG
 {
diff --git a/src/usr/ipmi/runtime/rt_ipmirp.C b/src/usr/ipmi/runtime/rt_ipmirp.C
index 846e0683c..670cb31d4 100644
--- a/src/usr/ipmi/runtime/rt_ipmirp.C
+++ b/src/usr/ipmi/runtime/rt_ipmirp.C
@@ -52,7 +52,7 @@ trace_desc_t * g_trac_ipmi;
 TRAC_INIT(&g_trac_ipmi, IPMI_COMP_NAME, 6*KILOBYTE, TRACE::BUFFER_SLOW);
 
 #define IPMI_TRAC(printf_string,args...) \
-    TRACFCOMP(g_trac_ipmi,"rt: "printf_string,##args)
+    TRACFCOMP(g_trac_ipmi,"rt: " printf_string,##args)
 
 namespace IPMI
 {