@@ -19,11 +19,10 @@
  * CDDL HEADER END
  */
 
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2015, Joyent, Inc.
  */
 
 #ifndef _LIBZONECFG_H
 #define _LIBZONECFG_H
 

@@ -118,12 +117,10 @@
 #define ZONE_STATE_DOWN                 6
 #define ZONE_STATE_MOUNTED              7
 
 #define ZONE_STATE_MAXSTRLEN    14
 
-#define ZONE_PROP_MAXSTRLEN     1024
-
 #define LIBZONECFG_PATH         "libzonecfg.so.1"
 
 #define ZONE_CONFIG_ROOT        "/etc/zones"
 #define ZONE_INDEX_FILE         ZONE_CONFIG_ROOT "/index"
 

@@ -168,15 +165,10 @@
 /*
  * Bit flag definitions for passing into libzonecfg functions.
  */
 #define ZONE_DRY_RUN            0x01
 
-typedef enum zone_iptype {
-        ZS_SHARED,
-        ZS_EXCLUSIVE
-} zone_iptype_t;
-
 /*
  * The integer field expresses the current values on a get.
  * On a put, it represents the new values if >= 0 or "don't change" if < 0.
  */
 struct zoneent {

@@ -183,13 +175,10 @@
         char    zone_name[ZONENAME_MAX];        /* name of the zone */
         int     zone_state;     /* configured | incomplete | installed */
         char    zone_path[MAXPATHLEN];          /* path to zone storage */
         uuid_t  zone_uuid;                      /* unique ID for zone */
         char    zone_newname[ZONENAME_MAX];     /* for doing renames */
-        char    zone_brand[MAXNAMELEN];         /* zone's brand */
-        zone_iptype_t zone_iptype;              /* zone's IP type */
-        zoneid_t zone_did;                      /* persistent debug ID */
 };
 
 typedef struct zone_dochandle *zone_dochandle_t;        /* opaque handle */
 
 typedef uint_t zone_state_t;

@@ -211,11 +200,11 @@
  * Generic resource attribute list.
  * Key/value resource that can be attached to net or device.
  */
 struct zone_res_attrtab {
         char    zone_res_attr_name[MAXNAMELEN];
-        char    zone_res_attr_value[ZONE_PROP_MAXSTRLEN];
+        char    zone_res_attr_value[MAXNAMELEN];
         struct zone_res_attrtab *zone_res_attr_next;
 };
 
 struct zone_nwiftab {
         char    zone_nwif_address[INET6_ADDRSTRLEN]; /* shared-ip only */

@@ -289,10 +278,15 @@
         uu_avl_node_t   zpe_entry;
         char            *zpe_name;
         char            *zpe_vers;
 } zone_pkg_entry_t;
 
+typedef enum zone_iptype {
+        ZS_SHARED,
+        ZS_EXCLUSIVE
+} zone_iptype_t;
+
 /*
  * Basic configuration management routines.
  */
 extern  zone_dochandle_t        zonecfg_init_handle(void);
 extern  int     zonecfg_get_handle(const char *, zone_dochandle_t);

@@ -316,11 +310,10 @@
 extern  boolean_t zonecfg_valid_ncpus(char *, char *);
 extern  boolean_t zonecfg_valid_importance(char *);
 extern  int     zonecfg_str_to_bytes(char *, uint64_t *);
 extern  boolean_t zonecfg_valid_memlimit(char *, uint64_t *);
 extern  boolean_t zonecfg_valid_alias_limit(char *, char *, uint64_t *);
-extern  void    zonecfg_notify_create(zone_dochandle_t);
 
 /*
  * Zone name, path to zone directory, autoboot setting, pool, boot
  * arguments, and scheduling-class.
  */

@@ -542,11 +535,10 @@
 extern  int     zone_get_state(char *, zone_state_t *);
 extern  int     zone_set_state(char *, zone_state_t);
 extern  char    *zone_state_str(zone_state_t);
 extern  int     zonecfg_get_name_by_uuid(const uuid_t, char *, size_t);
 extern  int     zonecfg_get_uuid(const char *, uuid_t);
-extern  int     zonecfg_set_uuid(const char *, const char *, const char *);
 extern  int     zonecfg_default_brand(char *, size_t);
 extern  int     zonecfg_fix_obsolete(zone_dochandle_t);
 
 /*
  * Iterator for configured zones.