diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2017-05-12 16:30:45 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-05-12 16:30:45 +0200 |
commit | b0ef18751e233302faabaf64ac0e01f08ff3ac10 (patch) | |
tree | edf0653516681def1e586081f70bcc2f63fe060d /bbot/machine.cxx | |
parent | 73546642ff887b0a887d00ac43395afde99577b3 (diff) |
Add support for including data with trace object
Diffstat (limited to 'bbot/machine.cxx')
-rw-r--r-- | bbot/machine.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bbot/machine.cxx b/bbot/machine.cxx index 8bc6359..0c8a0e5 100644 --- a/bbot/machine.cxx +++ b/bbot/machine.cxx @@ -80,10 +80,10 @@ namespace bbot static string create_tap (const string& br, uint16_t port) { - tracer trace ("create_tap"); - string t ("tap" + to_string (tc_num)); + tracer trace ("create_tap", t.c_str ()); + // First try to delete it in case there is one from a previous run. // iptables (trace, "-D", t, br, port, true); // Ignore errors. @@ -101,7 +101,7 @@ namespace bbot static void destroy_tap (const string& t, const string& br, uint16_t port) { - tracer trace ("destroy_tap"); + tracer trace ("destroy_tap", t.c_str ()); iptables (trace, "-D", t, br, port); // Delete. run (trace, "sudo", "ip", "tuntap", "delete", t, "mode", "tap"); } @@ -204,7 +204,7 @@ namespace bbot vnc ("127.0.0.1:" + to_string (5900 + tc_num)), monitor ("/tmp/" + tc_name + "-monitor") { - tracer trace ("kvm_machine"); + tracer trace ("kvm_machine", md.string ().c_str ()); if (sizeof (sockaddr_un::sun_path) <= monitor.size ()) throw invalid_argument ("monitor unix socket path too long"); |