From 122f4068d06c63cc3d6e882f92fb79a7af21cb20 Mon Sep 17 00:00:00 2001
From: Roi Dayan <roid@mellanox.com>
Date: Mon, 1 Feb 2016 11:46:15 +0200
Subject: [PATCH] xio: fix compilation

Signed-off-by: Roi Dayan <roid@mellanox.com>
---
 src/msg/xio/QueueStrategy.cc | 5 ++++-
 src/msg/xio/XioConnection.h  | 6 +++---
 src/msg/xio/XioPortal.h      | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/msg/xio/QueueStrategy.cc b/src/msg/xio/QueueStrategy.cc
index 2d9806c6797..0ce279b31e9 100644
--- a/src/msg/xio/QueueStrategy.cc
+++ b/src/msg/xio/QueueStrategy.cc
@@ -11,6 +11,7 @@
  * Foundation.  See file COPYING.
  *
  */
+#include <string>
 #include "QueueStrategy.h"
 #define dout_subsys ceph_subsys_ms
 #include "common/debug.h"
@@ -106,8 +107,10 @@ void QueueStrategy::start()
   assert(!stop);
   lock.Lock();
   for (int ix = 0; ix < n_threads; ++ix) {
+    string thread_name = "ms_xio_qs_";
+    thread_name.append(std::to_string(ix));
     thrd = new QSThread(this);
-    thrd->create();
+    thrd->create(thread_name.c_str());
   }
   lock.Unlock();
 }
diff --git a/src/msg/xio/XioConnection.h b/src/msg/xio/XioConnection.h
index da34d6e5520..7226ef65212 100644
--- a/src/msg/xio/XioConnection.h
+++ b/src/msg/xio/XioConnection.h
@@ -265,8 +265,8 @@ public:
   void send_keepalive() override {}
   void mark_down() override;
   int _mark_down(uint32_t flags);
-  virtual void mark_disposable() override;
-  int _mark_disposable(uint32_t flags) override;
+  void mark_disposable() override;
+  int _mark_disposable(uint32_t flags);
 
   const entity_inst_t& get_peer() const { return peer; }
 
@@ -337,7 +337,7 @@ public:
   bool is_connected() override { return true; }
 
   int send_message(Message *m) override;
-  void send_keepalive()i override {}
+  void send_keepalive() override {}
   void mark_down() override {}
   void mark_disposable() override {}
 
diff --git a/src/msg/xio/XioPortal.h b/src/msg/xio/XioPortal.h
index cb711c66d24..697c62e5c22 100644
--- a/src/msg/xio/XioPortal.h
+++ b/src/msg/xio/XioPortal.h
@@ -424,11 +424,11 @@ public:
       /* shift left */
       p_vec[(p_ix-1)] = (char*) /* portal->xio_uri.c_str() */
 			portal->portal_id;
-      }
+    }
 
     for (p_ix = 0; p_ix < nportals; ++p_ix) {
       portal = portals[p_ix];
-      portal->create();
+      portal->create(portal->portal_id);
     }
   }
 
-- 
2.47.3