Mercurial > illumos > illumos-gate

changeset 10987:87270074111b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6898448 x86gentopo is too chatty
author Tom Pothier <Tom.Pothier@Sun.COM>
date Fri, 06 Nov 2009 15:00:02 -0500
parents 8571cd82aeba
children 9d2e6b32f3a9
files usr/src/uts/i86pc/os/cmi_hw.c usr/src/uts/intel/io/mc-amd/mcamd_drv.c usr/src/uts/intel/os/fmsmb.c
diffstat 3 files changed, 13 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/i86pc/os/cmi_hw.c	Fri Nov 06 14:51:38 2009 -0500
+++ b/usr/src/uts/i86pc/os/cmi_hw.c	Fri Nov 06 15:00:02 2009 -0500
@@ -1321,7 +1321,7 @@
 			hdl->cmih_smbiosid = smb_id;
 		} else {
 #ifdef DEBUG
-			cmn_err(CE_NOTE, "cmi reads smbios chip info failed");
+			cmn_err(CE_NOTE, "!cmi reads smbios chip info failed");
 #endif /* DEBUG */
 			return;
 		}
@@ -1330,7 +1330,7 @@
 #ifdef DEBUG
 		if (hdl->cmih_smb_bboard == NULL)
 			cmn_err(CE_NOTE,
-			    "cmi reads smbios base boards info failed");
+			    "!cmi reads smbios base boards info failed");
 #endif /* DEBUG */
 	}
 }
--- a/usr/src/uts/intel/io/mc-amd/mcamd_drv.c	Fri Nov 06 14:51:38 2009 -0500
+++ b/usr/src/uts/intel/io/mc-amd/mcamd_drv.c	Fri Nov 06 15:00:02 2009 -0500
@@ -1297,7 +1297,7 @@
 			mc->smb_chipid = chip_inst;
 		} else {
 #ifdef DEBUG
-			cmn_err(CE_NOTE, "mc reads smbios chip info failed");
+			cmn_err(CE_NOTE, "!mc reads smbios chip info failed");
 #endif /* DEBUG */
 			return;
 		}
@@ -1305,7 +1305,7 @@
 #ifdef DEBUG
 		if (mc->smb_bboard == NULL)
 			cmn_err(CE_NOTE,
-			    "mc reads smbios base boards info failed");
+			    "!mc reads smbios base boards info failed");
 #endif /* DEBUG */
 	}
 }
--- a/usr/src/uts/intel/os/fmsmb.c	Fri Nov 06 14:51:38 2009 -0500
+++ b/usr/src/uts/intel/os/fmsmb.c	Fri Nov 06 15:00:02 2009 -0500
@@ -368,7 +368,7 @@
 	    expr_cnt != pr_cnt || exma_cnt != ma_cnt ||
 	    exmdev_cnt != mdev_cnt) {
 #ifdef	DEBUG
-		cmn_err(CE_NOTE, "Structure mismatch: ext_proc (%d) "
+		cmn_err(CE_NOTE, "!Structure mismatch: ext_proc (%d) "
 		    "proc (%d) ext_ma (%d) ma (%d) ext_mdev (%d) mdev (%d)\n",
 		    expr_cnt, pr_cnt, exma_cnt, ma_cnt, exmdev_cnt,
 		    mdev_cnt);
@@ -398,7 +398,7 @@
 		(void) smbios_info_extprocessor(shp, expr_id, &exproc);
 		if (exproc.smbpe_processor != pr_id) {
 #ifdef	DEBUG
-			cmn_err(CE_NOTE, "Processor struct linkage (%d)", i);
+			cmn_err(CE_NOTE, "!Processor struct linkage (%d)", i);
 #endif	/* DEBUG */
 			smb_free_strcnt(pr_stype, pr_cnt);
 			smb_free_strcnt(expr_stype, expr_cnt);
@@ -427,7 +427,8 @@
 		(void) smbios_info_extmemarray(shp, exma_id, &exma);
 		if (exma.smbmae_ma != ma_id) {
 #ifdef	DEBUG
-			cmn_err(CE_NOTE, "Memory Array struct linkage (%d)", i);
+			cmn_err(CE_NOTE,
+			    "!Memory Array struct linkage (%d)", i);
 #endif	/* DEBUG */
 			smb_free_strcnt(ma_stype, ma_cnt);
 			smb_free_strcnt(exma_stype, exma_cnt);
@@ -456,7 +457,7 @@
 		(void) smbios_info_extmemdevice(shp, exmdev_id, &exmdev);
 		if (exmdev.smbmdeve_md != mdev_id) {
 #ifdef	DEBUG
-			cmn_err(CE_NOTE, "Memory Device struct linkage (%d)",
+			cmn_err(CE_NOTE, "!Memory Device struct linkage (%d)",
 			    i);
 #endif	/* DEBUG */
 			smb_free_strcnt(mdev_stype, mdev_cnt);
@@ -488,7 +489,7 @@
 			(void) smbios_info_bboard(shp, bb_id, &bb);
 			if (bb.smbb_contn == 0) {
 #ifdef	DEBUG
-				cmn_err(CE_NOTE, "No contained hanldes (%d)",
+				cmn_err(CE_NOTE, "!No contained hanldes (%d)",
 				    i);
 #endif	/* DEBUG */
 				smb_free_strcnt(bb_stype, bb_cnt);
@@ -517,9 +518,6 @@
 
 	/* check for BKS */
 	if (x86gentopo_legacy == 1) {
-#ifdef DEBUG
-		cmn_err(CE_NOTE, "forced legacy x86 topology enumeration");
-#endif /* DEBUG */
 		return;
 	}
 
@@ -576,8 +574,9 @@
 bad:
 	/* not compatible with x86gentopo; revert to legacy enumeration */
 #ifdef	DEBUG
-	cmn_err(CE_NOTE, "SMBIOS is not compatible with x86 generic topology.");
-	cmn_err(CE_NOTE, "Invoking legacy x86 topology enumeration.");
+	cmn_err(CE_NOTE,
+	    "!SMBIOS is not compatible with x86 generic topology.");
+	cmn_err(CE_NOTE, "!Invoking legacy x86 topology enumeration.");
 #endif	/* DEBUG */
 	x86gentopo_legacy = 1;
 }