Print this page
14249 pseudo-terminal nomenclature should reflect POSIX
Change-Id: Ib4a3cef899ff4c71b09cb0dc6878863c5e8357bc
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/common/sys/zcons.h
+++ new/usr/src/uts/common/sys/zcons.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 */
25 25
|
↓ open down ↓ |
25 lines elided |
↑ open up ↑ |
26 26 #ifndef _SYS_ZCONS_H
27 27 #define _SYS_ZCONS_H
28 28
29 29 #include <sys/types.h>
30 30
31 31 #ifdef __cplusplus
32 32 extern "C" {
33 33 #endif
34 34
35 35 /*
36 - * Minor node name of the global zone side (often called the "master" side)
36 + * Minor node name of the global zone side (often called the "manager" side)
37 37 * of the zcons driver.
38 38 */
39 -#define ZCONS_MASTER_NAME "masterconsole"
39 +#define ZCONS_MANAGER_NAME "globalconsole"
40 40
41 41 /*
42 - * Minor node name of the non-global zone side (often called the "slave"
43 - * side) of the zcons driver. We name it "zoneconsole" since that nameo
42 + * Minor node name of the non-global zone side (often called the "subsidiary"
43 + * side) of the zcons driver. We name it "zoneconsole" since that name
44 44 * will show up in 'ps' output, and will make some sense to the global zone
45 45 * user. Inside the zone, it will simply show up as "console" due to the
46 46 * links we create.
47 47 */
48 -#define ZCONS_SLAVE_NAME "zoneconsole"
48 +#define ZCONS_SUBSIDIARY_NAME "zoneconsole"
49 49
50 50 /*
51 51 * ZC_IOC forms the base for all zcons ioctls.
52 52 */
53 53 #define ZC_IOC (('Z' << 24) | ('o' << 16) | ('n' << 8))
54 54
55 55 /*
56 - * These ioctls instruct the master side of the console to hold or release
57 - * a reference to the slave side's vnode. They are meant to be issued by
56 + * These ioctls instruct the manager side of the console to hold or release
57 + * a reference to the subsidiary side's vnode. They are meant to be issued by
58 58 * zoneadmd after the console device node is created and before it is destroyed
59 - * so that the slave's STREAMS anchor, ptem, is preserved when ttymon starts
60 - * popping STREAMS modules from within the associated zone. This guarantees
61 - * that the zone slave console will always have terminal semantics while the
62 - * zone is running.
59 + * so that the subsidiary's STREAMS anchor, ptem, is preserved when ttymon
60 + * starts popping STREAMS modules from within the associated zone. This
61 + * guarantees that the zone subsidiary console will always have terminal
62 + * semantics while the zone is running.
63 63 *
64 64 * A more detailed description can be found in uts/common/io/zcons.c.
65 65 */
66 -#define ZC_HOLDSLAVE (ZC_IOC | 0) /* get and save slave side reference */
67 -#define ZC_RELEASESLAVE (ZC_IOC | 1) /* release slave side reference */
66 +#define ZC_HOLDSUBSID (ZC_IOC | 0)
67 +#define ZC_RELEASESUBSID (ZC_IOC | 1)
68 68
69 69 #ifdef __cplusplus
70 70 }
71 71 #endif
72 72
73 73 #endif /* _SYS_ZCONS_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX