diff options
| author | robj <none@none> | 2006-11-01 14:53:24 -0800 |
|---|---|---|
| committer | robj <none@none> | 2006-11-01 14:53:24 -0800 |
| commit | 1bbdaf51e5a066c12cca745ff7cdd1e08d91b5fa (patch) | |
| tree | c60b43aacb7ab6f97358ec859f96bb2e6d9e5b24 /usr/src | |
| parent | e7f81dc70d84e6477fedcfad2759dcc9c68d0aa5 (diff) | |
| download | illumos-joyent-1bbdaf51e5a066c12cca745ff7cdd1e08d91b5fa.tar.gz | |
6438237 fmd can exit without producing a core file when the 'core' property is set
6474487 incorrect definitions for two safari ereport class descriptions
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/fm/fmd/common/fmd_subr.c | 12 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/fm/io/sun4upci.h | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/usr/src/cmd/fm/fmd/common/fmd_subr.c b/usr/src/cmd/fm/fmd/common/fmd_subr.c index 32cc290540..5de02d2912 100644 --- a/usr/src/cmd/fm/fmd/common/fmd_subr.c +++ b/usr/src/cmd/fm/fmd/common/fmd_subr.c @@ -21,7 +21,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -38,6 +38,7 @@ #include <exacct.h> #include <fmd_subr.h> +#include <fmd_conf.h> #include <fmd_error.h> #include <fmd_thread.h> #include <fmd_protocol.h> @@ -199,8 +200,15 @@ fmd_verror(int err, const char *format, va_list ap) if (tp != NULL) tp->thr_errdepth--; - if (err == EFMD_EXIT) + if (err == EFMD_EXIT) { + int core = 0; + + (void) fmd_conf_getprop(fmd.d_conf, "core", &core); + if (core) + fmd_panic("forcing core dump at user request\n"); + exit(FMD_EXIT_ERROR); + } } /*PRINTFLIKE2*/ diff --git a/usr/src/uts/common/sys/fm/io/sun4upci.h b/usr/src/uts/common/sys/fm/io/sun4upci.h index 820c577cdb..23afc7ec60 100644 --- a/usr/src/uts/common/sys/fm/io/sun4upci.h +++ b/usr/src/uts/common/sys/fm/io/sun4upci.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -94,8 +94,8 @@ extern "C" { #define SAFARI_SSM_DIS "saf.smm-dis" #define SAFARI_BAD_CMD_PCIA "saf.bca" #define SAFARI_BAD_CMD_PCIB "saf.bcb" -#define SAFARI_PAR_ERR_INT_PCIB "saf.para" -#define SAFARI_PAR_ERR_INT_PCIA "saf.parb" +#define SAFARI_PAR_ERR_INT_PCIB "saf.parb" +#define SAFARI_PAR_ERR_INT_PCIA "saf.para" #define SAFARI_PAR_ERR_INT_SAF "saf.pars" #define SAFARI_PLL_ERR_PCIB "saf.pllb" #define SAFARI_PLL_ERR_PCIA "saf.plla" |