Print this page
Merge cleanup from previous six commits
OS-200 need a better mechanism for storing persistent zone_did
OS-511 make zonecfg device resource extensible, like the net resource
OS-224 add more zonecfg net properties
OS-216 store all net config info on zone

Split Close
Expand all
Collapse all
          --- old/usr/src/head/libzonecfg.h
          +++ new/usr/src/head/libzonecfg.h
↓ open down ↓ 34 lines elided ↑ open up ↑
  35   35  #endif
  36   36  
  37   37  /* sys/socket.h is required by net/if.h, which has a constant needed here */
  38   38  #include <sys/param.h>
  39   39  #include <sys/fstyp.h>
  40   40  #include <sys/mount.h>
  41   41  #include <priv.h>
  42   42  #include <netinet/in.h>
  43   43  #include <sys/socket.h>
  44   44  #include <net/if.h>
       45 +#include <sys/mac.h>
  45   46  #include <stdio.h>
  46   47  #include <rctl.h>
  47   48  #include <zone.h>
  48   49  #include <libbrand.h>
  49   50  #include <sys/uuid.h>
  50   51  #include <libuutil.h>
  51   52  #include <sys/mnttab.h>
  52   53  #include <limits.h>
  53   54  #include <utmpx.h>
  54   55  
↓ open down ↓ 65 lines elided ↑ open up ↑
 120  121  
 121  122  #define LIBZONECFG_PATH         "libzonecfg.so.1"
 122  123  
 123  124  #define ZONE_CONFIG_ROOT        "/etc/zones"
 124  125  #define ZONE_INDEX_FILE         ZONE_CONFIG_ROOT "/index"
 125  126  
 126  127  #define MAXUSERNAME             (sizeof (((struct utmpx *)0)->ut_name))
 127  128  #define MAXAUTHS                4096
 128  129  #define ZONE_MGMT_PROF          "Zone Management"
 129  130  
      131 +#define ZONE_INT32SZ            11              /* string to hold 32bit int. */
      132 +
 130  133  /* Owner, group, and mode (defined by packaging) for the config directory */
 131  134  #define ZONE_CONFIG_UID         0               /* root */
 132  135  #define ZONE_CONFIG_GID         3               /* sys */
 133  136  #define ZONE_CONFIG_MODE        0755
 134  137  
 135  138  /* Owner, group, and mode (defined by packaging) for the index file */
 136  139  #define ZONE_INDEX_UID          0               /* root */
 137  140  #define ZONE_INDEX_GID          3               /* sys */
 138  141  #define ZONE_INDEX_MODE         0644
 139  142  
