12766 clean up bhyve lints

Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Robert Mustacchi <rm@fingolfin.org>

19 files changed, 7 insertions, 168 deletions

diff --git a/usr/src/cmd/bhyve/Makefile b/usr/src/cmd/bhyve/Makefile
index eb7c4def30..f9e8605b4e 100644
--- a/usr/src/cmd/bhyve/Makefile
+++ b/usr/src/cmd/bhyve/Makefile
@@ -26,7 +26,6 @@ all	:=	TARGET = all
 install	:=	TARGET = install
 clean	:=	TARGET = clean
 clobber	:=	TARGET = clobber
-lint	:=	TARGET = lint
 
 SRCS =	acpi.c			\
 	atkbdc.c		\
@@ -129,7 +128,6 @@ SMOFF += all_func_returns,leaks,no_if_block
 # Force c99 for everything
 CSTD=		$(CSTD_GNU99)
 C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
 
 $(PROG) := LDLIBS += -lsocket -lnsl -ldlpi -ldladm -lmd -luuid -lvmmapi -lz
 $(MEVENT_TEST_PROG) := LDLIBS += -lsocket
@@ -153,8 +151,6 @@ clean: $(SUBDIRS)
 clobber: clean $(SUBDIRS)
 	$(RM) $(CLOBBERFILES)
 
-lint:	lint_SRCS $(SUBDIRS)
-
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/cmd/bhyve/test/Makefile.com b/usr/src/cmd/bhyve/test/Makefile.com
index f5efacc510..a1a2d79db1 100644
--- a/usr/src/cmd/bhyve/test/Makefile.com
+++ b/usr/src/cmd/bhyve/test/Makefile.com
@@ -22,7 +22,6 @@ include $(SRC)/cmd/Makefile.cmd.64
 #
 CSTD=		$(CSTD_GNU99)
 C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
 
 CFLAGS +=	$(CCVERBOSE) -_gcc=-Wimplicit-function-declaration \
 		-_gcc=-Wno-parentheses
@@ -58,4 +57,3 @@ ROOTOUT =	$(OUTFILES:%=$(ROOTTSTDIR)/%)
 ROOTTESTS =	$(ROOTTSTEXES) $(ROOTTSTSH) $(ROOTOUT)
 FILEMODE =	0555
 LDLIBS =	$(LDLIBS.cmd)
-LINTEXE =	$(EXETESTS:%.exe=%.exe.ln)
diff --git a/usr/src/cmd/bhyve/test/Makefile.subdirs b/usr/src/cmd/bhyve/test/Makefile.subdirs
index 45f0aa67fa..ff7d6c91cb 100644
--- a/usr/src/cmd/bhyve/test/Makefile.subdirs
+++ b/usr/src/cmd/bhyve/test/Makefile.subdirs
@@ -19,9 +19,8 @@ all	:= TARGET += all
 clean	:= TARGET += clean
 clobber	:= TARGET += clobber
 install	:= TARGET += install
-lint	:= TARGET += lint
 
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/cmd/bhyve/test/Makefile.targ b/usr/src/cmd/bhyve/test/Makefile.targ
index e3ec55cfdb..13d28a0630 100644
--- a/usr/src/cmd/bhyve/test/Makefile.targ
+++ b/usr/src/cmd/bhyve/test/Makefile.targ
@@ -43,11 +43,6 @@ $(ROOTTSTDIR)/%.exe: %.exe $(ROOTTSTDIR)
 
 all: install
 
-%.exe.ln: %.c $(SUPOBJS)
-	$(LINT.c) $< $(LDLIBS)
-
-lint: $(LINTEXE)
-
 clean:
 	-$(RM) *.o $(CLEANFILES)
 
diff --git a/usr/src/cmd/bhyvectl/Makefile b/usr/src/cmd/bhyvectl/Makefile
index 0a8a96cfc9..bbac3dd0cc 100644
--- a/usr/src/cmd/bhyvectl/Makefile
+++ b/usr/src/cmd/bhyvectl/Makefile
@@ -51,8 +51,6 @@ install: all $(ROOTUSRSBINPROG)
 clean:
 	$(RM) $(OBJS) $(CLEANFILES)
 
-lint:	lint_SRCS
-
 include ../Makefile.targ
 
 %.o: $(CONTRIB)/freebsd/lib/libutil/%.c
diff --git a/usr/src/cmd/pptadm/Makefile b/usr/src/cmd/pptadm/Makefile
index 3be558a7a0..7094f8563c 100644
--- a/usr/src/cmd/pptadm/Makefile
+++ b/usr/src/cmd/pptadm/Makefile
@@ -21,7 +21,6 @@ include ../Makefile.ctf
 LDLIBS += -lofmt -lppt -lnvpair
 
 CSTD = $(CSTD_GNU99)
