base, dev: Fix port message for vnc and terminal

When running gem5, the simulator outputs the following message to
describe the ports used by the VNC server and ther terminal:

Listening for system connection on port 5900
Listening for system connection on port 3456

The code used to extract the basename ('terminal' or 'vncserver') and
print that instead of system. However, this doesn't seem to work any
more. Change the code to output the full object name instead.

Change-Id: Ib27f66a5f8ba64c7a875b4e2f26a2e2ff48db8f3
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Anouk Van Laer <anouk.vanlaer@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/10026
Reviewed-by: Gabe Black <gabeblack@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>

diff --git a/src/base/vnc/vncserver.cc b/src/base/vnc/vncserver.cc
index 97515ac16847d40c464d1ede83b101b273ba8d34..a37f1dd5ebad9df22df89284e756892df89b8146 100644 (file)
--- a/src/base/vnc/vncserver.cc
+++ b/src/base/vnc/vncserver.cc
@@ -174,11 +174,8 @@ VncServer::listen(int port)
         port++;
     }
 
-    int p1, p2;
-    p2 = name().rfind('.') - 1;
-    p1 = name().rfind('.', p2);
-    ccprintf(cerr, "Listening for %s connection on port %d\n",
-             name().substr(p1 + 1, p2 - p1), port);
+    ccprintf(cerr, "%s: Listening for connections on port %d\n",
+             name(), port);
 
     listenEvent = new ListenEvent(this, listener.getfd(), POLLIN);
     pollQueue.schedule(listenEvent);

diff --git a/src/dev/serial/terminal.cc b/src/dev/serial/terminal.cc
index 5e8e52e9523919c14c7543844bd2b2f53f55c9dd..bc8c14c531f94709f1ed1c2ad83d011570ec8390 100644 (file)
--- a/src/dev/serial/terminal.cc
+++ b/src/dev/serial/terminal.cc
@@ -153,11 +153,8 @@ Terminal::listen(int port)
         port++;
     }
 
-    int p1, p2;
-    p2 = name().rfind('.') - 1;
-    p1 = name().rfind('.', p2);
-    ccprintf(cerr, "Listening for %s connection on port %d\n",
-            name().substr(p1+1,p2-p1), port);
+    ccprintf(cerr, "%s: Listening for connections on port %d\n",
+             name(), port);
 
     listenEvent = new ListenEvent(this, listener.getfd(), POLLIN);
     pollQueue.schedule(listenEvent);