From owner-svn-src-projects@FreeBSD.ORG Tue Sep 24 21:06:56 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0356C705; Tue, 24 Sep 2013 21:06:56 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DF22B2B48; Tue, 24 Sep 2013 21:06:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8OL6tQs049245; Tue, 24 Sep 2013 21:06:55 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8OL6pWG049195; Tue, 24 Sep 2013 21:06:51 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201309242106.r8OL6pWG049195@svn.freebsd.org> From: Neel Natu Date: Tue, 24 Sep 2013 21:06:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r255863 - in projects/bhyve_npt_pmap: . cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libzfs/common contrib/ipfilter contrib/ipfilter/... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Sep 2013 21:06:56 -0000 Author: neel Date: Tue Sep 24 21:06:50 2013 New Revision: 255863 URL: http://svnweb.freebsd.org/changeset/base/255863 Log: IFC @r255858 Added: projects/bhyve_npt_pmap/contrib/ldns/drill/config.h - copied unchanged from r255845, head/contrib/ldns/drill/config.h projects/bhyve_npt_pmap/contrib/ldns/drill/drill.1 - copied unchanged from r255845, head/contrib/ldns/drill/drill.1 projects/bhyve_npt_pmap/crypto/openssh/Makefile.in - copied unchanged from r255845, head/crypto/openssh/Makefile.in projects/bhyve_npt_pmap/crypto/openssh/buildpkg.sh.in - copied unchanged from r255845, head/crypto/openssh/buildpkg.sh.in projects/bhyve_npt_pmap/crypto/openssh/config.sub - copied unchanged from r255845, head/crypto/openssh/config.sub projects/bhyve_npt_pmap/crypto/openssh/configure - copied unchanged from r255845, head/crypto/openssh/configure projects/bhyve_npt_pmap/crypto/openssh/configure.ac - copied unchanged from r255845, head/crypto/openssh/configure.ac projects/bhyve_npt_pmap/crypto/openssh/contrib/ - copied from r255845, head/crypto/openssh/contrib/ projects/bhyve_npt_pmap/crypto/openssh/fixalgorithms - copied unchanged from r255845, head/crypto/openssh/fixalgorithms projects/bhyve_npt_pmap/crypto/openssh/freebsd-configure.sh - copied unchanged from r255845, head/crypto/openssh/freebsd-configure.sh projects/bhyve_npt_pmap/crypto/openssh/install-sh - copied unchanged from r255845, head/crypto/openssh/install-sh projects/bhyve_npt_pmap/crypto/openssh/krb5_config.h - copied unchanged from r255845, head/crypto/openssh/krb5_config.h projects/bhyve_npt_pmap/crypto/openssh/mdoc2man.awk - copied unchanged from r255845, head/crypto/openssh/mdoc2man.awk projects/bhyve_npt_pmap/crypto/openssh/moduli.0 - copied unchanged from r255845, head/crypto/openssh/moduli.0 projects/bhyve_npt_pmap/crypto/openssh/nchan.ms - copied unchanged from r255845, head/crypto/openssh/nchan.ms projects/bhyve_npt_pmap/crypto/openssh/nchan2.ms - copied unchanged from r255845, head/crypto/openssh/nchan2.ms projects/bhyve_npt_pmap/crypto/openssh/openbsd-compat/Makefile.in - copied unchanged from r255845, head/crypto/openssh/openbsd-compat/Makefile.in projects/bhyve_npt_pmap/crypto/openssh/openbsd-compat/getopt.h - copied unchanged from r255845, head/crypto/openssh/openbsd-compat/getopt.h projects/bhyve_npt_pmap/crypto/openssh/openbsd-compat/getopt_long.c - copied unchanged from r255845, head/crypto/openssh/openbsd-compat/getopt_long.c projects/bhyve_npt_pmap/crypto/openssh/openbsd-compat/regress/ - copied from r255845, head/crypto/openssh/openbsd-compat/regress/ projects/bhyve_npt_pmap/crypto/openssh/openssh.xml.in - copied unchanged from r255845, head/crypto/openssh/openssh.xml.in projects/bhyve_npt_pmap/crypto/openssh/opensshd.init.in - copied unchanged from r255845, head/crypto/openssh/opensshd.init.in projects/bhyve_npt_pmap/crypto/openssh/regress/ - copied from r255845, head/crypto/openssh/regress/ projects/bhyve_npt_pmap/crypto/openssh/scp.0 - copied unchanged from r255845, head/crypto/openssh/scp.0 projects/bhyve_npt_pmap/crypto/openssh/sftp-server.0 - copied unchanged from r255845, head/crypto/openssh/sftp-server.0 projects/bhyve_npt_pmap/crypto/openssh/sftp.0 - copied unchanged from r255845, head/crypto/openssh/sftp.0 projects/bhyve_npt_pmap/crypto/openssh/ssh-add.0 - copied unchanged from r255845, head/crypto/openssh/ssh-add.0 projects/bhyve_npt_pmap/crypto/openssh/ssh-agent.0 - copied unchanged from r255845, head/crypto/openssh/ssh-agent.0 projects/bhyve_npt_pmap/crypto/openssh/ssh-keygen.0 - copied unchanged from r255845, head/crypto/openssh/ssh-keygen.0 projects/bhyve_npt_pmap/crypto/openssh/ssh-keyscan.0 - copied unchanged from r255845, head/crypto/openssh/ssh-keyscan.0 projects/bhyve_npt_pmap/crypto/openssh/ssh-keysign.0 - copied unchanged from r255845, head/crypto/openssh/ssh-keysign.0 projects/bhyve_npt_pmap/crypto/openssh/ssh-pkcs11-helper.0 - copied unchanged from r255845, head/crypto/openssh/ssh-pkcs11-helper.0 projects/bhyve_npt_pmap/crypto/openssh/ssh.0 - copied unchanged from r255845, head/crypto/openssh/ssh.0 projects/bhyve_npt_pmap/crypto/openssh/ssh_config.0 - copied unchanged from r255845, head/crypto/openssh/ssh_config.0 projects/bhyve_npt_pmap/crypto/openssh/sshd.0 - copied unchanged from r255845, head/crypto/openssh/sshd.0 projects/bhyve_npt_pmap/crypto/openssh/sshd_config.0 - copied unchanged from r255845, head/crypto/openssh/sshd_config.0 projects/bhyve_npt_pmap/crypto/openssh/survey.sh.in - copied unchanged from r255845, head/crypto/openssh/survey.sh.in projects/bhyve_npt_pmap/etc/rc.d/local_unbound - copied unchanged from r255845, head/etc/rc.d/local_unbound projects/bhyve_npt_pmap/include/mk-osreldate.sh - copied unchanged from r255845, head/include/mk-osreldate.sh projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_raidz.h - copied unchanged from r255845, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_raidz.h projects/bhyve_npt_pmap/sys/dev/bxe/57710_init_values.c - copied unchanged from r255845, head/sys/dev/bxe/57710_init_values.c projects/bhyve_npt_pmap/sys/dev/bxe/57710_int_offsets.h - copied unchanged from r255845, head/sys/dev/bxe/57710_int_offsets.h projects/bhyve_npt_pmap/sys/dev/bxe/57711_init_values.c - copied unchanged from r255845, head/sys/dev/bxe/57711_init_values.c projects/bhyve_npt_pmap/sys/dev/bxe/57711_int_offsets.h - copied unchanged from r255845, head/sys/dev/bxe/57711_int_offsets.h projects/bhyve_npt_pmap/sys/dev/bxe/57712_init_values.c - copied unchanged from r255845, head/sys/dev/bxe/57712_init_values.c projects/bhyve_npt_pmap/sys/dev/bxe/57712_int_offsets.h - copied unchanged from r255845, head/sys/dev/bxe/57712_int_offsets.h projects/bhyve_npt_pmap/sys/dev/bxe/bxe.c - copied unchanged from r255845, head/sys/dev/bxe/bxe.c projects/bhyve_npt_pmap/sys/dev/bxe/bxe.h - copied unchanged from r255845, head/sys/dev/bxe/bxe.h projects/bhyve_npt_pmap/sys/dev/bxe/bxe_dcb.h - copied unchanged from r255845, head/sys/dev/bxe/bxe_dcb.h projects/bhyve_npt_pmap/sys/dev/bxe/bxe_debug.c - copied unchanged from r255845, head/sys/dev/bxe/bxe_debug.c projects/bhyve_npt_pmap/sys/dev/bxe/bxe_elink.c - copied unchanged from r255845, head/sys/dev/bxe/bxe_elink.c projects/bhyve_npt_pmap/sys/dev/bxe/bxe_elink.h - copied unchanged from r255845, head/sys/dev/bxe/bxe_elink.h projects/bhyve_npt_pmap/sys/dev/bxe/bxe_stats.c - copied unchanged from r255845, head/sys/dev/bxe/bxe_stats.c projects/bhyve_npt_pmap/sys/dev/bxe/bxe_stats.h - copied unchanged from r255845, head/sys/dev/bxe/bxe_stats.h projects/bhyve_npt_pmap/sys/dev/bxe/ecore_fw_defs.h - copied unchanged from r255845, head/sys/dev/bxe/ecore_fw_defs.h projects/bhyve_npt_pmap/sys/dev/bxe/ecore_hsi.h - copied unchanged from r255845, head/sys/dev/bxe/ecore_hsi.h projects/bhyve_npt_pmap/sys/dev/bxe/ecore_init.h - copied unchanged from r255845, head/sys/dev/bxe/ecore_init.h projects/bhyve_npt_pmap/sys/dev/bxe/ecore_init_ops.h - copied unchanged from r255845, head/sys/dev/bxe/ecore_init_ops.h projects/bhyve_npt_pmap/sys/dev/bxe/ecore_mfw_req.h - copied unchanged from r255845, head/sys/dev/bxe/ecore_mfw_req.h projects/bhyve_npt_pmap/sys/dev/bxe/ecore_reg.h - copied unchanged from r255845, head/sys/dev/bxe/ecore_reg.h projects/bhyve_npt_pmap/sys/dev/bxe/ecore_sp.c - copied unchanged from r255845, head/sys/dev/bxe/ecore_sp.c projects/bhyve_npt_pmap/sys/dev/bxe/ecore_sp.h - copied unchanged from r255845, head/sys/dev/bxe/ecore_sp.h projects/bhyve_npt_pmap/usr.bin/drill/ - copied from r255845, head/usr.bin/drill/ projects/bhyve_npt_pmap/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh - copied unchanged from r255845, head/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh projects/bhyve_npt_pmap/usr.sbin/bsdconfig/examples/browse_packages_http.sh - copied unchanged from r255845, head/usr.sbin/bsdconfig/examples/browse_packages_http.sh projects/bhyve_npt_pmap/usr.sbin/unbound/local-setup/ - copied from r255845, head/usr.sbin/unbound/local-setup/ Deleted: projects/bhyve_npt_pmap/contrib/ipfilter/BSD/ projects/bhyve_npt_pmap/contrib/ipfilter/FAQ.FreeBSD projects/bhyve_npt_pmap/contrib/ipfilter/FWTK/ projects/bhyve_npt_pmap/contrib/ipfilter/FreeBSD/ projects/bhyve_npt_pmap/contrib/ipfilter/FreeBSD-2.2/ projects/bhyve_npt_pmap/contrib/ipfilter/FreeBSD-3/ projects/bhyve_npt_pmap/contrib/ipfilter/FreeBSD-4.0/ projects/bhyve_npt_pmap/contrib/ipfilter/IMPORTANT projects/bhyve_npt_pmap/contrib/ipfilter/INST.FreeBSD-2.2 projects/bhyve_npt_pmap/contrib/ipfilter/INSTALL.FreeBSD projects/bhyve_npt_pmap/contrib/ipfilter/INSTALL.xBSD projects/bhyve_npt_pmap/contrib/ipfilter/IPF.KANJI projects/bhyve_npt_pmap/contrib/ipfilter/WhatsNew40.txt projects/bhyve_npt_pmap/contrib/ipfilter/bsdinstall projects/bhyve_npt_pmap/contrib/ipfilter/etc/ projects/bhyve_npt_pmap/contrib/ipfilter/perl/ projects/bhyve_npt_pmap/contrib/ipfilter/test/ projects/bhyve_npt_pmap/contrib/ipfilter/todo projects/bhyve_npt_pmap/crypto/openssh/openbsd-compat/getopt.c projects/bhyve_npt_pmap/sys/amd64/conf/XENHVM projects/bhyve_npt_pmap/sys/dev/bxe/bxe_debug.h projects/bhyve_npt_pmap/sys/dev/bxe/bxe_fw_defs.h projects/bhyve_npt_pmap/sys/dev/bxe/bxe_hsi.h projects/bhyve_npt_pmap/sys/dev/bxe/bxe_include.h projects/bhyve_npt_pmap/sys/dev/bxe/bxe_init.h projects/bhyve_npt_pmap/sys/dev/bxe/bxe_init_values_e1.h projects/bhyve_npt_pmap/sys/dev/bxe/bxe_init_values_e1h.h projects/bhyve_npt_pmap/sys/dev/bxe/bxe_link.c projects/bhyve_npt_pmap/sys/dev/bxe/bxe_link.h projects/bhyve_npt_pmap/sys/dev/bxe/bxe_reg.h projects/bhyve_npt_pmap/sys/dev/bxe/bxe_self_test.h projects/bhyve_npt_pmap/sys/dev/bxe/dump_e1.h projects/bhyve_npt_pmap/sys/dev/bxe/dump_e1h.h projects/bhyve_npt_pmap/sys/dev/bxe/hw_dump_reg_st.h projects/bhyve_npt_pmap/sys/dev/bxe/if_bxe.c projects/bhyve_npt_pmap/sys/dev/bxe/if_bxe.h projects/bhyve_npt_pmap/sys/i386/conf/XENHVM projects/bhyve_npt_pmap/usr.sbin/bsdconfig/examples/browse_packages.sh Modified: projects/bhyve_npt_pmap/Makefile projects/bhyve_npt_pmap/Makefile.inc1 projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/bhyve_npt_pmap/contrib/ipfilter/ip_fil.c projects/bhyve_npt_pmap/contrib/libcxxrt/libelftc_dem_gnu3.c projects/bhyve_npt_pmap/contrib/libcxxrt/typeinfo.cc projects/bhyve_npt_pmap/contrib/libcxxrt/unwind-itanium.h projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp projects/bhyve_npt_pmap/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp projects/bhyve_npt_pmap/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp projects/bhyve_npt_pmap/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp projects/bhyve_npt_pmap/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp projects/bhyve_npt_pmap/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp projects/bhyve_npt_pmap/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp projects/bhyve_npt_pmap/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp projects/bhyve_npt_pmap/contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp projects/bhyve_npt_pmap/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp projects/bhyve_npt_pmap/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp projects/bhyve_npt_pmap/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp projects/bhyve_npt_pmap/contrib/unbound/config.h projects/bhyve_npt_pmap/contrib/unbound/config.h.in projects/bhyve_npt_pmap/contrib/unbound/configure projects/bhyve_npt_pmap/contrib/unbound/configure.ac projects/bhyve_npt_pmap/contrib/unbound/daemon/unbound.c projects/bhyve_npt_pmap/contrib/unbound/doc/unbound-checkconf.8 projects/bhyve_npt_pmap/contrib/unbound/doc/unbound-control.8 projects/bhyve_npt_pmap/contrib/unbound/doc/unbound.8 projects/bhyve_npt_pmap/contrib/unbound/doc/unbound.conf.5 projects/bhyve_npt_pmap/contrib/unbound/freebsd-configure.sh (contents, props changed) projects/bhyve_npt_pmap/contrib/unbound/freebsd-sources.pl (contents, props changed) projects/bhyve_npt_pmap/contrib/unbound/util/configparser.h projects/bhyve_npt_pmap/crypto/openssh/ChangeLog projects/bhyve_npt_pmap/crypto/openssh/FREEBSD-upgrade projects/bhyve_npt_pmap/crypto/openssh/README projects/bhyve_npt_pmap/crypto/openssh/aclocal.m4 projects/bhyve_npt_pmap/crypto/openssh/addrmatch.c projects/bhyve_npt_pmap/crypto/openssh/auth-chall.c projects/bhyve_npt_pmap/crypto/openssh/auth-krb5.c projects/bhyve_npt_pmap/crypto/openssh/auth-options.c projects/bhyve_npt_pmap/crypto/openssh/auth-pam.c projects/bhyve_npt_pmap/crypto/openssh/auth-rsa.c projects/bhyve_npt_pmap/crypto/openssh/auth.c projects/bhyve_npt_pmap/crypto/openssh/auth.h projects/bhyve_npt_pmap/crypto/openssh/auth1.c projects/bhyve_npt_pmap/crypto/openssh/auth2-chall.c projects/bhyve_npt_pmap/crypto/openssh/auth2-gss.c projects/bhyve_npt_pmap/crypto/openssh/auth2-hostbased.c projects/bhyve_npt_pmap/crypto/openssh/auth2-jpake.c projects/bhyve_npt_pmap/crypto/openssh/auth2-kbdint.c projects/bhyve_npt_pmap/crypto/openssh/auth2-passwd.c projects/bhyve_npt_pmap/crypto/openssh/auth2-pubkey.c projects/bhyve_npt_pmap/crypto/openssh/auth2.c projects/bhyve_npt_pmap/crypto/openssh/authfd.c projects/bhyve_npt_pmap/crypto/openssh/authfile.c projects/bhyve_npt_pmap/crypto/openssh/bufaux.c projects/bhyve_npt_pmap/crypto/openssh/bufbn.c projects/bhyve_npt_pmap/crypto/openssh/bufec.c projects/bhyve_npt_pmap/crypto/openssh/buffer.c projects/bhyve_npt_pmap/crypto/openssh/buffer.h projects/bhyve_npt_pmap/crypto/openssh/canohost.c projects/bhyve_npt_pmap/crypto/openssh/channels.c projects/bhyve_npt_pmap/crypto/openssh/channels.h projects/bhyve_npt_pmap/crypto/openssh/cipher-3des1.c projects/bhyve_npt_pmap/crypto/openssh/cipher-aes.c projects/bhyve_npt_pmap/crypto/openssh/cipher-ctr.c projects/bhyve_npt_pmap/crypto/openssh/cipher.c projects/bhyve_npt_pmap/crypto/openssh/cipher.h projects/bhyve_npt_pmap/crypto/openssh/clientloop.c projects/bhyve_npt_pmap/crypto/openssh/clientloop.h projects/bhyve_npt_pmap/crypto/openssh/compat.c projects/bhyve_npt_pmap/crypto/openssh/config.guess projects/bhyve_npt_pmap/crypto/openssh/config.h projects/bhyve_npt_pmap/crypto/openssh/config.h.in projects/bhyve_npt_pmap/crypto/openssh/defines.h projects/bhyve_npt_pmap/crypto/openssh/dh.c projects/bhyve_npt_pmap/crypto/openssh/dns.c projects/bhyve_npt_pmap/crypto/openssh/groupaccess.c projects/bhyve_npt_pmap/crypto/openssh/gss-genr.c projects/bhyve_npt_pmap/crypto/openssh/gss-serv-krb5.c projects/bhyve_npt_pmap/crypto/openssh/gss-serv.c projects/bhyve_npt_pmap/crypto/openssh/hostfile.c projects/bhyve_npt_pmap/crypto/openssh/hostfile.h projects/bhyve_npt_pmap/crypto/openssh/includes.h projects/bhyve_npt_pmap/crypto/openssh/jpake.c projects/bhyve_npt_pmap/crypto/openssh/kex.c projects/bhyve_npt_pmap/crypto/openssh/kex.h projects/bhyve_npt_pmap/crypto/openssh/kexdhc.c projects/bhyve_npt_pmap/crypto/openssh/kexdhs.c projects/bhyve_npt_pmap/crypto/openssh/kexecdh.c projects/bhyve_npt_pmap/crypto/openssh/kexecdhc.c projects/bhyve_npt_pmap/crypto/openssh/kexecdhs.c projects/bhyve_npt_pmap/crypto/openssh/kexgexc.c projects/bhyve_npt_pmap/crypto/openssh/kexgexs.c projects/bhyve_npt_pmap/crypto/openssh/key.c projects/bhyve_npt_pmap/crypto/openssh/key.h projects/bhyve_npt_pmap/crypto/openssh/krl.c projects/bhyve_npt_pmap/crypto/openssh/log.c projects/bhyve_npt_pmap/crypto/openssh/log.h projects/bhyve_npt_pmap/crypto/openssh/loginrec.c projects/bhyve_npt_pmap/crypto/openssh/mac.c projects/bhyve_npt_pmap/crypto/openssh/mac.h projects/bhyve_npt_pmap/crypto/openssh/match.c projects/bhyve_npt_pmap/crypto/openssh/misc.c projects/bhyve_npt_pmap/crypto/openssh/misc.h projects/bhyve_npt_pmap/crypto/openssh/moduli.c projects/bhyve_npt_pmap/crypto/openssh/monitor.c projects/bhyve_npt_pmap/crypto/openssh/monitor_mm.c projects/bhyve_npt_pmap/crypto/openssh/monitor_wrap.c projects/bhyve_npt_pmap/crypto/openssh/mux.c projects/bhyve_npt_pmap/crypto/openssh/myproposal.h projects/bhyve_npt_pmap/crypto/openssh/openbsd-compat/bsd-cygwin_util.c projects/bhyve_npt_pmap/crypto/openssh/openbsd-compat/bsd-cygwin_util.h projects/bhyve_npt_pmap/crypto/openssh/openbsd-compat/bsd-misc.h projects/bhyve_npt_pmap/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c projects/bhyve_npt_pmap/crypto/openssh/openbsd-compat/openbsd-compat.h projects/bhyve_npt_pmap/crypto/openssh/openbsd-compat/port-aix.c projects/bhyve_npt_pmap/crypto/openssh/openbsd-compat/port-linux.c projects/bhyve_npt_pmap/crypto/openssh/openbsd-compat/xcrypt.c projects/bhyve_npt_pmap/crypto/openssh/packet.c projects/bhyve_npt_pmap/crypto/openssh/packet.h projects/bhyve_npt_pmap/crypto/openssh/pathnames.h projects/bhyve_npt_pmap/crypto/openssh/progressmeter.c projects/bhyve_npt_pmap/crypto/openssh/readconf.c projects/bhyve_npt_pmap/crypto/openssh/readconf.h projects/bhyve_npt_pmap/crypto/openssh/readpass.c projects/bhyve_npt_pmap/crypto/openssh/roaming_client.c projects/bhyve_npt_pmap/crypto/openssh/roaming_common.c projects/bhyve_npt_pmap/crypto/openssh/rsa.c projects/bhyve_npt_pmap/crypto/openssh/sandbox-seccomp-filter.c projects/bhyve_npt_pmap/crypto/openssh/sandbox-systrace.c projects/bhyve_npt_pmap/crypto/openssh/schnorr.c projects/bhyve_npt_pmap/crypto/openssh/scp.1 projects/bhyve_npt_pmap/crypto/openssh/scp.c projects/bhyve_npt_pmap/crypto/openssh/servconf.c projects/bhyve_npt_pmap/crypto/openssh/servconf.h projects/bhyve_npt_pmap/crypto/openssh/serverloop.c projects/bhyve_npt_pmap/crypto/openssh/session.c projects/bhyve_npt_pmap/crypto/openssh/sftp-client.c projects/bhyve_npt_pmap/crypto/openssh/sftp-client.h projects/bhyve_npt_pmap/crypto/openssh/sftp-common.c projects/bhyve_npt_pmap/crypto/openssh/sftp-glob.c projects/bhyve_npt_pmap/crypto/openssh/sftp-server.8 projects/bhyve_npt_pmap/crypto/openssh/sftp-server.c projects/bhyve_npt_pmap/crypto/openssh/sftp.1 projects/bhyve_npt_pmap/crypto/openssh/sftp.c projects/bhyve_npt_pmap/crypto/openssh/ssh-add.c projects/bhyve_npt_pmap/crypto/openssh/ssh-agent.c projects/bhyve_npt_pmap/crypto/openssh/ssh-dss.c projects/bhyve_npt_pmap/crypto/openssh/ssh-ecdsa.c projects/bhyve_npt_pmap/crypto/openssh/ssh-gss.h projects/bhyve_npt_pmap/crypto/openssh/ssh-keygen.1 projects/bhyve_npt_pmap/crypto/openssh/ssh-keygen.c projects/bhyve_npt_pmap/crypto/openssh/ssh-keyscan.1 projects/bhyve_npt_pmap/crypto/openssh/ssh-keyscan.c projects/bhyve_npt_pmap/crypto/openssh/ssh-keysign.8 projects/bhyve_npt_pmap/crypto/openssh/ssh-keysign.c projects/bhyve_npt_pmap/crypto/openssh/ssh-pkcs11-client.c projects/bhyve_npt_pmap/crypto/openssh/ssh-pkcs11-helper.8 projects/bhyve_npt_pmap/crypto/openssh/ssh-pkcs11-helper.c projects/bhyve_npt_pmap/crypto/openssh/ssh-pkcs11.c projects/bhyve_npt_pmap/crypto/openssh/ssh-rsa.c projects/bhyve_npt_pmap/crypto/openssh/ssh.1 projects/bhyve_npt_pmap/crypto/openssh/ssh.c projects/bhyve_npt_pmap/crypto/openssh/ssh_config projects/bhyve_npt_pmap/crypto/openssh/ssh_config.5 projects/bhyve_npt_pmap/crypto/openssh/ssh_namespace.h projects/bhyve_npt_pmap/crypto/openssh/sshconnect.c projects/bhyve_npt_pmap/crypto/openssh/sshconnect1.c projects/bhyve_npt_pmap/crypto/openssh/sshconnect2.c projects/bhyve_npt_pmap/crypto/openssh/sshd.8 projects/bhyve_npt_pmap/crypto/openssh/sshd.c projects/bhyve_npt_pmap/crypto/openssh/sshd_config projects/bhyve_npt_pmap/crypto/openssh/sshd_config.5 projects/bhyve_npt_pmap/crypto/openssh/sshlogin.c projects/bhyve_npt_pmap/crypto/openssh/sshlogin.h projects/bhyve_npt_pmap/crypto/openssh/uidswap.c projects/bhyve_npt_pmap/crypto/openssh/umac.c projects/bhyve_npt_pmap/crypto/openssh/umac.h projects/bhyve_npt_pmap/crypto/openssh/umac128.c projects/bhyve_npt_pmap/crypto/openssh/uuencode.c projects/bhyve_npt_pmap/crypto/openssh/version.h projects/bhyve_npt_pmap/crypto/openssh/xmalloc.c projects/bhyve_npt_pmap/crypto/openssh/xmalloc.h projects/bhyve_npt_pmap/etc/Makefile projects/bhyve_npt_pmap/etc/defaults/rc.conf projects/bhyve_npt_pmap/etc/mtree/BSD.root.dist projects/bhyve_npt_pmap/etc/mtree/BSD.var.dist projects/bhyve_npt_pmap/etc/rc.d/Makefile projects/bhyve_npt_pmap/etc/rc.d/NETWORKING projects/bhyve_npt_pmap/etc/rc.d/sshd projects/bhyve_npt_pmap/etc/rc.subr projects/bhyve_npt_pmap/include/Makefile projects/bhyve_npt_pmap/libexec/rtld-elf/libmap.c projects/bhyve_npt_pmap/libexec/rtld-elf/libmap.h projects/bhyve_npt_pmap/libexec/rtld-elf/rtld.c projects/bhyve_npt_pmap/sbin/etherswitchcfg/etherswitchcfg.8 projects/bhyve_npt_pmap/sbin/etherswitchcfg/etherswitchcfg.c projects/bhyve_npt_pmap/secure/lib/libssh/Makefile projects/bhyve_npt_pmap/secure/usr.bin/bdes/bdes.1 projects/bhyve_npt_pmap/secure/usr.bin/ssh/Makefile projects/bhyve_npt_pmap/secure/usr.sbin/sshd/Makefile projects/bhyve_npt_pmap/share/man/man4/altq.4 projects/bhyve_npt_pmap/share/man/man4/bxe.4 projects/bhyve_npt_pmap/share/man/man4/netmap.4 projects/bhyve_npt_pmap/share/man/man4/vlan.4 projects/bhyve_npt_pmap/share/man/man5/libmap.conf.5 projects/bhyve_npt_pmap/share/man/man5/rc.conf.5 projects/bhyve_npt_pmap/share/man/man8/rc.8 projects/bhyve_npt_pmap/share/man/man8/rc.subr.8 projects/bhyve_npt_pmap/share/misc/committers-ports.dot projects/bhyve_npt_pmap/sys/amd64/amd64/mp_machdep.c projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c projects/bhyve_npt_pmap/sys/amd64/amd64/vm_machdep.c projects/bhyve_npt_pmap/sys/amd64/conf/GENERIC projects/bhyve_npt_pmap/sys/amd64/conf/NOTES projects/bhyve_npt_pmap/sys/amd64/include/cpu.h projects/bhyve_npt_pmap/sys/amd64/include/intr_machdep.h projects/bhyve_npt_pmap/sys/amd64/include/vmm_dev.h (contents, props changed) projects/bhyve_npt_pmap/sys/arm/arm/stdatomic.c projects/bhyve_npt_pmap/sys/arm/arm/vm_machdep.c projects/bhyve_npt_pmap/sys/arm/broadcom/bcm2835/bcm2835_systimer.c projects/bhyve_npt_pmap/sys/cam/ctl/ctl_frontend_iscsi.c projects/bhyve_npt_pmap/sys/cam/ctl/ctl_ioctl.h projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_systrace_args.c projects/bhyve_npt_pmap/sys/conf/NOTES projects/bhyve_npt_pmap/sys/conf/files projects/bhyve_npt_pmap/sys/conf/files.amd64 projects/bhyve_npt_pmap/sys/conf/files.i386 projects/bhyve_npt_pmap/sys/conf/options projects/bhyve_npt_pmap/sys/contrib/ipfilter/netinet/ip_compat.h projects/bhyve_npt_pmap/sys/contrib/ipfilter/netinet/ip_fil.h projects/bhyve_npt_pmap/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/bhyve_npt_pmap/sys/contrib/ipfilter/netinet/ip_log.c projects/bhyve_npt_pmap/sys/contrib/ipfilter/netinet/mlfk_ipl.c projects/bhyve_npt_pmap/sys/dev/acpica/acpi_timer.c projects/bhyve_npt_pmap/sys/dev/iscsi/iscsi.c projects/bhyve_npt_pmap/sys/dev/iscsi/iscsi_ioctl.h projects/bhyve_npt_pmap/sys/dev/iscsi_initiator/iscsi.c projects/bhyve_npt_pmap/sys/dev/mfi/mfireg.h projects/bhyve_npt_pmap/sys/dev/usb/controller/xhci.c projects/bhyve_npt_pmap/sys/dev/usb/controller/xhci.h projects/bhyve_npt_pmap/sys/dev/usb/controller/xhci_pci.c projects/bhyve_npt_pmap/sys/dev/xen/control/control.c projects/bhyve_npt_pmap/sys/dev/xen/timer/timer.c projects/bhyve_npt_pmap/sys/dev/xen/xenpci/xenpci.c projects/bhyve_npt_pmap/sys/i386/conf/GENERIC projects/bhyve_npt_pmap/sys/i386/conf/NOTES projects/bhyve_npt_pmap/sys/i386/i386/mp_machdep.c projects/bhyve_npt_pmap/sys/i386/i386/vm_machdep.c projects/bhyve_npt_pmap/sys/i386/include/cpu.h projects/bhyve_npt_pmap/sys/i386/include/intr_machdep.h projects/bhyve_npt_pmap/sys/i386/include/xen/xenvar.h projects/bhyve_npt_pmap/sys/i386/xen/mp_machdep.c projects/bhyve_npt_pmap/sys/i386/xen/mptable.c projects/bhyve_npt_pmap/sys/kern/kern_condvar.c projects/bhyve_npt_pmap/sys/kern/kern_event.c projects/bhyve_npt_pmap/sys/kern/kern_lock.c projects/bhyve_npt_pmap/sys/kern/kern_mutex.c projects/bhyve_npt_pmap/sys/kern/kern_rmlock.c projects/bhyve_npt_pmap/sys/kern/kern_rwlock.c projects/bhyve_npt_pmap/sys/kern/kern_sx.c projects/bhyve_npt_pmap/sys/kern/kern_synch.c projects/bhyve_npt_pmap/sys/kern/kern_timeout.c projects/bhyve_npt_pmap/sys/kern/makesyscalls.sh projects/bhyve_npt_pmap/sys/kern/subr_sbuf.c projects/bhyve_npt_pmap/sys/kern/subr_smp.c projects/bhyve_npt_pmap/sys/kern/systrace_args.c projects/bhyve_npt_pmap/sys/kern/uipc_syscalls.c projects/bhyve_npt_pmap/sys/mips/atheros/ar933x_chip.c projects/bhyve_npt_pmap/sys/mips/mips/vm_machdep.c projects/bhyve_npt_pmap/sys/modules/bxe/Makefile projects/bhyve_npt_pmap/sys/netinet/tcp_syncache.h projects/bhyve_npt_pmap/sys/netinet/tcp_var.h projects/bhyve_npt_pmap/sys/netinet6/frag6.c projects/bhyve_npt_pmap/sys/powerpc/aim/vm_machdep.c projects/bhyve_npt_pmap/sys/powerpc/booke/vm_machdep.c projects/bhyve_npt_pmap/sys/sparc64/sparc64/vm_machdep.c projects/bhyve_npt_pmap/sys/sys/lock.h projects/bhyve_npt_pmap/sys/sys/sdt.h projects/bhyve_npt_pmap/sys/sys/sf_buf.h projects/bhyve_npt_pmap/sys/sys/smp.h projects/bhyve_npt_pmap/sys/sys/timetc.h projects/bhyve_npt_pmap/sys/vm/vm_map.c projects/bhyve_npt_pmap/sys/x86/acpica/acpi_wakeup.c projects/bhyve_npt_pmap/sys/x86/isa/atpic.c projects/bhyve_npt_pmap/sys/x86/x86/intr_machdep.c projects/bhyve_npt_pmap/sys/x86/x86/io_apic.c projects/bhyve_npt_pmap/sys/x86/x86/local_apic.c projects/bhyve_npt_pmap/sys/x86/xen/hvm.c projects/bhyve_npt_pmap/sys/x86/xen/xen_intr.c projects/bhyve_npt_pmap/sys/xen/hvm.h projects/bhyve_npt_pmap/tools/build/mk/OptionalObsoleteFiles.inc projects/bhyve_npt_pmap/usr.bin/Makefile projects/bhyve_npt_pmap/usr.bin/calendar/calendars/calendar.freebsd projects/bhyve_npt_pmap/usr.bin/protect/protect.1 projects/bhyve_npt_pmap/usr.sbin/arp/arp.c projects/bhyve_npt_pmap/usr.sbin/bsdconfig/examples/Makefile projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/http.subr projects/bhyve_npt_pmap/usr.sbin/bsdinstall/partedit/gpart_ops.c projects/bhyve_npt_pmap/usr.sbin/bsdinstall/partedit/partedit_powerpc.c projects/bhyve_npt_pmap/usr.sbin/unbound/Makefile Directory Properties: projects/bhyve_npt_pmap/ (props changed) projects/bhyve_npt_pmap/cddl/ (props changed) projects/bhyve_npt_pmap/cddl/contrib/opensolaris/ (props changed) projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/bhyve_npt_pmap/contrib/ipfilter/ (props changed) projects/bhyve_npt_pmap/contrib/ldns/ (props changed) projects/bhyve_npt_pmap/contrib/libcxxrt/ (props changed) projects/bhyve_npt_pmap/contrib/llvm/ (props changed) projects/bhyve_npt_pmap/contrib/unbound/ (props changed) projects/bhyve_npt_pmap/contrib/unbound/validator/val_secalgo.c (props changed) projects/bhyve_npt_pmap/contrib/unbound/validator/val_secalgo.h (props changed) projects/bhyve_npt_pmap/crypto/openssh/ (props changed) projects/bhyve_npt_pmap/sbin/ (props changed) projects/bhyve_npt_pmap/share/man/man4/ (props changed) projects/bhyve_npt_pmap/sys/ (props changed) projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/ (props changed) projects/bhyve_npt_pmap/sys/conf/ (props changed) projects/bhyve_npt_pmap/sys/contrib/ipfilter/ (props changed) projects/bhyve_npt_pmap/usr.bin/calendar/ (props changed) Modified: projects/bhyve_npt_pmap/Makefile ============================================================================== --- projects/bhyve_npt_pmap/Makefile Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/Makefile Tue Sep 24 21:06:50 2013 (r255863) @@ -374,7 +374,7 @@ kernel-toolchains: # .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 -TARGET_ARCHES_arm?= arm armeb armv6 armv6eb +TARGET_ARCHES_arm?= arm armeb armv6 TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 TARGET_ARCHES_powerpc?= powerpc powerpc64 TARGET_ARCHES_pc98?= i386 Modified: projects/bhyve_npt_pmap/Makefile.inc1 ============================================================================== --- projects/bhyve_npt_pmap/Makefile.inc1 Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/Makefile.inc1 Tue Sep 24 21:06:50 2013 (r255863) @@ -132,7 +132,7 @@ VERSION!= uname -srp VERSION+= ${OSRELDATE} .endif -KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm armv6eb/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 +KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Sep 24 21:06:50 2013 (r255863) @@ -19,16 +19,16 @@ .\" .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved. .\" Copyright (c) 2012 by Delphix. All rights reserved. -.\" Copyright (c) 2012, Joyent, Inc. All rights reserved. .\" Copyright (c) 2011, Pawel Jakub Dawidek .\" Copyright (c) 2012, Glen Barber .\" Copyright (c) 2012, Bryan Drewery .\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved. .\" Copyright (c) 2013 Nexenta Systems, Inc. All Rights Reserved. +.\" Copyright (c) 2013, Joyent, Inc. All rights reserved. .\" .\" $FreeBSD$ .\" -.Dd March 21, 2013 +.Dd September 20, 2013 .Dt ZFS 8 .Os .Sh NAME @@ -891,14 +891,21 @@ command or unmounted by the command. .Pp This property is not inherited. -.It Sy checksum Ns = Ns Cm on | off | fletcher2 | fletcher4 | sha256 +.It Sy checksum Ns = Ns Cm on | off | fletcher2 | fletcher4 | sha256 | noparity Controls the checksum used to verify data integrity. The default value is .Cm on , which automatically selects an appropriate algorithm (currently, .Cm fletcher4 , but this may change in future releases). The value .Cm off -disables integrity checking on user data. Disabling checksums is +disables integrity checking on user data. +The value +.Cm noparity +not only +disables integrity but also disables maintaining parity for user data. This +setting is used internally by a dump device residing on a RAID-Z pool and should +not be used by any other dataset. +Disabling checksums is .Em NOT a recommended practice. .It Sy compression Ns = Ns Cm on | off | lzjb | gzip | gzip- Ns Ar N | zle | Cm lz4 Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 ============================================================================== --- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Tue Sep 24 21:06:50 2013 (r255863) @@ -19,10 +19,11 @@ .\" .\" Copyright (c) 2012 by Delphix. All rights reserved. .\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved. +.\" Copyright (c) 2013, Joyent, Inc. All rights reserved. .\" .\" $FreeBSD$ .\" -.Dd February 8, 2013 +.Dd September 20, 2013 .Dt ZPOOL-FEATURES 7 .Os .Sh NAME @@ -229,6 +230,27 @@ feature. At the moment, this operation cannot be reversed. Booting off of .Sy lz4 -compressed root pools is supported. +.It Sy multi_vdev_crash_dump +.Bl -column "READ\-ONLY COMPATIBLE" "com.joyent:multi_vdev_crash_dump" +.It GUID Ta com.joyent:multi_vdev_crash_dump +.It READ\-ONLY COMPATIBLE Ta no +.It DEPENDENCIES Ta none +.El +.Pp +This feature allows a dump device to be configured with a pool comprised +of multiple vdevs. +Those vdevs may be arranged in any mirrored or raidz +configuration. +.\" TODO: this is not yet supported on FreeBSD. +.\" .Pp +.\" When the +.\" .Sy multi_vdev_crash_dump +.\" feature is set to +.\" .Sy enabled , +.\" the administrator can use the +.\" .Xr dumpon 8 +.\" command to configure a +.\" dump device on a pool comprised of multiple vdevs. .El .Sh SEE ALSO .Xr zpool 8 Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c ============================================================================== --- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Tue Sep 24 21:06:50 2013 (r255863) @@ -23,6 +23,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013, Joyent, Inc. All rights reserved. */ #include @@ -4020,9 +4021,7 @@ supported_dump_vdev_type(libzfs_handle_t uint_t children, c; verify(nvlist_lookup_string(config, ZPOOL_CONFIG_TYPE, &type) == 0); - if (strcmp(type, VDEV_TYPE_RAIDZ) == 0 || - strcmp(type, VDEV_TYPE_FILE) == 0 || - strcmp(type, VDEV_TYPE_LOG) == 0 || + if (strcmp(type, VDEV_TYPE_FILE) == 0 || strcmp(type, VDEV_TYPE_HOLE) == 0 || strcmp(type, VDEV_TYPE_MISSING) == 0) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, @@ -4041,8 +4040,12 @@ supported_dump_vdev_type(libzfs_handle_t } /* - * check if this zvol is allowable for use as a dump device; zero if - * it is, > 0 if it isn't, < 0 if it isn't a zvol + * Check if this zvol is allowable for use as a dump device; zero if + * it is, > 0 if it isn't, < 0 if it isn't a zvol. + * + * Allowable storage configurations include mirrors, all raidz variants, and + * pools with log, cache, and spare devices. Pools which are backed by files or + * have missing/hole vdevs are not suitable. */ int zvol_check_dump_config(char *arg) @@ -4104,12 +4107,6 @@ zvol_check_dump_config(char *arg) verify(nvlist_lookup_nvlist_array(nvroot, ZPOOL_CONFIG_CHILDREN, &top, &toplevels) == 0); - if (toplevels != 1) { - zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, - "'%s' has multiple top level vdevs"), poolname); - (void) zfs_error(hdl, EZFS_DEVOVERFLOW, errbuf); - goto out; - } if (!supported_dump_vdev_type(hdl, top[0], errbuf)) { goto out; Modified: projects/bhyve_npt_pmap/contrib/ipfilter/ip_fil.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/ipfilter/ip_fil.c Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/contrib/ipfilter/ip_fil.c Tue Sep 24 21:06:50 2013 (r255863) @@ -228,7 +228,19 @@ ipf_setifpaddr(ifp, addr) sin6 = (struct sockaddr_in6 *)&ifa->ifa_addr; sin6->sin6_family = AF_INET6; - inet_pton(AF_INET6, addr, &sin6->sin6_addr); + /* Abort if bad address. */ + switch (inet_pton(AF_INET6, addr, &sin6->sin6_addr)) + { + case 1: + break; + case -1: + perror("inet_pton"); + abort(); + break; + default: + abort(); + break; + } } else #endif { Copied: projects/bhyve_npt_pmap/contrib/ldns/drill/config.h (from r255845, head/contrib/ldns/drill/config.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bhyve_npt_pmap/contrib/ldns/drill/config.h Tue Sep 24 21:06:50 2013 (r255863, copy of r255845, head/contrib/ldns/drill/config.h) @@ -0,0 +1,297 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ASSERT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_CTYPE_H 1 + +/* Whether getaddrinfo is available */ +#define HAVE_GETADDRINFO 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* If you have HMAC_CTX_init */ +#define HAVE_HMAC_CTX_INIT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `isblank' function. */ +#define HAVE_ISBLANK 1 + +/* Define to 1 if you have the `ldns' library (-lldns). */ +#define HAVE_LIBLDNS 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IF_ETHER_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IN_SYSTM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IP6_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IP_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_UDP_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NET_IF_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_ERR_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_RAND_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_SSL_H 1 + +/* Define if you have the SSL libraries installed. */ +#define HAVE_SSL /**/ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MOUNT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WINSOCK2_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WS2TCPIP_H */ + +/* Default trust anchor file */ +#define LDNS_TRUST_ANCHOR_FILE "/etc/unbound/root.key" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "libdns@nlnetlabs.nl" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "ldns" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "ldns 1.6.16" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libdns" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.6.16" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif + + +/* Whether the windows socket API is used */ +/* #undef USE_WINSOCK */ + +/* the version of the windows API enabled */ +#define WINVER 0x0502 + +/* Define to 1 if on MINIX. */ +/* #undef _MINIX */ + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +/* #undef _POSIX_1_SOURCE */ + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +/* #undef _POSIX_SOURCE */ + +/* in_addr_t */ +/* #undef in_addr_t */ + +/* in_port_t */ +/* #undef in_port_t */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to `short' if does not define. */ +/* #undef int16_t */ + +/* Define to `int' if does not define. */ +/* #undef int32_t */ + +/* Define to `long long' if does not define. */ +/* #undef int64_t */ + +/* Define to `char' if does not define. */ +/* #undef int8_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +/* Define to 'int' if not defined */ +/* #undef socklen_t */ + +/* Define to `int' if does not define. */ +/* #undef ssize_t */ + +/* Define to `unsigned short' if does not define. */ +/* #undef uint16_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef uint32_t */ + +/* Define to `unsigned long long' if does not define. */ +/* #undef uint64_t */ + +/* Define to `unsigned char' if does not define. */ +/* #undef uint8_t */ + + + +#include +#include +#include +#include + +#if STDC_HEADERS +#include +#include +#endif + +#ifdef HAVE_STDINT_H +#include +#endif + +#ifdef HAVE_SYS_SOCKET_H +#include +#endif + +#ifdef HAVE_NETINET_IN_H +#include +#endif + +#ifdef HAVE_ARPA_INET_H +#include +#endif + +#ifdef HAVE_NETINET_UDP_H +#include +#endif + +#ifdef HAVE_TIME_H +#include +#endif + +#ifdef HAVE_NETINET_IN_SYSTM_H +#include +#endif + +#ifdef HAVE_NETINET_IP_H +#include +#endif + +#ifdef HAVE_NET_IF_H +#include +#endif + +#ifdef HAVE_NETINET_IF_ETHER_H +#include +#endif + +#ifdef HAVE_WINSOCK2_H +#define USE_WINSOCK 1 +#include +#endif + +#ifdef HAVE_WS2TCPIP_H +#include +#endif + +extern char *optarg; +extern int optind, opterr; + +#ifndef EXIT_FAILURE +#define EXIT_FAILURE 1 +#endif +#ifndef EXIT_SUCCESS +#define EXIT_SUCCESS 0 +#endif + +#ifdef S_SPLINT_S +#define FD_ZERO(a) /* a */ +#define FD_SET(a,b) /* a, b */ +#endif + Copied: projects/bhyve_npt_pmap/contrib/ldns/drill/drill.1 (from r255845, head/contrib/ldns/drill/drill.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bhyve_npt_pmap/contrib/ldns/drill/drill.1 Tue Sep 24 21:06:50 2013 (r255863, copy of r255845, head/contrib/ldns/drill/drill.1) @@ -0,0 +1,242 @@ +.\" @(#)drill.1 1.7.0 14-Jul-2004 OF; +.TH drill 1 "28 May 2006" +.SH NAME +drill \- get (debug) information out of DNS(SEC) +.SH SYNOPSIS +.B drill +[ +.IR OPTIONS +] +.IR name +[ +.IR @server +] +[ +.IR type +] +[ +.IR class +] + +.SH DESCRIPTION +\fBdrill\fR is a tool to designed to get all sorts of information out of the +DNS. It is specificly designed to be used with DNSSEC. +.PP +The name \fBdrill\fR is a pun on \fBdig\fR. With \fBdrill\fR you should be able +get even more information than with \fBdig\fR. +.PP +If no arguments are given class defaults to 'IN' and type to 'A'. The +server(s) specified in /etc/resolv.conf are used to query against. + +.PP +\fIname\fR +Ask for this name. + +.PP +\fI@server\fR +Send to query to this server. If not specified use the nameservers from +\fI/etc/resolv.conf\fR. + +.PP +\fItype\fR +Ask for this RR type. If type is not given on the command line it defaults +to 'A'. Except when doing to reverse lookup when it defaults to 'PTR'. + +.PP +\fIclass\fR +Use this class when querying. + +.SH SAMPLE USAGE +\fBdrill mx miek.nl\fR +Show the MX records of the domain miek.nl + +.TP +\fBdrill -S jelte.nlnetlabs.nl\fR +Chase any signatures in the jelte.nlnetlab.nl domain. This option is +only available when ldns has been compiled with openssl-support. + +.TP +\fBdrill -TD www.example.com\fR +Do a DNSSEC (-D) trace (-T) from the rootservers down to www.example.com. +This option only works when ldns has been compiled with openssl support. + +.TP +\fBdrill -s dnskey jelte.nlnetlabs.nl\fR +Show the DNSKEY record(s) for jelte.nlnetlabs.nl. For each found DNSKEY +record also print the DS record. + +.SH OPTIONS + +.TP +\fB\-D +Enable DNSSEC in the query. When querying for DNSSEC types (DNSKEY, RRSIG, +DS and NSEC) this is \fInot\fR automaticly enabled. + +.TP +\fB\-T +Trace \fIname\fR from the root down. When using this option the @server and +the type arguments are not used. + +.TP +\fB\-S +Chase the signature(s) of 'name' to a known key or as high up in +the tree as possible. + +.TP +\fB\-V \fIlevel\fR +Be more verbose. Set level to 5 to see the actual query that is sent. + +.TP +\fB\-Q +Quiet mode, this overrules -V. + +.TP +\fB\-f \fIfile\fR +Read the query from a file. The query must be dumped with -w. + +.TP +\fB\-i \fIfile\fR +read the answer from the file instead from the network. This aids +in debugging and can be used to check if a query on disk is valid. +If the file contains binary data it is assumed to be a query in +network order. + +.TP +\fB\-w \fIfile\fR +Write an answer packet to file. + +.TP +\fB\-q \fIfile\fR +Write the query packet to file. + +.TP +\fB\-v +Show drill's version. + +.TP +\fB\-h +Show a short help message. + +.SS QUERY OPTIONS + +.TP +\fB\-4 +Stay on ip4. Only send queries to ip4 enabled nameservers. + +.TP +\fB\-6 +Stay on ip6. Only send queries to ip6 enabled nameservers. + +.TP +\fB\-a +Use the resolver structure's fallback mechanism if the answer +is truncated (TC=1). If a truncated packet is received and this +option is set, drill will first send a new query with EDNS0 +buffer size 4096. + +If the EDNS0 buffer size was already set to 512+ bytes, or the +above retry also results in a truncated answer, the resolver +structure will fall back to TCP. + +.TP +\fB\-b \fIsize\fR +Use size as the buffer size in the EDNS0 pseudo RR. + +.TP +\fB\-c \fIfile\fR +Use file instead of /etc/resolv.conf for nameserver configuration. + +.TP +\fB\-d \fIdomain\fR +When tracing (-T), start from this domain instead of the root. + +.TP +\fB\-t +Use TCP/IP when querying a server + +.TP +\fB\-k \fIkeyfile\fR +Use this file to read a (trusted) key from. When this options is +given \fBdrill\fR tries to validate the current answer with this +key. No chasing is done. When \fBdrill\fR is doing a secure trace, this +key will be used as trust anchor. Can contain a DNSKEY or a DS record. + +Alternatively, when DNSSEC enabled tracing (\fB-TD\fR) or signature +chasing (\fB-S\fR), if \fB-k\fR is not specified, and a default trust anchor +(/etc/unbound/root.key) exists and contains a valid DNSKEY or DS record, +it will be used as the trust anchor. + +.TP +\fB\-o \fImnemonic\fR +Use this option to set or unset specific header bits. A bit is +set by using the bit mnemonic in CAPITAL letters. A bit is unset when +the mnemonic is given in lowercase. The following mnemonics are +understood by \fBdrill\fR: + + QR, qr: set, unset QueRy (default: on) + AA, aa: set, unset Authoritative Answer (default: off) + TC, tc: set, unset TrunCated (default: off) + RD, rd: set, unset Recursion Desired (default: on) + CD, cd: set, unset Checking Disabled (default: off) + RA, ra: set, unset Recursion Available (default: off) + AD, ad: set, unset Authenticated Data (default: off) + +Thus: \fB-o CD\fR, will enable Checking Disabled, which instructs the +cache to not validate the answers it gives out. + +.TP +\fB\-p \fIport\fR +Use this port instead of the default of 53. + +.TP +\fB\-r \fIfile\fR +When tracing (-T), use file as a root servers hint file. + +.TP +\fB\-s +When encountering a DNSKEY print the equivalent DS also. + +.TP +\fB\-u +Use UDP when querying a server. This is the default. + +.TP +\fB\-w \fIfile\fR +write the answer to a file. The file will contain a hexadecimal dump +of the query. This can be used in conjunction with -f. + +.TP +\fB\-x +Do a reverse loopup. The type argument is not used, it is preset to PTR. + +.TP +\fB\-y \fI\fR +specify named base64 tsig key, and optional an algorithm (defaults to hmac-md5.sig-alg.reg.int) + +.TP +\fB\-z \fR +don't randomize the nameserver list before sending queries. + +.SH "FILES" +.TP +/etc/unbound/root.key +The file from which trusted keys are loaded when no \fB-k\fR option is given. +.SH "SEE ALSO" +.LP +unbound-anchor(8) + +.SH AUTHOR +Jelte Jansen and Miek Gieben. Both of NLnet Labs. + +.SH REPORTING BUGS +Report bugs to . + +.SH BUGS + +.SH COPYRIGHT +Copyright (c) 2004-2008 NLnet Labs. +Licensed under the revised BSD license. There is NO warranty; not even for MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. + +.SH SEE ALSO +\fBdig\fR(1), \fIRFC403{3,4,5}\fR. Modified: projects/bhyve_npt_pmap/contrib/libcxxrt/libelftc_dem_gnu3.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/libcxxrt/libelftc_dem_gnu3.c Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/contrib/libcxxrt/libelftc_dem_gnu3.c Tue Sep 24 21:06:50 2013 (r255863) @@ -405,6 +405,7 @@ static int cpp_demangle_read_expression_ const char *, size_t, const char *, size_t); static int cpp_demangle_read_function(struct cpp_demangle_data *, int *, struct vector_type_qualifier *); +static int cpp_demangle_local_source_name(struct cpp_demangle_data *ddata); static int cpp_demangle_read_local_name(struct cpp_demangle_data *); static int cpp_demangle_read_name(struct cpp_demangle_data *); static int cpp_demangle_read_nested_name(struct cpp_demangle_data *); @@ -453,13 +454,22 @@ __cxa_demangle_gnu3(const char *org) struct cpp_demangle_data ddata; ssize_t org_len; unsigned int limit; - char *rtn; + char *rtn = NULL; if (org == NULL) return (NULL); + org_len = strlen(org); + if (org_len > 11 && !strncmp(org, "_GLOBAL__I_", 11)) { + if ((rtn = malloc(org_len + 19)) == NULL) + return (NULL); + snprintf(rtn, org_len + 19, + "global constructors keyed to %s", org + 11); + return (rtn); + } + // Try demangling as a type for short encodings - if (((org_len = strlen(org)) < 2) || (org[0] != '_' || org[1] != 'Z' )) { + if ((org_len < 2) || (org[0] != '_' || org[1] != 'Z' )) { if (!cpp_demangle_data_init(&ddata, org)) return (NULL); if (!cpp_demangle_read_type(&ddata, 0)) @@ -467,13 +477,6 @@ __cxa_demangle_gnu3(const char *org) rtn = vector_str_get_flat(&ddata.output, (size_t *) NULL); goto clean; } - if (org_len > 11 && !strncmp(org, "_GLOBAL__I_", 11)) { - if ((rtn = malloc(org_len + 19)) == NULL) - return (NULL); - snprintf(rtn, org_len + 19, - "global constructors keyed to %s", org + 11); - return (rtn); - } if (!cpp_demangle_data_init(&ddata, org + 2)) @@ -604,13 +607,12 @@ cpp_demangle_push_fp(struct cpp_demangle return (0); rtn = 0; - if ((len = strlen(f)) > 0 && - cpp_demangle_push_str(ddata, f, len)) - rtn = 1; + if ((len = strlen(f)) > 0) + rtn = cpp_demangle_push_str(ddata, f, len); free(f); - return (0); + return (rtn); } static int @@ -655,6 +657,7 @@ cpp_demangle_push_subst_v(struct cpp_dem return (0); rtn = cpp_demangle_push_subst(ddata, str, str_len); + free(str); return (rtn); @@ -1868,9 +1871,18 @@ static int cpp_demangle_read_sname(struct cpp_demangle_data *ddata) { long len; + int err; if (ddata == NULL || cpp_demangle_read_number(ddata, &len) == 0 || - len <= 0 || cpp_demangle_push_str(ddata, ddata->cur, len) == 0) + len <= 0) + return (0); + + if (len == 12 && (memcmp("_GLOBAL__N_1", ddata->cur, 12) == 0)) + err = cpp_demangle_push_str(ddata, "(anonymous namespace)", 21); + else + err = cpp_demangle_push_str(ddata, ddata->cur, len); + + if (err == 0) return (0); assert(ddata->output.size > 0); @@ -2054,7 +2066,7 @@ clean: free(subst_str); vector_str_dest(&v); - return (1); + return (rtn); } static int @@ -2996,6 +3008,40 @@ cpp_demangle_read_uqname(struct cpp_dema if (ELFTC_ISDIGIT(*ddata->cur) != 0) return (cpp_demangle_read_sname(ddata)); + + /* local source name */ + if (*ddata->cur == 'L') + return (cpp_demangle_local_source_name(ddata)); + + return (1); +} + +/* + * Read local source name. + * + * References: + * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31775 + * http://gcc.gnu.org/viewcvs?view=rev&revision=124467 + */ +static int +cpp_demangle_local_source_name(struct cpp_demangle_data *ddata) +{ + /* L */ + if (ddata == NULL || *ddata->cur != 'L') + return (0); + ++ddata->cur; + + /* source name */ + if (!cpp_demangle_read_sname(ddata)) + return (0); + + /* discriminator */ + if (*ddata->cur == '_') { + ++ddata->cur; + while (ELFTC_ISDIGIT(*ddata->cur) != 0) + ++ddata->cur; + } + return (1); } Modified: projects/bhyve_npt_pmap/contrib/libcxxrt/typeinfo.cc ============================================================================== --- projects/bhyve_npt_pmap/contrib/libcxxrt/typeinfo.cc Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/contrib/libcxxrt/typeinfo.cc Tue Sep 24 21:06:50 2013 (r255863) @@ -86,7 +86,18 @@ extern "C" char* __cxa_demangle(const ch if (NULL != demangled) { size_t len = strlen(demangled); - buf = (char*)realloc(buf, len+1); + if (buf == NULL) + { + if (n) + { + *n = len; + } + return demangled; + } + if (*n < len+1) + { + buf = (char*)realloc(buf, len+1); + } if (0 != buf) { memcpy(buf, demangled, len); Modified: projects/bhyve_npt_pmap/contrib/libcxxrt/unwind-itanium.h ============================================================================== --- projects/bhyve_npt_pmap/contrib/libcxxrt/unwind-itanium.h Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/contrib/libcxxrt/unwind-itanium.h Tue Sep 24 21:06:50 2013 (r255863) @@ -80,7 +80,7 @@ struct _Unwind_Exception _Unwind_Exception_Cleanup_Fn exception_cleanup; unsigned long private_1; unsigned long private_2; - }; + } ; extern _Unwind_Reason_Code _Unwind_RaiseException (struct _Unwind_Exception *); extern _Unwind_Reason_Code _Unwind_ForcedUnwind (struct _Unwind_Exception *, Modified: projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Tue Sep 24 21:06:50 2013 (r255863) @@ -1736,15 +1736,15 @@ WalkChainUsers(const SDNode *ChainedNode SDNode *User = *UI; + if (User->getOpcode() == ISD::HANDLENODE) // Root of the graph. + continue; + // If we see an already-selected machine node, then we've gone beyond the // pattern that we're selecting down into the already selected chunk of the // DAG. - if (User->isMachineOpcode() || - User->getOpcode() == ISD::HANDLENODE) // Root of the graph. - continue; - unsigned UserOpcode = User->getOpcode(); - if (UserOpcode == ISD::CopyToReg || + if (User->isMachineOpcode() || + UserOpcode == ISD::CopyToReg || UserOpcode == ISD::CopyFromReg || UserOpcode == ISD::INLINEASM || UserOpcode == ISD::EH_LABEL || Modified: projects/bhyve_npt_pmap/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp Tue Sep 24 21:06:50 2013 (r255863) @@ -395,6 +395,7 @@ SDNode *AArch64DAGToDAGISel::Select(SDNo if (Node->isMachineOpcode()) { DEBUG(dbgs() << "== "; Node->dump(CurDAG); dbgs() << "\n"); + Node->setNodeId(-1); return NULL; } Modified: projects/bhyve_npt_pmap/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp Tue Sep 24 21:06:50 2013 (r255863) @@ -2546,8 +2546,10 @@ SDNode *ARMDAGToDAGISel::SelectAtomic64( SDNode *ARMDAGToDAGISel::Select(SDNode *N) { DebugLoc dl = N->getDebugLoc(); - if (N->isMachineOpcode()) + if (N->isMachineOpcode()) { + N->setNodeId(-1); return NULL; // Already selected. + } switch (N->getOpcode()) { default: break; Modified: projects/bhyve_npt_pmap/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp Tue Sep 24 21:06:50 2013 (r255863) @@ -1334,8 +1334,10 @@ SDNode *HexagonDAGToDAGISel::SelectAdd(S SDNode *HexagonDAGToDAGISel::Select(SDNode *N) { - if (N->isMachineOpcode()) + if (N->isMachineOpcode()) { + N->setNodeId(-1); return NULL; // Already selected. + } switch (N->getOpcode()) { Modified: projects/bhyve_npt_pmap/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp Tue Sep 24 21:06:50 2013 (r255863) @@ -394,6 +394,7 @@ SDNode *MSP430DAGToDAGISel::Select(SDNod DEBUG(errs() << "== "; Node->dump(CurDAG); errs() << "\n"); + Node->setNodeId(-1); return NULL; } Modified: projects/bhyve_npt_pmap/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp Tue Sep 24 21:06:50 2013 (r255863) @@ -97,6 +97,7 @@ SDNode* MipsDAGToDAGISel::Select(SDNode // If we have a custom node, we already have selected! if (Node->isMachineOpcode()) { DEBUG(errs() << "== "; Node->dump(CurDAG); errs() << "\n"); + Node->setNodeId(-1); return NULL; } Modified: projects/bhyve_npt_pmap/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp Tue Sep 24 20:38:55 2013 (r255862) +++ projects/bhyve_npt_pmap/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp Tue Sep 24 21:06:50 2013 (r255863) @@ -91,8 +91,10 @@ NVPTXDAGToDAGISel::NVPTXDAGToDAGISel(NVP /// expanded, promoted and normal instructions. SDNode *NVPTXDAGToDAGISel::Select(SDNode *N) { - if (N->isMachineOpcode()) + if (N->isMachineOpcode()) { + N->setNodeId(-1); return NULL; // Already selected. + } SDNode *ResNode = NULL; switch (N->getOpcode()) { Modified: projects/bhyve_npt_pmap/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp Tue Sep 24 20:38:55 2013 (r255862) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***