-C99LMODE = -Xc99=%all
 
 CLEANFILES += $(OBJS)
 
@@ -34,8 +33,6 @@ install: all $(ROOTUSRSBINPROG)
 clean:
 	-$(RM) $(CLEANFILES)
 
-lint: lint_SRCS
-
 %.o: ../%.c
 	$(COMPILE.c) $<
 	$(POST_PROCESS_O)
diff --git a/usr/src/lib/libppt/Makefile b/usr/src/lib/libppt/Makefile
index 21c26d447e..d8f34163ab 100644
--- a/usr/src/lib/libppt/Makefile
+++ b/usr/src/lib/libppt/Makefile
@@ -24,11 +24,10 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
diff --git a/usr/src/lib/libppt/Makefile.com b/usr/src/lib/libppt/Makefile.com
index 7b2ff4885f..3d5e96f436 100644
--- a/usr/src/lib/libppt/Makefile.com
+++ b/usr/src/lib/libppt/Makefile.com
@@ -22,25 +22,16 @@ include $(SRC)/lib/Makefile.lib
 
 SRCDIR = ../common
 
-LIBS = $(DYNLIB) $(LINTLIB)
+LIBS = $(DYNLIB)
 SRCS =	$(SRCDIR)/libppt.c
 
 CSTD=	$(CSTD_GNU99)
 C99LMODE=	-Xc99=%all
 
-#
-# lint doesn't like %4s in sscanf().
-#
-LINTFLAGS += -erroff=E_BAD_FORMAT_ARG_TYPE2
-LINTFLAGS64 += -erroff=E_BAD_FORMAT_ARG_TYPE2
-
-$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS += -lpcidb -ldevinfo -lcmdutils -lnvpair -lc
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-lint: lintcheck
-
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/libppt/common/llib-lppt b/usr/src/lib/libppt/common/llib-lppt
deleted file mode 100644
index dadd992a31..0000000000
--- a/usr/src/lib/libppt/common/llib-lppt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * This file and its contents are supplied under the terms of the
- * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms of version
- * 1.0 of the CDDL.
- *
- * A full copy of the text of the CDDL should have accompanied this
- * source.  A copy of the CDDL is also available via the Internet at
- * http://www.illumos.org/license/CDDL.
- */
-
-/*
- * Copyright 2018 Joyent, Inc.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-#include <libppt.h>
diff --git a/usr/src/lib/libvmm/Makefile b/usr/src/lib/libvmm/Makefile
index 66bd60eb46..0aae533bb0 100644
--- a/usr/src/lib/libvmm/Makefile
+++ b/usr/src/lib/libvmm/Makefile
@@ -26,11 +26,10 @@ all:=		TARGET= all
 install:=	TARGET= install
 clean:=		TARGET= clean
 clobber:=	TARGET= clobber
-lint:=		TARGET= lint
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 check:		$(CHECKHDRS)
diff --git a/usr/src/lib/libvmm/Makefile.com b/usr/src/lib/libvmm/Makefile.com
index d85abae8ce..bef555aed3 100644
--- a/usr/src/lib/libvmm/Makefile.com
+++ b/usr/src/lib/libvmm/Makefile.com
@@ -37,8 +37,6 @@ LDLIBS +=	-lc -lvmmapi
 
 all: $(LIBS)
 
-lint: lintcheck
-
 pics/%.o: $(SRC)/common/list/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
diff --git a/usr/src/lib/libvmmapi/Makefile b/usr/src/lib/libvmmapi/Makefile
index 233fcd5edb..d002a65297 100644
--- a/usr/src/lib/libvmmapi/Makefile
+++ b/usr/src/lib/libvmmapi/Makefile
@@ -27,12 +27,11 @@ all:=		TARGET= all
 install:=	TARGET= install
 clean:=	TARGET= clean
 clobber:=	TARGET= clobber
-lint:=		TARGET= lint
 _msg:=		TARGET= _msg
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
 
 # install rule for install_h target
 
diff --git a/usr/src/lib/libvmmapi/Makefile.com b/usr/src/lib/libvmmapi/Makefile.com
index 34240f4331..1653e8619c 100644
--- a/usr/src/lib/libvmmapi/Makefile.com
+++ b/usr/src/lib/libvmmapi/Makefile.com
@@ -27,7 +27,7 @@ include ../../Makefile.rootfs
 
 SRCDIR		= ../common
 
-LIBS		= $(DYNLIB) $(LINTLIB)
+LIBS		= $(DYNLIB)
 
 CPPFLAGS	= -I$(COMPAT)/freebsd -I$(CONTRIB)/freebsd \
 	$(CPPFLAGS.master) -I$(SRC)/uts/i86pc
@@ -35,16 +35,12 @@ CPPFLAGS	= -I$(COMPAT)/freebsd -I$(CONTRIB)/freebsd \
 # not linted
 SMATCH=off
 
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
-
 LDLIBS		+= -lc
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-lint: lintcheck
-
 pics/%.o: $(CONTRIB)/freebsd/lib/libutil/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
diff --git a/usr/src/lib/libvmmapi/common/llib-lvmmapi b/usr/src/lib/libvmmapi/common/llib-lvmmapi
deleted file mode 100644
index 221ed3a23e..0000000000
--- a/usr/src/lib/libvmmapi/common/llib-lvmmapi
+++ /dev/null
@@ -1,2 +0,0 @@
-/* LINTLIBRARY */
-/* PROTOLIB1 */
diff --git a/usr/src/uts/i86pc/io/vmm/amd/svm_support.s b/usr/src/uts/i86pc/io/vmm/amd/svm_support.s
index fad994b09c..27ef1a04af 100644
--- a/usr/src/uts/i86pc/io/vmm/amd/svm_support.s
+++ b/usr/src/uts/i86pc/io/vmm/amd/svm_support.s
@@ -36,18 +36,6 @@
 
 /* Porting note: This is named 'svm_support.S' upstream. */
 
