svn commit: r334114 - in head: sys/sys usr.sbin/pmcstat

[Matt Macy]

Author: mmacy
Date: Wed May 23 19:55:47 2018
New Revision: 334114
URL: https://svnweb.freebsd.org/changeset/base/334114

Log:
  pmc: bump PMC major version to reflect ABI breakage and make warning not require verbose

Modified:
  head/sys/sys/pmc.h
  head/usr.sbin/pmcstat/pmcstat_log.c

Modified: head/sys/sys/pmc.h
==============================================================================
--- head/sys/sys/pmc.h	Wed May 23 19:17:17 2018	(r334113)
+++ head/sys/sys/pmc.h	Wed May 23 19:55:47 2018	(r334114)
@@ -61,7 +61,7 @@
  *
  * The patch version is incremented for every bug fix.
  */
-#define	PMC_VERSION_MAJOR	0x03
+#define	PMC_VERSION_MAJOR	0x04
 #define	PMC_VERSION_MINOR	0x01
 #define	PMC_VERSION_PATCH	0x0000
 

Modified: head/usr.sbin/pmcstat/pmcstat_log.c
==============================================================================
--- head/usr.sbin/pmcstat/pmcstat_log.c	Wed May 23 19:17:17 2018	(r334113)
+++ head/usr.sbin/pmcstat/pmcstat_log.c	Wed May 23 19:55:47 2018	(r334114)
@@ -406,7 +406,7 @@ pmcstat_print_log(void)
 			    ev.pl_u.pl_i.pl_version,
 			    pmc_name_of_cputype(ev.pl_u.pl_i.pl_arch));
 			if ((ev.pl_u.pl_i.pl_version & 0xFF000000) !=
-			    PMC_VERSION_MAJOR << 24 && args.pa_verbosity > 0)
+			    PMC_VERSION_MAJOR << 24)
 				warnx(
 "WARNING: Log version 0x%x != expected version 0x%x.",
 				    ev.pl_u.pl_i.pl_version, PMC_VERSION);