[illumos-gate merge]

commit 8b4261085e0d677be9a3253ff6b4c290e402576d
    15244 zfs-tests: zfstest should accept multiple -c options
commit 9e3aeadeb229d472ee0ae8425dc913dfe7e81ea2
    15238 prom_reboot/panic should be machdep
commit 4e320a8a375380e6f3963134cd6c1001e2bdb7fa
    15245 zfs_clone_010_pos: fix python statement
commit 46593baa8941a05e8871baac4528bcfbf249570c
    15243 test-runner: tell us when there was no tests to run

10 files changed, 23 insertions, 7 deletions

diff --git a/usr/src/test/test-runner/cmd/run b/usr/src/test/test-runner/cmd/run
index 658940c3b9..189be04d4d 100644
--- a/usr/src/test/test-runner/cmd/run
+++ b/usr/src/test/test-runner/cmd/run
@@ -869,6 +869,7 @@ class TestRun(object):
 
     def summary(self):
         if Result.total == 0:
+            print('No tests to run')
             return
 
         print('\nResults Summary')
diff --git a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
index 40932e82a2..527c89163f 100644
--- a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
+++ b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
@@ -156,8 +156,13 @@ while getopts ac:l:qT: c; do
 		auto_detect=true
 		;;
 	'c')
-		runfiles=$OPTARG
-		[[ -f $runfiles ]] || fail "Cannot read file: $runfiles"
+		runfile=$OPTARG
+		[[ -f $runfile ]] || fail "Cannot read file: $runfile"
+		if [[ -z $runfiles ]]; then
+			runfiles=$runfile
+		else
+			runfiles+=",$runfile"
+		fi
 		;;
 	'l')
 		logfile=$OPTARG
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh
index cd471999e0..cd364bb957 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh
@@ -220,7 +220,7 @@ fs=$TESTPOOL/$TESTFS1
 log_must zfs create $fs
 log_must zfs snapshot $fs@snap
 while((i < 7)); do
-	log_must zfs clone $fs@snap $fs/$TESTCLONE$(python -c 'print "x" * 200').$i
+	log_must zfs clone $fs@snap $fs/$TESTCLONE$(printf %0.sx {1..200}).$i
 	((i=i+1))
 	((j=j+200))
 done
diff --git a/usr/src/uts/i86pc/Makefile.files b/usr/src/uts/i86pc/Makefile.files
index 064cda8548..11f6af52ee 100644
--- a/usr/src/uts/i86pc/Makefile.files
+++ b/usr/src/uts/i86pc/Makefile.files
@@ -113,6 +113,8 @@ CORE_OBJS +=			\
 	pci_orion.o		\
 	pmem.o			\
 	ppage.o			\
+	prom_panic.o		\
+	prom_reboot.o		\
 	pwrnow.o		\
 	speedstep.o		\
 	ssp.o			\
diff --git a/usr/src/uts/i86pc/Makefile.rules b/usr/src/uts/i86pc/Makefile.rules
index 9fe73c00f5..af57055292 100644
--- a/usr/src/uts/i86pc/Makefile.rules
+++ b/usr/src/uts/i86pc/Makefile.rules
@@ -24,6 +24,7 @@
 # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 # Copyright 2019 Joyent, Inc.
 # Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2022 Oxide Computer Company
 #
 
 #	This Makefile defines the build rules for the directory uts/i86pc
@@ -173,6 +174,10 @@ $(OBJS_DIR)/%.o:		$(UTSBASE)/i86pc/os/cpupm/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
+$(OBJS_DIR)/%.o:		$(UTSBASE)/i86pc/promif/%.c
+	$(COMPILE.c) -o $@ $<
+	$(CTFCONVERT_O)
+
 $(OBJS_DIR)/%.o:		$(UTSBASE)/i86pc/boot/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
diff --git a/usr/src/uts/intel/promif/prom_panic.c b/usr/src/uts/i86pc/promif/prom_panic.c
index 181d13bead..181d13bead 100644
--- a/usr/src/uts/intel/promif/prom_panic.c
+++ b/usr/src/uts/i86pc/promif/prom_panic.c
diff --git a/usr/src/uts/intel/promif/prom_reboot.c b/usr/src/uts/i86pc/promif/prom_reboot.c
index be7de23a23..be651c2783 100644
--- a/usr/src/uts/intel/promif/prom_reboot.c
+++ b/usr/src/uts/i86pc/promif/prom_reboot.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/promif.h>
 #include <sys/promimpl.h>
 #include <sys/bootsvcs.h>
diff --git a/usr/src/uts/i86xpv/Makefile.files b/usr/src/uts/i86xpv/Makefile.files
index 5c9acfabed..40d22b6029 100644
--- a/usr/src/uts/i86xpv/Makefile.files
+++ b/usr/src/uts/i86xpv/Makefile.files
@@ -23,6 +23,7 @@
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # Copyright 2019 Joyent, Inc.
+# Copyright 2022 Oxide Computer Company
 #
 
 #	This Makefile defines file modules in the directory uts/i86xpv
@@ -95,6 +96,8 @@ CORE_OBJS +=			\
 	pci_orion.o		\
 	pmem.o			\
 	ppage.o			\
+	prom_reboot.o		\
+	prom_panic.o		\
 	startup.o		\
 	ssp.o			\
 	xpv_timestamp.o		\
diff --git a/usr/src/uts/i86xpv/Makefile.rules b/usr/src/uts/i86xpv/Makefile.rules
index dfabbd6897..85d91a3a87 100644
--- a/usr/src/uts/i86xpv/Makefile.rules
+++ b/usr/src/uts/i86xpv/Makefile.rules
@@ -90,6 +90,10 @@ $(OBJS_DIR)/%.o:		$(UTSBASE)/i86xpv/vm/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
+$(OBJS_DIR)/%.o:		$(UTSBASE)/i86pc/promif/%.c
+	$(COMPILE.c) -o $@ $<
+	$(CTFCONVERT_O)
+
 $(OBJS_DIR)/%.o:		$(UTSBASE)/i86xpv/boot/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
diff --git a/usr/src/uts/intel/Makefile.files b/usr/src/uts/intel/Makefile.files
index 0843d21ef8..0ead68a021 100644
--- a/usr/src/uts/intel/Makefile.files
+++ b/usr/src/uts/intel/Makefile.files
@@ -74,7 +74,6 @@ GENUNIX_OBJS +=		\
 	lwp_private.o	\
 	prom_enter.o	\
 	prom_exit.o	\
-	prom_panic.o	\
 	sendsig.o	\
 	syscall.o
 
@@ -91,7 +90,6 @@ GENUNIX_OBJS +=		\
 	prom_printf.o	\
 	prom_prop.o	\
 	prom_putchar.o	\
-	prom_reboot.o	\
 	prom_version.o
 
 #