-#if defined(lint)
-
-struct svm_regctx;
-struct cpu;
-
-/*ARGSUSED*/
-void
-svm_launch(uint64_t pa, struct svm_regctx *gctx, struct cpu *cpu)
-{}
-
-#else /* lint */
-
 #define	VMLOAD	.byte 0x0f, 0x01, 0xda
 #define	VMRUN	.byte 0x0f, 0x01, 0xd8
 #define	VMSAVE	.byte 0x0f, 0x01, 0xdb
@@ -160,5 +148,3 @@ ENTRY_NP(svm_launch)
 	popq	%rbp
 	ret
 SET_SIZE(svm_launch)
-
-#endif /* lint */
diff --git a/usr/src/uts/i86pc/io/vmm/intel/vmx_support.s b/usr/src/uts/i86pc/io/vmm/intel/vmx_support.s
index 0130f88dd6..f719e31e30 100644
--- a/usr/src/uts/i86pc/io/vmm/intel/vmx_support.s
+++ b/usr/src/uts/i86pc/io/vmm/intel/vmx_support.s
@@ -45,31 +45,6 @@
 
 /* Porting note: This is named 'vmx_support.S' upstream. */
 
-
-
-#if defined(lint)
-
-struct vmxctx;
-struct vmx;
-
-/*ARGSUSED*/
-void
-vmx_launch(struct vmxctx *ctx)
-{}
-
-void
-vmx_exit_guest()
-{}
-
-/*ARGSUSED*/
-int
-vmx_enter_guest(struct vmxctx *ctx, struct vmx *vmx, int launched)
-{
-	return (0);
-}
-
-#else /* lint */
-
 #include "vmx_assym.h"
 #include "vmcs.h"
 
@@ -155,7 +130,7 @@ vmx_enter_guest(struct vmxctx *ctx, struct vmx *vmx, int launched)
 #define	VMXSTKSIZE	VMXSTK_FP
 
 /*
- * vmx_enter_guest(struct vmxctx *vmxctx, int launched)
+ * vmx_enter_guest(struct vmxctx *ctx, struct vmx *vmx, int launched)
  * Interrupts must be disabled on entry.
  */
 ENTRY_NP(vmx_enter_guest)
@@ -380,5 +355,3 @@ ENTRY_NP(vmx_call_isr)
 	popq	%rbp
 	ret
 SET_SIZE(vmx_call_isr)