↓ open down ↓ 7 lines elided ↑ open up ↑
 147  150  #define ALIAS_MAXSHMMEM         "max-shm-memory"
 148  151  #define ALIAS_MAXSHMIDS         "max-shm-ids"
 149  152  #define ALIAS_MAXMSGIDS         "max-msg-ids"
 150  153  #define ALIAS_MAXSEMIDS         "max-sem-ids"
 151  154  #define ALIAS_MAXLOCKEDMEM      "locked"
 152  155  #define ALIAS_MAXSWAP           "swap"
 153  156  #define ALIAS_MAXPHYSMEM        "physical"
 154  157  #define ALIAS_SHARES            "cpu-shares"
 155  158  #define ALIAS_CPUCAP            "cpu-cap"
 156  159  #define ALIAS_MAXPROCS          "max-processes"
      160 +#define ALIAS_ZFSPRI            "zfs-io-priority"
 157  161  
 158  162  /* Default name for zone detached manifest */
 159  163  #define ZONE_DETACHED   "SUNWdetached.xml"
 160  164  
 161  165  /*
 162  166   * Bit flag definitions for passing into libzonecfg functions.
 163  167   */
 164  168  #define ZONE_DRY_RUN            0x01
 165  169  
 166  170  /*
↓ open down ↓ 18 lines elided ↑ open up ↑
 185  189  } zone_fsopt_t;
 186  190  
 187  191  struct zone_fstab {
 188  192          char            zone_fs_special[MAXPATHLEN];    /* special file */
 189  193          char            zone_fs_dir[MAXPATHLEN];        /* mount point */
 190  194          char            zone_fs_type[FSTYPSZ];          /* e.g. ufs */
 191  195          zone_fsopt_t   *zone_fs_options;                /* mount options */
 192  196          char            zone_fs_raw[MAXPATHLEN];        /* device to fsck */
 193  197  };
 194  198  
      199 +/*
      200 + * Generic resource attribute list.
      201 + * Key/value resource that can be attached to net or device.
      202 + */
      203 +struct zone_res_attrtab {
      204 +        char    zone_res_attr_name[MAXNAMELEN];
      205 +        char    zone_res_attr_value[MAXNAMELEN];
      206 +        struct zone_res_attrtab *zone_res_attr_next;
      207 +};
      208 +
 195  209  struct zone_nwiftab {
 196  210          char    zone_nwif_address[INET6_ADDRSTRLEN]; /* shared-ip only */
 197  211          char    zone_nwif_allowed_address[INET6_ADDRSTRLEN]; /* excl-ip only */
 198  212          char    zone_nwif_physical[LIFNAMSIZ];
      213 +        char    zone_nwif_mac[MAXMACADDRLEN];           /* excl-ip only */
      214 +        char    zone_nwif_vlan_id[ZONE_INT32SZ];        /* excl-ip only */
      215 +        char    zone_nwif_gnic[LIFNAMSIZ];              /* excl-ip only */
 199  216          char    zone_nwif_defrouter[INET6_ADDRSTRLEN];
      217 +        struct zone_res_attrtab *zone_nwif_attrp;
 200  218  };
 201  219  
 202  220  struct zone_devtab {
 203  221          char    zone_dev_match[MAXPATHLEN];
      222 +        struct zone_res_attrtab *zone_dev_attrp;
 204  223  };
 205  224  
 206  225  struct zone_rctlvaltab {
 207  226          char    zone_rctlval_priv[MAXNAMELEN];
 208  227          char    zone_rctlval_limit[MAXNAMELEN];
 209  228          char    zone_rctlval_action[MAXNAMELEN];
 210  229          struct zone_rctlvaltab *zone_rctlval_next;
 211  230  };
 212  231  
 213  232  struct zone_rctltab {
↓ open down ↓ 93 lines elided ↑ open up ↑
 307  326  extern  int     zonecfg_set_autoboot(zone_dochandle_t, boolean_t);
 308  327  extern  int     zonecfg_get_iptype(zone_dochandle_t, zone_iptype_t *);
 309  328  extern  int     zonecfg_set_iptype(zone_dochandle_t, zone_iptype_t);
 310  329  extern  int     zonecfg_get_pool(zone_dochandle_t, char *, size_t);
 311  330  extern  int     zonecfg_set_pool(zone_dochandle_t, char *);
 312  331  extern  int     zonecfg_get_bootargs(zone_dochandle_t, char *, size_t);
 313  332  extern  int     zonecfg_set_bootargs(zone_dochandle_t, char *);
 314  333  extern  int     zonecfg_get_sched_class(zone_dochandle_t, char *, size_t);
 315  334  extern  int     zonecfg_set_sched(zone_dochandle_t, char *);
 316  335  extern  int     zonecfg_get_dflt_sched_class(zone_dochandle_t, char *, int);
      336 +extern  zoneid_t zonecfg_get_did(zone_dochandle_t);
      337 +extern  void    zonecfg_set_did(zone_dochandle_t);
 317  338  
 318  339  /*
 319  340   * Set/retrieve the brand for the zone
 320  341   */
 321  342  extern  int     zonecfg_get_brand(zone_dochandle_t, char *, size_t);
 322  343  extern  int     zonecfg_set_brand(zone_dochandle_t, char *);
 323  344  
 324  345  /*
 325  346   * Filesystem configuration.
 326  347   */
↓ open down ↓ 4 lines elided ↑ open up ↑
 331  352      struct zone_fstab *, struct zone_fstab *);
 332  353  extern  int     zonecfg_lookup_filesystem(zone_dochandle_t,
 333  354      struct zone_fstab *);
 334  355  extern  int     zonecfg_add_fs_option(struct zone_fstab *, char *);
 335  356  extern  int     zonecfg_remove_fs_option(struct zone_fstab *, char *);
 336  357  extern  void    zonecfg_free_fs_option_list(zone_fsopt_t *);
 337  358  extern  int     zonecfg_find_mounts(char *, int(*)(const struct mnttab *,
 338  359      void *), void *);
 339  360  
 340  361  /*
      362 + * Resource key/value attributes (properties).
      363 + */
      364 +extern  int     zonecfg_add_res_attr(struct zone_res_attrtab **,
      365 +    struct zone_res_attrtab *);
      366 +extern  void    zonecfg_free_res_attr_list(struct zone_res_attrtab *);
      367 +extern  int     zonecfg_remove_res_attr(struct zone_res_attrtab **,
      368 +    struct zone_res_attrtab *);
      369 +
      370 +/*
 341  371   * Network interface configuration.
 342  372   */
 343  373  extern  int     zonecfg_add_nwif(zone_dochandle_t, struct zone_nwiftab *);
 344  374  extern  int     zonecfg_delete_nwif(zone_dochandle_t, struct zone_nwiftab *);
 345  375  extern  int     zonecfg_modify_nwif(zone_dochandle_t, struct zone_nwiftab *,
 346  376      struct zone_nwiftab *);
 347  377  extern  int     zonecfg_lookup_nwif(zone_dochandle_t, struct zone_nwiftab *);
 348  378  
 349  379  /*
 350  380   * Hostid emulation configuration.
↓ open down ↓ 140 lines elided ↑ open up ↑
 491  521  extern  int     zonecfg_default_privset(priv_set_t *, const char *);
 492  522  extern  int     zonecfg_get_privset(zone_dochandle_t, priv_set_t *,
 493  523      char **);
 494  524  extern  int     zonecfg_get_limitpriv(zone_dochandle_t, char **);
 495  525  extern  int     zonecfg_set_limitpriv(zone_dochandle_t, char *);
 496  526  
 497  527  /*
 498  528   * Higher-level routines.
 499  529   */
 500  530  extern  int     zone_get_brand(char *, char *, size_t);
      531 +extern  zoneid_t zone_get_did(char *);
 501  532  extern  int     zone_get_rootpath(char *, char *, size_t);
 502  533  extern  int     zone_get_devroot(char *, char *, size_t);
 503  534  extern  int     zone_get_zonepath(char *, char *, size_t);
 504  535  extern  int     zone_get_state(char *, zone_state_t *);
 505  536  extern  int     zone_set_state(char *, zone_state_t);
 506  537  extern  char    *zone_state_str(zone_state_t);
 507  538  extern  int     zonecfg_get_name_by_uuid(const uuid_t, char *, size_t);
 508  539  extern  int     zonecfg_get_uuid(const char *, uuid_t);
 509  540  extern  int     zonecfg_default_brand(char *, size_t);
 510  541  extern  int     zonecfg_fix_obsolete(zone_dochandle_t);
↓ open down ↓ 80 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX