-typedef xbt_dictelm_t sg_host_t;
-XBT_PUBLIC(sg_host_t) sg_host_by_name(const char *name);
-XBT_PUBLIC(sg_host_t) sg_host_by_name_or_create(const char *name);
-static XBT_INLINE char *sg_host_get_name(sg_host_t host){
- return host->key;
-}
-XBT_PUBLIC(xbt_dynar_t) sg_hosts_as_dynar(void);
-
-#ifdef __cplusplus
-#define DEFINE_EXTERNAL_CLASS(klass) class klass;
-class Cpu;
-#else
-#define DEFINE_EXTERNAL_CLASS(klass) typedef struct klass klass;
-#endif
-
-// ========== MSG Layer ==============
-typedef struct s_msg_host_priv *msg_host_priv_t;
-msg_host_priv_t sg_host_msg(sg_host_t host);
-XBT_PUBLIC(void) sg_host_msg_set(sg_host_t host, msg_host_priv_t priv);
-XBT_PUBLIC(void) sg_host_msg_destroy(sg_host_t host);
-
-// ========== SD Layer ==============
-typedef struct SD_workstation *SD_workstation_priv_t;
-SD_workstation_priv_t sg_host_sd(sg_host_t host);
-XBT_PUBLIC(void) sg_host_sd_set(sg_host_t host, SD_workstation_priv_t priv);
-XBT_PUBLIC(void) sg_host_sd_destroy(sg_host_t host);
-
-// ========== Simix layer =============
-typedef struct s_smx_host_priv *smx_host_priv_t;
-XBT_PUBLIC(smx_host_priv_t) sg_host_simix(sg_host_t host);
-XBT_PUBLIC(void) sg_host_simix_set(sg_host_t host, smx_host_priv_t priv);
-XBT_PUBLIC(void) sg_host_simix_destroy(sg_host_t host);
-
-// ========== SURF CPU ============
-DEFINE_EXTERNAL_CLASS(Cpu);
-typedef Cpu *surf_cpu_t;
-XBT_PUBLIC(surf_cpu_t) sg_host_surfcpu(sg_host_t host);
-XBT_PUBLIC(void) sg_host_surfcpu_set(sg_host_t host, surf_cpu_t cpu);
-XBT_PUBLIC(void) sg_host_surfcpu_destroy(sg_host_t host);
-
-// ========== RoutingEdge ============
-DEFINE_EXTERNAL_CLASS(RoutingEdge);
-XBT_PUBLIC(RoutingEdge*) sg_host_edge(sg_host_t host);
-XBT_PUBLIC(void) sg_host_edge_set(sg_host_t host, RoutingEdge* edge);
-XBT_PUBLIC(void) sg_host_edge_destroy(sg_host_t host, int do_callback);
-
-
-// Module initializer. Won't survive the conversion to C++. Hopefully.
-XBT_PUBLIC(void) sg_host_init(void);
+SG_BEGIN_DECL()
+/** @brief Host datatype.
+ @ingroup m_host_management
+
+ A <em>location</em> (or <em>host</em>) is any possible place where an actor may run. Thus it is represented as a
+ <em>physical resource with computing capabilities</em>, some <em>mailboxes</em> to enable running actors to
+ communicate with remote ones, and some <em>private data</em> that can be only accessed by local actors.
+ */
+
+XBT_PUBLIC sg_host_t* sg_host_list();
+
+/** @ingroup m_host_management
+ * @brief Return the current number of hosts.
+ */
+XBT_PUBLIC size_t sg_host_count();
+
+/** @ingroup m_host_management
+ * @brief Return a dynar containing all the hosts declared at a given point of time (including VMs)
+ * @remark The host order in the returned array is generally different from the host creation/declaration order in the
+ * XML platform (we use a hash table internally)
+ */
+XBT_PUBLIC xbt_dynar_t sg_hosts_as_dynar();
+
+XBT_PUBLIC size_t sg_host_extension_create(void (*deleter)(void*));
+XBT_PUBLIC void* sg_host_extension_get(sg_host_t host, size_t rank);
+
+/** @ingroup m_host_management
+ * @brief Finds a sg_host_t using its name.
+ *
+ * This is a name directory service
+ * @param name the name of an host.
+ * @return the corresponding host
+ */
+XBT_PUBLIC sg_host_t sg_host_by_name(const char* name);
+
+/** @ingroup m_host_management
+ *
+ * @brief Return the name of the #sg_host_t. */
+XBT_PUBLIC const char* sg_host_get_name(sg_host_t host);
+
+// ========== User Data ==============
+/** @ingroup m_host_management
+ *
+ * @brief Return the user data of a #sg_host_t.
+ *
+ * This functions returns the user data associated to @a host if it is possible.
+ */
+XBT_PUBLIC void* sg_host_user(sg_host_t host);
+/** @ingroup m_host_management
+ *
+ * @brief Set the user data of a #sg_host_t.
+ *
+ * This functions attach @a data to @a host if it is possible.
+ */
+XBT_PUBLIC void sg_host_user_set(sg_host_t host, void* userdata);
+XBT_PUBLIC void sg_host_user_destroy(sg_host_t host);
+
+// ========= storage related functions ============
+/** @ingroup m_host_management
+ * @brief Return the list of mount point names on an host.
+ * @param host a host
+ * @return a dict containing all mount point on the host (mount_name => sg_storage_t)
+ */
+XBT_PUBLIC xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host);
+
+/** @ingroup m_host_management
+ * @brief Return the list of storages attached to an host.
+ * @param host a host
+ * @return a dynar containing all storages (name) attached to the host
+ */
+XBT_PUBLIC xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host);