diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2022-04-06 14:49:17 +0000 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-04-08 11:18:43 -0400 |
| commit | 5cb8206339038bd3cdadb064898960c302925147 (patch) | |
| tree | 7529c021a1fdb78a9129cf7cdc3a1405820d051e | |
| parent | f86b18596f1e3e52e8bb73ddb55dc6ff7e4e41e6 (diff) | |
| download | illumos-joyent-5cb8206339038bd3cdadb064898960c302925147.tar.gz | |
OS-8373 Revert values for sys/zone.h to better-match to -gate
| -rw-r--r-- | usr/src/cmd/truss/print.c | 15 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/zone.h | 31 |
2 files changed, 35 insertions, 11 deletions
diff --git a/usr/src/cmd/truss/print.c b/usr/src/cmd/truss/print.c index c679988bd5..6776a1ada4 100644 --- a/usr/src/cmd/truss/print.c +++ b/usr/src/cmd/truss/print.c @@ -2551,8 +2551,21 @@ prt_zga(private_t *pri, int raw, long val) case ZONE_ATTR_INITNAME: s = "ZONE_ATTR_INITNAME"; break; case ZONE_ATTR_BOOTARGS: s = "ZONE_ATTR_BOOTARGS"; break; case ZONE_ATTR_BRAND: s = "ZONE_ATTR_BRAND"; break; + case ZONE_ATTR_SCHED_CLASS: s = "ZONE_ATTR_SCHED_CLASS"; break; case ZONE_ATTR_FLAGS: s = "ZONE_ATTR_FLAGS"; break; - case ZONE_ATTR_DID: s = "ZONE_ATTR_DID"; break; + case ZONE_ATTR_HOSTID: s = "ZONE_ATTR_HOSTID"; break; + case ZONE_ATTR_FS_ALLOWED: s = "ZONE_ATTR_FS_ALLOWED"; break; + case ZONE_ATTR_NETWORK: s = "ZONE_ATTR_NETWORK"; break; + case ZONE_ATTR_INITNORESTART: s = "ZONE_ATTR_INITNORESTART"; + break; + case ZONE_ATTR_SECFLAGS: s = "ZONE_ATTR_SECFLAGS"; break; + case ZONE_ATTR_INITRESTART0: s = "ZONE_ATTR_INITRESTART0"; + break; + case ZONE_ATTR_INITREBOOT: s = "ZONE_ATTR_INITREBOOT"; break; + case ZONE_ATTR_DID: s = "ZONE_ATTR_DID"; break; + case ZONE_ATTR_APP_SVC_CT: s = "ZONE_ATTR_APP_SVC_CT"; break; + case ZONE_ATTR_SCHED_FIXEDHI: s = "ZONE_ATTR_SCHED_FIXEDHI"; + break; } } diff --git a/usr/src/uts/common/sys/zone.h b/usr/src/uts/common/sys/zone.h index 3a0556a937..fb97cc5476 100644 --- a/usr/src/uts/common/sys/zone.h +++ b/usr/src/uts/common/sys/zone.h @@ -111,7 +111,13 @@ extern "C" { #define ZONE_CHECK_DATALINK 12 #define ZONE_LIST_DATALINK 13 -/* zone attributes */ +/* + * zone attributes + * + * Note that values up to ZONE_ATTR_HOSTID are baked into things like Solaris + * 10 which can be run under the s10 brand; don't renumber or change them. Ones + * which are no longer used are commented out. + */ #define ZONE_ATTR_ROOT 1 #define ZONE_ATTR_NAME 2 #define ZONE_ATTR_STATUS 3 @@ -123,19 +129,24 @@ extern "C" { #define ZONE_ATTR_INITNAME 9 #define ZONE_ATTR_BOOTARGS 10 #define ZONE_ATTR_BRAND 11 -#define ZONE_ATTR_SCHED_CLASS 12 -#define ZONE_ATTR_FLAGS 13 -#define ZONE_ATTR_HOSTID 14 -#define ZONE_ATTR_FS_ALLOWED 15 -#define ZONE_ATTR_NETWORK 16 -#define ZONE_ATTR_DID 17 -#define ZONE_ATTR_INITNORESTART 18 -#define ZONE_ATTR_APP_SVC_CT 19 -#define ZONE_ATTR_SCHED_FIXEDHI 20 +/*#define ZONE_ATTR_PHYS_MCAP 12*/ +#define ZONE_ATTR_SCHED_CLASS 13 +#define ZONE_ATTR_FLAGS 14 +#define ZONE_ATTR_HOSTID 15 +#define ZONE_ATTR_FS_ALLOWED 16 +#define ZONE_ATTR_NETWORK 17 + +/* illumos extensions */ +#define ZONE_ATTR_INITNORESTART 20 #define ZONE_ATTR_SECFLAGS 21 #define ZONE_ATTR_INITRESTART0 22 #define ZONE_ATTR_INITREBOOT 23 +/* OmniOS/SmartOS extensions */ +#define ZONE_ATTR_DID 30 +#define ZONE_ATTR_APP_SVC_CT 31 +#define ZONE_ATTR_SCHED_FIXEDHI 32 + /* Start of the brand-specific attribute namespace */ #define ZONE_ATTR_BRAND_ATTRS 32768 |