Print this page


Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libc/port/sys/zone.c
          +++ new/usr/src/lib/libc/port/sys/zone.c
↓ open down ↓ 14 lines elided ↑ open up ↑
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  24   24   * Use is subject to license terms.
  25      - * Copyright 2011 Joyent Inc.  All rights reserved.
  26   25   */
  27   26  
  28   27  #include "lint.h"
  29   28  #include "thr_uberdata.h"
  30   29  #include <sys/types.h>
  31   30  #include <sys/syscall.h>
  32   31  #include <sys/zone.h>
  33   32  #include <sys/priv.h>
  34   33  #include <priv_private.h>
  35   34  #include <zone.h>
  36   35  #include <sys/tsol/label.h>
  37   36  #include <dlfcn.h>
  38   37  #include <stdlib.h>
  39   38  #include <errno.h>
  40   39  
  41   40  zoneid_t
  42   41  zone_create(const char *name, const char *root, const struct priv_set *privs,
  43   42      const char *rctls, size_t rctlsz, const char *zfs, size_t zfssz,
  44      -    int *extended_error, int match, int doi, const bslabel_t *label, int flags,
  45      -    zoneid_t req_zoneid)
       43 +    int *extended_error, int match, int doi, const bslabel_t *label, int flags)
  46   44  {
  47   45          zone_def  zd;
  48   46          priv_data_t *d;
  49   47  
  50   48          LOADPRIVDATA(d);
  51   49  
  52   50          zd.zone_name = name;
  53   51          zd.zone_root = root;
  54   52          zd.zone_privs = privs;
  55   53          zd.zone_privssz = d->pd_setsize;
  56   54          zd.rctlbuf = rctls;
  57   55          zd.rctlbufsz = rctlsz;
  58   56          zd.zfsbuf = zfs;
  59   57          zd.zfsbufsz = zfssz;
  60   58          zd.extended_error = extended_error;
  61   59          zd.match = match;
  62   60          zd.doi = doi;
  63   61          zd.label = label;
  64   62          zd.flags = flags;
  65      -        zd.zoneid = req_zoneid;
  66   63  
  67   64          return ((zoneid_t)syscall(SYS_zone, ZONE_CREATE, &zd));
  68   65  }
  69   66  
  70   67  int
  71   68  zone_boot(zoneid_t zoneid)
  72   69  {
  73   70          return (syscall(SYS_zone, ZONE_BOOT, zoneid));
  74   71  }
  75   72  
↓ open down ↓ 179 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX