--- old/usr/src/head/zone.h
          +++ new/usr/src/head/zone.h

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  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   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23   * Use is subject to license terms.
  24   24   * Copyright 2015 Joyent Inc.
  25   25   */
  26   26  
  27   27  #ifndef _ZONE_H
  28   28  #define _ZONE_H
  29   29  
  30   30  #include <sys/types.h>
  31   31  #include <sys/zone.h>
  32   32  #include <sys/priv.h>
  33   33  #include <tsol/label.h>
  34   34  
  35   35  #ifdef  __cplusplus
  36   36  extern "C" {
  37   37  #endif
  38   38  
  39   39  /*
  40   40   * Functions for mapping between id and name for active zones.
  41   41   */
  42   42  extern zoneid_t         getzoneid(void);
  43   43  extern zoneid_t         getzoneidbyname(const char *);
  44   44  extern ssize_t          getzonenamebyid(zoneid_t, char *, size_t);
  45   45  
  46   46  /*
  47   47   * NOTE
  48   48   *
  49   49   * The remaining contents of this file are private to the implementation
  50   50   * of Illumos and are subject to change at any time without notice,
  51   51   * Applications using these interfaces may fail to run on future releases.
  52   52   */

  53   53  
  54   54  #define ZLOGIN_DISCONNECT       0x1     /* disconnect on zone halt */
  55   55  #define ZLOGIN_ZFD_EOF          0x2     /* EOF on ZFD */
  56   56  
  57   57  extern int zonept(int, zoneid_t);
  58   58  extern int zone_get_id(const char *, zoneid_t *);
  59   59  
  60   60  /* System call API */
  61   61  extern zoneid_t zone_create(const char *, const char *,
  62   62      const struct priv_set *, const char *, size_t, const char *, size_t, int *,
  63      -    int, int, const bslabel_t *, int, zoneid_t);
       63 +    int, int, const bslabel_t *, int);
  64   64  extern int      zone_boot(zoneid_t);
  65   65  extern int      zone_destroy(zoneid_t);
  66   66  extern ssize_t  zone_getattr(zoneid_t, int, void *, size_t);
  67   67  extern int      zone_setattr(zoneid_t, int, void *, size_t);
  68   68  extern int      zone_enter(zoneid_t);
  69   69  extern int      zone_list(zoneid_t *, uint_t *);
  70   70  extern int      zone_shutdown(zoneid_t);
  71   71  extern int      zone_version(int *);
  72   72  extern int      zone_add_datalink(zoneid_t, datalink_id_t);
  73   73  extern int      zone_remove_datalink(zoneid_t, datalink_id_t);
  74   74  extern int      zone_check_datalink(zoneid_t *, datalink_id_t);
  75   75  extern int      zone_list_datalink(zoneid_t, int *, datalink_id_t *);
  76   76  extern const char *zone_get_nroot(void);
  77   77  
  78   78  #ifdef  __cplusplus
  79   79  }
  80   80  #endif
  81   81  
  82   82  #endif /* _ZONE_H */
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX