X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fplanetlab.h;h=41a85f0313b42c2d16b7dba0a20576325d04d949;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=7a232db1cdb2e5d63dbe9a7e3fbf6fb797ba023f;hpb=36499d4016b36a5e7bc3d64efd3478cbb17133ec;p=util-vserver.git

diff --git a/lib/planetlab.h b/lib/planetlab.h
index 7a232db..41a85f0 100644
--- a/lib/planetlab.h
+++ b/lib/planetlab.h
@@ -38,16 +38,16 @@ POSSIBILITY OF SUCH DAMAGE.
 
 struct sliver_resources {
   unsigned long long vs_cpu;
-  unsigned long long vs_cpuguaranteed;
   struct vc_rlimit vs_rss;
   struct vc_rlimit vs_as;
   struct vc_rlimit vs_nproc;
   struct vc_rlimit vs_openfd;
-  unsigned long long vs_whitelisted;
 };
 
+int adjust_lim(const struct vc_rlimit *vcr, struct rlimit *lim);
+
 int
-pl_chcontext(xid_t ctx, uint32_t flags, uint64_t bcaps, struct sliver_resources *slr);
+pl_chcontext(xid_t ctx, uint64_t bcaps, const struct sliver_resources *slr);
 
 int
 pl_setup_done(xid_t ctx);
@@ -61,10 +61,10 @@ pl_setsched(xid_t ctx, uint32_t cpu_share, uint32_t cpu_sched_flags);
 /* Null byte made explicit */
 #define NULLBYTE_SIZE                    1
 
-void pl_get_limits(char *, struct sliver_resources *);
-void pl_set_limits(xid_t, struct sliver_resources *);
+void pl_get_limits(const char *, struct sliver_resources *);
+void pl_set_ulimits(const struct sliver_resources *);
 
-static int
+static inline int
 _PERROR(const char *format, char *file, int line, int _errno, ...)
 {
 	va_list ap;