-
-#endif /* lint */
diff --git a/usr/src/uts/i86pc/ppt/Makefile b/usr/src/uts/i86pc/ppt/Makefile
index f231dfddf6..7c41368efd 100644
--- a/usr/src/uts/i86pc/ppt/Makefile
+++ b/usr/src/uts/i86pc/ppt/Makefile
@@ -24,7 +24,6 @@ UTSBASE	= ../..
 #
 MODULE		= ppt
 OBJECTS		= $(PPT_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(PPT_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(USR_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/i86pc/io/vmm/io
 MAPFILE		= $(UTSBASE)/i86pc/io/vmm/io/ppt.mapfile
@@ -38,7 +37,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 #
@@ -72,12 +70,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 #
diff --git a/usr/src/uts/i86pc/viona/Makefile b/usr/src/uts/i86pc/viona/Makefile
index dac59c9a45..b7f0fd6f53 100644
--- a/usr/src/uts/i86pc/viona/Makefile
+++ b/usr/src/uts/i86pc/viona/Makefile
@@ -24,7 +24,6 @@ UTSBASE	= ../..
 #
 MODULE		= viona
 OBJECTS	= $(VIONA_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(VIONA_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(USR_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/i86pc/io/viona
 MAPFILE		= $(UTSBASE)/i86pc/io/viona/viona.mapfile
@@ -38,17 +37,11 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 # Define targets
 #
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 #
 # Overrides
 #
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-LINTTAGS	+= -erroff=E_FUNC_ARG_UNUSED
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-LINTTAGS	+= -erroff=E_FUNC_RET_MAYBE_IGNORED2
-LINTTAGS	+= -erroff=E_FUNC_RET_ALWAYS_IGNOR2
 
 # needs work
 SMOFF += all_func_returns
@@ -74,12 +67,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 #
diff --git a/usr/src/uts/i86pc/vmm/Makefile b/usr/src/uts/i86pc/vmm/Makefile
index d5dc8d7124..c55abf6090 100644
--- a/usr/src/uts/i86pc/vmm/Makefile
+++ b/usr/src/uts/i86pc/vmm/Makefile
@@ -24,7 +24,6 @@ UTSBASE	= ../..
 #
 MODULE		= vmm
 OBJECTS		= $(VMM_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(VMM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(USR_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/i86pc/io/vmm
 MAPFILE		= $(UTSBASE)/i86pc/io/vmm/vmm.mapfile
@@ -38,42 +37,11 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 #
 #	Overrides and additions
 #
-LINTTAGS	+= -erroff=E_EMPTY_DECLARATION
-LINTTAGS	+= -erroff=E_OPERANDS_INCOMPATIBLE_TYPES
-LINTTAGS	+= -erroff=E_VOID_CANT_RETURN_VALUE
-LINTTAGS	+= -erroff=E_YACC_ERROR
-LINTTAGS	+= -erroff=E_STATIC_UNUSED
-LINTTAGS	+= -erroff=E_FUNC_RET_MAYBE_IGNORED2
-LINTTAGS	+= -erroff=E_FUNC_RET_ALWAYS_IGNOR2
-LINTTAGS	+= -erroff=E_BAD_FORMAT_ARG_TYPE2
-LINTTAGS	+= -erroff=E_FUNC_ARG_UNUSED
-LINTTAGS	+= -erroff=E_FUNC_SET_NOT_USED
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-LINTTAGS	+= -erroff=E_CONSTANT_CONDITION
-LINTTAGS	+= -erroff=E_PTR_TO_VOID_IN_ARITHMETIC
-LINTTAGS	+= -erroff=E_CONST_TRUNCATED_BY_ASSIGN
-LINTTAGS	+= -erroff=E_NOP_ELSE_STMT
-LINTTAGS	+= -erroff=E_FUNC_NO_RET_VAL
-LINTTAGS	+= -erroff=E_OLD_STYLE_DECL_OR_BAD_TYPE
-LINTTAGS	+= -erroff=E_VAR_USED_BEFORE_SET
-LINTTAGS	+= -erroff=E_INTEGER_OVERFLOW_DETECTED
-LINTTAGS	+= -erroff=E_STMT_NOT_REACHED
-LINTTAGS	+= -erroff=E_FUNC_NO_RET_VAL
-LINTTAGS	+= -erroff=E_USELESS_DECLARATION
-LINTTAGS	+= -erroff=E_EXPR_NULL_EFFECT
-LINTTAGS	+= -erroff=E_CASE_FALLTHRU
-LINTTAGS	+= -erroff=E_FUNC_DECL_VAR_ARG2
-LINTTAGS	+= -erroff=E_ASM_IMPOSSIBLE_CONSTRAINT
-LINTTAGS	+= -erroff=E_ASM_UNUSED_PARAM
-LINTTAGS	+= -erroff=E_NOP_IF_STMT
-LINTTAGS	+= -erroff=E_ZERO_OR_NEGATIVE_SUBSCRIPT
 
 CERRWARN	+= -_gcc=-Wno-empty-body
 
@@ -86,11 +54,6 @@ $(OBJS_DIR)/vmm_sol_dev.o := SMOFF += signed_integer_overflow_check
 # a can't happen: vmx_setcap() warn: variable dereferenced before check 'pptr'
 $(OBJS_DIR)/vmx.o := SMOFF += deref_check
 
-# These sources only compile with gcc.  Workaround a confluence of cruft
-# regarding dmake and shadow compilation by neutering the sun compiler.
-#amd64_CC	= $(ONBLD_TOOLS)/bin/$(MACH)/cw -_gcc
-#CFLAGS		+= -_cc=-xdryrun
-
 ALL_BUILDS	= $(ALL_BUILDSONLY64)
 DEF_BUILDS	= $(DEF_BUILDSONLY64)
 PRE_INC_PATH	= -I$(COMPAT)/freebsd -I$(COMPAT)/freebsd/amd64 \
@@ -133,12 +96,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 #