From 5bb13601feeafcd6367c5041082ab54d9e59bdb4 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@cloudius-systems.com>
Date: Sun, 9 Nov 2014 14:41:01 +0200
Subject: [PATCH] xen: wrap in "xen" namespace

Names like "port" are too generic for the global namespace.
---
 core/xen/evtchn.cc   | 4 ++++
 core/xen/evtchn.hh   | 5 +++++
 core/xen/gntalloc.cc | 4 ++++
 core/xen/gntalloc.hh | 5 +++++
 net/native-stack.cc  | 4 ++--
 net/xenfront.cc      | 4 ++++
 net/xenfront.hh      | 4 ++++
 7 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/core/xen/evtchn.cc b/core/xen/evtchn.cc
index 7e5dac039d..66ee367da7 100644
--- a/core/xen/evtchn.cc
+++ b/core/xen/evtchn.cc
@@ -10,6 +10,8 @@
 #include "evtchn.hh"
 #include "osv_xen.hh"
 
+namespace xen {
+
 void evtchn::make_ready_port(int port) {
     auto ports = _ports.equal_range(port);
     for (auto i = ports.first; i != ports.second; ++i) {
@@ -176,3 +178,5 @@ evtchn *evtchn::instance(bool userspace, unsigned otherend)
     }
     return _instance;
 }
+
+}
diff --git a/core/xen/evtchn.hh b/core/xen/evtchn.hh
index 4ef7ae9160..de3fe7fa9d 100644
--- a/core/xen/evtchn.hh
+++ b/core/xen/evtchn.hh
@@ -4,6 +4,8 @@
 #include "core/posix.hh"
 #include "core/future.hh"
 
+namespace xen {
+
 class evtchn;
 
 class port {
@@ -38,4 +40,7 @@ public:
     virtual port bind() = 0;
     port bind(int p) { return port(p); };
 };
+
+}
+
 #endif
diff --git a/core/xen/gntalloc.cc b/core/xen/gntalloc.cc
index d835b4577c..ec565b5408 100644
--- a/core/xen/gntalloc.cc
+++ b/core/xen/gntalloc.cc
@@ -8,6 +8,8 @@
 #include "osv_xen.hh"
 #include "gntalloc.hh"
 
+namespace xen {
+
 gntref invalid_ref;
 
 // FIXME: Most of the destructors are yet to be coded
@@ -210,3 +212,5 @@ gntalloc *gntalloc::instance() {
     }
     return _instance;
 }
+
+}
diff --git a/core/xen/gntalloc.hh b/core/xen/gntalloc.hh
index fde8462aad..050a9e56cc 100644
--- a/core/xen/gntalloc.hh
+++ b/core/xen/gntalloc.hh
@@ -3,6 +3,8 @@
 
 #include "core/posix.hh"
 
+namespace xen {
+
 class gntref {
 public:
     int xen_id;
@@ -42,4 +44,7 @@ public:
 };
 
 extern gntref invalid_ref;
+
+}
+
 #endif
diff --git a/net/native-stack.cc b/net/native-stack.cc
index 4e1fc6bba0..3db9c15f31 100644
--- a/net/native-stack.cc
+++ b/net/native-stack.cc
@@ -91,7 +91,7 @@ std::unique_ptr<net::device> create_native_net_device(boost::program_options::va
 #ifdef HAVE_XEN
     auto xen = is_xen();
     if (xen != xen_info::nonxen) {
-        return create_xenfront_net_device(opts, xen == xen_info::userspace);
+        return xen::create_xenfront_net_device(opts, xen == xen_info::userspace);
     }
 #endif
     return create_virtio_net_device(opts["tap-device"].as<std::string>(), opts);
@@ -103,7 +103,7 @@ add_native_net_options_description(boost::program_options::options_description &
 #ifdef HAVE_XEN
     auto xen = is_xen();
     if (xen != xen_info::nonxen) {
-        opts.add(get_xenfront_net_options_description());
+        opts.add(xen::get_xenfront_net_options_description());
         return;
     }
 #endif
diff --git a/net/xenfront.cc b/net/xenfront.cc
index 1f2149a6b5..0102c77639 100644
--- a/net/xenfront.cc
+++ b/net/xenfront.cc
@@ -31,6 +31,8 @@
 
 using namespace net;
 
+namespace xen {
+
 using phys = uint64_t;
 
 class xenfront_net_device : public net::device {
@@ -372,3 +374,5 @@ std::unique_ptr<net::device> create_xenfront_net_device(boost::program_options::
     dev = ptr.get();
     return std::move(ptr);
 }
+
+}
diff --git a/net/xenfront.hh b/net/xenfront.hh
index f8440ec465..6e996a9ca4 100644
--- a/net/xenfront.hh
+++ b/net/xenfront.hh
@@ -11,6 +11,8 @@
 #include "core/xen/gntalloc.hh"
 #include "core/queue.hh"
 
+namespace xen {
+
 std::unique_ptr<net::device> create_xenfront_net_device(boost::program_options::variables_map opts, bool userspace);
 boost::program_options::options_description get_xenfront_net_options_description();
 
@@ -108,4 +110,6 @@ public:
     T& operator[](std::size_t i) { return _sring->_ring[idx(i)]; }
 };
 
+}
+
 #endif /* XENFRONT_HH_ */