diff options
| -rw-r--r-- | usr/src/pkg/manifests/system-header.p5m | 3 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/sysevent/ap_driver.h | 70 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/sysevent/eventdefs.h | 15 |
4 files changed, 3 insertions, 88 deletions
diff --git a/usr/src/pkg/manifests/system-header.p5m b/usr/src/pkg/manifests/system-header.p5m index 60eac048e5..84281de44b 100644 --- a/usr/src/pkg/manifests/system-header.p5m +++ b/usr/src/pkg/manifests/system-header.p5m @@ -23,7 +23,7 @@ # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2012 by Delphix. All rights reserved. # Copyright 2013 Saso Kiselkov. All rights reserved. -# Copyright 2022 Garrett D'Amore <garrett@damore.org> +# Copyright 2022 Garrett D'Amore # Copyright 2018 Nexenta Systems, Inc. # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org> # Copyright 2020 Joyent, Inc. @@ -1410,7 +1410,6 @@ file path=usr/include/sys/sysdc.h file path=usr/include/sys/sysdc_impl.h dir path=usr/include/sys/sysevent file path=usr/include/sys/sysevent.h -file path=usr/include/sys/sysevent/ap_driver.h file path=usr/include/sys/sysevent/datalink.h file path=usr/include/sys/sysevent/dev.h file path=usr/include/sys/sysevent/domain.h diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile index ed4fcbef5a..f9cbfcd567 100644 --- a/usr/src/uts/common/sys/Makefile +++ b/usr/src/uts/common/sys/Makefile @@ -22,7 +22,7 @@ # # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2019 Joyent, Inc. -# Copyright 2013 Garrett D'Amore <garrett@damore.org> +# Copyright 2022 Garrett D'Amore # Copyright 2013 Saso Kiselkov. All rights reserved. # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com> # Copyright 2017 Nexenta Systems, Inc. @@ -982,7 +982,6 @@ SATAGENHDRS= \ sata_cfgadm.h SYSEVENTHDRS= \ - ap_driver.h \ datalink.h \ dev.h \ domain.h \ diff --git a/usr/src/uts/common/sys/sysevent/ap_driver.h b/usr/src/uts/common/sys/sysevent/ap_driver.h deleted file mode 100644 index 84ec2c86ca..0000000000 --- a/usr/src/uts/common/sys/sysevent/ap_driver.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (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 (c) 2000 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#ifndef _SYS_SYSEVENT_AP_DRIVER_H -#define _SYS_SYSEVENT_AP_DRIVER_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * Event type EC_AP_DRIVER/ESC_AP_DRIVER_PATHSWITCH schema - * Event Class - EC_AP_DRIVER - * Event Sub-Class - ESC_AP_DRIVER_PATHSWITCH - * Event Publisher - SUNW:kern:ap - * Attribute Name - AP_DRIVER_PATHGROUP - * Attribute Type - SE_DATA_TYPE_STRING - * Attribute Value - [pathgroup name, e.g. "sf:0", "mether1", etc.] - * - * Event type EC_AP_DRIVER/ESC_AP_DRIVER_COMMIT schema - * Event Class - EC_AP_DRIVER - * Event Sub-Class - ESC_AP_DRIVER_PATHSWITCH - * Event Publisher - SUNW:kern:ap - * [no attributes] - * - * Event type EC_AP_DRIVER/ESC_AP_DRIVER_PATHSWITCH schema - * Event Class - EC_AP_DRIVER - * Event Sub-Class - ESC_AP_DRIVER_PATHSWITCH - * Event Publisher - SUNW:kern:ap - * Attribute Name - AP_DRIVER_PATHGROUP - * Attribute Type - SE_DATA_TYPE_STRING - * Attribute Value - [pathgroup name, e.g. "msf:0", "mether1", etc.] - * Attribute Name - AP_DRIVER_PHYSICAL - * Attribute Type - SE_DATA_TYPE_STRING - * Attribute Value - [physical path name, e.g. "pln:0", "hme2", etc.] - */ - -#define AP_DRIVER_PATHGROUP "ap_driver_pathgroup" /* pathgroup name */ -#define AP_DRIVER_PHYSICAL "ap_driver_physical" /* physpath name */ - -#ifdef __cplusplus -} -#endif - -#endif /* _SYS_SYSEVENT_AP_DRIVER_H */ diff --git a/usr/src/uts/common/sys/sysevent/eventdefs.h b/usr/src/uts/common/sys/sysevent/eventdefs.h index 27c957d40e..c9f2bbac57 100644 --- a/usr/src/uts/common/sys/sysevent/eventdefs.h +++ b/usr/src/uts/common/sys/sysevent/eventdefs.h @@ -23,6 +23,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2016 Nexenta Systems, Inc. * Copyright 2019 Joyent, Inc. + * Copyright 2022 Garrett D'Amore */ #ifndef _SYS_SYSEVENT_EVENTDEFS_H @@ -45,7 +46,6 @@ extern "C" { #define EC_DR "EC_dr" /* Dynamic reconfiguration event class */ #define EC_ENV "EC_env" /* Environmental monitor event class */ #define EC_DOMAIN "EC_domain" /* Domain event class */ -#define EC_AP_DRIVER "EC_ap_driver" /* Alternate Pathing event class */ #define EC_IPMP "EC_ipmp" /* IP Multipathing event class */ #define EC_DEV_ADD "EC_dev_add" /* device add event class */ #define EC_DEV_REMOVE "EC_dev_remove" /* device remove event class */ @@ -93,19 +93,6 @@ extern "C" { #define ESC_DOMAIN_LOGHOST_CHANGE "ESC_domain_loghost_change" /* - * EC_AP_DRIVER subclass definitions - supporting attributes (name/value pairs) - * are found in sys/sysevent/ap_driver.h - */ - -/* Alternate Pathing path switch */ -#define ESC_AP_DRIVER_PATHSWITCH "ESC_ap_driver_pathswitch" -/* Alternate Pathing database commit */ -#define ESC_AP_DRIVER_COMMIT "ESC_ap_driver_commit" -/* Alternate Pathing physical path status change */ -#define ESC_AP_DRIVER_PHYS_PATH_STATUS_CHANGE \ - "ESC_ap_driver_phys_path_status_change" - -/* * EC_IPMP subclass definitions - supporting attributes (name/value pairs) * are found in sys/sysevent/ipmp.h */ |