There are bunch of ioctl definitions kdump(1) doesn't know about yet,
with the result, that kdump prints the numerical value of the ioctl and
not the name of the definition.
This patch adds support for ipmi, vscsi, pvbus, udl, fuse, trunk, pipex
and memrange.
OK?
natano
Index: Makefile
===================================================================
RCS file: /cvs/src/usr.bin/kdump/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 28 Feb 2016 15:46:19 -0000 1.31
+++ Makefile 12 Mar 2016 10:40:30 -0000
@@ -12,16 +12,23 @@ ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/
CC="${CC}" \
/bin/sh ${.CURDIR}/mkioctls ${SYS_DIR}/sys/ioctl.h \
${SYS_DIR}/dev/biovar.h \
+ ${SYS_DIR}/dev/ipmi.h \
${SYS_DIR}/dev/systrace.h \
${SYS_DIR}/dev/wscons/wsconsio.h \
${SYS_DIR}/dev/vndioctl.h \
+ ${SYS_DIR}/dev/vscsivar.h \
${SYS_DIR}/dev/pci/drm/i915_drm.h \
+ ${SYS_DIR}/dev/pv/pvvar.h \
+ ${SYS_DIR}/dev/usb/udlio.h \
${SYS_DIR}/dev/usb/usb.h \
+ ${SYS_DIR}/miscfs/fuse/fusefs.h \
${SYS_DIR}/net/bpf.h \
${SYS_DIR}/net/if_ppp.h \
${SYS_DIR}/net/if_pppoe.h \
+ ${SYS_DIR}/net/if_trunk.h \
${SYS_DIR}/net/if_tun.h \
${SYS_DIR}/net/pfvar.h \
+ ${SYS_DIR}/net/pipex.h \
${SYS_DIR}/net80211/ieee80211_ioctl.h \
${SYS_DIR}/netinet6/in6_var.h \
${SYS_DIR}/sys/tty.h \
@@ -33,6 +40,7 @@ ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/
${SYS_DIR}/sys/dkio.h \
${SYS_DIR}/sys/filio.h \
${SYS_DIR}/sys/gpio.h \
+ ${SYS_DIR}/sys/memrange.h \
${SYS_DIR}/sys/mtio.h \
${SYS_DIR}/sys/pciio.h \
${SYS_DIR}/sys/radioio.h \
Index: mkioctls
===================================================================
RCS file: /cvs/src/usr.bin/kdump/mkioctls,v
retrieving revision 1.35
diff -u -p -r1.35 mkioctls
--- mkioctls 5 Jan 2016 19:41:15 -0000 1.35
+++ mkioctls 12 Mar 2016 10:40:30 -0000
@@ -36,6 +36,7 @@ BEGIN {
print "#include <sys/param.h>"
print "#include <sys/socket.h>"
print "#include <sys/socketvar.h>"
+ print "#include <miscfs/fuse/fusefs.h>"
print "#include <net/route.h>"
print "#include <net/if.h>"
print "#include <net/bpf.h>"
@@ -54,8 +55,10 @@ BEGIN {
print "#include <net/ppp_defs.h>"
print "#include <net/if_ppp.h>"
print "#include <net/if_pppoe.h>"
+ print "#include <net/if_trunk.h>"
print "#include <net/if_tun.h>"
print "#include <net/pfvar.h>"
+ print "#include <net/pipex.h>"
print "#include <sys/disklabel.h>"
print "#include <sys/ataio.h>"
print "#include <sys/audioio.h>"
@@ -66,6 +69,7 @@ BEGIN {
print "#include <sys/dkio.h>"
print "#include <sys/filio.h>"
print "#include <sys/gpio.h>"
+ print "#include <sys/memrange.h>"
print "#include <sys/mtio.h>"
print "#include <sys/pciio.h>"
print "#include <sys/radioio.h>"
@@ -75,10 +79,15 @@ BEGIN {
print "#include <sys/syslog.h>"
print "#include <sys/videoio.h>"
print "#include <dev/biovar.h>"
+ print "#include <dev/ipmi.h>"
print "#include <dev/systrace.h>"
print "#include <dev/wscons/wsconsio.h>"
print "#include <dev/vndioctl.h>"
+ print "#include <scsi/scsi_all.h>"
+ print "#include <dev/vscsivar.h>"
print "#include <dev/pci/drm/i915_drm.h>"
+ print "#include <dev/pv/pvvar.h>"
+ print "#include <dev/usb/udlio.h>"
print "#include <dev/usb/usb.h>"
print "#include <sys/ioctl.h>"
print "#include \"kdump.h\""
@@ -92,7 +101,7 @@ BEGIN {
print ""
}
-/^[ ]*#[ ]*define[
]+(ATAIO|AUDIO_|BIOC|CDIO|CHIO|DIOC|DRM|GPIO|TIO|FIO|MTIOC|LIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|PPPOE|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|USB|VIDIOC|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[
]+(DRM)?_IO/ {
+/^[ ]*#[ ]*define[
]+(ATAIO|AUDIO_|BIOC|CDIO|CHIO|DIOC|DRM|GPIO|IPMICTL|TIO|FIO|MEMRANGE|MTIOC|LIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PIPEX|PPPIOC|PPPOE|PVBUSIOC|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|UDLIO|USB|VIDIOC|VNDIOC|VSCSI|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[
]+(DRM)?_IO/ {
# find where the name starts
for (i = 1; i <= NF; i++)
