X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ensc_wrappers%2Fwrappers-vserver.hc;h=01fe5476d9bf1179c0b1d199514b49fdf80ffa9f;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=1b8f3f63326221945263b5cac8a3c00d8c9dceff;hpb=2822ba293eb308225c50d346930c47bf98d9927b;p=util-vserver.git diff --git a/ensc_wrappers/wrappers-vserver.hc b/ensc_wrappers/wrappers-vserver.hc index 1b8f3f6..01fe547 100644 --- a/ensc_wrappers/wrappers-vserver.hc +++ b/ensc_wrappers/wrappers-vserver.hc @@ -1,4 +1,4 @@ -// $Id: wrappers-vserver.hc,v 1.11 2004/10/19 23:11:23 ensc Exp $ --*- c++ -*-- +// $Id: wrappers-vserver.hc 2589 2007-08-16 03:06:50Z dhozac $ --*- c++ -*-- // Copyright (C) 2004 Enrico Scholz // @@ -20,6 +20,8 @@ # error wrappers_handler.hc can not be used in this way #endif +#if defined(VC_ENABLE_API_COMPAT) || defined(VC_ENABLE_API_LEGACY) + inline static WRAPPER_DECL xid_t Evc_new_s_context(xid_t ctx, unsigned int remove_cap, unsigned int flags) { @@ -28,6 +30,8 @@ Evc_new_s_context(xid_t ctx, unsigned int remove_cap, unsigned int flags) return res; } +#endif + inline static WRAPPER_DECL xid_t Evc_get_task_xid(pid_t pid) { @@ -36,18 +40,54 @@ Evc_get_task_xid(pid_t pid) return res; } +inline static WRAPPER_DECL nid_t +Evc_get_task_nid(pid_t pid) +{ + register nid_t res = vc_get_task_nid(pid); + FatalErrnoError(res==VC_NOCTX, "vc_get_task_nid()"); + return res; +} + inline static WRAPPER_DECL xid_t -Evc_ctx_create(xid_t xid) +Evc_ctx_create(xid_t xid, struct vc_ctx_flags *flags) { - register xid_t res = vc_ctx_create(xid); + register xid_t res = vc_ctx_create(xid, flags); FatalErrnoError(res==VC_NOCTX, "vc_ctx_create()"); return res; } +inline static WRAPPER_DECL nid_t +Evc_net_create(nid_t nid) +{ + register nid_t res = vc_net_create(nid); + FatalErrnoError(res==VC_NOCTX, "vc_net_create()"); + return res; +} + +inline static WRAPPER_DECL tag_t +Evc_tag_create(tag_t tag) +{ + register tag_t res = vc_tag_create(tag); + FatalErrnoError(res==VC_NOCTX, "vc_tag_create()"); + return res; +} + +inline static WRAPPER_DECL void +Evc_ctx_migrate(xid_t xid, uint_least64_t flags) +{ + FatalErrnoError(vc_ctx_migrate(xid, flags)==-1, "vc_ctx_migrate()"); +} + +inline static WRAPPER_DECL void +Evc_net_migrate(nid_t nid) +{ + FatalErrnoError(vc_net_migrate(nid)==-1, "vc_net_migrate()"); +} + inline static WRAPPER_DECL void -Evc_ctx_migrate(xid_t xid) +Evc_tag_migrate(tag_t tag) { - FatalErrnoError(vc_ctx_migrate(xid)==-1, "vc_ctx_migrate()"); + FatalErrnoError(vc_tag_migrate(tag)==-1, "vc_tag_migrate()"); } inline static WRAPPER_DECL void @@ -62,6 +102,18 @@ Evc_set_cflags(xid_t xid, struct vc_ctx_flags const *flags) FatalErrnoError(vc_set_cflags(xid, flags)==-1, "vc_set_cflags()"); } +inline static WRAPPER_DECL void +Evc_get_nflags(nid_t nid, struct vc_net_flags *flags) +{ + FatalErrnoError(vc_get_nflags(nid, flags)==-1, "vc_get_nflags()"); +} + +inline static WRAPPER_DECL void +Evc_set_nflags(nid_t nid, struct vc_net_flags const *flags) +{ + FatalErrnoError(vc_set_nflags(nid, flags)==-1, "vc_set_nflags()"); +} + inline static WRAPPER_DECL void Evc_set_vhi_name(xid_t xid, vc_uts_type type, char const *val, size_t len) @@ -82,15 +134,27 @@ Evc_set_ccaps(xid_t xid, struct vc_ctx_caps const *caps) } inline static WRAPPER_DECL void -Evc_set_namespace() +Evc_get_ncaps(nid_t nid, struct vc_net_caps *caps) +{ + FatalErrnoError(vc_get_ncaps(nid, caps)==-1, "vc_get_ncaps()"); +} + +inline static WRAPPER_DECL void +Evc_set_ncaps(nid_t nid, struct vc_net_caps const *caps) { - FatalErrnoError(vc_set_namespace()==-1, "vc_set_namespace()"); + FatalErrnoError(vc_set_ncaps(nid, caps)==-1, "vc_set_ncaps()"); } inline static WRAPPER_DECL void -Evc_enter_namespace(xid_t xid) +Evc_set_namespace(xid_t xid, uint_least64_t mask) { - FatalErrnoError(vc_enter_namespace(xid)==-1, "vc_enter_namespace()"); + FatalErrnoError(vc_set_namespace(xid, mask)==-1, "vc_set_namespace()"); +} + +inline static WRAPPER_DECL void +Evc_enter_namespace(xid_t xid, uint_least64_t mask) +{ + FatalErrnoError(vc_enter_namespace(xid, mask)==-1, "vc_enter_namespace()"); } inline static WRAPPER_DECL xid_t @@ -118,3 +182,27 @@ Evc_xidopt2xid(char const *id, bool honor_static) return rc; } + +inline static WRAPPER_DECL nid_t +Evc_nidopt2nid(char const *id, bool honor_static) +{ + char const * err; + nid_t rc = vc_nidopt2nid(id, honor_static, &err); + if (__builtin_expect(rc==VC_NOCTX,0)) { + ENSC_DETAIL1(msg, "vc_nidopt2nid", id, 1); + FatalErrnoErrorFail(msg); + } + return rc; +} + +inline static WRAPPER_DECL tag_t +Evc_tagopt2tag(char const *id, bool honor_static) +{ + char const * err; + tag_t rc = vc_tagopt2tag(id, honor_static, &err); + if (__builtin_expect(rc==VC_NOCTX,0)) { + ENSC_DETAIL1(msg, "vc_tagopt2tag", id, 1); + FatalErrnoErrorFail(msg); + } + return rc; +}