svn commit: r298493 - in stable/10: sys/boot/common sys/sys usr.sbin/kldxref

[Ed Maste]

Author: emaste
Date: Fri Apr 22 21:38:37 2016
New Revision: 298493
URL: https://svnweb.freebsd.org/changeset/base/298493

Log:
  MFC r277205 (imp):
  
    Reserve and ignore the a new module metadata type MDT_PNP_INFO for
    associating an optional PNP hint table with this module. In the
    future, when these are added, these changes will silently ignore the
    new type they would otherwise warn about. It will always be safe to
    ignore this data. Get this into the builds today for some future
    proofing.

Modified:
  stable/10/sys/boot/common/load_elf_obj.c
  stable/10/sys/sys/module.h
  stable/10/usr.sbin/kldxref/kldxref.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/common/load_elf_obj.c
==============================================================================
--- stable/10/sys/boot/common/load_elf_obj.c	Fri Apr 22 21:33:11 2016	(r298492)
+++ stable/10/sys/boot/common/load_elf_obj.c	Fri Apr 22 21:38:37 2016	(r298493)
@@ -412,6 +412,7 @@ __elfN(obj_parse_modmetadata)(struct pre
 			modcnt++;
 			break;
 		case MDT_MODULE:
+		case MDT_PNP_INFO:
 			break;
 		default:
 			printf("unknown type %d\n", md.md_type);

Modified: stable/10/sys/sys/module.h
==============================================================================
--- stable/10/sys/sys/module.h	Fri Apr 22 21:33:11 2016	(r298492)
+++ stable/10/sys/sys/module.h	Fri Apr 22 21:38:37 2016	(r298493)
@@ -35,6 +35,7 @@
 #define	MDT_DEPEND	1		/* argument is a module name */
 #define	MDT_MODULE	2		/* module declaration */
 #define	MDT_VERSION	3		/* module version(s) */
+#define	MDT_PNP_INFO	4		/* Plug and play hints record */
 
 #define	MDT_STRUCT_VERSION	1	/* version of metadata structure */
 #define	MDT_SETNAME	"modmetadata_set"

Modified: stable/10/usr.sbin/kldxref/kldxref.c
==============================================================================
--- stable/10/usr.sbin/kldxref/kldxref.c	Fri Apr 22 21:33:11 2016	(r298492)
+++ stable/10/usr.sbin/kldxref/kldxref.c	Fri Apr 22 21:38:37 2016	(r298493)
@@ -172,6 +172,10 @@ parse_entry(struct mod_metadata *md, con
 			record_string(kldname);
 		}
 		break;
+	case MDT_PNP_INFO:
+		if (dflag) {
+			printf("  pnp info for bus %s\n", cval);
+		}
 	default:
 		warnx("unknown metadata record %d in file %s", md->md_type, kldname);
 	}