diff options
Diffstat (limited to 'usr/src/head')
| -rw-r--r-- | usr/src/head/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/head/libzonecfg.h | 47 | ||||
| -rw-r--r-- | usr/src/head/unistd.h | 3 | ||||
| -rw-r--r-- | usr/src/head/zdoor.h | 74 | ||||
| -rw-r--r-- | usr/src/head/zone.h | 3 |
5 files changed, 115 insertions, 13 deletions
diff --git a/usr/src/head/Makefile b/usr/src/head/Makefile index 62f8ee08d7..05fbcaa687 100644 --- a/usr/src/head/Makefile +++ b/usr/src/head/Makefile @@ -205,6 +205,7 @@ HDRS= $($(MACH)_HDRS) $(ATTRDB_HDRS) \ wordexp.h \ xti.h \ xti_inet.h \ + zdoor.h \ zone.h ISOHDRS = \ diff --git a/usr/src/head/libzonecfg.h b/usr/src/head/libzonecfg.h index d41dbb0520..0212224de5 100644 --- a/usr/src/head/libzonecfg.h +++ b/usr/src/head/libzonecfg.h @@ -21,6 +21,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, Joyent, Inc. All rights reserved. */ #ifndef _LIBZONECFG_H @@ -42,6 +43,7 @@ extern "C" { #include <netinet/in.h> #include <sys/socket.h> #include <net/if.h> +#include <sys/mac.h> #include <stdio.h> #include <rctl.h> #include <zone.h> @@ -127,6 +129,8 @@ extern "C" { #define MAXAUTHS 4096 #define ZONE_MGMT_PROF "Zone Management" +#define ZONE_INT32SZ 11 /* string to hold 32bit int. */ + /* Owner, group, and mode (defined by packaging) for the config directory */ #define ZONE_CONFIG_UID 0 /* root */ #define ZONE_CONFIG_GID 3 /* sys */ @@ -150,9 +154,11 @@ extern "C" { #define ALIAS_MAXSEMIDS "max-sem-ids" #define ALIAS_MAXLOCKEDMEM "locked" #define ALIAS_MAXSWAP "swap" +#define ALIAS_MAXPHYSMEM "physical" #define ALIAS_SHARES "cpu-shares" #define ALIAS_CPUCAP "cpu-cap" #define ALIAS_MAXPROCS "max-processes" +#define ALIAS_ZFSPRI "zfs-io-priority" /* Default name for zone detached manifest */ #define ZONE_DETACHED "SUNWdetached.xml" @@ -191,15 +197,30 @@ struct zone_fstab { char zone_fs_raw[MAXPATHLEN]; /* device to fsck */ }; +/* + * 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[MAXNAMELEN]; + struct zone_res_attrtab *zone_res_attr_next; +}; + struct zone_nwiftab { char zone_nwif_address[INET6_ADDRSTRLEN]; /* shared-ip only */ char zone_nwif_allowed_address[INET6_ADDRSTRLEN]; /* excl-ip only */ char zone_nwif_physical[LIFNAMSIZ]; + char zone_nwif_mac[MAXMACADDRLEN]; /* excl-ip only */ + char zone_nwif_vlan_id[ZONE_INT32SZ]; /* excl-ip only */ + char zone_nwif_gnic[LIFNAMSIZ]; /* excl-ip only */ char zone_nwif_defrouter[INET6_ADDRSTRLEN]; + struct zone_res_attrtab *zone_nwif_attrp; }; struct zone_devtab { char zone_dev_match[MAXPATHLEN]; + struct zone_res_attrtab *zone_dev_attrp; }; struct zone_rctlvaltab { @@ -230,10 +251,6 @@ struct zone_psettab { char zone_importance[MAXNAMELEN]; }; -struct zone_mcaptab { - char zone_physmem_cap[MAXNAMELEN]; -}; - struct zone_pkgtab { char zone_pkg_name[MAXNAMELEN]; char zone_pkg_version[ZONE_PKG_VERSMAX]; @@ -317,6 +334,8 @@ extern int zonecfg_set_bootargs(zone_dochandle_t, char *); extern int zonecfg_get_sched_class(zone_dochandle_t, char *, size_t); extern int zonecfg_set_sched(zone_dochandle_t, char *); extern int zonecfg_get_dflt_sched_class(zone_dochandle_t, char *, int); +extern zoneid_t zonecfg_get_did(zone_dochandle_t); +extern void zonecfg_set_did(zone_dochandle_t); /* * Set/retrieve the brand for the zone @@ -341,6 +360,15 @@ extern int zonecfg_find_mounts(char *, int(*)(const struct mnttab *, void *), void *); /* + * Resource key/value attributes (properties). + */ +extern int zonecfg_add_res_attr(struct zone_res_attrtab **, + struct zone_res_attrtab *); +extern void zonecfg_free_res_attr_list(struct zone_res_attrtab *); +extern int zonecfg_remove_res_attr(struct zone_res_attrtab **, + struct zone_res_attrtab *); + +/* * Network interface configuration. */ extern int zonecfg_add_nwif(zone_dochandle_t, struct zone_nwiftab *); @@ -422,13 +450,6 @@ extern int zonecfg_modify_pset(zone_dochandle_t, struct zone_psettab *); extern int zonecfg_lookup_pset(zone_dochandle_t, struct zone_psettab *); /* - * mem-cap configuration. - */ -extern int zonecfg_delete_mcap(zone_dochandle_t); -extern int zonecfg_modify_mcap(zone_dochandle_t, struct zone_mcaptab *); -extern int zonecfg_lookup_mcap(zone_dochandle_t, struct zone_mcaptab *); - -/* * Temporary pool support functions. */ extern int zonecfg_destroy_tmp_pool(char *, char *, int); @@ -485,7 +506,6 @@ extern int zonecfg_setdsent(zone_dochandle_t); extern int zonecfg_getdsent(zone_dochandle_t, struct zone_dstab *); extern int zonecfg_enddsent(zone_dochandle_t); extern int zonecfg_getpsetent(zone_dochandle_t, struct zone_psettab *); -extern int zonecfg_getmcapent(zone_dochandle_t, struct zone_mcaptab *); extern int zonecfg_getpkgdata(zone_dochandle_t, uu_avl_pool_t *, uu_avl_t *); extern int zonecfg_setdevperment(zone_dochandle_t); @@ -509,6 +529,7 @@ extern int zonecfg_set_limitpriv(zone_dochandle_t, char *); * Higher-level routines. */ extern int zone_get_brand(char *, char *, size_t); +extern zoneid_t zone_get_did(char *); extern int zone_get_rootpath(char *, char *, size_t); extern int zone_get_devroot(char *, char *, size_t); extern int zone_get_zonepath(char *, char *, size_t); @@ -517,7 +538,9 @@ 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. diff --git a/usr/src/head/unistd.h b/usr/src/head/unistd.h index 75078dd318..4b464d5c47 100644 --- a/usr/src/head/unistd.h +++ b/usr/src/head/unistd.h @@ -348,6 +348,9 @@ extern int gethostname(char *, size_t); extern int gethostname(char *, int); #endif extern char *getlogin(void); +#if defined(__EXTENSIONS__) +extern char *getxlogin(void); +#endif #if defined(_XPG4) || defined(__EXTENSIONS__) extern int getopt(int, char *const *, const char *); extern char *optarg; diff --git a/usr/src/head/zdoor.h b/usr/src/head/zdoor.h new file mode 100644 index 0000000000..f2d204042d --- /dev/null +++ b/usr/src/head/zdoor.h @@ -0,0 +1,74 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ +/* + * Copyright 2011 Joyent, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#ifndef _ZDOOR_H +#define _ZDOOR_H + +#include <sys/types.h> +#include <zone.h> + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct zdoor_handle *zdoor_handle_t; + +typedef struct zdoor_cookie { + char *zdc_zonename; + char *zdc_service; + void *zdc_biscuit; +} zdoor_cookie_t; + +typedef struct zdoor_result { + char *zdr_data; + size_t zdr_size; +} zdoor_result_t; + +typedef zdoor_result_t *(*zdoor_callback) (zdoor_cookie_t *cookie, + char *argp, size_t arpg_sz); + +#define ZDOOR_OK 0 +#define ZDOOR_ERROR -1 +#define ZDOOR_NOT_GLOBAL_ZONE -2 +#define ZDOOR_ZONE_NOT_RUNNING -3 +#define ZDOOR_ZONE_FORBIDDEN -4 +#define ZDOOR_ARGS_ERROR -5 +#define ZDOOR_OUT_OF_MEMORY -6 + +extern zdoor_handle_t zdoor_handle_init(); + +extern int zdoor_open(zdoor_handle_t handle, const char *zonename, + const char *service, void *biscuit, zdoor_callback callback); + +extern void * zdoor_close(zdoor_handle_t handle, const char *zonename, + const char *service); + +extern void zdoor_handle_destroy(zdoor_handle_t handle); + +#ifdef __cplusplus +} +#endif + +#endif /* _ZDOOR_H */ diff --git a/usr/src/head/zone.h b/usr/src/head/zone.h index 34528a27f5..ae03d2453c 100644 --- a/usr/src/head/zone.h +++ b/usr/src/head/zone.h @@ -21,6 +21,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2011 Joyent Inc. All rights reserved. */ #ifndef _ZONE_H @@ -56,7 +57,7 @@ extern int zone_get_id(const char *, zoneid_t *); /* System call API */ extern zoneid_t zone_create(const char *, const char *, const struct priv_set *, const char *, size_t, const char *, size_t, int *, - int, int, const bslabel_t *, int); + int, int, const bslabel_t *, int, zoneid_t); extern int zone_boot(zoneid_t); extern int zone_destroy(zoneid_t); extern ssize_t zone_getattr(zoneid_t, int, void *, size_t); |