From owner-svn-src-projects@FreeBSD.ORG Sun Oct 5 01:28:28 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 4DD0C5E1;
Sun, 5 Oct 2014 01:28:28 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 36EA1C84;
Sun, 5 Oct 2014 01:28:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s951SSgg049570;
Sun, 5 Oct 2014 01:28:28 GMT (envelope-from neel@FreeBSD.org)
Received: (from neel@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s951SNX6049548;
Sun, 5 Oct 2014 01:28:23 GMT (envelope-from neel@FreeBSD.org)
Message-Id: <201410050128.s951SNX6049548@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org
using -f
From: Neel Natu <neel@FreeBSD.org>
Date: Sun, 5 Oct 2014 01:28:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272545 - in projects/bhyve_svm: . bin/pkill/tests
cddl/contrib/opensolaris/cmd/dtrace contrib/binutils/gas/config
contrib/netbsd-tests contrib/tcpdump etc etc/devd etc/mtree games/fact...
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Oct 2014 01:28:28 -0000
Author: neel
Date: Sun Oct 5 01:28:21 2014
New Revision: 272545
URL: https://svnweb.freebsd.org/changeset/base/272545
Log:
IFC @r272481
Added:
projects/bhyve_svm/contrib/netbsd-tests/
- copied from r272481, head/contrib/netbsd-tests/
projects/bhyve_svm/release/amd64/mk-vmimage.sh
- copied unchanged from r272481, head/release/amd64/mk-vmimage.sh
projects/bhyve_svm/release/i386/mk-vmimage.sh
- copied unchanged from r272481, head/release/i386/mk-vmimage.sh
projects/bhyve_svm/sys/arm/arm/syscall.c
- copied unchanged from r272481, head/sys/arm/arm/syscall.c
projects/bhyve_svm/sys/arm/include/sysreg.h
- copied unchanged from r272481, head/sys/arm/include/sysreg.h
projects/bhyve_svm/sys/contrib/dev/acpica/common/acgetline.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/common/acgetline.c
projects/bhyve_svm/sys/contrib/dev/acpica/common/ahids.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/common/ahids.c
projects/bhyve_svm/sys/contrib/dev/acpica/common/ahuuids.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/common/ahuuids.c
projects/bhyve_svm/sys/contrib/dev/acpica/common/cmfsize.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/common/cmfsize.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslascii.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/compiler/aslascii.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslmapenter.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/compiler/aslmapenter.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslmapoutput.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/compiler/aslmapoutput.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslmaputils.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/compiler/aslmaputils.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslmessages.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/compiler/aslmessages.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslparser.y
- copied unchanged from r272481, head/sys/contrib/dev/acpica/compiler/aslparser.y
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslrules.y
- copied unchanged from r272481, head/sys/contrib/dev/acpica/compiler/aslrules.y
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslsupport.y
- copied unchanged from r272481, head/sys/contrib/dev/acpica/compiler/aslsupport.y
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/asltokens.y
- copied unchanged from r272481, head/sys/contrib/dev/acpica/compiler/asltokens.y
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/asltypes.y
- copied unchanged from r272481, head/sys/contrib/dev/acpica/compiler/asltypes.y
projects/bhyve_svm/sys/contrib/dev/acpica/components/debugger/dbtest.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/components/debugger/dbtest.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/tables/tbdata.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/components/tables/tbdata.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utfileio.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/components/utilities/utfileio.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/uthex.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/components/utilities/uthex.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utprint.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/components/utilities/utprint.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utuuid.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/components/utilities/utuuid.c
projects/bhyve_svm/sys/contrib/dev/acpica/include/platform/acenvex.h
- copied unchanged from r272481, head/sys/contrib/dev/acpica/include/platform/acenvex.h
projects/bhyve_svm/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c
- copied unchanged from r272481, head/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c
projects/bhyve_svm/sys/dev/ath/if_ath_pci_devlist.h
- copied unchanged from r272481, head/sys/dev/ath/if_ath_pci_devlist.h
projects/bhyve_svm/sys/dev/uart/uart_dev_msm.c
- copied unchanged from r272481, head/sys/dev/uart/uart_dev_msm.c
projects/bhyve_svm/sys/dev/uart/uart_dev_msm.h
- copied unchanged from r272481, head/sys/dev/uart/uart_dev_msm.h
projects/bhyve_svm/sys/dev/xen/xenstore/
- copied from r272481, head/sys/dev/xen/xenstore/
projects/bhyve_svm/sys/mips/conf/TP-MR3020
- copied unchanged from r272481, head/sys/mips/conf/TP-MR3020
projects/bhyve_svm/sys/mips/conf/TP-MR3020.hints
- copied unchanged from r272481, head/sys/mips/conf/TP-MR3020.hints
projects/bhyve_svm/sys/x86/xen/xen_msi.c
- copied unchanged from r272481, head/sys/x86/xen/xen_msi.c
projects/bhyve_svm/sys/x86/xen/xen_pci.c
- copied unchanged from r272481, head/sys/x86/xen/xen_pci.c
projects/bhyve_svm/sys/xen/xen_msi.h
- copied unchanged from r272481, head/sys/xen/xen_msi.h
projects/bhyve_svm/usr.sbin/pw/tests/
- copied from r272481, head/usr.sbin/pw/tests/
Deleted:
projects/bhyve_svm/lib/libc/arm/Symbol_oabi.map
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslcompiler.y
projects/bhyve_svm/sys/modules/acpi/acpi/
projects/bhyve_svm/sys/xen/xenstore/xenstore.c
projects/bhyve_svm/sys/xen/xenstore/xenstore_dev.c
Modified:
projects/bhyve_svm/Makefile.inc1
projects/bhyve_svm/ObsoleteFiles.inc
projects/bhyve_svm/bin/pkill/tests/pgrep-j_test.sh
projects/bhyve_svm/bin/pkill/tests/pkill-j_test.sh
projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
projects/bhyve_svm/contrib/binutils/gas/config/tc-arm.c
projects/bhyve_svm/contrib/tcpdump/tcpdump.c
projects/bhyve_svm/etc/devd/usb.conf
projects/bhyve_svm/etc/mtree/BSD.tests.dist
projects/bhyve_svm/etc/rc.subr
projects/bhyve_svm/games/factor/factor.6
projects/bhyve_svm/games/factor/factor.c
projects/bhyve_svm/games/primes/primes.c
projects/bhyve_svm/games/primes/primes.h
projects/bhyve_svm/gnu/lib/csu/Makefile
projects/bhyve_svm/gnu/lib/libgcc/Makefile
projects/bhyve_svm/gnu/lib/libgcov/Makefile
projects/bhyve_svm/gnu/lib/libstdc++/Makefile
projects/bhyve_svm/gnu/lib/libsupc++/Makefile
projects/bhyve_svm/gnu/usr.bin/cc/Makefile.inc
projects/bhyve_svm/gnu/usr.bin/cc/cc_tools/Makefile
projects/bhyve_svm/lib/clang/clang.build.mk
projects/bhyve_svm/lib/libc/arm/Makefile.inc
projects/bhyve_svm/lib/libc/arm/aeabi/Makefile.inc
projects/bhyve_svm/lib/libc/arm/gen/Makefile.inc
projects/bhyve_svm/lib/libc/powerpc/gen/_ctx_start.S
projects/bhyve_svm/lib/libc/powerpc/gen/_setjmp.S
projects/bhyve_svm/lib/libc/powerpc/gen/eabi.S
projects/bhyve_svm/lib/libc/powerpc/gen/fabs.S
projects/bhyve_svm/lib/libc/powerpc/gen/setjmp.S
projects/bhyve_svm/lib/libc/powerpc/gen/sigsetjmp.S
projects/bhyve_svm/lib/libc/powerpc/sys/brk.S
projects/bhyve_svm/lib/libc/powerpc/sys/exect.S
projects/bhyve_svm/lib/libc/powerpc/sys/pipe.S
projects/bhyve_svm/lib/libc/powerpc/sys/ptrace.S
projects/bhyve_svm/lib/libc/powerpc/sys/sbrk.S
projects/bhyve_svm/lib/libc/powerpc64/gen/_ctx_start.S
projects/bhyve_svm/lib/libc/powerpc64/gen/_setjmp.S
projects/bhyve_svm/lib/libc/powerpc64/gen/fabs.S
projects/bhyve_svm/lib/libc/powerpc64/gen/setjmp.S
projects/bhyve_svm/lib/libc/powerpc64/gen/sigsetjmp.S
projects/bhyve_svm/lib/libc/powerpc64/sys/brk.S
projects/bhyve_svm/lib/libc/powerpc64/sys/exect.S
projects/bhyve_svm/lib/libc/powerpc64/sys/pipe.S
projects/bhyve_svm/lib/libc/powerpc64/sys/ptrace.S
projects/bhyve_svm/lib/libc/powerpc64/sys/sbrk.S
projects/bhyve_svm/lib/libc/quad/Makefile.inc
projects/bhyve_svm/lib/libc/stdtime/strptime.3
projects/bhyve_svm/lib/libc/stdtime/strptime.c
projects/bhyve_svm/lib/libc/sys/connect.2
projects/bhyve_svm/lib/libcompiler_rt/Makefile
projects/bhyve_svm/lib/libpam/modules/pam_login_access/pam_login_access.c
projects/bhyve_svm/lib/libstand/Makefile
projects/bhyve_svm/lib/msun/src/e_lgamma_r.c
projects/bhyve_svm/libexec/rtld-elf/Makefile
projects/bhyve_svm/release/Makefile
projects/bhyve_svm/release/release.conf.sample
projects/bhyve_svm/release/release.sh
projects/bhyve_svm/rescue/rescue/Makefile
projects/bhyve_svm/sbin/fdisk_pc98/Makefile
projects/bhyve_svm/sbin/ifconfig/ifconfig.8
projects/bhyve_svm/sbin/ifconfig/iflagg.c
projects/bhyve_svm/share/man/man4/icmp.4
projects/bhyve_svm/share/man/man4/ipheth.4
projects/bhyve_svm/share/man/man4/lagg.4
projects/bhyve_svm/share/man/man4/sfxge.4
projects/bhyve_svm/share/man/man4/ucom.4
projects/bhyve_svm/share/man/man4/udplite.4
projects/bhyve_svm/share/man/man4/urndis.4
projects/bhyve_svm/share/man/man4/urtwn.4
projects/bhyve_svm/share/man/man7/release.7
projects/bhyve_svm/share/man/man9/sleepqueue.9
projects/bhyve_svm/share/mk/bsd.dep.mk
projects/bhyve_svm/share/mk/bsd.endian.mk
projects/bhyve_svm/share/mk/bsd.port.mk
projects/bhyve_svm/share/mk/bsd.port.subdir.mk
projects/bhyve_svm/share/mk/src.opts.mk
projects/bhyve_svm/sys/amd64/amd64/machdep.c
projects/bhyve_svm/sys/amd64/vmm/intel/vmx.c
projects/bhyve_svm/sys/amd64/vmm/io/vatpic.c
projects/bhyve_svm/sys/arm/allwinner/timer.c
projects/bhyve_svm/sys/arm/arm/cpufunc_asm_armv7.S
projects/bhyve_svm/sys/arm/arm/physmem.c
projects/bhyve_svm/sys/arm/arm/trap.c
projects/bhyve_svm/sys/arm/at91/at91rm9200.c
projects/bhyve_svm/sys/arm/at91/at91sam9g45reg.h
projects/bhyve_svm/sys/boot/Makefile.pc98
projects/bhyve_svm/sys/boot/arm/ixp425/boot2/Makefile
projects/bhyve_svm/sys/boot/i386/boot2/Makefile
projects/bhyve_svm/sys/boot/i386/libfirewire/fwohcireg.h
projects/bhyve_svm/sys/boot/libstand32/Makefile
projects/bhyve_svm/sys/boot/pc98/boot2/Makefile
projects/bhyve_svm/sys/boot/pc98/cdboot/cdboot.S
projects/bhyve_svm/sys/boot/pc98/libpc98/Makefile
projects/bhyve_svm/sys/boot/pc98/loader/Makefile
projects/bhyve_svm/sys/cam/ctl/ctl.c
projects/bhyve_svm/sys/cam/ctl/ctl_tpc.c
projects/bhyve_svm/sys/cam/scsi/scsi_xpt.c
projects/bhyve_svm/sys/cddl/boot/zfs/lz4.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
projects/bhyve_svm/sys/conf/Makefile.arm
projects/bhyve_svm/sys/conf/files
projects/bhyve_svm/sys/conf/files.amd64
projects/bhyve_svm/sys/conf/files.arm
projects/bhyve_svm/sys/conf/files.i386
projects/bhyve_svm/sys/conf/kern.opts.mk
projects/bhyve_svm/sys/contrib/dev/acpica/acpica_prep.sh
projects/bhyve_svm/sys/contrib/dev/acpica/changes.txt (contents, props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/common/adfile.c
projects/bhyve_svm/sys/contrib/dev/acpica/common/adisasm.c
projects/bhyve_svm/sys/contrib/dev/acpica/common/adwalk.c
projects/bhyve_svm/sys/contrib/dev/acpica/common/ahpredef.c
projects/bhyve_svm/sys/contrib/dev/acpica/common/dmextern.c
projects/bhyve_svm/sys/contrib/dev/acpica/common/dmrestag.c
projects/bhyve_svm/sys/contrib/dev/acpica/common/dmtable.c
projects/bhyve_svm/sys/contrib/dev/acpica/common/dmtbdump.c
projects/bhyve_svm/sys/contrib/dev/acpica/common/dmtbinfo.c
projects/bhyve_svm/sys/contrib/dev/acpica/common/getopt.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslanalyze.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslbtypes.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslcodegen.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslcompile.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslcompiler.h
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslcompiler.l
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/asldefine.h
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslerror.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslfileio.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslfiles.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslfold.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslglobal.h
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslhex.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/asllength.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/asllisting.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/asllistsup.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslload.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/asllookup.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslmain.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslmap.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslmessages.h
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslmethod.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslnamesp.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/asloffset.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslopcodes.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/asloperands.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslopt.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/asloptions.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslpredef.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslprepkg.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslresource.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslrestype1.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslrestype1i.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslrestype2.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslrestype2d.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslrestype2e.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslrestype2q.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslrestype2s.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslrestype2w.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslstartup.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslstubs.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslsupport.l
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/asltransform.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/asltree.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/asltypes.h
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslutils.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/asluuid.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslwalks.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/aslxref.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/dtcompile.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/dtcompiler.h
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/dtexpress.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/dtfield.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/dtio.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/dtparser.l
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/dtparser.y
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/dtsubtable.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/dttable.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/dttemplate.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/dttemplate.h
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/dtutils.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/preprocess.h
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/prexpress.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/prmacros.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/prparser.l
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/prparser.y
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/prscan.c
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/prutils.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/debugger/dbcmds.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/debugger/dbconvert.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/debugger/dbdisply.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/debugger/dbexec.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/debugger/dbfileio.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/debugger/dbhistry.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/debugger/dbinput.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/debugger/dbmethod.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/debugger/dbnames.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/debugger/dbstats.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/debugger/dbutils.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/debugger/dbxface.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/disassembler/dmnames.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/disassembler/dmobject.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/disassembler/dmutils.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/dsargs.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/dswload.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/dswscope.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/dswstate.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evevent.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evglock.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evgpe.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evgpeblk.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evgpeinit.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evgpeutil.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evhandler.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evmisc.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evregion.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evrgnini.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evsci.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evxface.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evxfevnt.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evxfgpe.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/evxfregn.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exconfig.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exconvrt.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/excreate.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exdebug.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exdump.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exfield.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exfldio.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exmisc.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exmutex.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exnames.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exoparg1.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exoparg2.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exoparg3.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exoparg6.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exprep.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exregion.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exresnte.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exresolv.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exresop.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exstore.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exstoren.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exstorob.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exsystem.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/exutils.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/hardware/hwacpi.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/hardware/hwesleep.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/hardware/hwgpe.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/hardware/hwpci.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/hardware/hwregs.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/hardware/hwsleep.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/hardware/hwtimer.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/hardware/hwvalid.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/hardware/hwxface.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsaccess.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsalloc.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsarguments.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsconvert.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsdump.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nseval.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsinit.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsload.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsnames.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsobject.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsparse.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nspredef.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsrepair.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nssearch.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsutils.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nswalk.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsxfname.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/nsxfobj.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/parser/psargs.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/parser/psloop.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/parser/psobject.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/parser/psopcode.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/parser/psopinfo.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/parser/psparse.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/parser/psscope.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/parser/pstree.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/parser/psutils.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/parser/pswalk.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/parser/psxface.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/rsaddr.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/rscalc.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/rscreate.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/rsdump.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/rsinfo.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/rsio.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/rsirq.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/rslist.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/rsmemory.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/rsmisc.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/rsserial.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/rsutils.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/rsxface.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/tables/tbfadt.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/tables/tbfind.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/tables/tbinstal.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/tables/tbprint.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/tables/tbutils.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/tables/tbxface.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/tables/tbxfload.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/tables/tbxfroot.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utaddress.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utalloc.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utbuffer.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utcache.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utcopy.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utdebug.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utdecode.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utdelete.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/uterror.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/uteval.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utexcep.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utglobal.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utids.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utinit.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utlock.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utmath.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utmisc.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utmutex.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utobject.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utosi.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utownerid.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utpredef.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utresrc.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utstate.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utstring.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/uttrack.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utxface.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utxferror.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utxfinit.c
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/utxfmutex.c
projects/bhyve_svm/sys/contrib/dev/acpica/include/acapps.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acbuffer.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/accommon.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acconfig.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acdebug.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acdisasm.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acdispat.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acevents.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acexcep.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acglobal.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/achware.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acinterp.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/aclocal.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acmacros.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acnames.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acnamesp.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acobject.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acopcode.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acoutput.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acparser.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acpi.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acpiosxf.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acpixf.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acpredef.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acresrc.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acrestyp.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acstruct.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/actables.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/actbl.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/actbl1.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/actbl2.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/actbl3.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/actypes.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/acutils.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/amlcode.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/amlresrc.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/platform/acenv.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/platform/acfreebsd.h
projects/bhyve_svm/sys/contrib/dev/acpica/include/platform/acgcc.h
projects/bhyve_svm/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
projects/bhyve_svm/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
projects/bhyve_svm/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
projects/bhyve_svm/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c
projects/bhyve_svm/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
projects/bhyve_svm/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.h
projects/bhyve_svm/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
projects/bhyve_svm/sys/dev/acpica/Osd/OsdSchedule.c
projects/bhyve_svm/sys/dev/acpica/Osd/OsdTable.c
projects/bhyve_svm/sys/dev/acpica/acpi.c
projects/bhyve_svm/sys/dev/acpica/acpi_pci.c
projects/bhyve_svm/sys/dev/ahci/ahci.c
projects/bhyve_svm/sys/dev/ath/ath_hal/ah.c
projects/bhyve_svm/sys/dev/ath/ath_hal/ah.h
projects/bhyve_svm/sys/dev/ath/ath_hal/ah_internal.h
projects/bhyve_svm/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
projects/bhyve_svm/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
projects/bhyve_svm/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
projects/bhyve_svm/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c
projects/bhyve_svm/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
projects/bhyve_svm/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c
projects/bhyve_svm/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c
projects/bhyve_svm/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
projects/bhyve_svm/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
projects/bhyve_svm/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c
projects/bhyve_svm/sys/dev/ath/if_ath.c
projects/bhyve_svm/sys/dev/ath/if_ath_lna_div.c
projects/bhyve_svm/sys/dev/ath/if_ath_pci.c
projects/bhyve_svm/sys/dev/ath/if_athvar.h
projects/bhyve_svm/sys/dev/bge/if_bge.c
projects/bhyve_svm/sys/dev/ce/if_ce.c
projects/bhyve_svm/sys/dev/cp/if_cp.c
projects/bhyve_svm/sys/dev/ctau/if_ct.c
projects/bhyve_svm/sys/dev/cx/if_cx.c
projects/bhyve_svm/sys/dev/cxgb/cxgb_adapter.h
projects/bhyve_svm/sys/dev/cxgb/cxgb_main.c
projects/bhyve_svm/sys/dev/cxgb/cxgb_sge.c
projects/bhyve_svm/sys/dev/cxgbe/adapter.h
projects/bhyve_svm/sys/dev/cxgbe/t4_main.c
projects/bhyve_svm/sys/dev/dwc/if_dwc.c
projects/bhyve_svm/sys/dev/e1000/if_em.c
projects/bhyve_svm/sys/dev/e1000/if_lem.c
projects/bhyve_svm/sys/dev/firewire/firewire.c
projects/bhyve_svm/sys/dev/firewire/firewire.h
projects/bhyve_svm/sys/dev/firewire/firewire_phy.h
projects/bhyve_svm/sys/dev/firewire/firewirereg.h
projects/bhyve_svm/sys/dev/firewire/fwcrom.c
projects/bhyve_svm/sys/dev/firewire/fwdev.c
projects/bhyve_svm/sys/dev/firewire/fwdma.c
projects/bhyve_svm/sys/dev/firewire/fwdma.h
projects/bhyve_svm/sys/dev/firewire/fwmem.c
projects/bhyve_svm/sys/dev/firewire/fwohci.c
projects/bhyve_svm/sys/dev/firewire/fwohci_pci.c
projects/bhyve_svm/sys/dev/firewire/fwohcireg.h
projects/bhyve_svm/sys/dev/firewire/fwohcivar.h
projects/bhyve_svm/sys/dev/firewire/iec68113.h
projects/bhyve_svm/sys/dev/firewire/if_fwe.c
projects/bhyve_svm/sys/dev/firewire/if_fwip.c
projects/bhyve_svm/sys/dev/firewire/sbp.c
projects/bhyve_svm/sys/dev/firewire/sbp.h
projects/bhyve_svm/sys/dev/firewire/sbp_targ.c
projects/bhyve_svm/sys/dev/fxp/if_fxp.c
projects/bhyve_svm/sys/dev/ie/if_ie.c
projects/bhyve_svm/sys/dev/iscsi_initiator/isc_cam.c
projects/bhyve_svm/sys/dev/ixgb/if_ixgb.c
projects/bhyve_svm/sys/dev/ixgbe/ixgbe.c
projects/bhyve_svm/sys/dev/ixgbe/ixv.c
projects/bhyve_svm/sys/dev/ixl/i40e_osdep.h
projects/bhyve_svm/sys/dev/ixl/if_ixl.c
projects/bhyve_svm/sys/dev/ixl/if_ixlv.c
projects/bhyve_svm/sys/dev/ixl/ixl.h
projects/bhyve_svm/sys/dev/ixl/ixl_txrx.c
projects/bhyve_svm/sys/dev/ixl/ixlvc.c
projects/bhyve_svm/sys/dev/nfe/if_nfe.c
projects/bhyve_svm/sys/dev/sfxge/common/efsys.h
projects/bhyve_svm/sys/dev/sfxge/sfxge.c
projects/bhyve_svm/sys/dev/sfxge/sfxge.h
projects/bhyve_svm/sys/dev/sfxge/sfxge_dma.c
projects/bhyve_svm/sys/dev/sfxge/sfxge_ev.c
projects/bhyve_svm/sys/dev/sfxge/sfxge_intr.c
projects/bhyve_svm/sys/dev/sfxge/sfxge_port.c
projects/bhyve_svm/sys/dev/sfxge/sfxge_rx.c
projects/bhyve_svm/sys/dev/sfxge/sfxge_rx.h
projects/bhyve_svm/sys/dev/sfxge/sfxge_tx.c
projects/bhyve_svm/sys/dev/sfxge/sfxge_tx.h
projects/bhyve_svm/sys/dev/sound/usb/uaudio.c
projects/bhyve_svm/sys/dev/sound/usb/uaudioreg.h
projects/bhyve_svm/sys/dev/uart/uart.h
projects/bhyve_svm/sys/dev/uart/uart_bus_fdt.c
projects/bhyve_svm/sys/dev/uart/uart_dev_imx.c
projects/bhyve_svm/sys/dev/usb/controller/xhci.c
projects/bhyve_svm/sys/dev/usb/controller/xhci.h
projects/bhyve_svm/sys/dev/usb/usb_dev.c
projects/bhyve_svm/sys/dev/usb/usbdevs
projects/bhyve_svm/sys/dev/usb/wlan/if_urtwn.c
projects/bhyve_svm/sys/dev/vt/vt.h
projects/bhyve_svm/sys/dev/vt/vt_core.c
projects/bhyve_svm/sys/dev/xen/balloon/balloon.c
projects/bhyve_svm/sys/dev/xen/blkback/blkback.c
projects/bhyve_svm/sys/fs/autofs/autofs.c
projects/bhyve_svm/sys/fs/autofs/autofs.h
projects/bhyve_svm/sys/fs/autofs/autofs_vfsops.c
projects/bhyve_svm/sys/fs/autofs/autofs_vnops.c
projects/bhyve_svm/sys/fs/nfs/nfs_commonsubs.c
projects/bhyve_svm/sys/fs/nfs/nfs_var.h
projects/bhyve_svm/sys/fs/nfs/nfsproto.h
projects/bhyve_svm/sys/fs/nfsserver/nfs_nfsdport.c
projects/bhyve_svm/sys/fs/nfsserver/nfs_nfsdserv.c
projects/bhyve_svm/sys/fs/nfsserver/nfs_nfsdstate.c
projects/bhyve_svm/sys/geom/geom_dev.c
projects/bhyve_svm/sys/i386/i386/machdep.c
projects/bhyve_svm/sys/kern/kern_exec.c
projects/bhyve_svm/sys/kern/kern_mbuf.c
projects/bhyve_svm/sys/kern/kern_poll.c
projects/bhyve_svm/sys/kern/sys_process.c
projects/bhyve_svm/sys/kern/tty.c
projects/bhyve_svm/sys/kern/vfs_subr.c
projects/bhyve_svm/sys/mips/atheros/ar724x_pci.c
projects/bhyve_svm/sys/modules/ncr/Makefile
projects/bhyve_svm/sys/modules/zfs/Makefile
projects/bhyve_svm/sys/net/ieee8023ad_lacp.c
projects/bhyve_svm/sys/net/if.c
projects/bhyve_svm/sys/net/if_lagg.c
projects/bhyve_svm/sys/net/if_lagg.h
projects/bhyve_svm/sys/net/if_var.h
projects/bhyve_svm/sys/net/if_vlan.c
projects/bhyve_svm/sys/net/ifq.h
projects/bhyve_svm/sys/net/radix.c
projects/bhyve_svm/sys/netinet/in_mcast.c
projects/bhyve_svm/sys/netinet/in_rmx.c
projects/bhyve_svm/sys/netinet/ip_icmp.c
projects/bhyve_svm/sys/netinet/ip_input.c
projects/bhyve_svm/sys/netinet/ip_output.c
projects/bhyve_svm/sys/netinet/tcp_subr.c
projects/bhyve_svm/sys/netinet/tcp_syncache.c
projects/bhyve_svm/sys/netinet/tcp_var.h
projects/bhyve_svm/sys/netinet/udp_usrreq.c
projects/bhyve_svm/sys/netinet6/in6.h
projects/bhyve_svm/sys/netinet6/in6_cksum.c
projects/bhyve_svm/sys/netinet6/in6_rmx.c
projects/bhyve_svm/sys/netinet6/ip6_forward.c
projects/bhyve_svm/sys/netinet6/ip6_output.c
projects/bhyve_svm/sys/netinet6/udp6_usrreq.c
projects/bhyve_svm/sys/netipsec/ipsec_input.c
projects/bhyve_svm/sys/netpfil/pf/pf_table.c
projects/bhyve_svm/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c
projects/bhyve_svm/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
projects/bhyve_svm/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
projects/bhyve_svm/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
projects/bhyve_svm/sys/pc98/conf/GENERIC
projects/bhyve_svm/sys/sys/fdcio.h
projects/bhyve_svm/sys/sys/vnode.h
projects/bhyve_svm/sys/x86/include/init.h
projects/bhyve_svm/sys/x86/x86/local_apic.c
projects/bhyve_svm/sys/x86/xen/pv.c
projects/bhyve_svm/sys/x86/xen/xen_intr.c
projects/bhyve_svm/sys/x86/xen/xen_nexus.c
projects/bhyve_svm/sys/xen/interface/physdev.h
projects/bhyve_svm/sys/xen/xen_intr.h
projects/bhyve_svm/sys/xen/xenstore/xenstore_internal.h
projects/bhyve_svm/tools/sched/schedgraph.py
projects/bhyve_svm/usr.bin/at/at.c
projects/bhyve_svm/usr.bin/mkimg/Makefile
projects/bhyve_svm/usr.bin/mkimg/image.c
projects/bhyve_svm/usr.bin/mkimg/mkimg.1
projects/bhyve_svm/usr.bin/mkimg/mkimg.c
projects/bhyve_svm/usr.bin/mkimg/vhd.c
projects/bhyve_svm/usr.bin/sort/sort.c
projects/bhyve_svm/usr.bin/systat/ifstat.c
projects/bhyve_svm/usr.sbin/acpi/acpiconf/Makefile
projects/bhyve_svm/usr.sbin/acpi/acpidb/Makefile
projects/bhyve_svm/usr.sbin/acpi/acpidb/acpidb.c
projects/bhyve_svm/usr.sbin/acpi/acpidump/Makefile
projects/bhyve_svm/usr.sbin/acpi/acpidump/acpi.c
projects/bhyve_svm/usr.sbin/acpi/iasl/Makefile
projects/bhyve_svm/usr.sbin/bhyve/acpi.c
projects/bhyve_svm/usr.sbin/bhyvectl/bhyvectl.c
projects/bhyve_svm/usr.sbin/bsdinstall/distextract/distextract.c
projects/bhyve_svm/usr.sbin/bsdinstall/distfetch/distfetch.c
projects/bhyve_svm/usr.sbin/bsdinstall/scripts/zfsboot
projects/bhyve_svm/usr.sbin/fdread/fdutil.c
projects/bhyve_svm/usr.sbin/pw/Makefile
Directory Properties:
projects/bhyve_svm/ (props changed)
projects/bhyve_svm/cddl/ (props changed)
projects/bhyve_svm/cddl/contrib/opensolaris/ (props changed)
projects/bhyve_svm/contrib/binutils/ (props changed)
projects/bhyve_svm/contrib/tcpdump/ (props changed)
projects/bhyve_svm/etc/ (props changed)
projects/bhyve_svm/gnu/lib/ (props changed)
projects/bhyve_svm/gnu/usr.bin/cc/cc_tools/ (props changed)
projects/bhyve_svm/lib/libc/ (props changed)
projects/bhyve_svm/lib/libc/stdtime/ (props changed)
projects/bhyve_svm/sbin/ (props changed)
projects/bhyve_svm/share/ (props changed)
projects/bhyve_svm/share/man/man4/ (props changed)
projects/bhyve_svm/sys/ (props changed)
projects/bhyve_svm/sys/amd64/vmm/ (props changed)
projects/bhyve_svm/sys/boot/ (props changed)
projects/bhyve_svm/sys/cddl/contrib/opensolaris/ (props changed)
projects/bhyve_svm/sys/conf/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/common/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/compiler/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/components/debugger/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/components/disassembler/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/components/dispatcher/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/components/events/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/components/executer/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/components/hardware/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/components/namespace/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/components/parser/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/components/resources/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/components/tables/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/components/utilities/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/include/ (props changed)
projects/bhyve_svm/sys/contrib/dev/acpica/os_specific/ (props changed)
projects/bhyve_svm/usr.bin/mkimg/ (props changed)
projects/bhyve_svm/usr.sbin/bhyve/ (props changed)
projects/bhyve_svm/usr.sbin/bhyvectl/ (props changed)
Modified: projects/bhyve_svm/Makefile.inc1
==============================================================================
--- projects/bhyve_svm/Makefile.inc1 Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/Makefile.inc1 Sun Oct 5 01:28:21 2014 (r272545)
@@ -336,11 +336,11 @@ XFLAGS+= -B${CROSS_BINUTILS_PREFIX}
.else
XFLAGS+= -B${WORLDTMP}/usr/bin
.endif
-.if ${TARGET} == "arm" && ${MK_ARM_EABI} != "no"
-.if ${TARGET_ARCH:M*eb*} == ""
-TARGET_ABI= gnueabi
-.elif ${TARGET_ARCH} == "armv6hf"
+.if ${TARGET} == "arm"
+.if ${TARGET_ARCH:M*hf*} != ""
TARGET_ABI= gnueabihf
+.else
+TARGET_ABI= gnueabi
.endif
.endif
TARGET_ABI?= unknown
Modified: projects/bhyve_svm/ObsoleteFiles.inc
==============================================================================
--- projects/bhyve_svm/ObsoleteFiles.inc Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/ObsoleteFiles.inc Sun Oct 5 01:28:21 2014 (r272545)
@@ -43,6 +43,9 @@ OLD_FILES+=usr/share/man/man9/sleepq_cal
OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz
# 20140917: hv_kvpd rc.d script removed in favor of devd configuration
OLD_FILES+=etc/rc.d/hv_kvpd
+# 20140917: libnv was accidentally being installed to /usr/lib instead of /lib
+OLD_LIBS+=usr/lib/libnv.a
+OLD_LIBS+=usr/lib/libnv.so.0
# 20140814: libopie version bump
OLD_LIBS+=usr/lib/libopie.so.7
OLD_LIBS+=usr/lib32/libopie.so.7
Modified: projects/bhyve_svm/bin/pkill/tests/pgrep-j_test.sh
==============================================================================
--- projects/bhyve_svm/bin/pkill/tests/pgrep-j_test.sh Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/bin/pkill/tests/pgrep-j_test.sh Sun Oct 5 01:28:21 2014 (r272545)
@@ -1,7 +1,23 @@
#!/bin/sh
# $FreeBSD$
-base=`basename $0`
+jail_name_to_jid()
+{
+ local check_name="$1"
+ (
+ line="$(jls -n 2> /dev/null | grep name=$check_name )"
+ for nv in $line; do
+ local name="${nv%=*}"
+ if [ "${name}" = "jid" ]; then
+ eval $nv
+ echo $jid
+ break
+ fi
+ done
+ )
+}
+
+base=pgrep_j_test
echo "1..3"
@@ -9,21 +25,25 @@ name="pgrep -j <jid>"
if [ `id -u` -eq 0 ]; then
sleep=$(pwd)/sleep.txt
ln -sf /bin/sleep $sleep
- jail / $base-1 127.0.0.1 $sleep 5 &
- chpid=$!
- jail / $base-2 127.0.0.1 $sleep 5 &
- chpid2=$!
- $sleep 5 &
- chpid3=$!
- sleep 0.5
- jid=`jls | awk "/127\\.0\\.0\\.1.*${base}-1/ {print \$1}"`
- pid=`pgrep -f -j $jid $sleep`
- if [ "$pid" = "$chpid" ]; then
+ jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 &
+
+ jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 &
+
+ jid1=$(jail_name_to_jid ${base}_1_1)
+ jid2=$(jail_name_to_jid ${base}_1_2)
+ jid="${jid1},${jid2}"
+ pid1="$(pgrep -f -x -j $jid "$sleep 5" | sort)"
+ pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \
+ $(cat ${PWD}/${base}_1_2.pid) | sort)
+ if [ "$pid1" = "$pid2" ]; then
echo "ok 1 - $name"
else
echo "not ok 1 - $name"
fi
- kill $chpid $chpid2 $chpid3
+ [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
+ [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
rm -f $sleep
else
echo "ok 1 - $name # skip Test needs uid 0."
@@ -33,21 +53,23 @@ name="pgrep -j any"
if [ `id -u` -eq 0 ]; then
sleep=$(pwd)/sleep.txt
ln -sf /bin/sleep $sleep
- jail / $base-1 127.0.0.1 $sleep 5 &
- chpid=$!
- jail / $base-2 127.0.0.1 $sleep 5 &
- chpid2=$!
- $sleep 5 &
- chpid3=$!
- sleep 0.5
- pids=`pgrep -f -j any $sleep | sort`
- refpids=`{ echo $chpid; echo $chpid2; } | sort`
- if [ "$pids" = "$refpids" ]; then
+ jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 &
+
+ jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 &
+
+ sleep 2
+ pid1="$(pgrep -f -x -j any "$sleep 5" | sort)"
+ pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \
+ $(cat ${PWD}/${base}_2_2.pid) | sort)
+ if [ "$pid1" = "$pid2" ]; then
echo "ok 2 - $name"
else
echo "not ok 2 - $name"
fi
- kill $chpid $chpid2 $chpid3
+ [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
+ [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
rm -f $sleep
else
echo "ok 2 - $name # skip Test needs uid 0."
@@ -57,19 +79,19 @@ name="pgrep -j none"
if [ `id -u` -eq 0 ]; then
sleep=$(pwd)/sleep.txt
ln -sf /bin/sleep $sleep
- $sleep 5 &
- chpid=$!
- jail / $base 127.0.0.1 $sleep 5 &
- chpid2=$!
- sleep 0.5
- pid=`pgrep -f -j none $sleep`
- if [ "$pid" = "$chpid" ]; then
+ daemon -p ${PWD}/${base}_3_1.pid $sleep 5 &
+ jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 &
+ sleep 2
+ pid="$(pgrep -f -x -j none "$sleep 5")"
+ if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then
echo "ok 3 - $name"
else
echo "not ok 3 - $name"
fi
- kill $chpid $chpid2
rm -f $sleep
+ [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid)
+ [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid)
else
echo "ok 3 - $name # skip Test needs uid 0."
fi
Modified: projects/bhyve_svm/bin/pkill/tests/pkill-j_test.sh
==============================================================================
--- projects/bhyve_svm/bin/pkill/tests/pkill-j_test.sh Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/bin/pkill/tests/pkill-j_test.sh Sun Oct 5 01:28:21 2014 (r272545)
@@ -1,7 +1,23 @@
#!/bin/sh
# $FreeBSD$
-base=`basename $0`
+jail_name_to_jid()
+{
+ local check_name="$1"
+ (
+ line="$(jls -n 2> /dev/null | grep name=$check_name )"
+ for nv in $line; do
+ local name="${nv%=*}"
+ if [ "${name}" = "jid" ]; then
+ eval $nv
+ echo $jid
+ break
+ fi
+ done
+ )
+}
+
+base=pkill_j_test
echo "1..3"
@@ -9,21 +25,28 @@ name="pkill -j <jid>"
if [ `id -u` -eq 0 ]; then
sleep=$(pwd)/sleep.txt
ln -sf /bin/sleep $sleep
- jail / $base-1 127.0.0.1 $sleep 5 &
- chpid=$!
- jail / $base-2 127.0.0.1 $sleep 5 &
- chpid2=$!
+ jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 &
+
+ jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 &
+
$sleep 5 &
- chpid3=$!
sleep 0.5
- jid=`jls | awk "/127\\.0\\.0\\.1.*${base}-1/ {print \$1}"`
- if pkill -f -j $jid $sleep && sleep 0.5 &&
- ! kill $chpid && kill $chpid2 $chpid3; then
+ jid1=$(jail_name_to_jid ${base}_1_1)
+ jid2=$(jail_name_to_jid ${base}_1_2)
+ jid="${jid1},${jid2}"
+ if pkill -f -j "$jid" $sleep && sleep 0.5 &&
+ ! -f ${PWD}/${base}_1_1.pid &&
+ ! -f ${PWD}/${base}_1_2.pid ; then
echo "ok 1 - $name"
else
echo "not ok 1 - $name"
fi 2>/dev/null
rm -f $sleep
+ [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
+ [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
+ wait
else
echo "ok 1 - $name # skip Test needs uid 0."
fi
@@ -32,20 +55,26 @@ name="pkill -j any"
if [ `id -u` -eq 0 ]; then
sleep=$(pwd)/sleep.txt
ln -sf /bin/sleep $sleep
- jail / $base-1 127.0.0.1 $sleep 5 &
- chpid=$!
- jail / $base-2 127.0.0.1 $sleep 5 &
- chpid2=$!
+ jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 &
+
+ jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 &
+
$sleep 5 &
- chpid3=$!
sleep 0.5
+ chpid3=$!
if pkill -f -j any $sleep && sleep 0.5 &&
- ! kill $chpid && ! kill $chpid2 && kill $chpid3; then
+ [ ! -f ${PWD}/${base}_2_1.pid -a
+ ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then
echo "ok 2 - $name"
else
echo "not ok 2 - $name"
fi 2>/dev/null
rm -f $sleep
+ [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
+ [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
+ wait
else
echo "ok 2 - $name # skip Test needs uid 0."
fi
@@ -54,18 +83,20 @@ name="pkill -j none"
if [ `id -u` -eq 0 ]; then
sleep=$(pwd)/sleep.txt
ln -sf /bin/sleep $sleep
- $sleep 5 &
- chpid=$!
- jail / $base 127.0.0.1 $sleep 5 &
- chpid2=$!
- sleep 0.5
- if pkill -f -j none $sleep && sleep 0.5 &&
- ! kill $chpid && kill $chpid2; then
+ daemon -p ${PWD}/${base}_3_1.pid $sleep 5
+ jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 &
+ sleep 1
+ if pkill -f -j none "$sleep 5" && sleep 1 &&
+ [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then
echo "ok 3 - $name"
else
+ ls ${PWD}/*.pid
echo "not ok 3 - $name"
fi 2>/dev/null
rm -f $sleep
+ [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid)
+ [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid)
else
echo "ok 3 - $name # skip Test needs uid 0."
fi
Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Sun Oct 5 01:28:21 2014 (r272545)
@@ -710,6 +710,9 @@ list_probe(dtrace_hdl_t *dtp, const dtra
if (g_verbose && dtrace_probe_info(dtp, pdp, &p) == 0)
print_probe_info(&p);
+ if (g_intr != 0)
+ return (1);
+
return (0);
}
@@ -1220,11 +1223,34 @@ intr(int signo)
g_impatient = 1;
}
+static void
+installsighands(void)
+{
+ struct sigaction act, oact;
+
+ (void) sigemptyset(&act.sa_mask);
+ act.sa_flags = 0;
+ act.sa_handler = intr;
+
+ if (sigaction(SIGINT, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGINT, &act, NULL);
+
+ if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGTERM, &act, NULL);
+
+#if !defined(sun)
+ if (sigaction(SIGPIPE, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGPIPE, &act, NULL);
+
+ if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGUSR1, &act, NULL);
+#endif
+}
+
int
main(int argc, char *argv[])
{
dtrace_bufdesc_t buf;
- struct sigaction act, oact;
dtrace_status_t status[2];
dtrace_optval_t opt;
dtrace_cmd_t *dcp;
@@ -1776,6 +1802,8 @@ main(int argc, char *argv[])
if (g_ofile != NULL && (g_ofp = fopen(g_ofile, "a")) == NULL)
fatal("failed to open output file '%s'", g_ofile);
+ installsighands();
+
oprintf("%5s %10s %17s %33s %s\n",
"ID", "PROVIDER", "MODULE", "FUNCTION", "NAME");
@@ -1861,20 +1889,7 @@ main(int argc, char *argv[])
if (opt != DTRACEOPT_UNSET)
notice("allowing destructive actions\n");
- (void) sigemptyset(&act.sa_mask);
- act.sa_flags = 0;
- act.sa_handler = intr;
-
- if (sigaction(SIGINT, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
- (void) sigaction(SIGINT, &act, NULL);
-
- if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
- (void) sigaction(SIGTERM, &act, NULL);
-
-#if !defined(sun)
- if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
- (void) sigaction(SIGUSR1, &act, NULL);
-#endif
+ installsighands();
/*
* Now that tracing is active and we are ready to consume trace data,
Modified: projects/bhyve_svm/contrib/binutils/gas/config/tc-arm.c
==============================================================================
--- projects/bhyve_svm/contrib/binutils/gas/config/tc-arm.c Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/contrib/binutils/gas/config/tc-arm.c Sun Oct 5 01:28:21 2014 (r272545)
@@ -4688,6 +4688,23 @@ parse_address_main (char **str, int i, i
return PARSE_OPERAND_FAIL;
}
}
+ else if (skip_past_char (&p, ':') == SUCCESS)
+ {
+ /* FIXME: '@' should be used here, but it's filtered out by generic
+ code before we get to see it here. This may be subject to
+ change. */
+ expressionS exp;
+ my_get_expression (&exp, &p, GE_NO_PREFIX);
+ if (exp.X_op != O_constant)
+ {
+ inst.error = _("alignment must be constant");
+ return PARSE_OPERAND_FAIL;
+ }
+ inst.operands[i].imm = exp.X_add_number << 8;
+ inst.operands[i].immisalign = 1;
+ /* Alignments are not pre-indexes. */
+ inst.operands[i].preind = 0;
+ }
if (skip_past_char (&p, ']') == FAIL)
{
@@ -6571,6 +6588,7 @@ do_barrier (void)
if (inst.operands[0].present)
{
constraint ((inst.instruction & 0xf0) != 0x40
+ && (inst.instruction & 0xf0) != 0x50
&& inst.operands[0].imm != 0xf,
"bad barrier type");
inst.instruction |= inst.operands[0].imm;
@@ -14694,10 +14712,18 @@ static const struct asm_cond conds[] =
static struct asm_barrier_opt barrier_opt_names[] =
{
- { "sy", 0xf },
- { "un", 0x7 },
- { "st", 0xe },
- { "unst", 0x6 }
+ { "sy", 0xf },
+ { "un", 0x7 },
+ { "st", 0xe },
+ { "unst", 0x6 },
+ { "ish", 0xb },
+ { "sh", 0xb },
+ { "ishst", 0xa },
+ { "shst", 0xa },
+ { "nsh", 0x7 },
+ { "nshst", 0x6 },
+ { "osh", 0x3 },
+ { "oshst", 0x2 }
};
/* Table of ARM-format instructions. */
Modified: projects/bhyve_svm/contrib/tcpdump/tcpdump.c
==============================================================================
--- projects/bhyve_svm/contrib/tcpdump/tcpdump.c Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/contrib/tcpdump/tcpdump.c Sun Oct 5 01:28:21 2014 (r272545)
@@ -1533,7 +1533,12 @@ main(int argc, char **argv)
if (RFileName == NULL && VFileName == NULL) {
static const unsigned long cmds[] = { BIOCGSTATS };
- cap_rights_init(&rights, CAP_IOCTL, CAP_READ);
+ /*
+ * the various libpcap devices use a combination of
+ * read (bpf), ioctl (bpf, netmap), poll (netmap)
+ * so we add the relevant access rights.
+ */
+ cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_EVENT);
if (cap_rights_limit(pcap_fileno(pd), &rights) < 0 &&
errno != ENOSYS) {
error("unable to limit pcap descriptor");
Modified: projects/bhyve_svm/etc/devd/usb.conf
==============================================================================
--- projects/bhyve_svm/etc/devd/usb.conf Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/etc/devd/usb.conf Sun Oct 5 01:28:21 2014 (r272545)
@@ -65,7 +65,23 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x03f0";
- match "product" "(0x2016|0x2116|0x2216|0x3016|0x3116)";
+ match "product" "(0x2016|0x2116|0x2216)";
+ action "kldload -n uipaq";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x03f0";
+ match "product" "(0x241d|0x251d)";
+ action "kldload -n u3g";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x03f0";
+ match "product" "(0x3016|0x3116)";
action "kldload -n uipaq";
};
@@ -129,7 +145,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0403";
- match "product" "(0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed74|0xee18|0xeee
8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0xeeee|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8)";
+ match "product" "(0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xa6d1|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed74|0xee1
8|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0xeeee|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8)";
action "kldload -n uftdi";
};
@@ -1057,7 +1073,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0586";
- match "product" "(0x3416|0x341a)";
+ match "product" "(0x3416|0x341a|0x341e)";
action "kldload -n if_run";
};
@@ -1097,7 +1113,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x05ac";
- match "product" "(0x020d|0x020e|0x020f|0x0215|0x0217|0x0218|0x0219|0x021a|0x021b|0x021c)";
+ match "product" "(0x020d|0x020e|0x020f|0x0210|0x0214|0x0215|0x0216|0x0217|0x0218|0x0219|0x021a|0x021b|0x021c)";
action "kldload -n atp";
};
@@ -2353,7 +2369,23 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0b05";
- match "product" "(0x17b5|0x17cb)";
+ match "product" "0x17b5";
+ action "kldload -n ng_ubt";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0b05";
+ match "product" "0x17ba";
+ action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0b05";
+ match "product" "0x17cb";
action "kldload -n ng_ubt";
};
@@ -2481,7 +2513,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0bda";
- match "product" "(0x018a|0x317f)";
+ match "product" "(0x0179|0x018a|0x317f)";
action "kldload -n if_urtwn";
};
@@ -2513,7 +2545,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0bda";
- match "product" "(0x8176|0x8176|0x8177|0x8178|0x817a|0x817b|0x817c|0x817d|0x817e)";
+ match "product" "(0x8176|0x8176|0x8177|0x8178|0x8179|0x817a|0x817b|0x817c|0x817d|0x817e)";
action "kldload -n if_urtwn";
};
@@ -2929,6 +2961,14 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0df6";
+ match "product" "0x0072";
+ action "kldload -n if_axge";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0df6";
match "product" "0x061c";
action "kldload -n if_axe";
};
@@ -3577,7 +3617,23 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x12d1";
- match "product" "(0x1001|0x1003|0x1004|0x1401|0x1402|0x1403|0x1404|0x1405|0x1406|0x1407|0x1408|0x1409|0x140a|0x140b|0x140c|0x140d|0x140e|0x140f|0x1410|0x1411|0x1412|0x1413|0x1414|0x1415|0x1416|0x1417|0x1418|0x1419|0x141a|0x141b|0x141c|0x141d|0x141e|0x141f|0x1420|0x1421|0x1422|0x1423|0x1424|0x1425|0x1426|0x1427|0x1428|0x1429|0x142a|0x142b|0x142c|0x142d|0x142e|0x142f|0x1430|0x1431|0x1432|0x1433|0x1434|0x1435|0x1436|0x1437|0x1438|0x1439|0x143a|0x143b|0x143c|0x143d|0x143e|0x143f|0x1446|0x1464|0x1465|0x14ac|0x14c9|0x14d1|0x14fe|0x1505|0x1506|0x1520|0x1521|0x1803|0x1c05|0x1c0b)";
+ match "product" "(0x1001|0x1003|0x1004|0x1401|0x1402|0x1403|0x1404|0x1405|0x1406|0x1407|0x1408|0x1409|0x140a|0x140b|0x140c|0x140d|0x140e|0x140f|0x1410|0x1411|0x1412|0x1413|0x1414|0x1415|0x1416|0x1417|0x1418|0x1419|0x141a|0x141b|0x141c|0x141d|0x141e|0x141f|0x1420|0x1421|0x1422|0x1423|0x1424|0x1425|0x1426|0x1427|0x1428|0x1429|0x142a|0x142b|0x142c|0x142d|0x142e|0x142f|0x1430|0x1431|0x1432|0x1433|0x1434|0x1435|0x1436|0x1437|0x1438|0x1439|0x143a|0x143b|0x143c|0x143d|0x143e|0x143f|0x1446|0x1464|0x1465|0x14ac|0x14c9|0x14d1|0x14fe|0x1505|0x1506|0x1520|0x1521)";
+ action "kldload -n u3g";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x12d1";
+ match "product" "0x155b";
+ action "kldload -n if_cdce";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x12d1";
+ match "product" "(0x1803|0x1c05|0x1c0b)";
action "kldload -n u3g";
};
@@ -3753,7 +3809,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x1410";
- match "product" "(0x1100|0x1110|0x1120|0x1130|0x1400|0x1410|0x1420|0x1430|0x1450|0x2100|0x2110|0x2120|0x2130|0x2400|0x2410|0x2420|0x4100|0x4400|0x5010|0x5020|0x5041|0x5100|0x6000|0x6002|0x7042)";
+ match "product" "(0x1100|0x1110|0x1120|0x1130|0x1400|0x1410|0x1420|0x1430|0x1450|0x2100|0x2110|0x2120|0x2130|0x2400|0x2410|0x2420|0x4100|0x4400|0x5010|0x5020|0x5041|0x5100|0x6000|0x6002|0x7001|0x7031|0x7042)";
action "kldload -n u3g";
};
@@ -4553,7 +4609,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x1cf1";
- match "product" "(0x0001|0x0004)";
+ match "product" "(0x0001|0x0004|0x0022)";
action "kldload -n uftdi";
};
@@ -4568,6 +4624,14 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x1d34";
+ match "product" "0x0004";
+ action "kldload -n uled";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "vendor" "0x1d4d";
match "product" "(0x0002|0x000c|0x000e|0x0010)";
action "kldload -n if_run";
@@ -4633,7 +4697,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x2001";
- match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d)";
+ match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d|0x330f)";
action "kldload -n if_urtwn";
};
@@ -4665,7 +4729,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x2001";
- match "product" "(0x3c09|0x3c0a|0x3c15|0x3c1a|0x3c1b|0x3c1f)";
+ match "product" "(0x3c09|0x3c0a|0x3c15|0x3c1a|0x3c1b|0x3c1f|0x3c20)";
action "kldload -n if_run";
};
@@ -4689,6 +4753,14 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x2001";
+ match "product" "0x4a00";
+ action "kldload -n if_axge";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x2001";
match "product" "(0x7e12|0xa805)";
action "kldload -n u3g";
};
@@ -5232,6 +5304,36 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x12d1";
+ match "intclass" "0xff";
+ match "intsubclass" "0x02";
+ match "intprotocol" "0x16";
+ action "kldload -n if_cdce";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x12d1";
+ match "intclass" "0xff";
+ match "intsubclass" "0x02";
+ match "intprotocol" "0x46";
+ action "kldload -n if_cdce";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x12d1";
+ match "intclass" "0xff";
+ match "intsubclass" "0x02";
+ match "intprotocol" "0x76";
+ action "kldload -n if_cdce";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "intclass" "0x02";
match "intsubclass" "0x02";
match "intprotocol" "0x00";
@@ -5399,5 +5501,5 @@ nomatch 32 {
action "kldload -n umass";
};
-# 2621 USB entries processed
+# 2643 USB entries processed
Modified: projects/bhyve_svm/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/bhyve_svm/etc/mtree/BSD.tests.dist Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/etc/mtree/BSD.tests.dist Sun Oct 5 01:28:21 2014 (r272545)
@@ -287,6 +287,8 @@
..
newsyslog
..
+ pw
+ ..
sa
..
..
Modified: projects/bhyve_svm/etc/rc.subr
==============================================================================
--- projects/bhyve_svm/etc/rc.subr Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/etc/rc.subr Sun Oct 5 01:28:21 2014 (r272545)
@@ -68,6 +68,39 @@ list_vars()
done; }
}
+# set_rcvar [var] [defval] [desc]
+#
+# Echo or define a rc.conf(5) variable name. Global variable
+# $rcvars is used.
+#
+# If no argument is specified, echo "${name}_enable".
+#
+# If only a var is specified, echo "${var}_enable".
+#
+# If var and defval are specified, the ${var} is defined as
+# rc.conf(5) variable and the default value is ${defvar}. An
+# optional argument $desc can also be specified to add a
+# description for that.
+#
+set_rcvar()
+{
+ local _var
+
+ case $# in
+ 0) echo ${name}_enable ;;
+ 1) echo ${1}_enable ;;
+ *)
+ debug "set_rcvar: \$$1=$2 is added" \
+ " as a rc.conf(5) variable."
+ _var=$1
+ rcvars="${rcvars# } $_var"
+ eval ${_var}_defval=\"$2\"
+ shift 2
+ eval ${_var}_desc=\"$*\"
+ ;;
+ esac
+}
+
# set_rcvar_obsolete oldvar [newvar] [msg]
# Define obsolete variable.
# Global variable $rcvars_obsolete is used.
@@ -76,7 +109,7 @@ set_rcvar_obsolete()
{
local _var
_var=$1
- debug "rcvar_obsolete: \$$1(old) -> \$$2(new) is defined"
+ debug "set_rcvar_obsolete: \$$1(old) -> \$$2(new) is defined"
rcvars_obsolete="${rcvars_obsolete# } $1"
eval ${1}_newvar=\"$2\"
@@ -1091,8 +1124,8 @@ $command $rc_flags $command_args"
echo ""
fi
echo "#"
- # Get unique vars in $rcvar
- for _v in $rcvar; do
+ # Get unique vars in $rcvar $rcvars
+ for _v in $rcvar $rcvars; do
case $v in
$_v\ *|\ *$_v|*\ $_v\ *) ;;
*) v="${v# } $_v" ;;
@@ -1238,7 +1271,7 @@ run_rc_script()
unset name command command_args command_interpreter \
extra_commands pidfile procname \
- rcvar rcvars_obsolete required_dirs required_files \
+ rcvar rcvars rcvars_obsolete required_dirs required_files \
required_vars
eval unset ${_arg}_cmd ${_arg}_precmd ${_arg}_postcmd
@@ -1306,7 +1339,7 @@ load_rc_config()
done
# Set defaults if defined.
- for _var in $rcvar; do
+ for _var in $rcvar $rcvars; do
eval _defval=\$${_var}_defval
if [ -n "$_defval" ]; then
eval : \${$_var:=\$${_var}_defval}
Modified: projects/bhyve_svm/games/factor/factor.6
==============================================================================
--- projects/bhyve_svm/games/factor/factor.6 Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/games/factor/factor.6 Sun Oct 5 01:28:21 2014 (r272545)
@@ -89,8 +89,7 @@ The
value must not be greater than the maximum.
The default and maximum value of
.Ar stop
-is 4294967295 on 32-bit architectures
-and 3825123056546413050 on 64-bit ones.
+is 3825123056546413050.
.Pp
When the
.Nm primes
Modified: projects/bhyve_svm/games/factor/factor.c
==============================================================================
--- projects/bhyve_svm/games/factor/factor.c Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/games/factor/factor.c Sun Oct 5 01:28:21 2014 (r272545)
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
#include <ctype.h>
#include <err.h>
#include <errno.h>
+#include <inttypes.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
@@ -227,7 +228,7 @@ pr_fact(BIGNUM *val)
/* Divide factor out until none are left. */
do {
- printf(hflag ? " 0x%lx" : " %lu", *fact);
+ printf(hflag ? " 0x%" PRIx64 "" : " %" PRIu64 "", *fact);
BN_div_word(val, (BN_ULONG)*fact);
} while (BN_mod_word(val, (BN_ULONG)*fact) == 0);
Modified: projects/bhyve_svm/games/primes/primes.c
==============================================================================
--- projects/bhyve_svm/games/primes/primes.c Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/games/primes/primes.c Sun Oct 5 01:28:21 2014 (r272545)
@@ -64,6 +64,7 @@ static const char rcsid[] =
#include <ctype.h>
#include <err.h>
#include <errno.h>
+#include <inttypes.h>
#include <limits.h>
#include <math.h>
#include <stdio.h>
@@ -111,10 +112,10 @@ main(int argc, char *argv[])
argv += optind;
start = 0;
- stop = (sizeof(ubig) > 4) ? SPSPMAX : BIG;
+ stop = SPSPMAX;
/*
- * Convert low and high args. Strtoul(3) sets errno to
+ * Convert low and high args. Strtoumax(3) sets errno to
* ERANGE if the number is too large, but, if there's
* a leading minus sign it returns the negation of the
* result of the conversion, which we'd rather disallow.
@@ -126,19 +127,19 @@ main(int argc, char *argv[])
errx(1, "negative numbers aren't permitted.");
errno = 0;
- start = strtoul(argv[0], &p, 0);
+ start = strtoumax(argv[0], &p, 0);
if (errno)
err(1, "%s", argv[0]);
if (*p != '\0')
errx(1, "%s: illegal numeric format.", argv[0]);
errno = 0;
- stop = strtoul(argv[1], &p, 0);
+ stop = strtoumax(argv[1], &p, 0);
if (errno)
err(1, "%s", argv[1]);
if (*p != '\0')
errx(1, "%s: illegal numeric format.", argv[1]);
- if ((uint64_t)stop > SPSPMAX)
+ if (stop > SPSPMAX)
errx(1, "%s: stop value too large.", argv[1]);
break;
case 1:
@@ -147,7 +148,7 @@ main(int argc, char *argv[])
errx(1, "negative numbers aren't permitted.");
errno = 0;
- start = strtoul(argv[0], &p, 0);
+ start = strtoumax(argv[0], &p, 0);
if (errno)
err(1, "%s", argv[0]);
if (*p != '\0')
@@ -188,7 +189,7 @@ read_num_buf(void)
if (*p == '-')
errx(1, "negative numbers aren't permitted.");
errno = 0;
- val = strtoul(buf, &p, 0);
+ val = strtoumax(buf, &p, 0);
if (errno)
err(1, "%s", buf);
if (*p != '\n')
@@ -243,7 +244,7 @@ primes(ubig start, ubig stop)
for (p = &prime[0], factor = prime[0];
factor < stop && p <= pr_limit; factor = *(++p)) {
if (factor >= start) {
- printf(hflag ? "0x%lx\n" : "%lu\n", factor);
+ printf(hflag ? "%" PRIx64 "\n" : "%" PRIu64 "\n", factor);
}
}
/* return early if we are done */
@@ -306,11 +307,11 @@ primes(ubig start, ubig stop)
*/
for (q = table; q < tab_lim; ++q, start+=2) {
if (*q) {
- if ((uint64_t)start > SIEVEMAX) {
+ if (start > SIEVEMAX) {
if (!isprime(start))
continue;
}
- printf(hflag ? "0x%lx\n" : "%lu\n", start);
+ printf(hflag ? "%" PRIx64 "\n" : "%" PRIu64 "\n", start);
}
}
}
Modified: projects/bhyve_svm/games/primes/primes.h
==============================================================================
--- projects/bhyve_svm/games/primes/primes.h Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/games/primes/primes.h Sun Oct 5 01:28:21 2014 (r272545)
@@ -41,8 +41,10 @@
* chongo <for a good prime call: 391581 * 2^216193 - 1> /\oo/\
*/
+#include <stdint.h>
+
/* ubig is the type that holds a large unsigned value */
-typedef unsigned long ubig; /* must be >=32 bit unsigned value */
+typedef uint64_t ubig; /* must be >=32 bit unsigned value */
#define BIG ULONG_MAX /* largest value will sieve */
/* bytes in sieve table (must be > 3*5*7*11) */
Modified: projects/bhyve_svm/gnu/lib/csu/Makefile
==============================================================================
--- projects/bhyve_svm/gnu/lib/csu/Makefile Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/gnu/lib/csu/Makefile Sun Oct 5 01:28:21 2014 (r272545)
@@ -24,7 +24,7 @@ CFLAGS+= -I${GCCLIB}/include -I${GCCDIR}
CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG}
MKDEP= -DCRT_BEGIN
-.if ${TARGET_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${TARGET_CPUARCH} == "arm"
CFLAGS+= -DTARGET_ARM_EABI
.endif
Modified: projects/bhyve_svm/gnu/lib/libgcc/Makefile
==============================================================================
--- projects/bhyve_svm/gnu/lib/libgcc/Makefile Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/gnu/lib/libgcc/Makefile Sun Oct 5 01:28:21 2014 (r272545)
@@ -15,7 +15,7 @@ MK_SSP= no
.include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
-.if ${TARGET_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${TARGET_CPUARCH} == "arm"
CFLAGS+= -DTARGET_ARM_EABI
.endif
@@ -56,7 +56,7 @@ LIB2FUNCS+= _fixuns${mode}si
.endfor
# Likewise double-word routines.
-.if ${TARGET_CPUARCH} != "arm" || ${MK_ARM_EABI} == "no"
+.if ${TARGET_CPUARCH} != "arm"
# These are implemented in an ARM specific file but will not be filtered out
.for mode in sf df xf tf
LIB2FUNCS+= _fix${mode}di _fixuns${mode}di
@@ -117,14 +117,10 @@ CFLAGS.clang+= -fheinous-gnu-extensions
LIB1ASMSRC = lib1funcs.asm
LIB1ASMFUNCS = _dvmd_tls _bb_init_func
-.if ${MK_ARM_EABI} != "no"
LIB2ADDEH = unwind-arm.c libunwind.S pr-support.c unwind-c.c
# Some compilers generate __aeabi_ functions libgcc_s is missing
DPADD+= ${LIBCOMPILER_RT}
LDADD+= -lcompiler_rt
-.else
-LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c
-.endif
.endif
.if ${TARGET_CPUARCH} == mips
@@ -319,7 +315,7 @@ CLEANFILES += cs-*.h option*
SHLIB_MKMAP = ${GCCDIR}/mkmap-symver.awk
SHLIB_MKMAP_OPTS =
SHLIB_MAPFILES = ${GCCDIR}/libgcc-std.ver
-.if ${TARGET_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${TARGET_CPUARCH} == "arm"
SHLIB_MAPFILES += ${GCCDIR}/config/arm/libgcc-bpabi.ver
.endif
VERSION_MAP = libgcc.map
Modified: projects/bhyve_svm/gnu/lib/libgcov/Makefile
==============================================================================
--- projects/bhyve_svm/gnu/lib/libgcov/Makefile Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/gnu/lib/libgcov/Makefile Sun Oct 5 01:28:21 2014 (r272545)
@@ -17,7 +17,7 @@ CFLAGS+= -D_PTHREADS -DGTHREAD_USE_WEAK
CFLAGS+= -I${.CURDIR}/../../usr.bin/cc/cc_tools \
-I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I.
-.if ${TARGET_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${TARGET_CPUARCH} == "arm"
CFLAGS+= -DTARGET_ARM_EABI
.endif
Modified: projects/bhyve_svm/gnu/lib/libstdc++/Makefile
==============================================================================
--- projects/bhyve_svm/gnu/lib/libstdc++/Makefile Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/gnu/lib/libstdc++/Makefile Sun Oct 5 01:28:21 2014 (r272545)
@@ -16,9 +16,6 @@ LIB= stdc++
SHLIB_MAJOR= 6
CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
-.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} == "no"
-CFLAGS+= -D_GLIBCXX_SJLJ_EXCEPTIONS=1
-.endif
CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include
CFLAGS+= -I${GCCLIB}/include -I${SRCDIR}/include -I.
CFLAGS+= -frandom-seed=RepeatabilityConsideredGood
@@ -596,7 +593,7 @@ gthr-default.h: ${GCCDIR}/gthr-posix.h
CLEANFILES+= ${THRHDRS}
-.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+.if ${MACHINE_CPUARCH} == "arm"
unwind.h: ${GCCDIR}/config/arm/unwind-arm.h
.else
unwind.h: ${GCCDIR}/unwind-generic.h
Modified: projects/bhyve_svm/gnu/lib/libsupc++/Makefile
==============================================================================
--- projects/bhyve_svm/gnu/lib/libsupc++/Makefile Sat Oct 4 23:56:25 2014 (r272544)
+++ projects/bhyve_svm/gnu/lib/libsupc++/Makefile Sun Oct 5 01:28:21 2014 (r272545)
@@ -22,9 +22,6 @@ SRCS+= del_op.cc del_opnt.cc del_opv.cc
SRCS+= cp-demangle.c
CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
-.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} == "no"
-CFLAGS+= -D_GLIBCXX_SJLJ_EXCEPTIONS=1
-.endif
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Sun Oct 5 10:20:48 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 6743AE50;
Sun, 5 Oct 2014 10:20:48 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 531F91F0;
Sun, 5 Oct 2014 10:20:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s95AKmpW002206;
Sun, 5 Oct 2014 10:20:48 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s95AKmQO002205;
Sun, 5 Oct 2014 10:20:48 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201410051020.s95AKmQO002205@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Sun, 5 Oct 2014 10:20:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272563 - projects/ipfw/sbin/ipfw
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Oct 2014 10:20:48 -0000
Author: melifaro
Date: Sun Oct 5 10:20:47 2014
New Revision: 272563
URL: https://svnweb.freebsd.org/changeset/base/272563
Log:
Fix tracked interface list retrieval.
Modified:
projects/ipfw/sbin/ipfw/ipfw2.c
Modified: projects/ipfw/sbin/ipfw/ipfw2.c
==============================================================================
--- projects/ipfw/sbin/ipfw/ipfw2.c Sun Oct 5 07:29:50 2014 (r272562)
+++ projects/ipfw/sbin/ipfw/ipfw2.c Sun Oct 5 10:20:47 2014 (r272563)
@@ -4860,7 +4860,7 @@ ipfw_get_tracked_ifaces(ipfw_obj_lheader
memset(&req, 0, sizeof(req));
sz = sizeof(req);
- if (do_get3(IP_FW_XIFLIST, &olh->opheader, &sz) != 0) {
+ if (do_get3(IP_FW_XIFLIST, &req.opheader, &sz) != 0) {
if (errno != ENOMEM)
return (errno);
}
From owner-svn-src-projects@FreeBSD.ORG Sun Oct 5 20:20:38 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id BD044C51
for <svn-src-projects@freebsd.org>; Sun, 5 Oct 2014 20:20:38 +0000 (UTC)
Received: from nk11p20im-asmtp001.me.com (nk11p20im-asmtp001.me.com
[17.158.216.160])
(using TLSv1 with cipher DES-CBC3-SHA (112/168 bits))
(Client CN "smtp.me.com",
Issuer "VeriSign Class 3 Extended Validation SSL SGC CA" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id A3A563EB
for <svn-src-projects@freebsd.org>; Sun, 5 Oct 2014 20:20:38 +0000 (UTC)
Received: from [192.168.1.68]
(189.223.3.175.dsl.dyn.telnor.net [189.223.3.175]) by
nk11p20im-asmtp001.me.com
(Oracle Communications Messaging Server 7u4-27.10(7.0.4.27.9) 64bit (built Jun
6 2014)) with ESMTPSA id <0NCZ00GDOKE3JR20@nk11p20im-asmtp001.me.com> for
svn-src-projects@freebsd.org; Sun, 05 Oct 2014 19:20:28 +0000 (GMT)
X-Proofpoint-Virus-Version: vendor=fsecure
engine=2.50.10432:5.12.52,1.0.28,0.0.0000
definitions=2014-10-05_03:2014-10-03,2014-10-05,1970-01-01 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0
suspectscore=3 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0
reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1410050212
From: Alex Fraude malandro <fraude50@icloud.com>
Content-type: text/plain; charset=us-ascii
X-Mailer: iPhone Mail (12A405)
Message-id: <4F199453-A736-4C5C-A13E-40868C991CB4@icloud.com>
Date: Sun, 05 Oct 2014 02:20:30 -0500
To: "svn-src-projects@freebsd.org" <svn-src-projects@freebsd.org>
Content-transfer-encoding: 7bit
MIME-version: 1.0 (1.0)
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Oct 2014 20:20:38 -0000
Ok i finnd My all life
Monitoring
From owner-svn-src-projects@FreeBSD.ORG Mon Oct 6 11:29:58 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id E43B0A45;
Mon, 6 Oct 2014 11:29:58 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id CD2C8B6E;
Mon, 6 Oct 2014 11:29:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s96BTwUg022496;
Mon, 6 Oct 2014 11:29:58 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s96BTpWT022460;
Mon, 6 Oct 2014 11:29:51 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201410061129.s96BTpWT022460@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Mon, 6 Oct 2014 11:29:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272610 - in projects/ipfw: . bin/sh
cddl/contrib/opensolaris/cmd/zdb contrib/binutils/bfd
contrib/binutils/gas/config contrib/binutils/include/elf lib/libc/stdtime
release/doc/en_US.IS...
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Oct 2014 11:29:59 -0000
Author: melifaro
Date: Mon Oct 6 11:29:50 2014
New Revision: 272610
URL: https://svnweb.freebsd.org/changeset/base/272610
Log:
Sync to HEAD@r272609.
Added:
projects/ipfw/tools/tools/bootparttest/stub.c
- copied unchanged from r272609, head/tools/tools/bootparttest/stub.c
projects/ipfw/usr.sbin/pw/tests/pw_modify.sh
- copied unchanged from r272609, head/usr.sbin/pw/tests/pw_modify.sh
Deleted:
projects/ipfw/tools/tools/bootparttest/malloc.c
Modified:
projects/ipfw/Makefile.inc1
projects/ipfw/bin/sh/eval.c
projects/ipfw/bin/sh/expand.c
projects/ipfw/bin/sh/jobs.c
projects/ipfw/bin/sh/redir.c
projects/ipfw/bin/sh/trap.c
projects/ipfw/cddl/contrib/opensolaris/cmd/zdb/zdb.c
projects/ipfw/contrib/binutils/bfd/config.bfd
projects/ipfw/contrib/binutils/bfd/elf32-arm.c
projects/ipfw/contrib/binutils/gas/config/tc-arm.c
projects/ipfw/contrib/binutils/include/elf/arm.h
projects/ipfw/lib/libc/stdtime/strptime.3
projects/ipfw/lib/libc/stdtime/strptime.c
projects/ipfw/release/doc/en_US.ISO8859-1/hardware/article.xml
projects/ipfw/sbin/ifconfig/iflagg.c
projects/ipfw/sbin/ipfw/ipfw2.c
projects/ipfw/share/man/man5/rc.conf.5
projects/ipfw/sys/boot/common/disk.c
projects/ipfw/sys/boot/common/part.c
projects/ipfw/sys/cam/ctl/ctl.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
projects/ipfw/sys/conf/Makefile.arm
projects/ipfw/sys/conf/NOTES
projects/ipfw/sys/conf/options
projects/ipfw/sys/contrib/ipfilter/netinet/fil.c
projects/ipfw/sys/contrib/ipfilter/netinet/ip_dns_pxy.c
projects/ipfw/sys/contrib/ipfilter/netinet/ip_dstlist.c
projects/ipfw/sys/contrib/ipfilter/netinet/ip_nat.c
projects/ipfw/sys/dev/ahci/ahci.c
projects/ipfw/sys/dev/uart/uart_bus_fdt.c
projects/ipfw/sys/dev/vt/vt_core.c
projects/ipfw/sys/fs/devfs/devfs_vnops.c
projects/ipfw/sys/kern/imgact_elf.c
projects/ipfw/sys/kern/kern_descrip.c
projects/ipfw/sys/kern/kern_event.c
projects/ipfw/sys/kern/kern_exit.c
projects/ipfw/sys/kern/kern_intr.c
projects/ipfw/sys/kern/kern_proc.c
projects/ipfw/sys/kern/kern_prot.c
projects/ipfw/sys/kern/kern_racct.c
projects/ipfw/sys/kern/kern_sig.c
projects/ipfw/sys/kern/vfs_vnops.c
projects/ipfw/sys/modules/Makefile
projects/ipfw/sys/net/ieee8023ad_lacp.c
projects/ipfw/sys/net/ieee8023ad_lacp.h
projects/ipfw/sys/net/if_bridge.c
projects/ipfw/sys/net/if_disc.c
projects/ipfw/sys/net/if_edsc.c
projects/ipfw/sys/net/if_lagg.c
projects/ipfw/sys/net/if_lagg.h
projects/ipfw/sys/netinet/ip6.h
projects/ipfw/sys/netinet/sctp_output.c
projects/ipfw/sys/netinet/tcp_output.c
projects/ipfw/sys/netpfil/ipfw/ip_fw2.c
projects/ipfw/sys/netpfil/ipfw/ip_fw_sockopt.c
projects/ipfw/sys/sys/event.h
projects/ipfw/sys/sys/filedesc.h
projects/ipfw/sys/sys/racct.h
projects/ipfw/sys/sys/seq.h
projects/ipfw/sys/sys/systm.h
projects/ipfw/sys/sys/ucred.h
projects/ipfw/sys/sys/vnode.h
projects/ipfw/sys/vm/uma_core.c
projects/ipfw/sys/vm/vm_glue.c
projects/ipfw/tools/tools/bootparttest/Makefile
projects/ipfw/tools/tools/bootparttest/bootparttest.c
projects/ipfw/usr.sbin/pw/tests/Makefile
Directory Properties:
projects/ipfw/ (props changed)
projects/ipfw/cddl/ (props changed)
projects/ipfw/cddl/contrib/opensolaris/ (props changed)
projects/ipfw/contrib/binutils/ (props changed)
projects/ipfw/lib/libc/ (props changed)
projects/ipfw/lib/libc/stdtime/ (props changed)
projects/ipfw/sbin/ (props changed)
projects/ipfw/sbin/ipfw/ (props changed)
projects/ipfw/share/ (props changed)
projects/ipfw/sys/ (props changed)
projects/ipfw/sys/boot/ (props changed)
projects/ipfw/sys/cddl/contrib/opensolaris/ (props changed)
projects/ipfw/sys/conf/ (props changed)
projects/ipfw/sys/contrib/ipfilter/ (props changed)
Modified: projects/ipfw/Makefile.inc1
==============================================================================
--- projects/ipfw/Makefile.inc1 Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/Makefile.inc1 Mon Oct 6 11:29:50 2014 (r272610)
@@ -1536,6 +1536,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
${_cddl_lib_libuutil} \
${_cddl_lib_libavl} \
${_cddl_lib_libzfs_core} \
+ ${_cddl_lib_libctf} \
lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_lib_libldns} \
${_secure_lib_libssh} ${_secure_lib_libssl}
@@ -1586,9 +1587,11 @@ _cddl_lib_libnvpair= cddl/lib/libnvpair
_cddl_lib_libavl= cddl/lib/libavl
_cddl_lib_libuutil= cddl/lib/libuutil
_cddl_lib_libzfs_core= cddl/lib/libzfs_core
+_cddl_lib_libctf= cddl/lib/libctf
_cddl_lib= cddl/lib
cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
cddl/lib/libzfs__L: lib/libgeom__L
+cddl/lib/libctf__L: lib/libz__L
.endif
.if ${MK_CRYPT} != "no"
Modified: projects/ipfw/bin/sh/eval.c
==============================================================================
--- projects/ipfw/bin/sh/eval.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/bin/sh/eval.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -316,9 +316,10 @@ evalloop(union node *n, int flags)
loopnest++;
status = 0;
for (;;) {
- evaltree(n->nbinary.ch1, EV_TESTED);
+ if (!evalskip)
+ evaltree(n->nbinary.ch1, EV_TESTED);
if (evalskip) {
-skipping: if (evalskip == SKIPCONT && --skipcount <= 0) {
+ if (evalskip == SKIPCONT && --skipcount <= 0) {
evalskip = 0;
continue;
}
@@ -337,8 +338,6 @@ skipping: if (evalskip == SKIPCONT &&
}
evaltree(n->nbinary.ch2, flags);
status = exitstatus;
- if (evalskip)
- goto skipping;
}
loopnest--;
exitstatus = status;
@@ -648,15 +647,15 @@ evalbackcmd(union node *n, struct backcm
struct jmploc *savehandler;
struct localvar *savelocalvars;
- setstackmark(&smark);
result->fd = -1;
result->buf = NULL;
result->nleft = 0;
result->jp = NULL;
if (n == NULL) {
exitstatus = 0;
- goto out;
+ return;
}
+ setstackmark(&smark);
exitstatus = oexitstatus;
if (is_valid_fast_cmdsubst(n)) {
savelocalvars = localvars;
@@ -698,7 +697,6 @@ evalbackcmd(union node *n, struct backcm
result->fd = pip[0];
result->jp = jp;
}
-out:
popstackmark(&smark);
TRACE(("evalbackcmd done: fd=%d buf=%p nleft=%d jp=%p\n",
result->fd, result->buf, result->nleft, result->jp));
Modified: projects/ipfw/bin/sh/expand.c
==============================================================================
--- projects/ipfw/bin/sh/expand.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/bin/sh/expand.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -328,24 +328,19 @@ exptilde(char *p, int flag)
done:
*p = '\0';
if (*(startp+1) == '\0') {
- if ((home = lookupvar("HOME")) == NULL)
- goto lose;
+ home = lookupvar("HOME");
} else {
- if ((pw = getpwnam(startp+1)) == NULL)
- goto lose;
- home = pw->pw_dir;
+ pw = getpwnam(startp+1);
+ home = pw != NULL ? pw->pw_dir : NULL;
}
- if (*home == '\0')
- goto lose;
*p = c;
+ if (home == NULL || *home == '\0')
+ return (startp);
if (quotes)
STPUTS_QUOTES(home, SQSYNTAX, expdest);
else
STPUTS(home, expdest);
return (p);
-lose:
- *p = c;
- return (startp);
}
Modified: projects/ipfw/bin/sh/jobs.c
==============================================================================
--- projects/ipfw/bin/sh/jobs.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/bin/sh/jobs.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -373,13 +373,13 @@ showjob(struct job *jp, int mode)
strcat(statestr, " (core dumped)");
}
- for (ps = jp->ps ; ; ps++) { /* for each process */
+ for (ps = jp->ps ; procno > 0 ; ps++, procno--) { /* for each process */
if (mode == SHOWJOBS_PIDS || mode == SHOWJOBS_PGIDS) {
out1fmt("%d\n", (int)ps->pid);
- goto skip;
+ continue;
}
if (mode != SHOWJOBS_VERBOSE && ps != jp->ps)
- goto skip;
+ continue;
if (jobno == curr && ps == jp->ps)
c = '+';
else if (jobno == prev && ps == jp->ps)
@@ -410,8 +410,6 @@ showjob(struct job *jp, int mode)
out1c('\n');
} else
printjobcmd(jp);
-skip: if (--procno <= 0)
- break;
}
}
Modified: projects/ipfw/bin/sh/redir.c
==============================================================================
--- projects/ipfw/bin/sh/redir.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/bin/sh/redir.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -173,21 +173,12 @@ openredirect(union node *redir, char mem
fname = redir->nfile.expfname;
if ((f = open(fname, O_RDONLY)) < 0)
error("cannot open %s: %s", fname, strerror(errno));
-movefd:
- if (f != fd) {
- if (dup2(f, fd) == -1) {
- e = errno;
- close(f);
- error("%d: %s", fd, strerror(e));
- }
- close(f);
- }
break;
case NFROMTO:
fname = redir->nfile.expfname;
if ((f = open(fname, O_RDWR|O_CREAT, 0666)) < 0)
error("cannot create %s: %s", fname, strerror(errno));
- goto movefd;
+ break;
case NTO:
if (Cflag) {
fname = redir->nfile.expfname;
@@ -205,19 +196,19 @@ movefd:
} else
error("cannot create %s: %s", fname,
strerror(EEXIST));
- goto movefd;
+ break;
}
/* FALLTHROUGH */
case NCLOBBER:
fname = redir->nfile.expfname;
if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
error("cannot create %s: %s", fname, strerror(errno));
- goto movefd;
+ break;
case NAPPEND:
fname = redir->nfile.expfname;
if ((f = open(fname, O_WRONLY|O_CREAT|O_APPEND, 0666)) < 0)
error("cannot create %s: %s", fname, strerror(errno));
- goto movefd;
+ break;
case NTOFD:
case NFROMFD:
if (redir->ndup.dupfd >= 0) { /* if not ">&-" */
@@ -231,14 +222,22 @@ movefd:
} else {
close(fd);
}
- break;
+ return;
case NHERE:
case NXHERE:
f = openhere(redir);
- goto movefd;
+ break;
default:
abort();
}
+ if (f != fd) {
+ if (dup2(f, fd) == -1) {
+ e = errno;
+ close(f);
+ error("%d: %s", fd, strerror(e));
+ }
+ close(f);
+ }
}
Modified: projects/ipfw/bin/sh/trap.c
==============================================================================
--- projects/ipfw/bin/sh/trap.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/bin/sh/trap.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -510,28 +510,25 @@ exitshell_savedstatus(void)
exiting_exitstatus = oexitstatus;
}
exitstatus = oexitstatus = exiting_exitstatus;
- if (setjmp(loc1.loc)) {
- goto l1;
+ if (!setjmp(loc1.loc)) {
+ handler = &loc1;
+ if ((p = trap[0]) != NULL && *p != '\0') {
+ /*
+ * Reset evalskip, or the trap on EXIT could be
+ * interrupted if the last command was a "return".
+ */
+ evalskip = 0;
+ trap[0] = NULL;
+ evalstring(p, 0);
+ }
}
- if (setjmp(loc2.loc)) {
- goto l2;
- }
- handler = &loc1;
- if ((p = trap[0]) != NULL && *p != '\0') {
- /*
- * Reset evalskip, or the trap on EXIT could be
- * interrupted if the last command was a "return".
- */
- evalskip = 0;
- trap[0] = NULL;
- evalstring(p, 0);
- }
-l1: handler = &loc2; /* probably unnecessary */
- flushall();
+ if (!setjmp(loc2.loc)) {
+ handler = &loc2; /* probably unnecessary */
+ flushall();
#if JOBS
- setjobctl(0);
+ setjobctl(0);
#endif
-l2:
+ }
if (sig != 0 && sig != SIGSTOP && sig != SIGTSTP && sig != SIGTTIN &&
sig != SIGTTOU) {
signal(sig, SIG_DFL);
Modified: projects/ipfw/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -1461,6 +1461,11 @@ dump_deadlist(dsl_deadlist_t *dl)
if (dump_opt['d'] < 3)
return;
+ if (dl->dl_oldfmt) {
+ dump_bpobj(&dl->dl_bpobj, "old-format deadlist", 0);
+ return;
+ }
+
zdb_nicenum(dl->dl_phys->dl_used, bytes);
zdb_nicenum(dl->dl_phys->dl_comp, comp);
zdb_nicenum(dl->dl_phys->dl_uncomp, uncomp);
@@ -2594,10 +2599,12 @@ dump_block_stats(spa_t *spa)
* all async I/Os to complete.
*/
if (dump_opt['c']) {
- (void) zio_wait(spa->spa_async_zio_root);
- spa->spa_async_zio_root = zio_root(spa, NULL, NULL,
- ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE |
- ZIO_FLAG_GODFATHER);
+ for (int i = 0; i < max_ncpus; i++) {
+ (void) zio_wait(spa->spa_async_zio_root[i]);
+ spa->spa_async_zio_root[i] = zio_root(spa, NULL, NULL,
+ ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE |
+ ZIO_FLAG_GODFATHER);
+ }
}
if (zcb.zcb_haderrors) {
Modified: projects/ipfw/contrib/binutils/bfd/config.bfd
==============================================================================
--- projects/ipfw/contrib/binutils/bfd/config.bfd Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/contrib/binutils/bfd/config.bfd Mon Oct 6 11:29:50 2014 (r272610)
@@ -273,19 +273,11 @@ case "${targ}" in
targ_defvec=bfd_elf32_littlearm_vec
targ_selvecs=bfd_elf32_bigarm_vec
;;
- armeb-*-freebsd*)
+ arm*eb*-*-freebsd*)
targ_defvec=bfd_elf32_bigarm_vec
targ_selvecs=bfd_elf32_littlearm_vec
;;
- armv6eb-*-freebsd*)
- targ_defvec=bfd_elf32_bigarm_vec
- targ_selvecs=bfd_elf32_littlearm_vec
- ;;
- armv6-*-freebsd* | armv6hf-*-freebsd*)
- targ_defvec=bfd_elf32_littlearm_vec
- targ_selvecs=bfd_elf32_bigarm_vec
- ;;
- arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
+ arm-*-elf | arm*-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
arm*-*-eabi* )
targ_defvec=bfd_elf32_littlearm_vec
Modified: projects/ipfw/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- projects/ipfw/contrib/binutils/bfd/elf32-arm.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/contrib/binutils/bfd/elf32-arm.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -6965,7 +6965,8 @@ elf32_arm_merge_eabi_attributes (bfd *ib
for (; in_list; in_list = in_list->next)
{
- if ((in_list->tag & 128) < 64)
+ if ((in_list->tag & 128) < 64
+ && in_list->tag != Tag_Virtualization_use)
{
_bfd_error_handler
(_("Warning: %B: Unknown EABI object attribute %d"),
Modified: projects/ipfw/contrib/binutils/gas/config/tc-arm.c
==============================================================================
--- projects/ipfw/contrib/binutils/gas/config/tc-arm.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/contrib/binutils/gas/config/tc-arm.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -19395,6 +19395,12 @@ arm_fix_adjustable (fixS * fixP)
|| fixP->fx_r_type == BFD_RELOC_ARM_LDR_PC_G0)
return 0;
+ if (fixP->fx_r_type == BFD_RELOC_ARM_MOVW
+ || fixP->fx_r_type == BFD_RELOC_ARM_MOVT
+ || fixP->fx_r_type == BFD_RELOC_ARM_THUMB_MOVW
+ || fixP->fx_r_type == BFD_RELOC_ARM_THUMB_MOVT)
+ return 0;
+
return 1;
}
#endif /* defined (OBJ_ELF) || defined (OBJ_COFF) */
Modified: projects/ipfw/contrib/binutils/include/elf/arm.h
==============================================================================
--- projects/ipfw/contrib/binutils/include/elf/arm.h Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/contrib/binutils/include/elf/arm.h Mon Oct 6 11:29:50 2014 (r272610)
@@ -271,6 +271,8 @@ enum
Tag_ABI_optimization_goals,
Tag_ABI_FP_optimization_goals,
/* 32 is generic. */
+
+ Tag_Virtualization_use = 68,
};
#endif
Modified: projects/ipfw/lib/libc/stdtime/strptime.3
==============================================================================
--- projects/ipfw/lib/libc/stdtime/strptime.3 Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/lib/libc/stdtime/strptime.3 Mon Oct 6 11:29:50 2014 (r272610)
@@ -79,7 +79,8 @@ and
.Fa \&%D ,
are now interpreted as beginning at 1969 per POSIX requirements.
Years 69-00 are interpreted in the 20th century (1969-2000), years
-01-68 in the 21st century (2001-2068). The
+01-68 in the 21st century (2001-2068).
+The
.Fa \&%U
and
.Fa %W
Modified: projects/ipfw/lib/libc/stdtime/strptime.c
==============================================================================
--- projects/ipfw/lib/libc/stdtime/strptime.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/lib/libc/stdtime/strptime.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -552,7 +552,8 @@ label:
strncpy(zonestr, buf, cp - buf);
zonestr[cp - buf] = '\0';
tzset();
- if (0 == strcmp(zonestr, "GMT")) {
+ if (0 == strcmp(zonestr, "GMT") ||
+ 0 == strcmp(zonestr, "UTC")) {
*GMTp = 1;
} else if (0 == strcmp(zonestr, tzname[0])) {
tm->tm_isdst = 0;
@@ -674,6 +675,9 @@ strptime_l(const char * __restrict buf,
ret = _strptime(buf, fmt, tm, &gmt, loc);
if (ret && gmt) {
time_t t = timegm(tm);
+
+ if (t == -1)
+ return (NULL);
localtime_r(&t, tm);
}
Modified: projects/ipfw/release/doc/en_US.ISO8859-1/hardware/article.xml
==============================================================================
--- projects/ipfw/release/doc/en_US.ISO8859-1/hardware/article.xml Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/release/doc/en_US.ISO8859-1/hardware/article.xml Mon Oct 6 11:29:50 2014 (r272610)
@@ -908,6 +908,8 @@
&hwlist.udav;
+ &hwlist.urndis;
+
&hwlist.vge;
&hwlist.vr;
Modified: projects/ipfw/sbin/ifconfig/iflagg.c
==============================================================================
--- projects/ipfw/sbin/ifconfig/iflagg.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/sbin/ifconfig/iflagg.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -17,6 +17,7 @@ static const char rcsid[] =
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_lagg.h>
+#include <net/ieee8023ad_lacp.h>
#include <net/route.h>
#include <ctype.h>
@@ -246,18 +247,9 @@ lagg_status(int s)
putchar('\n');
if (verbose) {
printf("\tlagg options:\n");
- printf("\t\tuse_flowid: %d\n",
- (ro.ro_opts & LAGG_OPT_USE_FLOWID) ? 1 : 0);
+ printb("\t\tflags", ro.ro_opts, LAGG_OPT_BITS);
+ putchar('\n');
printf("\t\tflowid_shift: %d\n", ro.ro_flowid_shift);
- switch (ra.ra_proto) {
- case LAGG_PROTO_LACP:
- printf("\t\tlacp_strict: %d\n",
- (ro.ro_opts & LAGG_OPT_LACP_STRICT) ? 1 : 0);
- printf("\t\tlacp_rxtest: %d\n",
- (ro.ro_opts & LAGG_OPT_LACP_RXTEST) ? 1 : 0);
- printf("\t\tlacp_txtest: %d\n",
- (ro.ro_opts & LAGG_OPT_LACP_TXTEST) ? 1 : 0);
- }
printf("\tlagg statistics:\n");
printf("\t\tactive ports: %d\n", ro.ro_active);
printf("\t\tflapping: %u\n", ro.ro_flapping);
@@ -272,7 +264,8 @@ lagg_status(int s)
printf("\tlaggport: %s ", rpbuf[i].rp_portname);
printb("flags", rpbuf[i].rp_flags, LAGG_PORT_BITS);
if (verbose && ra.ra_proto == LAGG_PROTO_LACP)
- printf(" state=%X", lp->actor_state);
+ printb(" state", lp->actor_state,
+ LACP_STATE_BITS);
putchar('\n');
if (verbose && ra.ra_proto == LAGG_PROTO_LACP)
printf("\t\t%s\n",
Modified: projects/ipfw/sbin/ipfw/ipfw2.c
==============================================================================
--- projects/ipfw/sbin/ipfw/ipfw2.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/sbin/ipfw/ipfw2.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -3341,13 +3341,34 @@ add_dstip(ipfw_insn *cmd, char *av, int
return cmd;
}
+static struct _s_x f_reserved_keywords[] = {
+ { "altq", TOK_OR },
+ { "//", TOK_OR },
+ { "diverted", TOK_OR },
+ { "dst-port", TOK_OR },
+ { "src-port", TOK_OR },
+ { "established", TOK_OR },
+ { "keep-state", TOK_OR },
+ { "frag", TOK_OR },
+ { "icmptypes", TOK_OR },
+ { "in", TOK_OR },
+ { "out", TOK_OR },
+ { "ip6", TOK_OR },
+ { "any", TOK_OR },
+ { "to", TOK_OR },
+ { "via", TOK_OR },
+ { "{", TOK_OR },
+ { NULL, 0 } /* terminator */
+};
+
static ipfw_insn *
add_ports(ipfw_insn *cmd, char *av, u_char proto, int opcode, int cblen)
{
- /* XXX "any" is trapped before. Perhaps "to" */
- if (_substrcmp(av, "any") == 0) {
- return NULL;
- } else if (fill_newports((ipfw_insn_u16 *)cmd, av, proto, cblen)) {
+
+ if (match_token(f_reserved_keywords, av) != -1)
+ return (NULL);
+
+ if (fill_newports((ipfw_insn_u16 *)cmd, av, proto, cblen)) {
/* XXX todo: check that we have a protocol with ports */
cmd->opcode = opcode;
return cmd;
Modified: projects/ipfw/share/man/man5/rc.conf.5
==============================================================================
--- projects/ipfw/share/man/man5/rc.conf.5 Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/share/man/man5/rc.conf.5 Mon Oct 6 11:29:50 2014 (r272610)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 27, 2014
+.Dd September 11, 2014
.Dt RC.CONF 5
.Os
.Sh NAME
Modified: projects/ipfw/sys/boot/common/disk.c
==============================================================================
--- projects/ipfw/sys/boot/common/disk.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/sys/boot/common/disk.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -90,7 +90,7 @@ disk_lookup(struct disk_devdesc *dev)
entry->d_partition == dev->d_partition) {
dev->d_offset = entry->d_offset;
DEBUG("%s offset %lld", disk_fmtdev(dev),
- dev->d_offset);
+ (long long)dev->d_offset);
#ifdef DISK_DEBUG
entry->count++;
#endif
@@ -367,7 +367,7 @@ out:
dev->d_slice = slice;
dev->d_partition = partition;
DEBUG("%s offset %lld => %p", disk_fmtdev(dev),
- dev->d_offset, od);
+ (long long)dev->d_offset, od);
}
return (rc);
}
Modified: projects/ipfw/sys/boot/common/part.c
==============================================================================
--- projects/ipfw/sys/boot/common/part.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/sys/boot/common/part.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -301,6 +301,7 @@ ptable_gptread(struct ptable *table, voi
}
}
}
+ DEBUG("GPT detected");
if (pri == 0 && sec == 0) {
/* Both primary and backup tables are invalid. */
table->type = PTABLE_NONE;
@@ -378,6 +379,7 @@ ptable_ebrread(struct ptable *table, voi
buf = malloc(table->sectorsize);
if (buf == NULL)
return (table);
+ DEBUG("EBR detected");
for (i = 0; i < MAXEBRENTRIES; i++) {
#if 0 /* Some BIOSes return an incorrect number of sectors */
if (offset >= table->sectors)
@@ -470,6 +472,7 @@ ptable_bsdread(struct ptable *table, voi
DEBUG("invalid number of partitions");
goto out;
}
+ DEBUG("BSD detected");
part = &dl->d_partitions[0];
raw_offset = le32toh(part[RAW_PART].p_offset);
for (i = 0; i < dl->d_npartitions; i++, part++) {
@@ -553,6 +556,7 @@ ptable_vtoc8read(struct ptable *table, v
DEBUG("invalid geometry");
goto out;
}
+ DEBUG("VTOC8 detected");
for (i = 0; i < VTOC8_NPARTS; i++) {
dl->part[i].tag = be16toh(dl->part[i].tag);
if (i == VTOC_RAW_PART ||
@@ -665,6 +669,7 @@ ptable_open(void *dev, off_t sectors, ui
#endif
#ifdef LOADER_MBR_SUPPORT
/* Read MBR. */
+ DEBUG("MBR detected");
table->type = PTABLE_MBR;
for (i = has_ext = 0; i < NDOSPART; i++) {
if (dp[i].dp_typ == 0)
Modified: projects/ipfw/sys/cam/ctl/ctl.c
==============================================================================
--- projects/ipfw/sys/cam/ctl/ctl.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/sys/cam/ctl/ctl.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -9912,9 +9912,7 @@ ctl_inquiry_evpd_eid(struct ctl_scsiio *
lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
- data_len = sizeof(struct scsi_vpd_mode_page_policy) +
- sizeof(struct scsi_vpd_mode_page_policy_descr);
-
+ data_len = sizeof(struct scsi_vpd_extended_inquiry_data);
ctsio->kern_data_ptr = malloc(data_len, M_CTL, M_WAITOK | M_ZERO);
eid_ptr = (struct scsi_vpd_extended_inquiry_data *)ctsio->kern_data_ptr;
ctsio->kern_sg_entries = 0;
Modified: projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -2584,6 +2584,7 @@ arc_reclaim_needed(void)
extern kmem_cache_t *zio_buf_cache[];
extern kmem_cache_t *zio_data_buf_cache[];
+extern kmem_cache_t *range_seg_cache;
static void __noinline
arc_kmem_reap_now(arc_reclaim_strategy_t strat)
@@ -2591,7 +2592,6 @@ arc_kmem_reap_now(arc_reclaim_strategy_t
size_t i;
kmem_cache_t *prev_cache = NULL;
kmem_cache_t *prev_data_cache = NULL;
- extern kmem_cache_t *range_seg_cache;
DTRACE_PROBE(arc__kmem_reap_start);
#ifdef _KERNEL
Modified: projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
==============================================================================
--- projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -1332,7 +1332,14 @@ dmu_assign_arcbuf(dmu_buf_t *handle, uin
rw_exit(&dn->dn_struct_rwlock);
DB_DNODE_EXIT(dbuf);
- if (offset == db->db.db_offset && blksz == db->db.db_size) {
+ /*
+ * We can only assign if the offset is aligned, the arc buf is the
+ * same size as the dbuf, and the dbuf is not metadata. It
+ * can't be metadata because the loaned arc buf comes from the
+ * user-data kmem arena.
+ */
+ if (offset == db->db.db_offset && blksz == db->db.db_size &&
+ DBUF_GET_BUFC_TYPE(db) == ARC_BUFC_DATA) {
dbuf_assign_arcbuf(db, buf, tx);
dbuf_rele(db, FTAG);
} else {
Modified: projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
==============================================================================
--- projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -1273,18 +1273,20 @@ restore_bytes(struct restorearg *ra, voi
}
static void *
-restore_read(struct restorearg *ra, int len)
+restore_read(struct restorearg *ra, int len, char *buf)
{
- void *rv;
int done = 0;
+ if (buf == NULL)
+ buf = ra->buf;
+
/* some things will require 8-byte alignment, so everything must */
ASSERT0(len % 8);
while (done < len) {
ssize_t resid;
- ra->err = restore_bytes(ra, (caddr_t)ra->buf + done,
+ ra->err = restore_bytes(ra, buf + done,
len - done, ra->voff, &resid);
if (resid == len - done)
@@ -1296,12 +1298,11 @@ restore_read(struct restorearg *ra, int
}
ASSERT3U(done, ==, len);
- rv = ra->buf;
if (ra->byteswap)
- fletcher_4_incremental_byteswap(rv, len, &ra->cksum);
+ fletcher_4_incremental_byteswap(buf, len, &ra->cksum);
else
- fletcher_4_incremental_native(rv, len, &ra->cksum);
- return (rv);
+ fletcher_4_incremental_native(buf, len, &ra->cksum);
+ return (buf);
}
static void
@@ -1416,7 +1417,7 @@ restore_object(struct restorearg *ra, ob
return (SET_ERROR(EINVAL));
if (drro->drr_bonuslen) {
- data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8));
+ data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8), NULL);
if (ra->err != 0)
return (ra->err);
}
@@ -1513,19 +1514,30 @@ restore_write(struct restorearg *ra, obj
!DMU_OT_IS_VALID(drrw->drr_type))
return (SET_ERROR(EINVAL));
- data = restore_read(ra, drrw->drr_length);
- if (data == NULL)
- return (ra->err);
-
if (dmu_object_info(os, drrw->drr_object, NULL) != 0)
return (SET_ERROR(EINVAL));
+ dmu_buf_t *bonus;
+ if (dmu_bonus_hold(os, drrw->drr_object, FTAG, &bonus) != 0)
+ return (SET_ERROR(EINVAL));
+
+ arc_buf_t *abuf = dmu_request_arcbuf(bonus, drrw->drr_length);
+
+ data = restore_read(ra, drrw->drr_length, abuf->b_data);
+ if (data == NULL) {
+ dmu_return_arcbuf(abuf);
+ dmu_buf_rele(bonus, FTAG);
+ return (ra->err);
+ }
+
tx = dmu_tx_create(os);
dmu_tx_hold_write(tx, drrw->drr_object,
drrw->drr_offset, drrw->drr_length);
err = dmu_tx_assign(tx, TXG_WAIT);
if (err != 0) {
+ dmu_return_arcbuf(abuf);
+ dmu_buf_rele(bonus, FTAG);
dmu_tx_abort(tx);
return (err);
}
@@ -1534,9 +1546,9 @@ restore_write(struct restorearg *ra, obj
DMU_OT_BYTESWAP(drrw->drr_type);
dmu_ot_byteswap[byteswap].ob_func(data, drrw->drr_length);
}
- dmu_write(os, drrw->drr_object,
- drrw->drr_offset, drrw->drr_length, data, tx);
+ dmu_assign_arcbuf(bonus, drrw->drr_offset, abuf, tx);
dmu_tx_commit(tx);
+ dmu_buf_rele(bonus, FTAG);
return (0);
}
@@ -1618,7 +1630,7 @@ restore_write_embedded(struct restorearg
if (drrwnp->drr_compression >= ZIO_COMPRESS_FUNCTIONS)
return (EINVAL);
- data = restore_read(ra, P2ROUNDUP(drrwnp->drr_psize, 8));
+ data = restore_read(ra, P2ROUNDUP(drrwnp->drr_psize, 8), NULL);
if (data == NULL)
return (ra->err);
@@ -1653,7 +1665,7 @@ restore_spill(struct restorearg *ra, obj
drrs->drr_length > SPA_MAXBLOCKSIZE)
return (SET_ERROR(EINVAL));
- data = restore_read(ra, drrs->drr_length);
+ data = restore_read(ra, drrs->drr_length, NULL);
if (data == NULL)
return (ra->err);
@@ -1795,7 +1807,7 @@ dmu_recv_stream(dmu_recv_cookie_t *drc,
*/
pcksum = ra.cksum;
while (ra.err == 0 &&
- NULL != (drr = restore_read(&ra, sizeof (*drr)))) {
+ NULL != (drr = restore_read(&ra, sizeof (*drr), NULL))) {
if (issig(JUSTLOOKING) && issig(FORREAL)) {
ra.err = SET_ERROR(EINTR);
goto out;
Modified: projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
==============================================================================
--- projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -21,7 +21,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Portions Copyright (c) 2011 Martin Matuska <mm@FreeBSD.org>
- * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
* Copyright (c) 2014, Joyent, Inc. All rights reserved.
* Copyright (c) 2014 RackTop Systems.
*/
@@ -699,7 +699,13 @@ dsl_dataset_create_sync_dd(dsl_dir_t *dd
dsphys->ds_uncompressed_bytes =
origin->ds_phys->ds_uncompressed_bytes;
dsphys->ds_bp = origin->ds_phys->ds_bp;
- dsphys->ds_flags |= origin->ds_phys->ds_flags;
+
+ /*
+ * Inherit flags that describe the dataset's contents
+ * (INCONSISTENT) or properties (Case Insensitive).
+ */
+ dsphys->ds_flags |= origin->ds_phys->ds_flags &
+ (DS_FLAG_INCONSISTENT | DS_FLAG_CI_DATASET);
dmu_buf_will_dirty(origin->ds_dbuf, tx);
origin->ds_phys->ds_num_children++;
Modified: projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
==============================================================================
--- projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -375,13 +375,12 @@ dsl_scan_cancel(dsl_pool_t *dp)
dsl_scan_cancel_sync, NULL, 3, ZFS_SPACE_CHECK_RESERVED));
}
-static void dsl_scan_visitbp(blkptr_t *bp,
- const zbookmark_phys_t *zb, dnode_phys_t *dnp, arc_buf_t *pbuf,
- dsl_dataset_t *ds, dsl_scan_t *scn, dmu_objset_type_t ostype,
- dmu_tx_t *tx);
+static void dsl_scan_visitbp(blkptr_t *bp, const zbookmark_phys_t *zb,
+ dnode_phys_t *dnp, dsl_dataset_t *ds, dsl_scan_t *scn,
+ dmu_objset_type_t ostype, dmu_tx_t *tx);
static void dsl_scan_visitdnode(dsl_scan_t *, dsl_dataset_t *ds,
dmu_objset_type_t ostype,
- dnode_phys_t *dnp, arc_buf_t *buf, uint64_t object, dmu_tx_t *tx);
+ dnode_phys_t *dnp, uint64_t object, dmu_tx_t *tx);
void
dsl_free(dsl_pool_t *dp, uint64_t txg, const blkptr_t *bp)
@@ -615,7 +614,7 @@ dsl_scan_check_resume(dsl_scan_t *scn, c
static int
dsl_scan_recurse(dsl_scan_t *scn, dsl_dataset_t *ds, dmu_objset_type_t ostype,
dnode_phys_t *dnp, const blkptr_t *bp,
- const zbookmark_phys_t *zb, dmu_tx_t *tx, arc_buf_t **bufp)
+ const zbookmark_phys_t *zb, dmu_tx_t *tx)
{
dsl_pool_t *dp = scn->scn_dp;
int zio_flags = ZIO_FLAG_CANFAIL | ZIO_FLAG_SCAN_THREAD;
@@ -626,76 +625,72 @@ dsl_scan_recurse(dsl_scan_t *scn, dsl_da
int i;
blkptr_t *cbp;
int epb = BP_GET_LSIZE(bp) >> SPA_BLKPTRSHIFT;
+ arc_buf_t *buf;
- err = arc_read(NULL, dp->dp_spa, bp, arc_getbuf_func, bufp,
+ err = arc_read(NULL, dp->dp_spa, bp, arc_getbuf_func, &buf,
ZIO_PRIORITY_ASYNC_READ, zio_flags, &flags, zb);
if (err) {
scn->scn_phys.scn_errors++;
return (err);
}
- for (i = 0, cbp = (*bufp)->b_data; i < epb; i++, cbp++) {
- dsl_scan_prefetch(scn, *bufp, cbp, zb->zb_objset,
+ for (i = 0, cbp = buf->b_data; i < epb; i++, cbp++) {
+ dsl_scan_prefetch(scn, buf, cbp, zb->zb_objset,
zb->zb_object, zb->zb_blkid * epb + i);
}
- for (i = 0, cbp = (*bufp)->b_data; i < epb; i++, cbp++) {
+ for (i = 0, cbp = buf->b_data; i < epb; i++, cbp++) {
zbookmark_phys_t czb;
SET_BOOKMARK(&czb, zb->zb_objset, zb->zb_object,
zb->zb_level - 1,
zb->zb_blkid * epb + i);
dsl_scan_visitbp(cbp, &czb, dnp,
- *bufp, ds, scn, ostype, tx);
- }
- } else if (BP_GET_TYPE(bp) == DMU_OT_USERGROUP_USED) {
- uint32_t flags = ARC_WAIT;
-
- err = arc_read(NULL, dp->dp_spa, bp, arc_getbuf_func, bufp,
- ZIO_PRIORITY_ASYNC_READ, zio_flags, &flags, zb);
- if (err) {
- scn->scn_phys.scn_errors++;
- return (err);
+ ds, scn, ostype, tx);
}
+ (void) arc_buf_remove_ref(buf, &buf);
} else if (BP_GET_TYPE(bp) == DMU_OT_DNODE) {
uint32_t flags = ARC_WAIT;
dnode_phys_t *cdnp;
int i, j;
int epb = BP_GET_LSIZE(bp) >> DNODE_SHIFT;
+ arc_buf_t *buf;
- err = arc_read(NULL, dp->dp_spa, bp, arc_getbuf_func, bufp,
+ err = arc_read(NULL, dp->dp_spa, bp, arc_getbuf_func, &buf,
ZIO_PRIORITY_ASYNC_READ, zio_flags, &flags, zb);
if (err) {
scn->scn_phys.scn_errors++;
return (err);
}
- for (i = 0, cdnp = (*bufp)->b_data; i < epb; i++, cdnp++) {
+ for (i = 0, cdnp = buf->b_data; i < epb; i++, cdnp++) {
for (j = 0; j < cdnp->dn_nblkptr; j++) {
blkptr_t *cbp = &cdnp->dn_blkptr[j];
- dsl_scan_prefetch(scn, *bufp, cbp,
+ dsl_scan_prefetch(scn, buf, cbp,
zb->zb_objset, zb->zb_blkid * epb + i, j);
}
}
- for (i = 0, cdnp = (*bufp)->b_data; i < epb; i++, cdnp++) {
+ for (i = 0, cdnp = buf->b_data; i < epb; i++, cdnp++) {
dsl_scan_visitdnode(scn, ds, ostype,
- cdnp, *bufp, zb->zb_blkid * epb + i, tx);
+ cdnp, zb->zb_blkid * epb + i, tx);
}
+ (void) arc_buf_remove_ref(buf, &buf);
} else if (BP_GET_TYPE(bp) == DMU_OT_OBJSET) {
uint32_t flags = ARC_WAIT;
objset_phys_t *osp;
+ arc_buf_t *buf;
- err = arc_read(NULL, dp->dp_spa, bp, arc_getbuf_func, bufp,
+ err = arc_read(NULL, dp->dp_spa, bp, arc_getbuf_func, &buf,
ZIO_PRIORITY_ASYNC_READ, zio_flags, &flags, zb);
if (err) {
scn->scn_phys.scn_errors++;
return (err);
}
- osp = (*bufp)->b_data;
+ osp = buf->b_data;
dsl_scan_visitdnode(scn, ds, osp->os_type,
- &osp->os_meta_dnode, *bufp, DMU_META_DNODE_OBJECT, tx);
+ &osp->os_meta_dnode, DMU_META_DNODE_OBJECT, tx);
- if (OBJSET_BUF_HAS_USERUSED(*bufp)) {
+ if (OBJSET_BUF_HAS_USERUSED(buf)) {
/*
* We also always visit user/group accounting
* objects, and never skip them, even if we are
@@ -703,12 +698,13 @@ dsl_scan_recurse(dsl_scan_t *scn, dsl_da
* deltas from this txg get integrated.
*/
dsl_scan_visitdnode(scn, ds, osp->os_type,
- &osp->os_groupused_dnode, *bufp,
+ &osp->os_groupused_dnode,
DMU_GROUPUSED_OBJECT, tx);
dsl_scan_visitdnode(scn, ds, osp->os_type,
- &osp->os_userused_dnode, *bufp,
+ &osp->os_userused_dnode,
DMU_USERUSED_OBJECT, tx);
}
+ (void) arc_buf_remove_ref(buf, &buf);
}
return (0);
@@ -716,7 +712,7 @@ dsl_scan_recurse(dsl_scan_t *scn, dsl_da
static void
dsl_scan_visitdnode(dsl_scan_t *scn, dsl_dataset_t *ds,
- dmu_objset_type_t ostype, dnode_phys_t *dnp, arc_buf_t *buf,
+ dmu_objset_type_t ostype, dnode_phys_t *dnp,
uint64_t object, dmu_tx_t *tx)
{
int j;
@@ -727,7 +723,7 @@ dsl_scan_visitdnode(dsl_scan_t *scn, dsl
SET_BOOKMARK(&czb, ds ? ds->ds_object : 0, object,
dnp->dn_nlevels - 1, j);
dsl_scan_visitbp(&dnp->dn_blkptr[j],
- &czb, dnp, buf, ds, scn, ostype, tx);
+ &czb, dnp, ds, scn, ostype, tx);
}
if (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) {
@@ -735,7 +731,7 @@ dsl_scan_visitdnode(dsl_scan_t *scn, dsl
SET_BOOKMARK(&czb, ds ? ds->ds_object : 0, object,
0, DMU_SPILL_BLKID);
dsl_scan_visitbp(&dnp->dn_spill,
- &czb, dnp, buf, ds, scn, ostype, tx);
+ &czb, dnp, ds, scn, ostype, tx);
}
}
@@ -745,9 +741,8 @@ dsl_scan_visitdnode(dsl_scan_t *scn, dsl
*/
static void
dsl_scan_visitbp(blkptr_t *bp, const zbookmark_phys_t *zb,
- dnode_phys_t *dnp, arc_buf_t *pbuf,
- dsl_dataset_t *ds, dsl_scan_t *scn, dmu_objset_type_t ostype,
- dmu_tx_t *tx)
+ dnode_phys_t *dnp, dsl_dataset_t *ds, dsl_scan_t *scn,
+ dmu_objset_type_t ostype, dmu_tx_t *tx)
{
dsl_pool_t *dp = scn->scn_dp;
arc_buf_t *buf = NULL;
@@ -767,16 +762,15 @@ dsl_scan_visitbp(blkptr_t *bp, const zbo
scn->scn_visited_this_txg++;
dprintf_bp(bp,
- "visiting ds=%p/%llu zb=%llx/%llx/%llx/%llx buf=%p bp=%p",
+ "visiting ds=%p/%llu zb=%llx/%llx/%llx/%llx bp=%p",
ds, ds ? ds->ds_object : 0,
zb->zb_objset, zb->zb_object, zb->zb_level, zb->zb_blkid,
- pbuf, bp);
+ bp);
if (bp->blk_birth <= scn->scn_phys.scn_cur_min_txg)
return;
- if (dsl_scan_recurse(scn, ds, ostype, dnp, &bp_toread, zb, tx,
- &buf) != 0)
+ if (dsl_scan_recurse(scn, ds, ostype, dnp, &bp_toread, zb, tx) != 0)
return;
/*
@@ -800,8 +794,6 @@ dsl_scan_visitbp(blkptr_t *bp, const zbo
if (BP_PHYSICAL_BIRTH(bp) <= scn->scn_phys.scn_cur_max_txg) {
scan_funcs[scn->scn_phys.scn_func](dp, bp, zb);
}
- if (buf)
- (void) arc_buf_remove_ref(buf, &buf);
}
static void
@@ -812,7 +804,7 @@ dsl_scan_visit_rootbp(dsl_scan_t *scn, d
SET_BOOKMARK(&zb, ds ? ds->ds_object : DMU_META_OBJSET,
ZB_ROOT_OBJECT, ZB_ROOT_LEVEL, ZB_ROOT_BLKID);
- dsl_scan_visitbp(bp, &zb, NULL, NULL,
+ dsl_scan_visitbp(bp, &zb, NULL,
ds, scn, DMU_OST_NONE, tx);
dprintf_ds(ds, "finished scan%s", "");
Modified: projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Mon Oct 6 11:15:11 2014 (r272609)
+++ projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Mon Oct 6 11:29:50 2014 (r272610)
@@ -1277,7 +1277,9 @@ spa_unload(spa_t *spa)
* Wait for any outstanding async I/O to complete.
*/
if (spa->spa_async_zio_root != NULL) {
- (void) zio_wait(spa->spa_async_zio_root);
+ for (int i = 0; i < max_ncpus; i++)
+ (void) zio_wait(spa->spa_async_zio_root[i]);
+ kmem_free(spa->spa_async_zio_root, max_ncpus * sizeof (void *));
spa->spa_async_zio_root = NULL;
}
@@ -2213,8 +2215,13 @@ spa_load_impl(spa_t *spa, uint64_t pool_
/*
* Create "The Godfather" zio to hold all async IOs
*/
- spa->spa_async_zio_root = zio_root(spa, NULL, NULL,
- ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE | ZIO_FLAG_GODFATHER);
+ spa->spa_async_zio_root = kmem_alloc(max_ncpus * sizeof (void *),
+ KM_SLEEP);
+ for (int i = 0; i < max_ncpus; i++) {
+ spa->spa_async_zio_root[i] = zio_root(spa, NULL, NULL,
+ ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE |
+ ZIO_FLAG_GODFATHER);
+ }
/*
* Parse the configuration into a vdev tree. We explicitly set the
@@ -3567,8 +3574,13 @@ spa_create(const char *pool, nvlist_t *n
/*
* Create "The Godfather" zio to hold all async IOs
*/
- spa->spa_async_zio_root = zio_root(spa, NULL, NULL,
- ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE | ZIO_FLAG_GODFATHER);
+ spa->spa_async_zio_root = kmem_alloc(max_ncpus * sizeof (void *),
+ KM_SLEEP);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Mon Oct 6 16:38:10 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 6F9405AB;
Mon, 6 Oct 2014 16:38:10 +0000 (UTC)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 48D7F6CF;
Mon, 6 Oct 2014 16:38:10 +0000 (UTC)
Received: from ralph.baldwin.cx (pool-173-70-85-31.nwrknj.fios.verizon.net
[173.70.85.31])
by bigwig.baldwin.cx (Postfix) with ESMTPSA id 3F172B977;
Mon, 6 Oct 2014 12:38:09 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: "Alexander V. Chernikov" <melifaro@freebsd.org>
Subject: Re: svn commit: r272515 - projects/ipfw/sys/netpfil/ipfw
Date: Mon, 06 Oct 2014 11:45:26 -0400
Message-ID: <5520708.eFNh9vYom7@ralph.baldwin.cx>
User-Agent: KMail/4.12.5 (FreeBSD/10.1-BETA2; KDE/4.12.5; amd64; ; )
In-Reply-To: <201410041210.s94CAX7I012628@svn.freebsd.org>
References: <201410041210.s94CAX7I012628@svn.freebsd.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
(bigwig.baldwin.cx); Mon, 06 Oct 2014 12:38:09 -0400 (EDT)
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Oct 2014 16:38:10 -0000
On Saturday, October 04, 2014 12:10:33 PM Alexander V. Chernikov wrote:
> Author: melifaro
> Date: Sat Oct 4 12:10:32 2014
> New Revision: 272515
> URL: https://svnweb.freebsd.org/changeset/base/272515
>
> Log:
> Add "ipfw_ctl3" FEATURE to indicate presence of new ipfw interface.
>
> Modified:
> projects/ipfw/sys/netpfil/ipfw/ip_fw2.c
>
> Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw2.c
> ============================================================================
> == --- projects/ipfw/sys/netpfil/ipfw/ip_fw2.c Sat Oct 4 11:40:35
> 2014 (r272514) +++ projects/ipfw/sys/netpfil/ipfw/ip_fw2.c Sat Oct 4
> 12:10:32 2014 (r272515) @@ -2874,6 +2874,7 @@ static moduledata_t ipfwmod =
> {
> #define IPFW_VNET_ORDER (IPFW_MODEVENT_ORDER + 2) /* Later still. */
>
> DECLARE_MODULE(ipfw, ipfwmod, IPFW_SI_SUB_FIREWALL, IPFW_MODEVENT_ORDER);
> +FEATURE(ipfw_ctl3, "ipfw new sockopt calls");
> MODULE_VERSION(ipfw, 2);
> /* should declare some dependencies here */
Would it be better to bump the module version to 3 instead? Userland programs
can then use modfind() and modstat() to determine the version.
--
John Baldwin
From owner-svn-src-projects@FreeBSD.ORG Tue Oct 7 10:54:55 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 0BA432A8;
Tue, 7 Oct 2014 10:54:55 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id EB9B4C14;
Tue, 7 Oct 2014 10:54:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97AssUs011217;
Tue, 7 Oct 2014 10:54:54 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97AsrxU011209;
Tue, 7 Oct 2014 10:54:53 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201410071054.s97AsrxU011209@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Tue, 7 Oct 2014 10:54:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272685 - projects/ipfw/sys/netpfil/ipfw
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2014 10:54:55 -0000
Author: melifaro
Date: Tue Oct 7 10:54:53 2014
New Revision: 272685
URL: https://svnweb.freebsd.org/changeset/base/272685
Log:
* Fix crash in interface tracker due to using old "linked" field.
* Ensure we're flushing entries without any locks held.
* Free memory in (rare) case when interface tracker fails to register ifp.
* Add KASSERT on table values refcounts.
Modified:
projects/ipfw/sys/netpfil/ipfw/ip_fw_iface.c
projects/ipfw/sys/netpfil/ipfw/ip_fw_private.h
projects/ipfw/sys/netpfil/ipfw/ip_fw_table.c
projects/ipfw/sys/netpfil/ipfw/ip_fw_table_algo.c
projects/ipfw/sys/netpfil/ipfw/ip_fw_table_value.c
Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_iface.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw_iface.c Tue Oct 7 10:36:06 2014 (r272684)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw_iface.c Tue Oct 7 10:54:53 2014 (r272685)
@@ -392,8 +392,7 @@ ipfw_iface_del_notify(struct ip_fw_chain
IPFW_UH_WLOCK_ASSERT(ch);
iif = ic->iface;
- if (ic->linked != 0)
- TAILQ_REMOVE(&iif->consumers, ic, next);
+ TAILQ_REMOVE(&iif->consumers, ic, next);
}
/*
Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_private.h
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw_private.h Tue Oct 7 10:36:06 2014 (r272684)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw_private.h Tue Oct 7 10:54:53 2014 (r272685)
@@ -355,8 +355,6 @@ struct ipfw_ifc {
struct ipfw_iface *iface;
ipfw_ifc_cb *cb;
void *cbdata;
- int linked;
- int spare;
};
/* Macro for working with various counters */
Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_table.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw_table.c Tue Oct 7 10:36:06 2014 (r272684)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw_table.c Tue Oct 7 10:54:53 2014 (r272685)
@@ -564,10 +564,14 @@ add_table_entry(struct ip_fw_chain *ch,
*/
restart:
if (ts.modified != 0) {
+ IPFW_UH_WUNLOCK(ch);
flush_batch_buffer(ch, ta, tei, count, rollback,
ta_buf_m, ta_buf);
memset(&ts, 0, sizeof(ts));
+ ta = NULL;
+ IPFW_UH_WLOCK(ch);
}
+
error = find_ref_table(ch, ti, tei, count, OP_ADD, &tc);
if (error != 0) {
IPFW_UH_WUNLOCK(ch);
Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_table_algo.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw_table_algo.c Tue Oct 7 10:36:06 2014 (r272684)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw_table_algo.c Tue Oct 7 10:54:53 2014 (r272685)
@@ -2045,8 +2045,10 @@ ta_prepare_add_ifidx(struct ip_fw_chain
ife->ic.cb = if_notifier;
ife->ic.cbdata = ife;
- if (ipfw_iface_ref(ch, ifname, &ife->ic) != 0)
+ if (ipfw_iface_ref(ch, ifname, &ife->ic) != 0) {
+ free(ife, M_IPFW_TBL);
return (EINVAL);
+ }
/* Use ipfw_iface 'ifname' field as stable storage */
ife->no.name = ife->ic.iface->ifname;
Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_table_value.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw_table_value.c Tue Oct 7 10:36:06 2014 (r272684)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw_table_value.c Tue Oct 7 10:54:53 2014 (r272685)
@@ -251,10 +251,9 @@ unref_table_value(struct namedobj_instan
{
struct table_val_link *ptvl;
- if (pval[kidx].refcnt > 1) {
- pval[kidx].refcnt--;
+ KASSERT(pval[kidx].refcnt > 0, ("Refcount is 0 on kidx %d", kidx));
+ if (--pval[kidx].refcnt > 0)
return;
- }
/* Last reference, delete item */
ptvl = (struct table_val_link *)ipfw_objhash_lookup_kidx(vi, kidx);
@@ -307,6 +306,8 @@ ipfw_unref_table_values(struct ip_fw_cha
{
struct flush_args fa;
+ IPFW_UH_WLOCK_ASSERT(ch);
+
memset(&fa, 0, sizeof(fa));
fa.ch = ch;
fa.ta = ta;
From owner-svn-src-projects@FreeBSD.ORG Tue Oct 7 13:08:53 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 3BFCFAFA;
Tue, 7 Oct 2014 13:08:53 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 28A14CB7;
Tue, 7 Oct 2014 13:08:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97D8r6I077093;
Tue, 7 Oct 2014 13:08:53 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97D8r2W077092;
Tue, 7 Oct 2014 13:08:53 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201410071308.s97D8r2W077092@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 7 Oct 2014 13:08:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272686 - projects/sendfile/sys/netinet
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2014 13:08:53 -0000
Author: glebius
Date: Tue Oct 7 13:08:52 2014
New Revision: 272686
URL: https://svnweb.freebsd.org/changeset/base/272686
Log:
tcp_usr_ready() shouldn't honor SBS_CANTSENDMORE, since data already
is in the socket and we must send it.
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
Modified:
projects/sendfile/sys/netinet/tcp_usrreq.c
Modified: projects/sendfile/sys/netinet/tcp_usrreq.c
==============================================================================
--- projects/sendfile/sys/netinet/tcp_usrreq.c Tue Oct 7 10:54:53 2014 (r272685)
+++ projects/sendfile/sys/netinet/tcp_usrreq.c Tue Oct 7 13:08:52 2014 (r272686)
@@ -941,17 +941,10 @@ tcp_usr_ready(struct socket *so, struct
tp = intotcpcb(inp);
SOCKBUF_LOCK(&so->so_snd);
- if (so->so_snd.sb_state & SBS_CANTSENDMORE) {
- SOCKBUF_UNLOCK(&so->so_snd);
- error = ENOTCONN;
- } else if (sbready(&so->so_snd, m, count) == 0) {
- SOCKBUF_UNLOCK(&so->so_snd);
+ error = sbready(&so->so_snd, m, count);
+ SOCKBUF_UNLOCK(&so->so_snd);
+ if (error == 0)
error = tcp_output(tp);
- } else {
- SOCKBUF_UNLOCK(&so->so_snd);
- error = EINPROGRESS;
- }
-
INP_WUNLOCK(inp);
return (error);
From owner-svn-src-projects@FreeBSD.ORG Tue Oct 7 13:18:29 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 09108E93;
Tue, 7 Oct 2014 13:18:29 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id E9829D98;
Tue, 7 Oct 2014 13:18:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97DISVZ081943;
Tue, 7 Oct 2014 13:18:28 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97DISu9081942;
Tue, 7 Oct 2014 13:18:28 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201410071318.s97DISu9081942@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 7 Oct 2014 13:18:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272687 - projects/sendfile/sys/netinet
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2014 13:18:29 -0000
Author: glebius
Date: Tue Oct 7 13:18:28 2014
New Revision: 272687
URL: https://svnweb.freebsd.org/changeset/base/272687
Log:
Fix three critical bugs when sbavail() was used in place of sbused(),
and one non-critical. The critical ones led to FIN bit sent before
remainer of data.
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
Modified:
projects/sendfile/sys/netinet/tcp_output.c
Modified: projects/sendfile/sys/netinet/tcp_output.c
==============================================================================
--- projects/sendfile/sys/netinet/tcp_output.c Tue Oct 7 13:08:52 2014 (r272686)
+++ projects/sendfile/sys/netinet/tcp_output.c Tue Oct 7 13:18:28 2014 (r272687)
@@ -322,7 +322,7 @@ after_sack_rexmit:
* to send then the probe will be the FIN
* itself.
*/
- if (off < sbavail(&so->so_snd))
+ if (off < sbused(&so->so_snd))
flags &= ~TH_FIN;
sendwin = 1;
} else {
@@ -503,11 +503,11 @@ after_sack_rexmit:
tso = 1;
if (sack_rxmit) {
- if (SEQ_LT(p->rxmit + len, tp->snd_una + sbavail(&so->so_snd)))
+ if (SEQ_LT(p->rxmit + len, tp->snd_una + sbused(&so->so_snd)))
flags &= ~TH_FIN;
} else {
if (SEQ_LT(tp->snd_nxt + len, tp->snd_una +
- sbavail(&so->so_snd)))
+ sbused(&so->so_snd)))
flags &= ~TH_FIN;
}
@@ -979,7 +979,7 @@ send:
* give data to the user when a buffer fills or
* a PUSH comes in.)
*/
- if (off + len == sbavail(&so->so_snd))
+ if (off + len == sbused(&so->so_snd))
flags |= TH_PUSH;
SOCKBUF_UNLOCK(&so->so_snd);
} else {
From owner-svn-src-projects@FreeBSD.ORG Tue Oct 7 13:26:08 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 462C35EA;
Tue, 7 Oct 2014 13:26:08 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 2D729E8B;
Tue, 7 Oct 2014 13:26:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97DQ83J086692;
Tue, 7 Oct 2014 13:26:08 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97DQ1C6086656;
Tue, 7 Oct 2014 13:26:01 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201410071326.s97DQ1C6086656@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 7 Oct 2014 13:26:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272692 - in projects/sendfile: . bin/sh
bin/sh/tests/builtins cddl/contrib/opensolaris/cmd/dtrace
cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf
cddl/contrib/opensolaris/cmd/...
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2014 13:26:08 -0000
Author: glebius
Date: Tue Oct 7 13:25:59 2014
New Revision: 272692
URL: https://svnweb.freebsd.org/changeset/base/272692
Log:
Merge head r258543 through r272687.
Added:
projects/sendfile/bin/sh/tests/builtins/lineno3.0
- copied unchanged from r272687, head/bin/sh/tests/builtins/lineno3.0
projects/sendfile/bin/sh/tests/builtins/lineno3.0.stdout
- copied unchanged from r272687, head/bin/sh/tests/builtins/lineno3.0.stdout
projects/sendfile/contrib/byacc/test/btyacc/btyacc_demo2.error
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_demo2.error
projects/sendfile/contrib/byacc/test/btyacc/btyacc_demo2.output
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_demo2.output
projects/sendfile/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
projects/sendfile/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy1.error
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy1.error
projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy1.output
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy1.output
projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy2.error
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy2.error
projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy2.output
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy2.output
projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy3.error
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy3.error
projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy3.output
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy3.output
projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
projects/sendfile/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
- copied unchanged from r272687, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
projects/sendfile/contrib/byacc/test/btyacc_destroy1.y
- copied unchanged from r272687, head/contrib/byacc/test/btyacc_destroy1.y
projects/sendfile/contrib/byacc/test/btyacc_destroy2.y
- copied unchanged from r272687, head/contrib/byacc/test/btyacc_destroy2.y
projects/sendfile/contrib/byacc/test/btyacc_destroy3.y
- copied unchanged from r272687, head/contrib/byacc/test/btyacc_destroy3.y
projects/sendfile/contrib/netbsd-tests/
- copied from r272687, head/contrib/netbsd-tests/
projects/sendfile/lib/libc/string/explicit_bzero.c
- copied unchanged from r272687, head/lib/libc/string/explicit_bzero.c
projects/sendfile/lib/libpcap/pcap-netmap.c
- copied unchanged from r272687, head/lib/libpcap/pcap-netmap.c
projects/sendfile/release/amd64/mk-vmimage.sh
- copied unchanged from r272687, head/release/amd64/mk-vmimage.sh
projects/sendfile/release/i386/mk-vmimage.sh
- copied unchanged from r272687, head/release/i386/mk-vmimage.sh
projects/sendfile/sys/contrib/dev/acpica/common/acgetline.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/common/acgetline.c
projects/sendfile/sys/contrib/dev/acpica/common/ahids.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/common/ahids.c
projects/sendfile/sys/contrib/dev/acpica/common/ahuuids.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/common/ahuuids.c
projects/sendfile/sys/contrib/dev/acpica/common/cmfsize.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/common/cmfsize.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslascii.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslascii.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslmapenter.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslmapenter.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslmapoutput.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslmapoutput.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslmaputils.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslmaputils.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslmessages.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslmessages.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslparser.y
- copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslparser.y
projects/sendfile/sys/contrib/dev/acpica/compiler/aslrules.y
- copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslrules.y
projects/sendfile/sys/contrib/dev/acpica/compiler/aslsupport.y
- copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/aslsupport.y
projects/sendfile/sys/contrib/dev/acpica/compiler/asltokens.y
- copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/asltokens.y
projects/sendfile/sys/contrib/dev/acpica/compiler/asltypes.y
- copied unchanged from r272687, head/sys/contrib/dev/acpica/compiler/asltypes.y
projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbtest.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/components/debugger/dbtest.c
projects/sendfile/sys/contrib/dev/acpica/components/tables/tbdata.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/components/tables/tbdata.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utfileio.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/components/utilities/utfileio.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/uthex.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/components/utilities/uthex.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utprint.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/components/utilities/utprint.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utuuid.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/components/utilities/utuuid.c
projects/sendfile/sys/contrib/dev/acpica/include/platform/acenvex.h
- copied unchanged from r272687, head/sys/contrib/dev/acpica/include/platform/acenvex.h
projects/sendfile/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c
- copied unchanged from r272687, head/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c
projects/sendfile/sys/libkern/explicit_bzero.c
- copied unchanged from r272687, head/sys/libkern/explicit_bzero.c
projects/sendfile/sys/sys/seq.h
- copied unchanged from r272687, head/sys/sys/seq.h
projects/sendfile/tools/tools/bootparttest/stub.c
- copied unchanged from r272687, head/tools/tools/bootparttest/stub.c
projects/sendfile/usr.sbin/pw/tests/
- copied from r272687, head/usr.sbin/pw/tests/
Deleted:
projects/sendfile/sys/contrib/dev/acpica/compiler/aslcompiler.y
projects/sendfile/sys/modules/acpi/acpi/
projects/sendfile/sys/pc98/pc98/machdep.c
projects/sendfile/tools/tools/bootparttest/malloc.c
Modified:
projects/sendfile/Makefile.inc1
projects/sendfile/ObsoleteFiles.inc
projects/sendfile/bin/sh/eval.c
projects/sendfile/bin/sh/expand.c
projects/sendfile/bin/sh/jobs.c
projects/sendfile/bin/sh/parser.c
projects/sendfile/bin/sh/redir.c
projects/sendfile/bin/sh/tests/builtins/Makefile
projects/sendfile/bin/sh/trap.c
projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c
projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
projects/sendfile/cddl/lib/libdtrace/libproc_compat.h
projects/sendfile/cddl/lib/libzfs/Makefile
projects/sendfile/cddl/lib/libzpool/Makefile
projects/sendfile/contrib/binutils/bfd/config.bfd
projects/sendfile/contrib/binutils/bfd/elf32-arm.c
projects/sendfile/contrib/binutils/gas/config/tc-arm.c
projects/sendfile/contrib/binutils/include/elf/arm.h
projects/sendfile/contrib/byacc/CHANGES
projects/sendfile/contrib/byacc/MANIFEST
projects/sendfile/contrib/byacc/VERSION
projects/sendfile/contrib/byacc/aclocal.m4
projects/sendfile/contrib/byacc/btyaccpar.c
projects/sendfile/contrib/byacc/closure.c
projects/sendfile/contrib/byacc/config.sub
projects/sendfile/contrib/byacc/configure
projects/sendfile/contrib/byacc/defs.h
projects/sendfile/contrib/byacc/lalr.c
projects/sendfile/contrib/byacc/main.c
projects/sendfile/contrib/byacc/output.c
projects/sendfile/contrib/byacc/package/byacc.spec
projects/sendfile/contrib/byacc/package/debian/changelog
projects/sendfile/contrib/byacc/package/mingw-byacc.spec
projects/sendfile/contrib/byacc/package/pkgsrc/Makefile
projects/sendfile/contrib/byacc/reader.c
projects/sendfile/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
projects/sendfile/contrib/byacc/test/btyacc/btyacc_demo.tab.c
projects/sendfile/contrib/byacc/test/btyacc/calc.tab.c
projects/sendfile/contrib/byacc/test/btyacc/calc1.tab.c
projects/sendfile/contrib/byacc/test/btyacc/calc2.tab.c
projects/sendfile/contrib/byacc/test/btyacc/calc3.tab.c
projects/sendfile/contrib/byacc/test/btyacc/code_calc.code.c
projects/sendfile/contrib/byacc/test/btyacc/code_calc.tab.c
projects/sendfile/contrib/byacc/test/btyacc/code_error.code.c
projects/sendfile/contrib/byacc/test/btyacc/code_error.tab.c
projects/sendfile/contrib/byacc/test/btyacc/empty.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_inherit1.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_inherit2.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_inherit3.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_inherit4.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_inherit5.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax1.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax10.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax11.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax12.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax13.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax14.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax15.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax16.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax17.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax18.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax19.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax2.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax20.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax21.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax22.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax23.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax24.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax25.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax26.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax27.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax3.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax4.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax5.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax6.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax7.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax7a.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax7b.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax8.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax8a.tab.c
projects/sendfile/contrib/byacc/test/btyacc/err_syntax9.tab.c
projects/sendfile/contrib/byacc/test/btyacc/error.tab.c
projects/sendfile/contrib/byacc/test/btyacc/grammar.tab.c
projects/sendfile/contrib/byacc/test/btyacc/inherit0.tab.c
projects/sendfile/contrib/byacc/test/btyacc/inherit1.tab.c
projects/sendfile/contrib/byacc/test/btyacc/inherit2.tab.c
projects/sendfile/contrib/byacc/test/btyacc/ok_syntax1.tab.c
projects/sendfile/contrib/byacc/test/btyacc/pure_calc.tab.c
projects/sendfile/contrib/byacc/test/btyacc/pure_error.tab.c
projects/sendfile/contrib/byacc/test/btyacc/quote_calc-s.tab.c
projects/sendfile/contrib/byacc/test/btyacc/quote_calc.tab.c
projects/sendfile/contrib/byacc/test/btyacc/quote_calc2-s.tab.c
projects/sendfile/contrib/byacc/test/btyacc/quote_calc2.tab.c
projects/sendfile/contrib/byacc/test/btyacc/quote_calc3-s.tab.c
projects/sendfile/contrib/byacc/test/btyacc/quote_calc3.tab.c
projects/sendfile/contrib/byacc/test/btyacc/quote_calc4-s.tab.c
projects/sendfile/contrib/byacc/test/btyacc/quote_calc4.tab.c
projects/sendfile/contrib/byacc/test/btyacc/rename_debug.c
projects/sendfile/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
projects/sendfile/contrib/byacc/test/yacc/calc2.tab.c
projects/sendfile/contrib/byacc/test/yacc/calc3.tab.c
projects/sendfile/contrib/byacc/test/yacc/ok_syntax1.tab.c
projects/sendfile/contrib/byacc/yacc.1
projects/sendfile/contrib/libpcap/inet.c
projects/sendfile/contrib/libpcap/pcap.c
projects/sendfile/contrib/tcpdump/tcpdump.c
projects/sendfile/etc/mtree/BSD.tests.dist
projects/sendfile/include/strings.h
projects/sendfile/lib/libc/stdtime/strptime.3
projects/sendfile/lib/libc/stdtime/strptime.c
projects/sendfile/lib/libc/string/Makefile.inc
projects/sendfile/lib/libc/string/Symbol.map
projects/sendfile/lib/libc/string/bzero.3
projects/sendfile/lib/libpcap/Makefile
projects/sendfile/lib/libpcap/config.h
projects/sendfile/lib/libproc/Makefile
projects/sendfile/lib/libproc/libproc.h
projects/sendfile/lib/libproc/proc_sym.c
projects/sendfile/lib/libproc/tests/proc_test.c
projects/sendfile/lib/librtld_db/rtld_db.c
projects/sendfile/lib/msun/src/e_lgamma_r.c
projects/sendfile/release/Makefile
projects/sendfile/release/doc/en_US.ISO8859-1/hardware/article.xml
projects/sendfile/release/release.conf.sample
projects/sendfile/release/release.sh
projects/sendfile/sbin/ifconfig/ifconfig.c
projects/sendfile/sbin/ifconfig/iflagg.c
projects/sendfile/sbin/ipfw/ipfw2.c
projects/sendfile/share/man/man4/ucom.4
projects/sendfile/share/man/man4/urndis.4
projects/sendfile/share/man/man4/urtwn.4
projects/sendfile/share/man/man5/rc.conf.5
projects/sendfile/share/man/man7/release.7
projects/sendfile/share/man/man9/sleepqueue.9
projects/sendfile/sys/amd64/include/vmm.h (contents, props changed)
projects/sendfile/sys/amd64/vmm/intel/vmx.c
projects/sendfile/sys/amd64/vmm/vmm.c
projects/sendfile/sys/boot/common/disk.c
projects/sendfile/sys/boot/common/part.c
projects/sendfile/sys/cam/ctl/ctl.c
projects/sendfile/sys/cam/ctl/ctl_frontend_cam_sim.c
projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c
projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.h
projects/sendfile/sys/cam/scsi/scsi_xpt.c
projects/sendfile/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
projects/sendfile/sys/cddl/compat/opensolaris/sys/kmem.h
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
projects/sendfile/sys/conf/Makefile.arm
projects/sendfile/sys/conf/NOTES
projects/sendfile/sys/conf/files
projects/sendfile/sys/conf/files.pc98
projects/sendfile/sys/conf/options
projects/sendfile/sys/conf/options.pc98
projects/sendfile/sys/contrib/dev/acpica/acpica_prep.sh
projects/sendfile/sys/contrib/dev/acpica/changes.txt (contents, props changed)
projects/sendfile/sys/contrib/dev/acpica/common/adfile.c
projects/sendfile/sys/contrib/dev/acpica/common/adisasm.c
projects/sendfile/sys/contrib/dev/acpica/common/adwalk.c
projects/sendfile/sys/contrib/dev/acpica/common/ahpredef.c
projects/sendfile/sys/contrib/dev/acpica/common/dmextern.c
projects/sendfile/sys/contrib/dev/acpica/common/dmrestag.c
projects/sendfile/sys/contrib/dev/acpica/common/dmtable.c
projects/sendfile/sys/contrib/dev/acpica/common/dmtbdump.c
projects/sendfile/sys/contrib/dev/acpica/common/dmtbinfo.c
projects/sendfile/sys/contrib/dev/acpica/common/getopt.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslanalyze.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslbtypes.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslcodegen.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslcompile.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslcompiler.h
projects/sendfile/sys/contrib/dev/acpica/compiler/aslcompiler.l
projects/sendfile/sys/contrib/dev/acpica/compiler/asldefine.h
projects/sendfile/sys/contrib/dev/acpica/compiler/aslerror.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslfileio.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslfiles.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslfold.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslglobal.h
projects/sendfile/sys/contrib/dev/acpica/compiler/aslhex.c
projects/sendfile/sys/contrib/dev/acpica/compiler/asllength.c
projects/sendfile/sys/contrib/dev/acpica/compiler/asllisting.c
projects/sendfile/sys/contrib/dev/acpica/compiler/asllistsup.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslload.c
projects/sendfile/sys/contrib/dev/acpica/compiler/asllookup.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslmain.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslmap.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslmessages.h
projects/sendfile/sys/contrib/dev/acpica/compiler/aslmethod.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslnamesp.c
projects/sendfile/sys/contrib/dev/acpica/compiler/asloffset.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslopcodes.c
projects/sendfile/sys/contrib/dev/acpica/compiler/asloperands.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslopt.c
projects/sendfile/sys/contrib/dev/acpica/compiler/asloptions.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslpredef.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslprepkg.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslresource.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype1.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype1i.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype2.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype2d.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype2e.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype2q.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype2s.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslrestype2w.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslstartup.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslstubs.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslsupport.l
projects/sendfile/sys/contrib/dev/acpica/compiler/asltransform.c
projects/sendfile/sys/contrib/dev/acpica/compiler/asltree.c
projects/sendfile/sys/contrib/dev/acpica/compiler/asltypes.h
projects/sendfile/sys/contrib/dev/acpica/compiler/aslutils.c
projects/sendfile/sys/contrib/dev/acpica/compiler/asluuid.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslwalks.c
projects/sendfile/sys/contrib/dev/acpica/compiler/aslxref.c
projects/sendfile/sys/contrib/dev/acpica/compiler/dtcompile.c
projects/sendfile/sys/contrib/dev/acpica/compiler/dtcompiler.h
projects/sendfile/sys/contrib/dev/acpica/compiler/dtexpress.c
projects/sendfile/sys/contrib/dev/acpica/compiler/dtfield.c
projects/sendfile/sys/contrib/dev/acpica/compiler/dtio.c
projects/sendfile/sys/contrib/dev/acpica/compiler/dtparser.l
projects/sendfile/sys/contrib/dev/acpica/compiler/dtparser.y
projects/sendfile/sys/contrib/dev/acpica/compiler/dtsubtable.c
projects/sendfile/sys/contrib/dev/acpica/compiler/dttable.c
projects/sendfile/sys/contrib/dev/acpica/compiler/dttemplate.c
projects/sendfile/sys/contrib/dev/acpica/compiler/dttemplate.h
projects/sendfile/sys/contrib/dev/acpica/compiler/dtutils.c
projects/sendfile/sys/contrib/dev/acpica/compiler/preprocess.h
projects/sendfile/sys/contrib/dev/acpica/compiler/prexpress.c
projects/sendfile/sys/contrib/dev/acpica/compiler/prmacros.c
projects/sendfile/sys/contrib/dev/acpica/compiler/prparser.l
projects/sendfile/sys/contrib/dev/acpica/compiler/prparser.y
projects/sendfile/sys/contrib/dev/acpica/compiler/prscan.c
projects/sendfile/sys/contrib/dev/acpica/compiler/prutils.c
projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbcmds.c
projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbconvert.c
projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbdisply.c
projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbexec.c
projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbfileio.c
projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbhistry.c
projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbinput.c
projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbmethod.c
projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbnames.c
projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbstats.c
projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbutils.c
projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbxface.c
projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmnames.c
projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmobject.c
projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c
projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmutils.c
projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsargs.c
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dswload.c
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dswscope.c
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dswstate.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evevent.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evglock.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evgpe.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evgpeblk.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evgpeinit.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evgpeutil.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evhandler.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evmisc.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evregion.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evrgnini.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evsci.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evxface.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evxfevnt.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evxfgpe.c
projects/sendfile/sys/contrib/dev/acpica/components/events/evxfregn.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exconfig.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exconvrt.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/excreate.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exdebug.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exdump.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exfield.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exfldio.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exmisc.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exmutex.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exnames.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exoparg1.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exoparg2.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exoparg3.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exoparg6.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exprep.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exregion.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exresnte.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exresolv.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exresop.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exstore.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exstoren.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exstorob.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exsystem.c
projects/sendfile/sys/contrib/dev/acpica/components/executer/exutils.c
projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwacpi.c
projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwesleep.c
projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwgpe.c
projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwpci.c
projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwregs.c
projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwsleep.c
projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwtimer.c
projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwvalid.c
projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwxface.c
projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsaccess.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsalloc.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsarguments.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsconvert.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsdump.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nseval.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsinit.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsload.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsnames.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsobject.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsparse.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nspredef.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsrepair.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nssearch.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsutils.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nswalk.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsxfname.c
projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsxfobj.c
projects/sendfile/sys/contrib/dev/acpica/components/parser/psargs.c
projects/sendfile/sys/contrib/dev/acpica/components/parser/psloop.c
projects/sendfile/sys/contrib/dev/acpica/components/parser/psobject.c
projects/sendfile/sys/contrib/dev/acpica/components/parser/psopcode.c
projects/sendfile/sys/contrib/dev/acpica/components/parser/psopinfo.c
projects/sendfile/sys/contrib/dev/acpica/components/parser/psparse.c
projects/sendfile/sys/contrib/dev/acpica/components/parser/psscope.c
projects/sendfile/sys/contrib/dev/acpica/components/parser/pstree.c
projects/sendfile/sys/contrib/dev/acpica/components/parser/psutils.c
projects/sendfile/sys/contrib/dev/acpica/components/parser/pswalk.c
projects/sendfile/sys/contrib/dev/acpica/components/parser/psxface.c
projects/sendfile/sys/contrib/dev/acpica/components/resources/rsaddr.c
projects/sendfile/sys/contrib/dev/acpica/components/resources/rscalc.c
projects/sendfile/sys/contrib/dev/acpica/components/resources/rscreate.c
projects/sendfile/sys/contrib/dev/acpica/components/resources/rsdump.c
projects/sendfile/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
projects/sendfile/sys/contrib/dev/acpica/components/resources/rsinfo.c
projects/sendfile/sys/contrib/dev/acpica/components/resources/rsio.c
projects/sendfile/sys/contrib/dev/acpica/components/resources/rsirq.c
projects/sendfile/sys/contrib/dev/acpica/components/resources/rslist.c
projects/sendfile/sys/contrib/dev/acpica/components/resources/rsmemory.c
projects/sendfile/sys/contrib/dev/acpica/components/resources/rsmisc.c
projects/sendfile/sys/contrib/dev/acpica/components/resources/rsserial.c
projects/sendfile/sys/contrib/dev/acpica/components/resources/rsutils.c
projects/sendfile/sys/contrib/dev/acpica/components/resources/rsxface.c
projects/sendfile/sys/contrib/dev/acpica/components/tables/tbfadt.c
projects/sendfile/sys/contrib/dev/acpica/components/tables/tbfind.c
projects/sendfile/sys/contrib/dev/acpica/components/tables/tbinstal.c
projects/sendfile/sys/contrib/dev/acpica/components/tables/tbprint.c
projects/sendfile/sys/contrib/dev/acpica/components/tables/tbutils.c
projects/sendfile/sys/contrib/dev/acpica/components/tables/tbxface.c
projects/sendfile/sys/contrib/dev/acpica/components/tables/tbxfload.c
projects/sendfile/sys/contrib/dev/acpica/components/tables/tbxfroot.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utaddress.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utalloc.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utbuffer.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utcache.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utcopy.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utdebug.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utdecode.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utdelete.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/uterror.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/uteval.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utexcep.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utglobal.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utids.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utinit.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utlock.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utmath.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utmisc.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utmutex.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utobject.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utosi.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utownerid.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utpredef.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utresrc.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utstate.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utstring.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/uttrack.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utxface.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utxferror.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utxfinit.c
projects/sendfile/sys/contrib/dev/acpica/components/utilities/utxfmutex.c
projects/sendfile/sys/contrib/dev/acpica/include/acapps.h
projects/sendfile/sys/contrib/dev/acpica/include/acbuffer.h
projects/sendfile/sys/contrib/dev/acpica/include/accommon.h
projects/sendfile/sys/contrib/dev/acpica/include/acconfig.h
projects/sendfile/sys/contrib/dev/acpica/include/acdebug.h
projects/sendfile/sys/contrib/dev/acpica/include/acdisasm.h
projects/sendfile/sys/contrib/dev/acpica/include/acdispat.h
projects/sendfile/sys/contrib/dev/acpica/include/acevents.h
projects/sendfile/sys/contrib/dev/acpica/include/acexcep.h
projects/sendfile/sys/contrib/dev/acpica/include/acglobal.h
projects/sendfile/sys/contrib/dev/acpica/include/achware.h
projects/sendfile/sys/contrib/dev/acpica/include/acinterp.h
projects/sendfile/sys/contrib/dev/acpica/include/aclocal.h
projects/sendfile/sys/contrib/dev/acpica/include/acmacros.h
projects/sendfile/sys/contrib/dev/acpica/include/acnames.h
projects/sendfile/sys/contrib/dev/acpica/include/acnamesp.h
projects/sendfile/sys/contrib/dev/acpica/include/acobject.h
projects/sendfile/sys/contrib/dev/acpica/include/acopcode.h
projects/sendfile/sys/contrib/dev/acpica/include/acoutput.h
projects/sendfile/sys/contrib/dev/acpica/include/acparser.h
projects/sendfile/sys/contrib/dev/acpica/include/acpi.h
projects/sendfile/sys/contrib/dev/acpica/include/acpiosxf.h
projects/sendfile/sys/contrib/dev/acpica/include/acpixf.h
projects/sendfile/sys/contrib/dev/acpica/include/acpredef.h
projects/sendfile/sys/contrib/dev/acpica/include/acresrc.h
projects/sendfile/sys/contrib/dev/acpica/include/acrestyp.h
projects/sendfile/sys/contrib/dev/acpica/include/acstruct.h
projects/sendfile/sys/contrib/dev/acpica/include/actables.h
projects/sendfile/sys/contrib/dev/acpica/include/actbl.h
projects/sendfile/sys/contrib/dev/acpica/include/actbl1.h
projects/sendfile/sys/contrib/dev/acpica/include/actbl2.h
projects/sendfile/sys/contrib/dev/acpica/include/actbl3.h
projects/sendfile/sys/contrib/dev/acpica/include/actypes.h
projects/sendfile/sys/contrib/dev/acpica/include/acutils.h
projects/sendfile/sys/contrib/dev/acpica/include/amlcode.h
projects/sendfile/sys/contrib/dev/acpica/include/amlresrc.h
projects/sendfile/sys/contrib/dev/acpica/include/platform/acenv.h
projects/sendfile/sys/contrib/dev/acpica/include/platform/acfreebsd.h
projects/sendfile/sys/contrib/dev/acpica/include/platform/acgcc.h
projects/sendfile/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
projects/sendfile/sys/contrib/ipfilter/netinet/fil.c
projects/sendfile/sys/contrib/ipfilter/netinet/ip_dns_pxy.c
projects/sendfile/sys/contrib/ipfilter/netinet/ip_dstlist.c
projects/sendfile/sys/contrib/ipfilter/netinet/ip_nat.c
projects/sendfile/sys/dev/acpica/Osd/OsdTable.c
projects/sendfile/sys/dev/acpica/acpi.c
projects/sendfile/sys/dev/ahci/ahci.c
projects/sendfile/sys/dev/sfxge/sfxge_dma.c
projects/sendfile/sys/dev/sfxge/sfxge_port.c
projects/sendfile/sys/dev/uart/uart_bus_fdt.c
projects/sendfile/sys/dev/usb/controller/xhci.c
projects/sendfile/sys/dev/usb/controller/xhci.h
projects/sendfile/sys/dev/usb/usb_dev.c
projects/sendfile/sys/dev/usb/usbdevs
projects/sendfile/sys/dev/usb/wlan/if_urtwn.c
projects/sendfile/sys/dev/vt/vt.h
projects/sendfile/sys/dev/vt/vt_core.c
projects/sendfile/sys/fs/autofs/autofs.c
projects/sendfile/sys/fs/autofs/autofs.h
projects/sendfile/sys/fs/autofs/autofs_vfsops.c
projects/sendfile/sys/fs/autofs/autofs_vnops.c
projects/sendfile/sys/fs/devfs/devfs_vnops.c
projects/sendfile/sys/fs/nfs/nfs_commonsubs.c
projects/sendfile/sys/fs/nfs/nfs_var.h
projects/sendfile/sys/fs/nfs/nfsproto.h
projects/sendfile/sys/fs/nfsserver/nfs_nfsdport.c
projects/sendfile/sys/fs/nfsserver/nfs_nfsdserv.c
projects/sendfile/sys/fs/nfsserver/nfs_nfsdstate.c
projects/sendfile/sys/geom/geom_dev.c
projects/sendfile/sys/i386/i386/machdep.c
projects/sendfile/sys/kern/imgact_elf.c
projects/sendfile/sys/kern/kern_descrip.c
projects/sendfile/sys/kern/kern_event.c
projects/sendfile/sys/kern/kern_exit.c
projects/sendfile/sys/kern/kern_intr.c
projects/sendfile/sys/kern/kern_proc.c
projects/sendfile/sys/kern/kern_prot.c
projects/sendfile/sys/kern/kern_racct.c
projects/sendfile/sys/kern/kern_sig.c
projects/sendfile/sys/kern/sys_process.c
projects/sendfile/sys/kern/vfs_vnops.c
projects/sendfile/sys/modules/Makefile
projects/sendfile/sys/modules/ncr/Makefile
projects/sendfile/sys/net/ieee8023ad_lacp.c
projects/sendfile/sys/net/ieee8023ad_lacp.h
projects/sendfile/sys/net/if_bridge.c
projects/sendfile/sys/net/if_disc.c
projects/sendfile/sys/net/if_edsc.c
projects/sendfile/sys/net/if_lagg.c
projects/sendfile/sys/net/if_lagg.h
projects/sendfile/sys/netinet/ip6.h
projects/sendfile/sys/netinet/sctp_output.c
projects/sendfile/sys/netinet/tcp_output.c
projects/sendfile/sys/netinet6/in6.h
projects/sendfile/sys/netinet6/in6_cksum.c
projects/sendfile/sys/netinet6/udp6_usrreq.c
projects/sendfile/sys/netpfil/ipfw/ip_fw2.c
projects/sendfile/sys/netpfil/ipfw/ip_fw_sockopt.c
projects/sendfile/sys/ofed/drivers/net/mlx4/mlx4.h
projects/sendfile/sys/ofed/include/linux/mlx4/device.h
projects/sendfile/sys/sys/event.h
projects/sendfile/sys/sys/filedesc.h
projects/sendfile/sys/sys/param.h
projects/sendfile/sys/sys/racct.h
projects/sendfile/sys/sys/systm.h
projects/sendfile/sys/sys/ucred.h
projects/sendfile/sys/sys/vnode.h
projects/sendfile/sys/vm/uma_core.c
projects/sendfile/sys/vm/vm_glue.c
projects/sendfile/sys/vm/vm_pageout.c
projects/sendfile/sys/x86/x86/local_apic.c
projects/sendfile/tools/tools/ath/athalq/ar9300_ds.c
projects/sendfile/tools/tools/bootparttest/Makefile
projects/sendfile/tools/tools/bootparttest/bootparttest.c
projects/sendfile/usr.bin/mkimg/Makefile
projects/sendfile/usr.bin/mkimg/ebr.c
projects/sendfile/usr.bin/mkimg/mbr.c
projects/sendfile/usr.bin/mkimg/mkimg.c
projects/sendfile/usr.bin/mkimg/mkimg.h
projects/sendfile/usr.bin/mkimg/pc98.c
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow2.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-ebr.raw.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-ebr.vmdk.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow2.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-mbr.raw.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-mbr.vmdk.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow2.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-pc98.raw.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-4096-pc98.vmdk.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow2.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-ebr.raw.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-ebr.vmdk.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow2.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-mbr.raw.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-mbr.vmdk.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow2.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-pc98.raw.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
projects/sendfile/usr.bin/mkimg/tests/img-63x255-512-pc98.vmdk.gz.uu
projects/sendfile/usr.sbin/acpi/acpiconf/Makefile
projects/sendfile/usr.sbin/acpi/acpidb/Makefile
projects/sendfile/usr.sbin/acpi/acpidb/acpidb.c
projects/sendfile/usr.sbin/acpi/acpidump/Makefile
projects/sendfile/usr.sbin/acpi/acpidump/acpi.c
projects/sendfile/usr.sbin/acpi/iasl/Makefile
projects/sendfile/usr.sbin/bhyve/acpi.c
projects/sendfile/usr.sbin/nscd/query.c
projects/sendfile/usr.sbin/pw/Makefile
Directory Properties:
projects/sendfile/ (props changed)
projects/sendfile/cddl/ (props changed)
projects/sendfile/cddl/contrib/opensolaris/ (props changed)
projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/sendfile/contrib/binutils/ (props changed)
projects/sendfile/contrib/byacc/ (props changed)
projects/sendfile/contrib/libpcap/ (props changed)
projects/sendfile/contrib/tcpdump/ (props changed)
projects/sendfile/etc/ (props changed)
projects/sendfile/include/ (props changed)
projects/sendfile/lib/libc/ (props changed)
projects/sendfile/lib/libc/stdtime/ (props changed)
projects/sendfile/sbin/ (props changed)
projects/sendfile/sbin/ipfw/ (props changed)
projects/sendfile/share/ (props changed)
projects/sendfile/share/man/man4/ (props changed)
projects/sendfile/sys/ (props changed)
projects/sendfile/sys/amd64/vmm/ (props changed)
projects/sendfile/sys/boot/ (props changed)
projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed)
projects/sendfile/sys/conf/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/common/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/compiler/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/components/debugger/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/components/disassembler/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/components/events/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/components/executer/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/components/hardware/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/components/namespace/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/components/parser/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/components/resources/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/components/tables/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/components/utilities/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/include/ (props changed)
projects/sendfile/sys/contrib/dev/acpica/os_specific/ (props changed)
projects/sendfile/sys/contrib/ipfilter/ (props changed)
projects/sendfile/usr.bin/mkimg/ (props changed)
projects/sendfile/usr.sbin/bhyve/ (props changed)
Modified: projects/sendfile/Makefile.inc1
==============================================================================
--- projects/sendfile/Makefile.inc1 Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/Makefile.inc1 Tue Oct 7 13:25:59 2014 (r272692)
@@ -1531,9 +1531,12 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \
lib/libradius lib/libsbuf lib/libtacplus \
+ lib/libgeom \
${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
+ ${_cddl_lib_libuutil} \
${_cddl_lib_libavl} \
${_cddl_lib_libzfs_core} \
+ ${_cddl_lib_libctf} \
lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_lib_libldns} \
${_secure_lib_libssh} ${_secure_lib_libssl}
@@ -1543,6 +1546,8 @@ gnu/lib/libstdc++__L: lib/msun__L
gnu/lib/libsupc++__L: gnu/lib/libstdc++__L
.endif
+lib/libgeom__L: lib/libexpat__L
+
.if defined(WITH_ATF) || ${MK_TESTS} != "no"
.if !defined(WITH_ATF)
# Ensure that the ATF libraries will be built during make libraries, even
@@ -1580,9 +1585,13 @@ lib/libopie__L lib/libtacplus__L: lib/li
_cddl_lib_libumem= cddl/lib/libumem
_cddl_lib_libnvpair= cddl/lib/libnvpair
_cddl_lib_libavl= cddl/lib/libavl
+_cddl_lib_libuutil= cddl/lib/libuutil
_cddl_lib_libzfs_core= cddl/lib/libzfs_core
+_cddl_lib_libctf= cddl/lib/libctf
_cddl_lib= cddl/lib
cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
+cddl/lib/libzfs__L: lib/libgeom__L
+cddl/lib/libctf__L: lib/libz__L
.endif
.if ${MK_CRYPT} != "no"
Modified: projects/sendfile/ObsoleteFiles.inc
==============================================================================
--- projects/sendfile/ObsoleteFiles.inc Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/ObsoleteFiles.inc Tue Oct 7 13:25:59 2014 (r272692)
@@ -1496,6 +1496,7 @@ OLD_LIBS+=usr/lib/libpanel.so.4
OLD_LIBS+=usr/lib/libpanelw.so.4
OLD_LIBS+=usr/lib/libpmc.so.4
OLD_LIBS+=usr/lib/libproc.so.1
+OLD_LIBS+=usr/lib/libproc.so.2
OLD_LIBS+=usr/lib/libradius.so.3
OLD_LIBS+=usr/lib/librpcsvc.so.4
OLD_LIBS+=usr/lib/libsdp.so.3
Modified: projects/sendfile/bin/sh/eval.c
==============================================================================
--- projects/sendfile/bin/sh/eval.c Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/bin/sh/eval.c Tue Oct 7 13:25:59 2014 (r272692)
@@ -316,9 +316,10 @@ evalloop(union node *n, int flags)
loopnest++;
status = 0;
for (;;) {
- evaltree(n->nbinary.ch1, EV_TESTED);
+ if (!evalskip)
+ evaltree(n->nbinary.ch1, EV_TESTED);
if (evalskip) {
-skipping: if (evalskip == SKIPCONT && --skipcount <= 0) {
+ if (evalskip == SKIPCONT && --skipcount <= 0) {
evalskip = 0;
continue;
}
@@ -337,8 +338,6 @@ skipping: if (evalskip == SKIPCONT &&
}
evaltree(n->nbinary.ch2, flags);
status = exitstatus;
- if (evalskip)
- goto skipping;
}
loopnest--;
exitstatus = status;
@@ -648,15 +647,15 @@ evalbackcmd(union node *n, struct backcm
struct jmploc *savehandler;
struct localvar *savelocalvars;
- setstackmark(&smark);
result->fd = -1;
result->buf = NULL;
result->nleft = 0;
result->jp = NULL;
if (n == NULL) {
exitstatus = 0;
- goto out;
+ return;
}
+ setstackmark(&smark);
exitstatus = oexitstatus;
if (is_valid_fast_cmdsubst(n)) {
savelocalvars = localvars;
@@ -698,7 +697,6 @@ evalbackcmd(union node *n, struct backcm
result->fd = pip[0];
result->jp = jp;
}
-out:
popstackmark(&smark);
TRACE(("evalbackcmd done: fd=%d buf=%p nleft=%d jp=%p\n",
result->fd, result->buf, result->nleft, result->jp));
Modified: projects/sendfile/bin/sh/expand.c
==============================================================================
--- projects/sendfile/bin/sh/expand.c Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/bin/sh/expand.c Tue Oct 7 13:25:59 2014 (r272692)
@@ -328,24 +328,19 @@ exptilde(char *p, int flag)
done:
*p = '\0';
if (*(startp+1) == '\0') {
- if ((home = lookupvar("HOME")) == NULL)
- goto lose;
+ home = lookupvar("HOME");
} else {
- if ((pw = getpwnam(startp+1)) == NULL)
- goto lose;
- home = pw->pw_dir;
+ pw = getpwnam(startp+1);
+ home = pw != NULL ? pw->pw_dir : NULL;
}
- if (*home == '\0')
- goto lose;
*p = c;
+ if (home == NULL || *home == '\0')
+ return (startp);
if (quotes)
STPUTS_QUOTES(home, SQSYNTAX, expdest);
else
STPUTS(home, expdest);
return (p);
-lose:
- *p = c;
- return (startp);
}
Modified: projects/sendfile/bin/sh/jobs.c
==============================================================================
--- projects/sendfile/bin/sh/jobs.c Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/bin/sh/jobs.c Tue Oct 7 13:25:59 2014 (r272692)
@@ -373,13 +373,13 @@ showjob(struct job *jp, int mode)
strcat(statestr, " (core dumped)");
}
- for (ps = jp->ps ; ; ps++) { /* for each process */
+ for (ps = jp->ps ; procno > 0 ; ps++, procno--) { /* for each process */
if (mode == SHOWJOBS_PIDS || mode == SHOWJOBS_PGIDS) {
out1fmt("%d\n", (int)ps->pid);
- goto skip;
+ continue;
}
if (mode != SHOWJOBS_VERBOSE && ps != jp->ps)
- goto skip;
+ continue;
if (jobno == curr && ps == jp->ps)
c = '+';
else if (jobno == prev && ps == jp->ps)
@@ -410,8 +410,6 @@ showjob(struct job *jp, int mode)
out1c('\n');
} else
printjobcmd(jp);
-skip: if (--procno <= 0)
- break;
}
}
Modified: projects/sendfile/bin/sh/parser.c
==============================================================================
--- projects/sendfile/bin/sh/parser.c Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/bin/sh/parser.c Tue Oct 7 13:25:59 2014 (r272692)
@@ -1279,6 +1279,13 @@ readcstyleesc(char *out)
c = pgetc();
if (c == PEOF)
synerror("Unterminated quoted string");
+ if (c == '\n') {
+ plinno++;
+ if (doprompt)
+ setprompt(2);
+ else
+ setprompt(0);
+ }
}
pungetc();
return out;
Modified: projects/sendfile/bin/sh/redir.c
==============================================================================
--- projects/sendfile/bin/sh/redir.c Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/bin/sh/redir.c Tue Oct 7 13:25:59 2014 (r272692)
@@ -173,21 +173,12 @@ openredirect(union node *redir, char mem
fname = redir->nfile.expfname;
if ((f = open(fname, O_RDONLY)) < 0)
error("cannot open %s: %s", fname, strerror(errno));
-movefd:
- if (f != fd) {
- if (dup2(f, fd) == -1) {
- e = errno;
- close(f);
- error("%d: %s", fd, strerror(e));
- }
- close(f);
- }
break;
case NFROMTO:
fname = redir->nfile.expfname;
if ((f = open(fname, O_RDWR|O_CREAT, 0666)) < 0)
error("cannot create %s: %s", fname, strerror(errno));
- goto movefd;
+ break;
case NTO:
if (Cflag) {
fname = redir->nfile.expfname;
@@ -205,19 +196,19 @@ movefd:
} else
error("cannot create %s: %s", fname,
strerror(EEXIST));
- goto movefd;
+ break;
}
/* FALLTHROUGH */
case NCLOBBER:
fname = redir->nfile.expfname;
if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
error("cannot create %s: %s", fname, strerror(errno));
- goto movefd;
+ break;
case NAPPEND:
fname = redir->nfile.expfname;
if ((f = open(fname, O_WRONLY|O_CREAT|O_APPEND, 0666)) < 0)
error("cannot create %s: %s", fname, strerror(errno));
- goto movefd;
+ break;
case NTOFD:
case NFROMFD:
if (redir->ndup.dupfd >= 0) { /* if not ">&-" */
@@ -231,14 +222,22 @@ movefd:
} else {
close(fd);
}
- break;
+ return;
case NHERE:
case NXHERE:
f = openhere(redir);
- goto movefd;
+ break;
default:
abort();
}
+ if (f != fd) {
+ if (dup2(f, fd) == -1) {
+ e = errno;
+ close(f);
+ error("%d: %s", fd, strerror(e));
+ }
+ close(f);
+ }
}
Modified: projects/sendfile/bin/sh/tests/builtins/Makefile
==============================================================================
--- projects/sendfile/bin/sh/tests/builtins/Makefile Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/bin/sh/tests/builtins/Makefile Tue Oct 7 13:25:59 2014 (r272692)
@@ -100,6 +100,7 @@ FILES+= jobid2.0
FILES+= kill1.0 kill2.0
FILES+= lineno.0 lineno.0.stdout
FILES+= lineno2.0
+FILES+= lineno3.0 lineno3.0.stdout
FILES+= local1.0
FILES+= local2.0
FILES+= local3.0
Copied: projects/sendfile/bin/sh/tests/builtins/lineno3.0 (from r272687, head/bin/sh/tests/builtins/lineno3.0)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/sendfile/bin/sh/tests/builtins/lineno3.0 Tue Oct 7 13:25:59 2014 (r272692, copy of r272687, head/bin/sh/tests/builtins/lineno3.0)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+echo before: $LINENO
+dummy=$'a\0
+'
+echo after: $LINENO
Copied: projects/sendfile/bin/sh/tests/builtins/lineno3.0.stdout (from r272687, head/bin/sh/tests/builtins/lineno3.0.stdout)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/sendfile/bin/sh/tests/builtins/lineno3.0.stdout Tue Oct 7 13:25:59 2014 (r272692, copy of r272687, head/bin/sh/tests/builtins/lineno3.0.stdout)
@@ -0,0 +1,2 @@
+before: 3
+after: 6
Modified: projects/sendfile/bin/sh/trap.c
==============================================================================
--- projects/sendfile/bin/sh/trap.c Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/bin/sh/trap.c Tue Oct 7 13:25:59 2014 (r272692)
@@ -510,28 +510,25 @@ exitshell_savedstatus(void)
exiting_exitstatus = oexitstatus;
}
exitstatus = oexitstatus = exiting_exitstatus;
- if (setjmp(loc1.loc)) {
- goto l1;
+ if (!setjmp(loc1.loc)) {
+ handler = &loc1;
+ if ((p = trap[0]) != NULL && *p != '\0') {
+ /*
+ * Reset evalskip, or the trap on EXIT could be
+ * interrupted if the last command was a "return".
+ */
+ evalskip = 0;
+ trap[0] = NULL;
+ evalstring(p, 0);
+ }
}
- if (setjmp(loc2.loc)) {
- goto l2;
- }
- handler = &loc1;
- if ((p = trap[0]) != NULL && *p != '\0') {
- /*
- * Reset evalskip, or the trap on EXIT could be
- * interrupted if the last command was a "return".
- */
- evalskip = 0;
- trap[0] = NULL;
- evalstring(p, 0);
- }
-l1: handler = &loc2; /* probably unnecessary */
- flushall();
+ if (!setjmp(loc2.loc)) {
+ handler = &loc2; /* probably unnecessary */
+ flushall();
#if JOBS
- setjobctl(0);
+ setjobctl(0);
#endif
-l2:
+ }
if (sig != 0 && sig != SIGSTOP && sig != SIGTSTP && sig != SIGTTIN &&
sig != SIGTTOU) {
signal(sig, SIG_DFL);
Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Tue Oct 7 13:25:59 2014 (r272692)
@@ -710,6 +710,9 @@ list_probe(dtrace_hdl_t *dtp, const dtra
if (g_verbose && dtrace_probe_info(dtp, pdp, &p) == 0)
print_probe_info(&p);
+ if (g_intr != 0)
+ return (1);
+
return (0);
}
@@ -1220,11 +1223,34 @@ intr(int signo)
g_impatient = 1;
}
+static void
+installsighands(void)
+{
+ struct sigaction act, oact;
+
+ (void) sigemptyset(&act.sa_mask);
+ act.sa_flags = 0;
+ act.sa_handler = intr;
+
+ if (sigaction(SIGINT, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGINT, &act, NULL);
+
+ if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGTERM, &act, NULL);
+
+#if !defined(sun)
+ if (sigaction(SIGPIPE, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGPIPE, &act, NULL);
+
+ if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGUSR1, &act, NULL);
+#endif
+}
+
int
main(int argc, char *argv[])
{
dtrace_bufdesc_t buf;
- struct sigaction act, oact;
dtrace_status_t status[2];
dtrace_optval_t opt;
dtrace_cmd_t *dcp;
@@ -1776,6 +1802,8 @@ main(int argc, char *argv[])
if (g_ofile != NULL && (g_ofp = fopen(g_ofile, "a")) == NULL)
fatal("failed to open output file '%s'", g_ofile);
+ installsighands();
+
oprintf("%5s %10s %17s %33s %s\n",
"ID", "PROVIDER", "MODULE", "FUNCTION", "NAME");
@@ -1861,20 +1889,7 @@ main(int argc, char *argv[])
if (opt != DTRACEOPT_UNSET)
notice("allowing destructive actions\n");
- (void) sigemptyset(&act.sa_mask);
- act.sa_flags = 0;
- act.sa_handler = intr;
-
- if (sigaction(SIGINT, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
- (void) sigaction(SIGINT, &act, NULL);
-
- if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
- (void) sigaction(SIGTERM, &act, NULL);
-
-#if !defined(sun)
- if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
- (void) sigaction(SIGUSR1, &act, NULL);
-#endif
+ installsighands();
/*
* Now that tracing is active and we are ready to consume trace data,
Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh Tue Oct 7 13:25:59 2014 (r272692)
@@ -38,7 +38,7 @@ fi
./$exe &
pid=$!
-$dtrace -32 -qs /dev/stdin <<EOF
+$dtrace -qs /dev/stdin <<EOF
typedef struct info {
char *zi_gamename;
int zi_ndungeons;
Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Oct 7 13:25:59 2014 (r272692)
@@ -1461,6 +1461,11 @@ dump_deadlist(dsl_deadlist_t *dl)
if (dump_opt['d'] < 3)
return;
+ if (dl->dl_oldfmt) {
+ dump_bpobj(&dl->dl_bpobj, "old-format deadlist", 0);
+ return;
+ }
+
zdb_nicenum(dl->dl_phys->dl_used, bytes);
zdb_nicenum(dl->dl_phys->dl_comp, comp);
zdb_nicenum(dl->dl_phys->dl_uncomp, uncomp);
@@ -2594,10 +2599,12 @@ dump_block_stats(spa_t *spa)
* all async I/Os to complete.
*/
if (dump_opt['c']) {
- (void) zio_wait(spa->spa_async_zio_root);
- spa->spa_async_zio_root = zio_root(spa, NULL, NULL,
- ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE |
- ZIO_FLAG_GODFATHER);
+ for (int i = 0; i < max_ncpus; i++) {
+ (void) zio_wait(spa->spa_async_zio_root[i]);
+ spa->spa_async_zio_root[i] = zio_root(spa, NULL, NULL,
+ ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE |
+ ZIO_FLAG_GODFATHER);
+ }
}
if (zcb.zcb_haderrors) {
Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Tue Oct 7 13:25:59 2014 (r272692)
@@ -2857,10 +2857,7 @@ print_pool(zpool_handle_t *zhp, list_cbd
right_justify = B_FALSE;
if (pl->pl_prop != ZPROP_INVAL) {
- if (pl->pl_prop == ZPOOL_PROP_EXPANDSZ &&
- zpool_get_prop_int(zhp, pl->pl_prop, NULL) == 0)
- propstr = "-";
- else if (zpool_get_prop(zhp, pl->pl_prop, property,
+ if (zpool_get_prop(zhp, pl->pl_prop, property,
sizeof (property), NULL, cb->cb_literal) != 0)
propstr = "-";
else
@@ -2894,21 +2891,37 @@ print_pool(zpool_handle_t *zhp, list_cbd
}
static void
-print_one_column(zpool_prop_t prop, uint64_t value, boolean_t scripted)
+print_one_column(zpool_prop_t prop, uint64_t value, boolean_t scripted,
+ boolean_t valid)
{
char propval[64];
boolean_t fixed;
size_t width = zprop_width(prop, &fixed, ZFS_TYPE_POOL);
-
- if (prop == ZPOOL_PROP_EXPANDSZ && value == 0)
- (void) strlcpy(propval, "-", sizeof (propval));
- else if (prop == ZPOOL_PROP_FRAGMENTATION && value == ZFS_FRAG_INVALID)
- (void) strlcpy(propval, "-", sizeof (propval));
- else if (prop == ZPOOL_PROP_FRAGMENTATION)
+ switch (prop) {
+ case ZPOOL_PROP_EXPANDSZ:
+ if (value == 0)
+ (void) strlcpy(propval, "-", sizeof (propval));
+ else
+ zfs_nicenum(value, propval, sizeof (propval));
+ break;
+ case ZPOOL_PROP_FRAGMENTATION:
+ if (value == ZFS_FRAG_INVALID) {
+ (void) strlcpy(propval, "-", sizeof (propval));
+ } else {
+ (void) snprintf(propval, sizeof (propval), "%llu%%",
+ value);
+ }
+ break;
+ case ZPOOL_PROP_CAPACITY:
(void) snprintf(propval, sizeof (propval), "%llu%%", value);
- else
+ break;
+ default:
zfs_nicenum(value, propval, sizeof (propval));
+ }
+
+ if (!valid)
+ (void) strlcpy(propval, "-", sizeof (propval));
if (scripted)
(void) printf("\t%s", propval);
@@ -2930,6 +2943,9 @@ print_list_stats(zpool_handle_t *zhp, co
(uint64_t **)&vs, &c) == 0);
if (name != NULL) {
+ boolean_t toplevel = (vs->vs_space != 0);
+ uint64_t cap;
+
if (scripted)
(void) printf("\t%s", name);
else if (strlen(name) + depth > cb->cb_namewidth)
@@ -2938,24 +2954,26 @@ print_list_stats(zpool_handle_t *zhp, co
(void) printf("%*s%s%*s", depth, "", name,
(int)(cb->cb_namewidth - strlen(name) - depth), "");
- /* only toplevel vdevs have capacity stats */
- if (vs->vs_space == 0) {
- if (scripted)
- (void) printf("\t-\t-\t-\t-");
- else
- (void) printf(" - - - -");
- } else {
- print_one_column(ZPOOL_PROP_SIZE, vs->vs_space,
- scripted);
- print_one_column(ZPOOL_PROP_CAPACITY, vs->vs_alloc,
- scripted);
- print_one_column(ZPOOL_PROP_FREE,
- vs->vs_space - vs->vs_alloc, scripted);
- print_one_column(ZPOOL_PROP_FRAGMENTATION,
- vs->vs_fragmentation, scripted);
- }
- print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize,
- scripted);
+ /*
+ * Print the properties for the individual vdevs. Some
+ * properties are only applicable to toplevel vdevs. The
+ * 'toplevel' boolean value is passed to the print_one_column()
+ * to indicate that the value is valid.
+ */
+ print_one_column(ZPOOL_PROP_SIZE, vs->vs_space, scripted,
+ toplevel);
+ print_one_column(ZPOOL_PROP_ALLOCATED, vs->vs_alloc, scripted,
+ toplevel);
+ print_one_column(ZPOOL_PROP_FREE, vs->vs_space - vs->vs_alloc,
+ scripted, toplevel);
+ print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize, scripted,
+ B_TRUE);
+ print_one_column(ZPOOL_PROP_FRAGMENTATION,
+ vs->vs_fragmentation, scripted,
+ (vs->vs_fragmentation != ZFS_FRAG_INVALID && toplevel));
+ cap = (vs->vs_space == 0) ? 0 :
+ (vs->vs_alloc * 100 / vs->vs_space);
+ print_one_column(ZPOOL_PROP_CAPACITY, cap, scripted, toplevel);
(void) printf("\n");
}
@@ -3024,7 +3042,8 @@ list_callback(zpool_handle_t *zhp, void
* -H Scripted mode. Don't display headers, and separate properties
* by a single tab.
* -o List of properties to display. Defaults to
- * "name,size,allocated,free,capacity,health,altroot"
+ * "name,size,allocated,free,expandsize,fragmentation,capacity,"
+ * "dedupratio,health,altroot"
* -p Diplay values in parsable (exact) format.
* -T Display a timestamp in date(1) or Unix format
*
@@ -3038,7 +3057,7 @@ zpool_do_list(int argc, char **argv)
int ret;
list_cbdata_t cb = { 0 };
static char default_props[] =
- "name,size,allocated,free,fragmentation,expandsize,capacity,"
+ "name,size,allocated,free,expandsize,fragmentation,capacity,"
"dedupratio,health,altroot";
char *props = default_props;
unsigned long interval = 0, count = 0;
Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y Tue Oct 7 13:25:59 2014 (r272692)
@@ -207,6 +207,8 @@
%type <l_tok> unary_operator
%type <l_tok> struct_or_union
+%type <l_str> dtrace_keyword_ident
+
%%
dtrace_program: d_expression DT_TOK_EOF { return (dt_node_root($1)); }
@@ -391,12 +393,18 @@ postfix_expression:
| postfix_expression DT_TOK_DOT DT_TOK_TNAME {
$$ = OP2(DT_TOK_DOT, $1, dt_node_ident($3));
}
+ | postfix_expression DT_TOK_DOT dtrace_keyword_ident {
+ $$ = OP2(DT_TOK_DOT, $1, dt_node_ident($3));
+ }
| postfix_expression DT_TOK_PTR DT_TOK_IDENT {
$$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
}
| postfix_expression DT_TOK_PTR DT_TOK_TNAME {
$$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
}
+ | postfix_expression DT_TOK_PTR dtrace_keyword_ident {
+ $$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
+ }
| postfix_expression DT_TOK_ADDADD {
$$ = OP1(DT_TOK_POSTINC, $1);
}
@@ -411,6 +419,10 @@ postfix_expression:
DT_TOK_TNAME DT_TOK_RPAR {
$$ = dt_node_offsetof($3, $5);
}
+ | DT_TOK_OFFSETOF DT_TOK_LPAR type_name DT_TOK_COMMA
+ dtrace_keyword_ident DT_TOK_RPAR {
+ $$ = dt_node_offsetof($3, $5);
+ }
| DT_TOK_XLATE DT_TOK_LT type_name DT_TOK_GT
DT_TOK_LPAR expression DT_TOK_RPAR {
$$ = OP2(DT_TOK_XLATE, dt_node_type($3), $6);
@@ -835,4 +847,15 @@ function_parameters:
| parameter_type_list { $$ = $1; }
;
+dtrace_keyword_ident:
+ DT_KEY_PROBE { $$ = DUP("probe"); }
+ | DT_KEY_PROVIDER { $$ = DUP("provider"); }
+ | DT_KEY_SELF { $$ = DUP("self"); }
+ | DT_KEY_STRING { $$ = DUP("string"); }
+ | DT_TOK_STRINGOF { $$ = DUP("stringof"); }
+ | DT_KEY_USERLAND { $$ = DUP("userland"); }
+ | DT_TOK_XLATE { $$ = DUP("xlate"); }
+ | DT_KEY_XLATOR { $$ = DUP("translator"); }
+ ;
+
%%
Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Tue Oct 7 13:25:59 2014 (r272692)
@@ -434,15 +434,10 @@ static const prmap_t *
dt_pid_fix_mod(dtrace_probedesc_t *pdp, struct ps_prochandle *P)
{
char m[MAXPATHLEN];
-#if defined(sun)
Lmid_t lmid = PR_LMID_EVERY;
-#else
- Lmid_t lmid = 0;
-#endif
const char *obj;
const prmap_t *pmp;
-#if defined(sun)
/*
* Pick apart the link map from the library name.
*/
@@ -463,20 +458,17 @@ dt_pid_fix_mod(dtrace_probedesc_t *pdp,
} else {
obj = pdp->dtpd_mod;
}
-#else
- obj = pdp->dtpd_mod;
-#endif
if ((pmp = Plmid_to_map(P, lmid, obj)) == NULL)
return (NULL);
-#if defined(sun)
(void) Pobjname(P, pmp->pr_vaddr, m, sizeof (m));
if ((obj = strrchr(m, '/')) == NULL)
obj = &m[0];
else
obj++;
+#if defined(sun)
(void) Plmid(P, pmp->pr_vaddr, &lmid);
#endif
@@ -571,9 +563,7 @@ dt_pid_usdt_mapping(void *data, const pr
{
struct ps_prochandle *P = data;
GElf_Sym sym;
-#if defined(sun)
prsyminfo_t sip;
-#endif
dof_helper_t dh;
GElf_Half e_type;
const char *mname;
@@ -852,11 +842,7 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
ctf_funcinfo_t f;
ctf_id_t argv[32];
GElf_Sym sym;
-#if defined(sun)
prsyminfo_t si;
-#else
- void *si;
-#endif
struct ps_prochandle *p;
int i, args;
char buf[DTRACE_ARGTYPELEN];
@@ -941,13 +927,11 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
pdp->dtpd_func, pdp->dtpd_provider, pdp->dtpd_mod);
goto out;
}
-#if defined(sun)
if (ctf_func_info(fp, si.prs_id, &f) == CTF_ERR) {
dt_dprintf("failed to get ctf information for %s in %s`%s\n",
pdp->dtpd_func, pdp->dtpd_provider, pdp->dtpd_mod);
goto out;
}
-#endif
(void) snprintf(buf, sizeof (buf), "%s`%s", pdp->dtpd_provider,
pdp->dtpd_mod);
@@ -977,7 +961,6 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
(void) ctf_type_qname(fp, f.ctc_return, adp->dtargd_native +
ret, DTRACE_ARGTYPELEN - ret, buf);
*nargs = 2;
-#if defined(sun)
} else {
if (ctf_func_args(fp, si.prs_id, argc, argv) == CTF_ERR)
goto out;
@@ -993,7 +976,6 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
(void) ctf_type_qname(fp, argv[i], adp->dtargd_native +
ret, DTRACE_ARGTYPELEN - ret, buf);
}
-#endif
}
out:
dt_proc_unlock(dtp, p);
Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Tue Oct 7 13:25:59 2014 (r272692)
@@ -22,7 +22,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
*/
@@ -304,7 +304,6 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
case ZPOOL_PROP_FREE:
case ZPOOL_PROP_FREEING:
case ZPOOL_PROP_LEAKED:
- case ZPOOL_PROP_EXPANDSZ:
if (literal) {
(void) snprintf(buf, len, "%llu",
(u_longlong_t)intval);
@@ -312,7 +311,16 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
(void) zfs_nicenum(intval, buf, len);
}
break;
-
+ case ZPOOL_PROP_EXPANDSZ:
+ if (intval == 0) {
+ (void) strlcpy(buf, "-", len);
+ } else if (literal) {
+ (void) snprintf(buf, len, "%llu",
+ (u_longlong_t)intval);
+ } else {
+ (void) zfs_nicenum(intval, buf, len);
+ }
+ break;
case ZPOOL_PROP_CAPACITY:
if (literal) {
(void) snprintf(buf, len, "%llu",
@@ -330,13 +338,11 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
(u_longlong_t)intval);
}
break;
-
case ZPOOL_PROP_DEDUPRATIO:
(void) snprintf(buf, len, "%llu.%02llux",
(u_longlong_t)(intval / 100),
(u_longlong_t)(intval % 100));
break;
-
case ZPOOL_PROP_HEALTH:
verify(nvlist_lookup_nvlist(zpool_get_config(zhp, NULL),
ZPOOL_CONFIG_VDEV_TREE, &nvroot) == 0);
Modified: projects/sendfile/cddl/lib/libdtrace/libproc_compat.h
==============================================================================
--- projects/sendfile/cddl/lib/libdtrace/libproc_compat.h Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/cddl/lib/libdtrace/libproc_compat.h Tue Oct 7 13:25:59 2014 (r272692)
@@ -38,7 +38,7 @@
#define Pxlookup_by_addr(p, a, n, s, sym, i) \
proc_addr2sym(p, a, n, s, sym)
#define Pxlookup_by_name(p, l, s1, s2, sym, a) \
- proc_name2sym((p), (s1), (s2), (sym))
+ proc_name2sym(p, s1, s2, sym, a)
#define Paddr_to_map proc_addr2map
#define Pcreate_error strerror
#define Pdelbkpt proc_bkptdel
@@ -46,10 +46,10 @@
#define Plmid(p, a, l) (-1)
#define Plmid_to_map(p, l, o) proc_obj2map((p), (o))
#define Plookup_by_addr proc_addr2sym
-#define Pname_to_ctf(p, obj) NULL
+#define Pname_to_ctf(p, obj) (ctf_file_t *)proc_name2ctf(p, obj)
#define Pname_to_map proc_name2map
#define Pobject_iter proc_iter_objs
-#define Pobject_iter_resolved(p, f, arg) 1
+#define Pobject_iter_resolved(p, f, arg) proc_iter_objs(p, f, arg)
#define Pobjname proc_objname
#define Pread proc_read
#define Prd_agent proc_rdagent
Modified: projects/sendfile/cddl/lib/libzfs/Makefile
==============================================================================
--- projects/sendfile/cddl/lib/libzfs/Makefile Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/cddl/lib/libzfs/Makefile Tue Oct 7 13:25:59 2014 (r272692)
@@ -7,8 +7,11 @@
LIB= zfs
DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
- ${LIBAVL} ${LIBZFS_CORE}
-LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core
+ ${LIBAVL} ${LIBZFS_CORE} ${LIBUUTIL} ${LIBBSDXML} ${LIBGEOM} \
+ ${LIBNVPAIR}
+
+LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
+ -lbsdxml -lgeom -lnvpair -lzfs_core
SRCS= deviceid.c \
fsshare.c \
Modified: projects/sendfile/cddl/lib/libzpool/Makefile
==============================================================================
--- projects/sendfile/cddl/lib/libzpool/Makefile Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/cddl/lib/libzpool/Makefile Tue Oct 7 13:25:59 2014 (r272692)
@@ -56,8 +56,9 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpt
CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys
CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
-DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ}
-LDADD= -lmd -lpthread -lz
+DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \
+ ${LIBAVL} ${LIBUMEM}
+LDADD= -lmd -lpthread -lz -lnvpair -lavl -lumem
# atomic.S doesn't like profiling.
MK_PROFILE= no
Modified: projects/sendfile/contrib/binutils/bfd/config.bfd
==============================================================================
--- projects/sendfile/contrib/binutils/bfd/config.bfd Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/contrib/binutils/bfd/config.bfd Tue Oct 7 13:25:59 2014 (r272692)
@@ -273,19 +273,11 @@ case "${targ}" in
targ_defvec=bfd_elf32_littlearm_vec
targ_selvecs=bfd_elf32_bigarm_vec
;;
- armeb-*-freebsd*)
+ arm*eb*-*-freebsd*)
targ_defvec=bfd_elf32_bigarm_vec
targ_selvecs=bfd_elf32_littlearm_vec
;;
- armv6eb-*-freebsd*)
- targ_defvec=bfd_elf32_bigarm_vec
- targ_selvecs=bfd_elf32_littlearm_vec
- ;;
- armv6-*-freebsd* | armv6hf-*-freebsd*)
- targ_defvec=bfd_elf32_littlearm_vec
- targ_selvecs=bfd_elf32_bigarm_vec
- ;;
- arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
+ arm-*-elf | arm*-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
arm*-*-eabi* )
targ_defvec=bfd_elf32_littlearm_vec
Modified: projects/sendfile/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- projects/sendfile/contrib/binutils/bfd/elf32-arm.c Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/contrib/binutils/bfd/elf32-arm.c Tue Oct 7 13:25:59 2014 (r272692)
@@ -6965,7 +6965,8 @@ elf32_arm_merge_eabi_attributes (bfd *ib
for (; in_list; in_list = in_list->next)
{
- if ((in_list->tag & 128) < 64)
+ if ((in_list->tag & 128) < 64
+ && in_list->tag != Tag_Virtualization_use)
{
_bfd_error_handler
(_("Warning: %B: Unknown EABI object attribute %d"),
Modified: projects/sendfile/contrib/binutils/gas/config/tc-arm.c
==============================================================================
--- projects/sendfile/contrib/binutils/gas/config/tc-arm.c Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/contrib/binutils/gas/config/tc-arm.c Tue Oct 7 13:25:59 2014 (r272692)
@@ -4688,6 +4688,23 @@ parse_address_main (char **str, int i, i
return PARSE_OPERAND_FAIL;
}
}
+ else if (skip_past_char (&p, ':') == SUCCESS)
+ {
+ /* FIXME: '@' should be used here, but it's filtered out by generic
+ code before we get to see it here. This may be subject to
+ change. */
+ expressionS exp;
+ my_get_expression (&exp, &p, GE_NO_PREFIX);
+ if (exp.X_op != O_constant)
+ {
+ inst.error = _("alignment must be constant");
+ return PARSE_OPERAND_FAIL;
+ }
+ inst.operands[i].imm = exp.X_add_number << 8;
+ inst.operands[i].immisalign = 1;
+ /* Alignments are not pre-indexes. */
+ inst.operands[i].preind = 0;
+ }
if (skip_past_char (&p, ']') == FAIL)
{
@@ -6571,6 +6588,7 @@ do_barrier (void)
if (inst.operands[0].present)
{
constraint ((inst.instruction & 0xf0) != 0x40
+ && (inst.instruction & 0xf0) != 0x50
&& inst.operands[0].imm != 0xf,
"bad barrier type");
inst.instruction |= inst.operands[0].imm;
@@ -14694,10 +14712,18 @@ static const struct asm_cond conds[] =
static struct asm_barrier_opt barrier_opt_names[] =
{
- { "sy", 0xf },
- { "un", 0x7 },
- { "st", 0xe },
- { "unst", 0x6 }
+ { "sy", 0xf },
+ { "un", 0x7 },
+ { "st", 0xe },
+ { "unst", 0x6 },
+ { "ish", 0xb },
+ { "sh", 0xb },
+ { "ishst", 0xa },
+ { "shst", 0xa },
+ { "nsh", 0x7 },
+ { "nshst", 0x6 },
+ { "osh", 0x3 },
+ { "oshst", 0x2 }
};
/* Table of ARM-format instructions. */
@@ -19369,6 +19395,12 @@ arm_fix_adjustable (fixS * fixP)
|| fixP->fx_r_type == BFD_RELOC_ARM_LDR_PC_G0)
return 0;
+ if (fixP->fx_r_type == BFD_RELOC_ARM_MOVW
+ || fixP->fx_r_type == BFD_RELOC_ARM_MOVT
+ || fixP->fx_r_type == BFD_RELOC_ARM_THUMB_MOVW
+ || fixP->fx_r_type == BFD_RELOC_ARM_THUMB_MOVT)
+ return 0;
+
return 1;
}
#endif /* defined (OBJ_ELF) || defined (OBJ_COFF) */
Modified: projects/sendfile/contrib/binutils/include/elf/arm.h
==============================================================================
--- projects/sendfile/contrib/binutils/include/elf/arm.h Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/contrib/binutils/include/elf/arm.h Tue Oct 7 13:25:59 2014 (r272692)
@@ -271,6 +271,8 @@ enum
Tag_ABI_optimization_goals,
Tag_ABI_FP_optimization_goals,
/* 32 is generic. */
+
+ Tag_Virtualization_use = 68,
};
#endif
Modified: projects/sendfile/contrib/byacc/CHANGES
==============================================================================
--- projects/sendfile/contrib/byacc/CHANGES Tue Oct 7 13:24:07 2014 (r272691)
+++ projects/sendfile/contrib/byacc/CHANGES Tue Oct 7 13:25:59 2014 (r272692)
@@ -1,3 +1,125 @@
+2014-10-05 Thomas E. Dickey <tom@invisible-island.net>
+
+ * main.c:
+ make change to umask before calling mkstemp, as suggested in Coverity #56902
+
+ * reader.c:
+ adjust logic in copy_action to avoid potential null-pointer dereference
+ (Coverity #56901)
+
+ * reader.c:
+ adjust logic to avoid potential null-pointer dereference in compile_args
+ (Coverity #63407)
+
+ * reader.c: eliminate strcpy into fixed-size buffer (Coverity #63408)
+
+ * yacc.1: document changes made with respect to %parse-param
+
+ * output.c:
+ add parameters from %parse-param to destructor. The order of the parameters
+ is intentionally inconsistent with yyparse/yyerror, for "compatibility" with
+ bison.
+
+ * test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c:
+ regen
+
+ * output.c:
+ use puts_param_types/puts_param_names to output lex_param data.
+
+ * test/btyacc/ok_syntax1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c
, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/rename_debug.c:
+ regen
+
+ * btyaccpar.c: add casts, change types to fix strict compiler warnings
+
+ * test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.tab.c, test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax9.tab.c, test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c:
+ regen
+
+ * output.c: gcc-warning
+
+ * test/btyacc/code_calc.tab.c, test/btyacc/code_error.tab.c: regen
+
+ * output.c: fix limit when merging real/workaround tables
+
+ * output.c:
+ for btyacc, it is possible to have no conflicts - but in that case, the
+ "ctable" was not generated at all, while the skeleton uses the table.
+ The most straightforward (workaround) is generating a dummy table which
+ rejects any state.
+
+ * test/btyacc_destroy3.y, test/btyacc_destroy2.y, test/btyacc_destroy1.y:
+ fix "make check_make"
+
+ * test/yacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/calc2.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c:
+ regen
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Tue Oct 7 14:09:06 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 343F714A;
Tue, 7 Oct 2014 14:09:06 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 21395606;
Tue, 7 Oct 2014 14:09:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97E96kA007465;
Tue, 7 Oct 2014 14:09:06 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97E953O007464;
Tue, 7 Oct 2014 14:09:05 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201410071409.s97E953O007464@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 7 Oct 2014 14:09:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272700 - projects/sendfile/sys/netinet
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2014 14:09:06 -0000
Author: glebius
Date: Tue Oct 7 14:09:05 2014
New Revision: 272700
URL: https://svnweb.freebsd.org/changeset/base/272700
Log:
Add what was missed in r267272: pru_ready for tcp6_usrreqs.
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
Modified:
projects/sendfile/sys/netinet/tcp_usrreq.c
Modified: projects/sendfile/sys/netinet/tcp_usrreq.c
==============================================================================
--- projects/sendfile/sys/netinet/tcp_usrreq.c Tue Oct 7 13:47:54 2014 (r272699)
+++ projects/sendfile/sys/netinet/tcp_usrreq.c Tue Oct 7 14:09:05 2014 (r272700)
@@ -1107,6 +1107,7 @@ struct pr_usrreqs tcp6_usrreqs = {
.pru_rcvd = tcp_usr_rcvd,
.pru_rcvoob = tcp_usr_rcvoob,
.pru_send = tcp_usr_send,
+ .pru_ready = tcp_usr_ready,
.pru_shutdown = tcp_usr_shutdown,
.pru_sockaddr = in6_mapped_sockaddr,
.pru_sosetlabel = in_pcbsosetlabel,
From owner-svn-src-projects@FreeBSD.ORG Tue Oct 7 14:34:42 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 877A0324;
Tue, 7 Oct 2014 14:34:42 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 73C7099A;
Tue, 7 Oct 2014 14:34:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97EYgMx022054;
Tue, 7 Oct 2014 14:34:42 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97EYgQQ022052;
Tue, 7 Oct 2014 14:34:42 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201410071434.s97EYgQQ022052@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 7 Oct 2014 14:34:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272703 - projects/sendfile/sys/kern
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2014 14:34:42 -0000
Author: glebius
Date: Tue Oct 7 14:34:41 2014
New Revision: 272703
URL: https://svnweb.freebsd.org/changeset/base/272703
Log:
Inline sb_shift_nrdy().
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
Modified:
projects/sendfile/sys/kern/uipc_sockbuf.c
Modified: projects/sendfile/sys/kern/uipc_sockbuf.c
==============================================================================
--- projects/sendfile/sys/kern/uipc_sockbuf.c Tue Oct 7 14:30:24 2014 (r272702)
+++ projects/sendfile/sys/kern/uipc_sockbuf.c Tue Oct 7 14:34:41 2014 (r272703)
@@ -68,25 +68,6 @@ static u_long sb_efficiency = 8; /* para
static struct mbuf *sbcut_internal(struct sockbuf *sb, int len);
static void sbflush_internal(struct sockbuf *sb);
-static void
-sb_shift_nrdy(struct sockbuf *sb, struct mbuf *m)
-{
-
-#if 0 /* XXX: not yet: soclose() call path comes here w/o lock. */
- SOCKBUF_LOCK_ASSERT(sb);
-#endif
- KASSERT(m->m_flags & M_NOTREADY, ("%s: m %p !M_NOTREADY", __func__, m));
-
- m = m->m_next;
- while (m != NULL && !(m->m_flags & M_NOTREADY)) {
- m->m_flags &= ~M_BLOCKED;
- sb->sb_acc += m->m_len;
- m = m->m_next;
- }
-
- sb->sb_fnrdy = m;
-}
-
int
sbready(struct sockbuf *sb, struct mbuf *m, int count)
{
@@ -169,8 +150,18 @@ sbfree(struct sockbuf *sb, struct mbuf *
if (!(m->m_flags & M_NOTAVAIL))
sb->sb_acc -= m->m_len;
- if (sb->sb_fnrdy == m)
- sb_shift_nrdy(sb, m);
+ if (m == sb->sb_fnrdy) {
+ KASSERT(m->m_flags & M_NOTREADY,
+ ("%s: m %p !M_NOTREADY", __func__, m));
+
+ m = m->m_next;
+ while (m != NULL && !(m->m_flags & M_NOTREADY)) {
+ m->m_flags &= ~M_BLOCKED;
+ sb->sb_acc += m->m_len;
+ m = m->m_next;
+ }
+ sb->sb_fnrdy = m;
+ }
if (m->m_type != MT_DATA && m->m_type != MT_OOBDATA)
sb->sb_ctl -= m->m_len;
From owner-svn-src-projects@FreeBSD.ORG Tue Oct 7 15:12:07 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 264E53DB;
Tue, 7 Oct 2014 15:12:07 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 129CADE6;
Tue, 7 Oct 2014 15:12:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97FC6ga041068;
Tue, 7 Oct 2014 15:12:06 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97FC6Js041067;
Tue, 7 Oct 2014 15:12:06 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201410071512.s97FC6Js041067@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 7 Oct 2014 15:12:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272704 - projects/sendfile/sys/kern
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2014 15:12:07 -0000
Author: glebius
Date: Tue Oct 7 15:12:06 2014
New Revision: 272704
URL: https://svnweb.freebsd.org/changeset/base/272704
Log:
uipc_ready() should not honor SBS_CANTRCVMORE. We already put the
data in the peer's receive buffer.
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
Modified:
projects/sendfile/sys/kern/uipc_usrreq.c
Modified: projects/sendfile/sys/kern/uipc_usrreq.c
==============================================================================
--- projects/sendfile/sys/kern/uipc_usrreq.c Tue Oct 7 14:34:41 2014 (r272703)
+++ projects/sendfile/sys/kern/uipc_usrreq.c Tue Oct 7 15:12:06 2014 (r272704)
@@ -1062,10 +1062,7 @@ uipc_ready(struct socket *so, struct mbu
so2 = unp2->unp_socket;
SOCKBUF_LOCK(&so2->so_rcv);
- if (so2->so_rcv.sb_state & SBS_CANTRCVMORE) {
- SOCKBUF_UNLOCK(&so2->so_rcv);
- error = ENOTCONN;
- } else if ((error = sbready(&so2->so_rcv, m, count)) == 0)
+ if ((error = sbready(&so2->so_rcv, m, count)) == 0)
sorwakeup_locked(so2);
else
SOCKBUF_UNLOCK(&so2->so_rcv);
From owner-svn-src-projects@FreeBSD.ORG Tue Oct 7 16:46:12 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id CCAF33B6;
Tue, 7 Oct 2014 16:46:12 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id B82BEC8D;
Tue, 7 Oct 2014 16:46:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97GkCuI086752;
Tue, 7 Oct 2014 16:46:12 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97GkCnc086751;
Tue, 7 Oct 2014 16:46:12 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201410071646.s97GkCnc086751@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Tue, 7 Oct 2014 16:46:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272709 - projects/ipfw/sys/netpfil/ipfw
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2014 16:46:12 -0000
Author: melifaro
Date: Tue Oct 7 16:46:11 2014
New Revision: 272709
URL: https://svnweb.freebsd.org/changeset/base/272709
Log:
Notify table algo aboute runtime data change on table flush.
Modified:
projects/ipfw/sys/netpfil/ipfw/ip_fw_table.c
Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_table.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw_table.c Tue Oct 7 16:08:21 2014 (r272708)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw_table.c Tue Oct 7 16:46:11 2014 (r272709)
@@ -1280,6 +1280,10 @@ restart:
tc->ti = ti_new;
tc->count = 0;
+ /* Notify algo on real @ti address */
+ if (ta->change_ti != NULL)
+ ta->change_ti(tc->astate, &tablestate[kidx]);
+
/*
* Stage 4: unref values.
*/
From owner-svn-src-projects@FreeBSD.ORG Tue Oct 7 17:23:11 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id D38B39E1;
Tue, 7 Oct 2014 17:23:11 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id BF02F17F;
Tue, 7 Oct 2014 17:23:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97HNBh3006883;
Tue, 7 Oct 2014 17:23:11 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97HNBF7006882;
Tue, 7 Oct 2014 17:23:11 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201410071723.s97HNBF7006882@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 7 Oct 2014 17:23:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272711 - projects/sendfile/sys/kern
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2014 17:23:12 -0000
Author: glebius
Date: Tue Oct 7 17:23:11 2014
New Revision: 272711
URL: https://svnweb.freebsd.org/changeset/base/272711
Log:
Fix stupid error in r272703.
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
Modified:
projects/sendfile/sys/kern/uipc_sockbuf.c
Modified: projects/sendfile/sys/kern/uipc_sockbuf.c
==============================================================================
--- projects/sendfile/sys/kern/uipc_sockbuf.c Tue Oct 7 17:08:53 2014 (r272710)
+++ projects/sendfile/sys/kern/uipc_sockbuf.c Tue Oct 7 17:23:11 2014 (r272711)
@@ -151,16 +151,18 @@ sbfree(struct sockbuf *sb, struct mbuf *
sb->sb_acc -= m->m_len;
if (m == sb->sb_fnrdy) {
+ struct mbuf *n;
+
KASSERT(m->m_flags & M_NOTREADY,
("%s: m %p !M_NOTREADY", __func__, m));
- m = m->m_next;
- while (m != NULL && !(m->m_flags & M_NOTREADY)) {
- m->m_flags &= ~M_BLOCKED;
- sb->sb_acc += m->m_len;
- m = m->m_next;
+ n = m->m_next;
+ while (n != NULL && !(n->m_flags & M_NOTREADY)) {
+ n->m_flags &= ~M_BLOCKED;
+ sb->sb_acc += n->m_len;
+ n = m->m_next;
}
- sb->sb_fnrdy = m;
+ sb->sb_fnrdy = n;
}
if (m->m_type != MT_DATA && m->m_type != MT_OOBDATA)
From owner-svn-src-projects@FreeBSD.ORG Tue Oct 7 18:22:06 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 33F40205;
Tue, 7 Oct 2014 18:22:06 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 1F152AC5;
Tue, 7 Oct 2014 18:22:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97IM5fG036331;
Tue, 7 Oct 2014 18:22:05 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97IM5eO036330;
Tue, 7 Oct 2014 18:22:05 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201410071822.s97IM5eO036330@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Tue, 7 Oct 2014 18:22:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272714 - projects/ipfw/sys/netpfil/ipfw
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2014 18:22:06 -0000
Author: melifaro
Date: Tue Oct 7 18:22:05 2014
New Revision: 272714
URL: https://svnweb.freebsd.org/changeset/base/272714
Log:
Fix possible crash when old value pointer is not updated after array resize.
Modified:
projects/ipfw/sys/netpfil/ipfw/ip_fw_table_value.c
Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_table_value.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw_table_value.c Tue Oct 7 18:00:34 2014 (r272713)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw_table_value.c Tue Oct 7 18:22:05 2014 (r272714)
@@ -555,8 +555,17 @@ ipfw_link_table_values(struct ip_fw_chai
/* Let's try to link values */
for (i = 0; i < count; i++) {
ptei = &tei[i];
- if (ptei->value != 0)
+ if (ptei->value != 0) {
+
+ /*
+ * We may be here after several process restarts,
+ * so we need to update all fields that might
+ * have changed.
+ */
+ ptv = (struct table_val_link *)ptei->ptv;
+ ptv->pval = &pval[i];
continue;
+ }
/* Check if record has appeared */
mask_table_value(ptei->pvalue, &tval, ts->vmask);
From owner-svn-src-projects@FreeBSD.ORG Wed Oct 8 11:12:16 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 3BAB5246;
Wed, 8 Oct 2014 11:12:16 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 279ECEE6;
Wed, 8 Oct 2014 11:12:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s98BCGi1024986;
Wed, 8 Oct 2014 11:12:16 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s98BCFMh024983;
Wed, 8 Oct 2014 11:12:15 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201410081112.s98BCFMh024983@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Wed, 8 Oct 2014 11:12:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272745 - in projects/ipfw/sys: netinet netpfil/ipfw
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Oct 2014 11:12:16 -0000
Author: melifaro
Date: Wed Oct 8 11:12:14 2014
New Revision: 272745
URL: https://svnweb.freebsd.org/changeset/base/272745
Log:
Add IP_FW_DUMP_SOPTCODES sopt to be able to determine
which opcodes are currently available in kernel.
Modified:
projects/ipfw/sys/netinet/ip_fw.h
projects/ipfw/sys/netpfil/ipfw/ip_fw_sockopt.c
projects/ipfw/sys/netpfil/ipfw/ip_fw_table_value.c
Modified: projects/ipfw/sys/netinet/ip_fw.h
==============================================================================
--- projects/ipfw/sys/netinet/ip_fw.h Wed Oct 8 10:14:37 2014 (r272744)
+++ projects/ipfw/sys/netinet/ip_fw.h Wed Oct 8 11:12:14 2014 (r272745)
@@ -104,6 +104,8 @@ typedef struct _ip_fw3_opheader {
#define IP_FW_NAT44_LIST_NAT 114 /* List all NAT44 instances */
#define IP_FW_NAT44_XGETLOG 115 /* Get log from NAT44 instance */
+#define IP_FW_DUMP_SOPTCODES 116 /* Dump available sopts/versions */
+
/*
* The kernel representation of ipfw rules is made of a list of
* 'instructions' (for all practical purposes equivalent to BPF
@@ -991,4 +993,12 @@ typedef struct _ipfw_range_header {
ipfw_range_tlv range;
} ipfw_range_header;
+typedef struct _ipfw_sopt_info {
+ uint16_t opcode;
+ uint8_t version;
+ uint8_t dir;
+ uint8_t spare;
+ uint64_t refcnt;
+} ipfw_sopt_info;
+
#endif /* _IPFW2_H */
Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_sockopt.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw_sockopt.c Wed Oct 8 10:14:37 2014 (r272744)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw_sockopt.c Wed Oct 8 11:12:14 2014 (r272745)
@@ -115,6 +115,8 @@ static int move_rules(struct ip_fw_chain
struct sockopt_data *sd);
static int manage_sets(struct ip_fw_chain *chain, ip_fw3_opheader *op3,
struct sockopt_data *sd);
+static int dump_soptcodes(struct ip_fw_chain *chain, ip_fw3_opheader *op3,
+ struct sockopt_data *sd);
/* ctl3 handler data */
struct mtx ctl3_lock;
@@ -141,6 +143,7 @@ static struct ipfw_sopt_handler scodes[]
{ IP_FW_SET_SWAP, 0, HDIR_SET, manage_sets },
{ IP_FW_SET_MOVE, 0, HDIR_SET, manage_sets },
{ IP_FW_SET_ENABLE, 0, HDIR_SET, manage_sets },
+ { IP_FW_DUMP_SOPTCODES, 0, HDIR_GET, dump_soptcodes },
};
/*
@@ -2285,6 +2288,57 @@ add_rules(struct ip_fw_chain *chain, ip_
}
/*
+ * Lists all sopts currently registered.
+ * Data layout (v0)(current):
+ * Request: [ ipfw_obj_lheader ], size = ipfw_obj_lheader.size
+ * Reply: [ ipfw_obj_lheader ipfw_sopt_info x N ]
+ *
+ * Returns 0 on success
+ */
+static int
+dump_soptcodes(struct ip_fw_chain *chain, ip_fw3_opheader *op3,
+ struct sockopt_data *sd)
+{
+ struct _ipfw_obj_lheader *olh;
+ ipfw_sopt_info *i;
+ struct ipfw_sopt_handler *sh;
+ uint32_t count, n, size;
+
+ olh = (struct _ipfw_obj_lheader *)ipfw_get_sopt_header(sd,sizeof(*olh));
+ if (olh == NULL)
+ return (EINVAL);
+ if (sd->valsize < olh->size)
+ return (EINVAL);
+
+ CTL3_LOCK();
+ count = ctl3_hsize;
+ size = count * sizeof(ipfw_sopt_info) + sizeof(ipfw_obj_lheader);
+
+ /* Fill in header regadless of buffer size */
+ olh->count = count;
+ olh->objsize = sizeof(ipfw_sopt_info);
+
+ if (size > olh->size) {
+ olh->size = size;
+ CTL3_UNLOCK();
+ return (ENOMEM);
+ }
+ olh->size = size;
+
+ for (n = 1; n <= count; n++) {
+ i = (ipfw_sopt_info *)ipfw_get_sopt_space(sd, sizeof(*i));
+ KASSERT(i != 0, ("previously checked buffer is not enough"));
+ sh = &ctl3_handlers[n];
+ i->opcode = sh->opcode;
+ i->version = sh->version;
+ i->refcnt = sh->refcnt;
+ }
+ CTL3_UNLOCK();
+
+ return (0);
+}
+
+/*
* Compares two sopt handlers (code, version and handler ptr).
* Used both as qsort() and bsearch().
* Does not compare handler for latter case.
Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_table_value.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw_table_value.c Wed Oct 8 10:14:37 2014 (r272744)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw_table_value.c Wed Oct 8 11:12:14 2014 (r272745)
@@ -547,8 +547,15 @@ ipfw_link_table_values(struct ip_fw_chai
IPFW_UH_WLOCK(ch);
tc_unref(tc);
del_toperation_state(ch, ts);
- if (ts->modified != 0)
+ if (ts->modified != 0) {
+
+ /*
+ * In general, we should free all state/indexes here
+ * and return. However, we keep allocated state instead
+ * to ensure we achieve some progress on each restart.
+ */
return (0);
+ }
KASSERT(pval == ch->tablestate, ("resize_storage() notify failure"));
From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 03:20:29 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id B17DDDDB;
Thu, 9 Oct 2014 03:20:29 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 9DFA885A;
Thu, 9 Oct 2014 03:20:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s993KTKI091890;
Thu, 9 Oct 2014 03:20:29 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s993KTbY091888;
Thu, 9 Oct 2014 03:20:29 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201410090320.s993KTbY091888@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 9 Oct 2014 03:20:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272792 - in projects/release-vmimage/release: amd64 i386
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 03:20:29 -0000
Author: gjb
Date: Thu Oct 9 03:20:28 2014
New Revision: 272792
URL: https://svnweb.freebsd.org/changeset/base/272792
Log:
Add /usr/local/bin and /usr/local/sbin to PATH, needed
if third-party software needs to use utilities outside
of the base system during post-install stages (indexinfo
is one culprit).
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-vmimage/release/amd64/mk-vmimage.sh
projects/release-vmimage/release/i386/mk-vmimage.sh
Modified: projects/release-vmimage/release/amd64/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/amd64/mk-vmimage.sh Thu Oct 9 03:07:13 2014 (r272791)
+++ projects/release-vmimage/release/amd64/mk-vmimage.sh Thu Oct 9 03:20:28 2014 (r272792)
@@ -32,7 +32,7 @@
# $FreeBSD$
#
-PATH="/bin:/usr/bin:/sbin:/usr/sbin"
+PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
export PATH
usage_vm_base() {
Modified: projects/release-vmimage/release/i386/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/i386/mk-vmimage.sh Thu Oct 9 03:07:13 2014 (r272791)
+++ projects/release-vmimage/release/i386/mk-vmimage.sh Thu Oct 9 03:20:28 2014 (r272792)
@@ -32,7 +32,7 @@
# $FreeBSD$
#
-PATH="/bin:/usr/bin:/sbin:/usr/sbin"
+PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
export PATH
usage_vm_base() {
From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 03:29:53 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 489FA14B;
Thu, 9 Oct 2014 03:29:53 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 1BEA593A;
Thu, 9 Oct 2014 03:29:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s993Tq9p096564;
Thu, 9 Oct 2014 03:29:52 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s993TqSa096562;
Thu, 9 Oct 2014 03:29:52 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201410090329.s993TqSa096562@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 9 Oct 2014 03:29:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272793 - in projects/release-vmimage/release: amd64 i386
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 03:29:53 -0000
Author: gjb
Date: Thu Oct 9 03:29:52 2014
New Revision: 272793
URL: https://svnweb.freebsd.org/changeset/base/272793
Log:
Add prototypes for build-specific tuning:
- vm_prebuild_setup():
Steps to run prior to creating the file-backed
disk image.
- vm_setup():
Steps to run while the file-backed disk image
is mounted.
- vm_postbuild_setup():
Steps to run after the file-backed disk image
is dismounted.
The intention is to override as necessary via build
configuration files, as needed.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-vmimage/release/amd64/mk-vmimage.sh
projects/release-vmimage/release/i386/mk-vmimage.sh
Modified: projects/release-vmimage/release/amd64/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/amd64/mk-vmimage.sh Thu Oct 9 03:20:28 2014 (r272792)
+++ projects/release-vmimage/release/amd64/mk-vmimage.sh Thu Oct 9 03:29:52 2014 (r272793)
@@ -35,6 +35,18 @@
PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
export PATH
+vm_prebuild_setup() {
+ return 0
+}
+
+vm_setup() {
+ return 0
+}
+
+vm_postbuild_setup() {
+ return 0
+}
+
usage_vm_base() {
echo -n "$(basename ${0}) vm-base <base image> <source tree>"
echo " <dest dir> <disk image size>"
Modified: projects/release-vmimage/release/i386/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/i386/mk-vmimage.sh Thu Oct 9 03:20:28 2014 (r272792)
+++ projects/release-vmimage/release/i386/mk-vmimage.sh Thu Oct 9 03:29:52 2014 (r272793)
@@ -35,6 +35,18 @@
PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
export PATH
+vm_prebuild_setup() {
+ return 0
+}
+
+vm_setup() {
+ return 0
+}
+
+vm_postbuild_setup() {
+ return 0
+}
+
usage_vm_base() {
echo -n "$(basename ${0}) vm-base <base image> <source tree>"
echo " <dest dir> <disk image size>"
From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 03:50:39 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 7D1533E7;
Thu, 9 Oct 2014 03:50:39 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4F4B5AD7;
Thu, 9 Oct 2014 03:50:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s993odLf006644;
Thu, 9 Oct 2014 03:50:39 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s993ocfg006642;
Thu, 9 Oct 2014 03:50:38 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201410090350.s993ocfg006642@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 9 Oct 2014 03:50:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272794 - in projects/release-vmimage/release: amd64 i386
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 03:50:39 -0000
Author: gjb
Date: Thu Oct 9 03:50:38 2014
New Revision: 272794
URL: https://svnweb.freebsd.org/changeset/base/272794
Log:
Allow mk-vmimage.sh to accept a configuration file as
an argument to '-c'.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-vmimage/release/amd64/mk-vmimage.sh
projects/release-vmimage/release/i386/mk-vmimage.sh
Modified: projects/release-vmimage/release/amd64/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/amd64/mk-vmimage.sh Thu Oct 9 03:29:52 2014 (r272793)
+++ projects/release-vmimage/release/amd64/mk-vmimage.sh Thu Oct 9 03:50:38 2014 (r272794)
@@ -188,9 +188,28 @@ vm_create_vmdisk() {
}
main() {
+ vm_config=
+ while getopts "c:" arg; do
+ case ${arg} in
+ c)
+ vm_config="${OPTARG}"
+ ;;
+ *)
+ ;;
+ esac
+ done
+ shift $(( ${OPTIND} - 1 ))
+
cmd="${1}"
shift 1
+ if [ ! -z "${vm_config}" ]; then
+ if [ ! -e "${vm_config}" ]; then
+ panic "Configuration file ${vm_config} not found."
+ fi
+ . ${vm_config}
+ fi
+
case ${cmd} in
vm-base)
eval vm_create_baseimage "$@" || return 0
Modified: projects/release-vmimage/release/i386/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/i386/mk-vmimage.sh Thu Oct 9 03:29:52 2014 (r272793)
+++ projects/release-vmimage/release/i386/mk-vmimage.sh Thu Oct 9 03:50:38 2014 (r272794)
@@ -188,9 +188,28 @@ vm_create_vmdisk() {
}
main() {
+ vm_config=
+ while getopts "c:" arg; do
+ case ${arg} in
+ c)
+ vm_config="${OPTARG}"
+ ;;
+ *)
+ ;;
+ esac
+ done
+ shift $(( ${OPTIND} - 1 ))
+
cmd="${1}"
shift 1
+ if [ ! -z "${vm_config}" ]; then
+ if [ ! -e "${vm_config}" ]; then
+ panic "Configuration file ${vm_config} not found."
+ fi
+ . ${vm_config}
+ fi
+
case ${cmd} in
vm-base)
eval vm_create_baseimage "$@" || return 0
From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 04:10:59 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 5F46F8C6;
Thu, 9 Oct 2014 04:10:59 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 31CB9D1C;
Thu, 9 Oct 2014 04:10:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s994AxxZ016809;
Thu, 9 Oct 2014 04:10:59 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s994Aw1S016806;
Thu, 9 Oct 2014 04:10:58 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201410090410.s994Aw1S016806@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 9 Oct 2014 04:10:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272795 - in projects/release-vmimage/release: amd64 i386
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 04:10:59 -0000
Author: gjb
Date: Thu Oct 9 04:10:58 2014
New Revision: 272795
URL: https://svnweb.freebsd.org/changeset/base/272795
Log:
Reference vm_prebuild_setup(), vm_setup(), and
vm_postbuild_setup() functions.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-vmimage/release/amd64/mk-vmimage.sh
projects/release-vmimage/release/i386/mk-vmimage.sh
Modified: projects/release-vmimage/release/amd64/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/amd64/mk-vmimage.sh Thu Oct 9 03:50:38 2014 (r272794)
+++ projects/release-vmimage/release/amd64/mk-vmimage.sh Thu Oct 9 04:10:58 2014 (r272795)
@@ -92,6 +92,9 @@ panic() {
}
vm_create_baseimage() {
+ # Run anything that is needed before the virtual machine disk image
+ # is created.
+ vm_prebuild_setup
# Creates the UFS root filesystem for the virtual machine disk,
# written to the formatted disk image with mkimg(1).
#
@@ -125,6 +128,9 @@ vm_create_baseimage() {
>> ${DESTDIR}/etc/fstab
echo '/dev/gpt/swapfs none swap sw 0 0' \
>> ${DESTDIR}/etc/fstab
+ # Run anything that is needed while the virtual machine disk image
+ # userland filesystem is still mounted as a md(4) device.
+ vm_setup
sync
while ! umount ${DESTDIR}; do
i=$(( $i + 1 ))
@@ -184,6 +190,9 @@ vm_create_vmdisk() {
-p freebsd-ufs/rootfs:=${VMBASE} \
-o ${VMIMAGE}
+ # Run anything that is needed for the virtual machine disk image
+ # after it has been created.
+ vm_postbuild_setup
return 0
}
Modified: projects/release-vmimage/release/i386/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/i386/mk-vmimage.sh Thu Oct 9 03:50:38 2014 (r272794)
+++ projects/release-vmimage/release/i386/mk-vmimage.sh Thu Oct 9 04:10:58 2014 (r272795)
@@ -92,6 +92,9 @@ panic() {
}
vm_create_baseimage() {
+ # Run anything that is needed before the virtual machine disk image
+ # is created.
+ vm_prebuild_setup
# Creates the UFS root filesystem for the virtual machine disk,
# written to the formatted disk image with mkimg(1).
#
@@ -125,6 +128,9 @@ vm_create_baseimage() {
>> ${DESTDIR}/etc/fstab
echo '/dev/gpt/swapfs none swap sw 0 0' \
>> ${DESTDIR}/etc/fstab
+ # Run anything that is needed while the virtual machine disk image
+ # userland filesystem is still mounted as a md(4) device.
+ vm_setup
sync
while ! umount ${DESTDIR}; do
i=$(( $i + 1 ))
@@ -184,6 +190,9 @@ vm_create_vmdisk() {
-p freebsd-ufs/rootfs:=${VMBASE} \
-o ${VMIMAGE}
+ # Run anything that is needed for the virtual machine disk image
+ # after it has been created.
+ vm_postbuild_setup
return 0
}
From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 12:37:54 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 10966D4;
Thu, 9 Oct 2014 12:37:54 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id E5AA2804;
Thu, 9 Oct 2014 12:37:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s99Cbrcq058572;
Thu, 9 Oct 2014 12:37:53 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s99CbrFv058571;
Thu, 9 Oct 2014 12:37:53 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201410091237.s99CbrFv058571@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Thu, 9 Oct 2014 12:37:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272817 - projects/ipfw/sys/netpfil/ipfw
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 12:37:54 -0000
Author: melifaro
Date: Thu Oct 9 12:37:53 2014
New Revision: 272817
URL: https://svnweb.freebsd.org/changeset/base/272817
Log:
* Wire large user buffer before processing GET request.
* Fix incorrect size calculation for IP_FW_XGET request.
Modified:
projects/ipfw/sys/netpfil/ipfw/ip_fw_sockopt.c
Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_sockopt.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw_sockopt.c Thu Oct 9 12:35:17 2014 (r272816)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw_sockopt.c Thu Oct 9 12:37:53 2014 (r272817)
@@ -60,6 +60,8 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/route.h>
#include <net/vnet.h>
+#include <vm/vm.h>
+#include <vm/vm_extern.h>
#include <netinet/in.h>
#include <netinet/ip_var.h> /* hooks */
@@ -1957,7 +1959,7 @@ dump_static_rules(struct ip_fw_chain *ch
* Data layout (version 0)(current):
* Request: [ ipfw_cfg_lheader ] + IPFW_CFG_GET_* flags
* size = ipfw_cfg_lheader.size
- * Reply: [ ipfw_rules_lheader
+ * Reply: [ ipfw_cfg_lheader
* [ ipfw_obj_ctlv(IPFW_TLV_TBL_LIST) ipfw_obj_ntlv x N ] (optional)
* [ ipfw_obj_ctlv(IPFW_TLV_RULE_LIST)
* ipfw_obj_tlv(IPFW_TLV_RULE_ENT) [ ip_fw_bcounter (optional) ip_fw_rule ]
@@ -1997,7 +1999,7 @@ dump_config(struct ip_fw_chain *chain, i
* STAGE 1: Determine size/count for objects in range.
* Prepare used tables bitmask.
*/
- sz = 0;
+ sz = sizeof(ipfw_cfg_lheader);
memset(&da, 0, sizeof(da));
da.b = 0;
@@ -2550,7 +2552,7 @@ ipfw_flush_sopt_data(struct sockopt_data
sd->kavail = sd->valsize - sd->ktotal;
/* Update sopt buffer */
- sd->sopt->sopt_valsize = sd->kavail;
+ sd->sopt->sopt_valsize = sd->ktotal;
sd->sopt->sopt_val = sd->sopt_val + sd->ktotal;
return (0);
@@ -2612,7 +2614,7 @@ ipfw_get_sopt_header(struct sockopt_data
int
ipfw_ctl3(struct sockopt *sopt)
{
- int error;
+ int error, locked;
size_t size, valsize;
struct ip_fw_chain *chain;
char xbuf[256];
@@ -2663,6 +2665,7 @@ ipfw_ctl3(struct sockopt *sopt)
* Fill in sockopt_data structure that may be useful for
* IP_FW3 get requests.
*/
+ locked = 0;
if (valsize <= sizeof(xbuf)) {
/* use on-stack buffer */
sdata.kbuf = xbuf;
@@ -2686,6 +2689,14 @@ ipfw_ctl3(struct sockopt *sopt)
} else {
/* Get request. Allocate sliding window buffer */
size = (valsize<CTL3_SMALLBUF) ? valsize:CTL3_SMALLBUF;
+
+ if (size < valsize) {
+ /* We have to wire user buffer */
+ error = vslock(sopt->sopt_val, valsize);
+ if (error != 0)
+ return (error);
+ locked = 1;
+ }
}
sdata.kbuf = malloc(size, M_TEMP, M_WAITOK | M_ZERO);
@@ -2718,6 +2729,9 @@ ipfw_ctl3(struct sockopt *sopt)
else
ipfw_flush_sopt_data(&sdata);
+ if (locked != 0)
+ vsunlock(sdata.sopt_val, valsize);
+
/* Restore original pointer and set number of bytes written */
sopt->sopt_val = sdata.sopt_val;
sopt->sopt_valsize = sdata.ktotal;
From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 12:54:57 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 324CF7E4;
Thu, 9 Oct 2014 12:54:57 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 1E8879F5;
Thu, 9 Oct 2014 12:54:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s99Csunn068066;
Thu, 9 Oct 2014 12:54:56 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s99Csuh1068065;
Thu, 9 Oct 2014 12:54:56 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201410091254.s99Csuh1068065@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Thu, 9 Oct 2014 12:54:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272818 - projects/ipfw/sbin/ipfw
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 12:54:57 -0000
Author: melifaro
Date: Thu Oct 9 12:54:56 2014
New Revision: 272818
URL: https://svnweb.freebsd.org/changeset/base/272818
Log:
* Fix use-after-free in table printing code.
* Fix showing human-readable error in table cmds code.
Modified:
projects/ipfw/sbin/ipfw/tables.c
Modified: projects/ipfw/sbin/ipfw/tables.c
==============================================================================
--- projects/ipfw/sbin/ipfw/tables.c Thu Oct 9 12:37:53 2014 (r272817)
+++ projects/ipfw/sbin/ipfw/tables.c Thu Oct 9 12:54:56 2014 (r272818)
@@ -1018,6 +1018,8 @@ table_modify_record(ipfw_obj_header *oh,
if (error == 0)
return;
+ /* Get real OS error */
+ error = errno;
/* Try to provide more human-readable error */
switch (error) {
@@ -1551,12 +1553,11 @@ tables_foreach(table_cb_t *f, void *arg,
olh->size = sz;
if (do_get3(IP_FW_TABLES_XLIST, &olh->opheader, &sz) != 0) {
+ sz = olh->size;
free(olh);
- if (errno == ENOMEM) {
- sz = olh->size;
- continue;
- }
- return (errno);
+ if (errno != ENOMEM)
+ return (errno);
+ continue;
}
if (sort != 0)
From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 14:33:21 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id BE14FD56;
Thu, 9 Oct 2014 14:33:21 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 906696EB;
Thu, 9 Oct 2014 14:33:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s99EXLPr016912;
Thu, 9 Oct 2014 14:33:21 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s99EXLcE016911;
Thu, 9 Oct 2014 14:33:21 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201410091433.s99EXLcE016911@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Thu, 9 Oct 2014 14:33:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272821 - projects/ipfw/sys/netpfil/ipfw
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 14:33:21 -0000
Author: melifaro
Date: Thu Oct 9 14:33:20 2014
New Revision: 272821
URL: https://svnweb.freebsd.org/changeset/base/272821
Log:
Fix core on table destroy inroduced by table values code.
Rename @ti array copy to 'ti_copy'.
Modified:
projects/ipfw/sys/netpfil/ipfw/ip_fw_table.c
Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_table.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw_table.c Thu Oct 9 13:58:19 2014 (r272820)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw_table.c Thu Oct 9 14:33:20 2014 (r272821)
@@ -85,7 +85,7 @@ struct table_config {
char tablename[64]; /* table name */
struct table_algo *ta; /* Callbacks for given algo */
void *astate; /* algorithm state */
- struct table_info ti; /* data to put to table_info */
+ struct table_info ti_copy; /* data to put to table_info */
struct namedobj_instance *vi;
};
@@ -1277,7 +1277,7 @@ restart:
astate_old = tc->astate;
tc->astate = astate_new;
- tc->ti = ti_new;
+ tc->ti_copy = ti_new;
tc->count = 0;
/* Notify algo on real @ti address */
@@ -1430,8 +1430,8 @@ swap_tables(struct ip_fw_chain *ch, stru
IPFW_WUNLOCK(ch);
/* Ensure tc.ti copies are in sync */
- tc_a->ti = tablestate[tc_a->no.kidx];
- tc_b->ti = tablestate[tc_b->no.kidx];
+ tc_a->ti_copy = tablestate[tc_a->no.kidx];
+ tc_b->ti_copy = tablestate[tc_b->no.kidx];
/* Notify both tables on @ti change */
if (tc_a->ta->change_ti != NULL)
@@ -1481,8 +1481,7 @@ destroy_table(struct ip_fw_chain *ch, st
tc->no.kidx, tc->tablename);
/* Unref values used in tables while holding UH lock */
- ipfw_unref_table_values(ch, tc, tc->ta, tc->astate,
- &((struct table_info *)ch->tablestate)[tc->no.kidx]);
+ ipfw_unref_table_values(ch, tc, tc->ta, tc->astate, &tc->ti_copy);
IPFW_UH_WUNLOCK(ch);
free_table_config(ni, tc);
@@ -3008,7 +3007,7 @@ alloc_table_config(struct ip_fw_chain *c
}
/* Preallocate data structures for new tables */
- error = ta->init(ch, &tc->astate, &tc->ti, aname, tflags);
+ error = ta->init(ch, &tc->astate, &tc->ti_copy, aname, tflags);
if (error != 0) {
free(tc, M_IPFW);
return (NULL);
@@ -3030,7 +3029,7 @@ free_table_config(struct namedobj_instan
* We're using ta without any locking/referencing.
* TODO: fix this if we're going to use unloadable algos.
*/
- tc->ta->destroy(tc->astate, &tc->ti);
+ tc->ta->destroy(tc->astate, &tc->ti_copy);
free(tc, M_IPFW);
}
@@ -3054,7 +3053,7 @@ link_table(struct ip_fw_chain *ch, struc
ipfw_objhash_add(ni, &tc->no);
ti = KIDX_TO_TI(ch, kidx);
- *ti = tc->ti;
+ *ti = tc->ti_copy;
/* Notify algo on real @ti address */
if (tc->ta->change_ti != NULL)
From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 15:35:33 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 01D92A1;
Thu, 9 Oct 2014 15:35:32 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id DD1C5F25;
Thu, 9 Oct 2014 15:35:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s99FZW6O048673;
Thu, 9 Oct 2014 15:35:32 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s99FZTm4048659;
Thu, 9 Oct 2014 15:35:29 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201410091535.s99FZTm4048659@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Thu, 9 Oct 2014 15:35:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272826 - in projects/ipfw: . bin/sleep bin/sleep/tests
cddl/contrib/opensolaris/cmd/zdb
cddl/contrib/opensolaris/lib/libdtrace/common contrib/byacc
contrib/byacc/package contrib/byacc/...
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 15:35:33 -0000
Author: melifaro
Date: Thu Oct 9 15:35:28 2014
New Revision: 272826
URL: https://svnweb.freebsd.org/changeset/base/272826
Log:
Sync to HEAD@r272825.
Added:
projects/ipfw/bin/sleep/tests/
- copied from r272825, head/bin/sleep/tests/
projects/ipfw/contrib/byacc/test/btyacc/btyacc_demo2.error
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_demo2.error
projects/ipfw/contrib/byacc/test/btyacc/btyacc_demo2.output
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_demo2.output
projects/ipfw/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
projects/ipfw/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy1.error
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy1.error
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy1.output
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy1.output
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy2.error
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy2.error
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy2.output
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy2.output
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy3.error
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy3.error
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy3.output
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy3.output
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
projects/ipfw/contrib/byacc/test/btyacc_destroy1.y
- copied unchanged from r272825, head/contrib/byacc/test/btyacc_destroy1.y
projects/ipfw/contrib/byacc/test/btyacc_destroy2.y
- copied unchanged from r272825, head/contrib/byacc/test/btyacc_destroy2.y
projects/ipfw/contrib/byacc/test/btyacc_destroy3.y
- copied unchanged from r272825, head/contrib/byacc/test/btyacc_destroy3.y
projects/ipfw/etc/devd/ulpt.conf
- copied unchanged from r272825, head/etc/devd/ulpt.conf
projects/ipfw/gnu/usr.bin/diff/tests/
- copied from r272825, head/gnu/usr.bin/diff/tests/
projects/ipfw/lib/libc/string/explicit_bzero.c
- copied unchanged from r272825, head/lib/libc/string/explicit_bzero.c
projects/ipfw/lib/libpcap/pcap-netmap.c
- copied unchanged from r272825, head/lib/libpcap/pcap-netmap.c
projects/ipfw/sys/dev/mmc/host/
- copied from r272825, head/sys/dev/mmc/host/
projects/ipfw/sys/dev/mrsas/mrsas_linux.c
- copied unchanged from r272825, head/sys/dev/mrsas/mrsas_linux.c
projects/ipfw/sys/libkern/explicit_bzero.c
- copied unchanged from r272825, head/sys/libkern/explicit_bzero.c
projects/ipfw/sys/modules/mrsas/mrsas_linux/
- copied from r272825, head/sys/modules/mrsas/mrsas_linux/
projects/ipfw/sys/netinet/sctp_syscalls.c
- copied unchanged from r272825, head/sys/netinet/sctp_syscalls.c
projects/ipfw/usr.bin/basename/tests/
- copied from r272825, head/usr.bin/basename/tests/
projects/ipfw/usr.bin/cmp/tests/
- copied from r272825, head/usr.bin/cmp/tests/
projects/ipfw/usr.bin/cut/tests/
- copied from r272825, head/usr.bin/cut/tests/
projects/ipfw/usr.bin/dirname/tests/
- copied from r272825, head/usr.bin/dirname/tests/
projects/ipfw/usr.bin/grep/tests/
- copied from r272825, head/usr.bin/grep/tests/
projects/ipfw/usr.bin/gzip/tests/
- copied from r272825, head/usr.bin/gzip/tests/
projects/ipfw/usr.sbin/nmtree/tests/
- copied from r272825, head/usr.sbin/nmtree/tests/
Modified:
projects/ipfw/Makefile.inc1
projects/ipfw/bin/sleep/Makefile
projects/ipfw/cddl/contrib/opensolaris/cmd/zdb/zdb.c
projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
projects/ipfw/contrib/byacc/CHANGES
projects/ipfw/contrib/byacc/MANIFEST
projects/ipfw/contrib/byacc/VERSION
projects/ipfw/contrib/byacc/aclocal.m4
projects/ipfw/contrib/byacc/btyaccpar.c
projects/ipfw/contrib/byacc/closure.c
projects/ipfw/contrib/byacc/config.sub
projects/ipfw/contrib/byacc/configure
projects/ipfw/contrib/byacc/configure.in
projects/ipfw/contrib/byacc/defs.h
projects/ipfw/contrib/byacc/lalr.c
projects/ipfw/contrib/byacc/main.c
projects/ipfw/contrib/byacc/output.c
projects/ipfw/contrib/byacc/package/byacc.spec
projects/ipfw/contrib/byacc/package/debian/changelog
projects/ipfw/contrib/byacc/package/debian/source/format
projects/ipfw/contrib/byacc/package/mingw-byacc.spec
projects/ipfw/contrib/byacc/package/pkgsrc/Makefile
projects/ipfw/contrib/byacc/reader.c
projects/ipfw/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
projects/ipfw/contrib/byacc/test/btyacc/btyacc_demo.tab.c
projects/ipfw/contrib/byacc/test/btyacc/calc.tab.c
projects/ipfw/contrib/byacc/test/btyacc/calc1.tab.c
projects/ipfw/contrib/byacc/test/btyacc/calc2.tab.c
projects/ipfw/contrib/byacc/test/btyacc/calc3.tab.c
projects/ipfw/contrib/byacc/test/btyacc/code_calc.code.c
projects/ipfw/contrib/byacc/test/btyacc/code_calc.tab.c
projects/ipfw/contrib/byacc/test/btyacc/code_error.code.c
projects/ipfw/contrib/byacc/test/btyacc/code_error.tab.c
projects/ipfw/contrib/byacc/test/btyacc/empty.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_inherit1.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_inherit2.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_inherit3.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_inherit4.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_inherit5.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax1.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax10.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax11.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax12.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax13.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax14.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax15.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax16.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax17.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax18.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax19.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax2.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax20.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax21.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax22.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax23.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax24.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax25.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax26.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax27.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax3.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax4.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax5.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax6.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax7.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax7a.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax7b.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax8.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax8a.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax9.tab.c
projects/ipfw/contrib/byacc/test/btyacc/error.tab.c
projects/ipfw/contrib/byacc/test/btyacc/grammar.tab.c
projects/ipfw/contrib/byacc/test/btyacc/inherit0.tab.c
projects/ipfw/contrib/byacc/test/btyacc/inherit1.tab.c
projects/ipfw/contrib/byacc/test/btyacc/inherit2.tab.c
projects/ipfw/contrib/byacc/test/btyacc/ok_syntax1.tab.c
projects/ipfw/contrib/byacc/test/btyacc/pure_calc.tab.c
projects/ipfw/contrib/byacc/test/btyacc/pure_error.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc-s.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc2-s.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc2.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc3-s.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc3.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc4-s.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc4.tab.c
projects/ipfw/contrib/byacc/test/btyacc/rename_debug.c
projects/ipfw/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
projects/ipfw/contrib/byacc/test/yacc/calc2.tab.c
projects/ipfw/contrib/byacc/test/yacc/calc3.tab.c
projects/ipfw/contrib/byacc/test/yacc/ok_syntax1.tab.c
projects/ipfw/contrib/byacc/yacc.1
projects/ipfw/contrib/libpcap/inet.c
projects/ipfw/contrib/libpcap/pcap.c
projects/ipfw/contrib/tcpdump/tcpdump.c
projects/ipfw/etc/devd/Makefile
projects/ipfw/etc/mtree/BSD.tests.dist
projects/ipfw/gnu/usr.bin/diff/Makefile
projects/ipfw/include/rpcsvc/nis.x
projects/ipfw/include/strings.h
projects/ipfw/lib/libc/stdtime/strptime.c
projects/ipfw/lib/libc/string/Makefile.inc
projects/ipfw/lib/libc/string/Symbol.map
projects/ipfw/lib/libc/string/bzero.3
projects/ipfw/lib/libpcap/Makefile
projects/ipfw/lib/libpcap/config.h
projects/ipfw/sbin/dumpon/dumpon.8
projects/ipfw/share/man/man4/alc.4
projects/ipfw/share/man/man9/timeout.9
projects/ipfw/sys/amd64/amd64/minidump_machdep.c
projects/ipfw/sys/amd64/amd64/pmap.c
projects/ipfw/sys/amd64/include/md_var.h
projects/ipfw/sys/amd64/include/pmap.h
projects/ipfw/sys/amd64/include/vmm.h (contents, props changed)
projects/ipfw/sys/amd64/vmm/intel/vmx.c
projects/ipfw/sys/amd64/vmm/vmm.c
projects/ipfw/sys/arm/altera/socfpga/files.socfpga
projects/ipfw/sys/arm/altera/socfpga/socfpga_machdep.c
projects/ipfw/sys/arm/arm/dump_machdep.c
projects/ipfw/sys/arm/arm/minidump_machdep.c
projects/ipfw/sys/arm/conf/EXYNOS5.common
projects/ipfw/sys/arm/conf/SOCKIT
projects/ipfw/sys/arm/include/md_var.h
projects/ipfw/sys/arm/samsung/exynos/exynos5_machdep.c
projects/ipfw/sys/arm/samsung/exynos/files.exynos5
projects/ipfw/sys/boot/common/disk.h
projects/ipfw/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
projects/ipfw/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts
projects/ipfw/sys/boot/fdt/dts/arm/exynos5420.dtsi
projects/ipfw/sys/boot/fdt/dts/arm/socfpga-sockit.dts
projects/ipfw/sys/boot/fdt/dts/arm/socfpga.dtsi
projects/ipfw/sys/boot/i386/gptboot/gptboot.c
projects/ipfw/sys/cam/cam_xpt.c
projects/ipfw/sys/cam/ctl/ctl.c
projects/ipfw/sys/cam/ctl/ctl_backend.h
projects/ipfw/sys/cam/ctl/ctl_backend_block.c
projects/ipfw/sys/cam/ctl/ctl_backend_ramdisk.c
projects/ipfw/sys/cam/ctl/ctl_cmd_table.c
projects/ipfw/sys/cam/ctl/ctl_frontend_cam_sim.c
projects/ipfw/sys/cam/ctl/ctl_frontend_iscsi.c
projects/ipfw/sys/cam/ctl/ctl_frontend_iscsi.h
projects/ipfw/sys/cam/ctl/ctl_private.h
projects/ipfw/sys/cam/ctl/scsi_ctl.c
projects/ipfw/sys/cam/scsi/scsi_all.h
projects/ipfw/sys/cddl/compat/opensolaris/sys/assfail.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
projects/ipfw/sys/compat/freebsd32/freebsd32_proto.h
projects/ipfw/sys/compat/freebsd32/freebsd32_syscall.h
projects/ipfw/sys/compat/freebsd32/freebsd32_syscalls.c
projects/ipfw/sys/compat/freebsd32/freebsd32_sysent.c
projects/ipfw/sys/compat/freebsd32/syscalls.master
projects/ipfw/sys/conf/files
projects/ipfw/sys/conf/newvers.sh
projects/ipfw/sys/dev/acpica/acpi.c
projects/ipfw/sys/dev/acpica/acpi_pci.c
projects/ipfw/sys/dev/acpica/acpivar.h
projects/ipfw/sys/dev/alc/if_alc.c
projects/ipfw/sys/dev/alc/if_alcreg.h
projects/ipfw/sys/dev/alc/if_alcvar.h
projects/ipfw/sys/dev/ale/if_ale.c
projects/ipfw/sys/dev/ale/if_alereg.h
projects/ipfw/sys/dev/cxgbe/common/t4_msg.h
projects/ipfw/sys/dev/cxgbe/tom/t4_connect.c
projects/ipfw/sys/dev/cxgbe/tom/t4_tom.c
projects/ipfw/sys/dev/cxgbe/tom/t4_tom.h
projects/ipfw/sys/dev/cxgbe/tom/t4_tom_l2t.c
projects/ipfw/sys/dev/drm2/i915/intel_ringbuffer.c
projects/ipfw/sys/dev/hwpmc/hwpmc_core.c
projects/ipfw/sys/dev/iscsi/icl.c
projects/ipfw/sys/dev/iscsi/icl.h
projects/ipfw/sys/dev/iscsi/iscsi.c
projects/ipfw/sys/dev/mmc/mmc.c
projects/ipfw/sys/dev/mpr/mpr_sas.c
projects/ipfw/sys/dev/mpr/mpr_table.c
projects/ipfw/sys/dev/mrsas/mrsas.c
projects/ipfw/sys/dev/mrsas/mrsas.h
projects/ipfw/sys/dev/mrsas/mrsas_cam.c
projects/ipfw/sys/dev/mrsas/mrsas_fp.c
projects/ipfw/sys/dev/mrsas/mrsas_ioctl.c
projects/ipfw/sys/dev/mrsas/mrsas_ioctl.h
projects/ipfw/sys/dev/pci/pci.c
projects/ipfw/sys/dev/usb/usb_freebsd.h
projects/ipfw/sys/dev/usb/usb_freebsd_loader.h
projects/ipfw/sys/dev/usb/usb_hub.c
projects/ipfw/sys/dev/usb/usbdevs
projects/ipfw/sys/dev/vt/vt_core.c
projects/ipfw/sys/fs/autofs/autofs.c
projects/ipfw/sys/geom/geom_dev.c
projects/ipfw/sys/i386/i386/machdep.c
projects/ipfw/sys/i386/i386/minidump_machdep.c
projects/ipfw/sys/i386/i386/pmap.c
projects/ipfw/sys/i386/i386/vm_machdep.c
projects/ipfw/sys/i386/include/md_var.h
projects/ipfw/sys/i386/include/pmap.h
projects/ipfw/sys/kern/bus_if.m
projects/ipfw/sys/kern/init_sysent.c
projects/ipfw/sys/kern/kern_timeout.c
projects/ipfw/sys/kern/subr_bus.c
projects/ipfw/sys/kern/syscalls.c
projects/ipfw/sys/kern/syscalls.master
projects/ipfw/sys/kern/tty.c
projects/ipfw/sys/kern/uipc_syscalls.c
projects/ipfw/sys/kern/vfs_bio.c
projects/ipfw/sys/mips/include/md_var.h
projects/ipfw/sys/mips/mips/dump_machdep.c
projects/ipfw/sys/mips/mips/minidump_machdep.c
projects/ipfw/sys/modules/mrsas/Makefile
projects/ipfw/sys/net/if_enc.c
projects/ipfw/sys/net/if_gif.c
projects/ipfw/sys/netinet/ip_gre.c
projects/ipfw/sys/netinet/sctp_output.c
projects/ipfw/sys/netinet/sctp_output.h
projects/ipfw/sys/netinet/sctp_usrreq.c
projects/ipfw/sys/netinet/tcp_output.c
projects/ipfw/sys/netinet/tcp_timer.c
projects/ipfw/sys/netinet/tcp_var.h
projects/ipfw/sys/netinet/udp_usrreq.c
projects/ipfw/sys/netinet6/udp6_usrreq.c
projects/ipfw/sys/netpfil/ipfw/ip_fw2.c
projects/ipfw/sys/ofed/drivers/net/mlx4/mlx4.h
projects/ipfw/sys/ofed/include/linux/mlx4/device.h
projects/ipfw/sys/sys/bus.h
projects/ipfw/sys/sys/mbuf.h
projects/ipfw/sys/sys/param.h
projects/ipfw/sys/sys/socketvar.h
projects/ipfw/sys/sys/syscall.h
projects/ipfw/sys/sys/syscall.mk
projects/ipfw/sys/sys/sysproto.h
projects/ipfw/sys/sys/systm.h
projects/ipfw/sys/ufs/ufs/dir.h
projects/ipfw/sys/x86/acpica/srat.c
projects/ipfw/sys/x86/x86/dump_machdep.c
projects/ipfw/sys/x86/x86/local_apic.c
projects/ipfw/tools/sched/schedgraph.py
projects/ipfw/usr.bin/basename/Makefile
projects/ipfw/usr.bin/cmp/Makefile
projects/ipfw/usr.bin/cut/Makefile
projects/ipfw/usr.bin/dirname/Makefile
projects/ipfw/usr.bin/find/function.c
projects/ipfw/usr.bin/grep/Makefile
projects/ipfw/usr.bin/gzip/Makefile
projects/ipfw/usr.bin/w/w.c
projects/ipfw/usr.sbin/autofs/common.c
projects/ipfw/usr.sbin/bhyve/pci_virtio_block.c
projects/ipfw/usr.sbin/ctladm/ctladm.8
projects/ipfw/usr.sbin/newsyslog/newsyslog.c
projects/ipfw/usr.sbin/nmtree/Makefile
projects/ipfw/usr.sbin/nscd/query.c
Directory Properties:
projects/ipfw/ (props changed)
projects/ipfw/cddl/ (props changed)
projects/ipfw/cddl/contrib/opensolaris/ (props changed)
projects/ipfw/contrib/byacc/ (props changed)
projects/ipfw/contrib/libpcap/ (props changed)
projects/ipfw/contrib/tcpdump/ (props changed)
projects/ipfw/etc/ (props changed)
projects/ipfw/include/ (props changed)
projects/ipfw/lib/libc/ (props changed)
projects/ipfw/lib/libc/stdtime/ (props changed)
projects/ipfw/sbin/ (props changed)
projects/ipfw/sbin/dumpon/ (props changed)
projects/ipfw/share/ (props changed)
projects/ipfw/share/man/man4/ (props changed)
projects/ipfw/sys/ (props changed)
projects/ipfw/sys/amd64/vmm/ (props changed)
projects/ipfw/sys/boot/ (props changed)
projects/ipfw/sys/cddl/contrib/opensolaris/ (props changed)
projects/ipfw/sys/conf/ (props changed)
projects/ipfw/usr.sbin/bhyve/ (props changed)
Modified: projects/ipfw/Makefile.inc1
==============================================================================
--- projects/ipfw/Makefile.inc1 Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/Makefile.inc1 Thu Oct 9 15:35:28 2014 (r272826)
@@ -299,6 +299,10 @@ HMAKE+= PATH=${TMPPATH} METALOG=${METAL
WMAKEENV+= MK_CTF=no
.endif
+.if defined(CROSS_TOOLCHAIN)
+LOCALBASE?= /usr/local
+.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
+.endif
.if defined(CROSS_TOOLCHAIN_PREFIX)
CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
@@ -311,7 +315,7 @@ X${COMPILER}?= ${CROSS_COMPILER_PREFIX}$
X${COMPILER}?= ${${COMPILER}}
.endif
.endfor
-XBINUTILS= AS AR LD NM OBJDUMP RANLIB STRINGS
+XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB STRINGS
.for BINUTIL in ${XBINUTILS}
.if defined(CROSS_BINUTILS_PREFIX)
X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
@@ -322,7 +326,8 @@ X${BINUTIL}?= ${${BINUTIL}}
WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \
CPP="${XCPP} ${XFLAGS}" \
AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
- OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
+ OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \
+ RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
.if ${XCC:M/*}
XFLAGS= --sysroot=${WORLDTMP}
@@ -343,10 +348,14 @@ TARGET_ABI= gnueabihf
TARGET_ABI= gnueabi
.endif
.endif
+.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
+XFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib
+.else
TARGET_ABI?= unknown
TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
XFLAGS+= -target ${TARGET_TRIPLE}
.endif
+.endif
WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
Modified: projects/ipfw/bin/sleep/Makefile
==============================================================================
--- projects/ipfw/bin/sleep/Makefile Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/bin/sleep/Makefile Thu Oct 9 15:35:28 2014 (r272826)
@@ -1,6 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
+.include <src.opts.mk>
+
PROG= sleep
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: projects/ipfw/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/cmd/zdb/zdb.c Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/cddl/contrib/opensolaris/cmd/zdb/zdb.c Thu Oct 9 15:35:28 2014 (r272826)
@@ -76,8 +76,10 @@
#ifndef lint
extern boolean_t zfs_recover;
+extern uint64_t zfs_arc_max, zfs_arc_meta_limit;
#else
boolean_t zfs_recover;
+uint64_t zfs_arc_max, zfs_arc_meta_limit;
#endif
const char cmdname[] = "zdb";
@@ -89,7 +91,7 @@ extern void dump_intent_log(zilog_t *);
uint64_t *zopt_object = NULL;
int zopt_objects = 0;
libzfs_handle_t *g_zfs;
-uint64_t max_inflight = 200;
+uint64_t max_inflight = 1000;
/*
* These libumem hooks provide a reasonable set of defaults for the allocator's
@@ -2382,7 +2384,7 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog
zcb->zcb_readfails = 0;
- if (dump_opt['b'] < 5 && isatty(STDERR_FILENO) &&
+ if (dump_opt['b'] < 5 &&
gethrtime() > zcb->zcb_lastprint + NANOSEC) {
uint64_t now = gethrtime();
char buf[10];
@@ -2467,9 +2469,9 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
if (!dump_opt['L']) {
vdev_t *rvd = spa->spa_root_vdev;
- for (int c = 0; c < rvd->vdev_children; c++) {
+ for (uint64_t c = 0; c < rvd->vdev_children; c++) {
vdev_t *vd = rvd->vdev_child[c];
- for (int m = 0; m < vd->vdev_ms_count; m++) {
+ for (uint64_t m = 0; m < vd->vdev_ms_count; m++) {
metaslab_t *msp = vd->vdev_ms[m];
mutex_enter(&msp->ms_lock);
metaslab_unload(msp);
@@ -2482,6 +2484,15 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
* interfaces.
*/
if (msp->ms_sm != NULL) {
+ (void) fprintf(stderr,
+ "\rloading space map for "
+ "vdev %llu of %llu, "
+ "metaslab %llu of %llu ...",
+ (longlong_t)c,
+ (longlong_t)rvd->vdev_children,
+ (longlong_t)m,
+ (longlong_t)vd->vdev_ms_count);
+
msp->ms_ops = &zdb_metaslab_ops;
VERIFY0(space_map_load(msp->ms_sm,
msp->ms_tree, SM_ALLOC));
@@ -2490,6 +2501,7 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
mutex_exit(&msp->ms_lock);
}
}
+ (void) fprintf(stderr, "\n");
}
spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER);
@@ -3490,6 +3502,12 @@ main(int argc, char **argv)
usage();
}
+ /*
+ * ZDB does not typically re-read blocks; therefore limit the ARC
+ * to 256 MB, which can be used entirely for metadata.
+ */
+ zfs_arc_max = zfs_arc_meta_limit = 256 * 1024 * 1024;
+
kernel_init(FREAD);
g_zfs = libzfs_init();
ASSERT(g_zfs != NULL);
Modified: projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y Thu Oct 9 15:35:28 2014 (r272826)
@@ -207,6 +207,8 @@
%type <l_tok> unary_operator
%type <l_tok> struct_or_union
+%type <l_str> dtrace_keyword_ident
+
%%
dtrace_program: d_expression DT_TOK_EOF { return (dt_node_root($1)); }
@@ -391,12 +393,18 @@ postfix_expression:
| postfix_expression DT_TOK_DOT DT_TOK_TNAME {
$$ = OP2(DT_TOK_DOT, $1, dt_node_ident($3));
}
+ | postfix_expression DT_TOK_DOT dtrace_keyword_ident {
+ $$ = OP2(DT_TOK_DOT, $1, dt_node_ident($3));
+ }
| postfix_expression DT_TOK_PTR DT_TOK_IDENT {
$$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
}
| postfix_expression DT_TOK_PTR DT_TOK_TNAME {
$$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
}
+ | postfix_expression DT_TOK_PTR dtrace_keyword_ident {
+ $$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
+ }
| postfix_expression DT_TOK_ADDADD {
$$ = OP1(DT_TOK_POSTINC, $1);
}
@@ -411,6 +419,10 @@ postfix_expression:
DT_TOK_TNAME DT_TOK_RPAR {
$$ = dt_node_offsetof($3, $5);
}
+ | DT_TOK_OFFSETOF DT_TOK_LPAR type_name DT_TOK_COMMA
+ dtrace_keyword_ident DT_TOK_RPAR {
+ $$ = dt_node_offsetof($3, $5);
+ }
| DT_TOK_XLATE DT_TOK_LT type_name DT_TOK_GT
DT_TOK_LPAR expression DT_TOK_RPAR {
$$ = OP2(DT_TOK_XLATE, dt_node_type($3), $6);
@@ -835,4 +847,15 @@ function_parameters:
| parameter_type_list { $$ = $1; }
;
+dtrace_keyword_ident:
+ DT_KEY_PROBE { $$ = DUP("probe"); }
+ | DT_KEY_PROVIDER { $$ = DUP("provider"); }
+ | DT_KEY_SELF { $$ = DUP("self"); }
+ | DT_KEY_STRING { $$ = DUP("string"); }
+ | DT_TOK_STRINGOF { $$ = DUP("stringof"); }
+ | DT_KEY_USERLAND { $$ = DUP("userland"); }
+ | DT_TOK_XLATE { $$ = DUP("xlate"); }
+ | DT_KEY_XLATOR { $$ = DUP("translator"); }
+ ;
+
%%
Modified: projects/ipfw/contrib/byacc/CHANGES
==============================================================================
--- projects/ipfw/contrib/byacc/CHANGES Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/CHANGES Thu Oct 9 15:35:28 2014 (r272826)
@@ -1,3 +1,145 @@
+2014-10-06 Thomas E. Dickey <tom@invisible-island.net>
+
+ * package/debian/source/format:
+ change to native format to work around regression in Debian packaging.
+
+ * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+ bump
+
+ * configure: regen
+
+ * main.c:
+ correct parameter for umask - for very old mkstemp's - and use type mode_t
+ to quiet compiler warning
+
+ * configure.in: add configure check for mode_t
+
+ * reader.c:
+ better fix for get_line, by ensuring there is enough space to null-terminate
+ its result (prompted by discussion with Craig Rodrigues).
+
+2014-10-05 Thomas E. Dickey <tom@invisible-island.net>
+
+ * main.c:
+ make change to umask before calling mkstemp, as suggested in Coverity #56902
+
+ * reader.c:
+ adjust logic in copy_action to avoid potential null-pointer dereference
+ (Coverity #56901)
+
+ * reader.c:
+ adjust logic to avoid potential null-pointer dereference in compile_args
+ (Coverity #63407)
+
+ * reader.c: eliminate strcpy into fixed-size buffer (Coverity #63408)
+
+ * yacc.1: document changes made with respect to %parse-param
+
+ * output.c:
+ add parameters from %parse-param to destructor. The order of the parameters
+ is intentionally inconsistent with yyparse/yyerror, for "compatibility" with
+ bison.
+
+ * test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c:
+ regen
+
+ * output.c:
+ use puts_param_types/puts_param_names to output lex_param data.
+
+ * test/btyacc/ok_syntax1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c
, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/rename_debug.c:
+ regen
+
+ * btyaccpar.c: add casts, change types to fix strict compiler warnings
+
+ * test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.tab.c, test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax9.tab.c, test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c:
+ regen
+
+ * output.c: gcc-warning
+
+ * test/btyacc/code_calc.tab.c, test/btyacc/code_error.tab.c: regen
+
+ * output.c: fix limit when merging real/workaround tables
+
+ * output.c:
+ for btyacc, it is possible to have no conflicts - but in that case, the
+ "ctable" was not generated at all, while the skeleton uses the table.
+ The most straightforward (workaround) is generating a dummy table which
+ rejects any state.
+
+ * test/btyacc_destroy3.y, test/btyacc_destroy2.y, test/btyacc_destroy1.y:
+ fix "make check_make"
+
+ * test/yacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/calc2.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c:
+ regen
+
+ * reader.c:
+ trim blanks from interim value in copy_param() to handle special case when
+ a space precedes a comma.
+
+ * output.c:
+ use two new functions, puts_param_types and puts_param_names, to improve
+ format of the parse_param list (by trimming space after "*") as well as
+ correcting the output of the comma-separated names (only the last name
+ was output).
+
+ * test/btyacc/ok_syntax1.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c:
+ regen
+
+ * reader.c:
+ modify copy_param() to handle resulting comma-separated list. Before, it
+ only expected a single parameter.
+
+2014-10-04 Thomas E. Dickey <tom@invisible-island.net>
+
+ * reader.c: split-out save_param() from copy_param()
+
+ * reader.c: trim_blanks() did not always convert spaces - fix.
+
+ * reader.c: fix some minor regressions with error-reporting
+
+ * aclocal.m4: update CF_XOPEN_SOURCE for Unixware change from lynx
+
+ * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+ bump
+
+ * reader.c:
+ modify copy_param() to accept multiple parameters, each in curly braces like
+ recent bison, as well as honoring bison's undocumented feature to accept the
+ parameters as a comma-separated list.
+
+ * test/btyacc/btyacc_destroy3.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.error, test/btyacc/btyacc_destroy3.output, test/btyacc/btyacc_destroy3.tab.h, test/btyacc/btyacc_destroy2.error, test/btyacc/btyacc_destroy2.output, test/btyacc/btyacc_destroy2.tab.h:
+ RCS_BASE
+
+2014-10-03 Thomas E. Dickey <tom@invisible-island.net>
+
+ * test/btyacc/btyacc_demo2.error, test/btyacc/btyacc_demo2.output, test/btyacc/btyacc_demo2.tab.c, test/btyacc/btyacc_demo2.tab.h, test/btyacc/btyacc_destroy1.error, test/btyacc/btyacc_destroy1.output, test/btyacc/btyacc_destroy1.tab.h, test/btyacc_destroy3.y, test/btyacc_destroy1.y, test/btyacc_destroy2.y:
+ RCS_BASE
+
+2014-10-02 Thomas E. Dickey <tom@invisible-island.net>
+
+ * main.c, reader.c, defs.h:
+ use calloc in get_line() when allocating line to ensure it is fully initialized,
+ fixes a later uninitialized value in copy_param() (FreeBSD #193499).
+
+2014-09-17 Thomas E. Dickey <tom@invisible-island.net>
+
+ * closure.c, lalr.c, output.c, defs.h:
+ rephrase odd addressing to fix Coverity #48848, #38950, #38860, not actually
+ a bug.
+
+2014-09-01 Thomas E. Dickey <tom@invisible-island.net>
+
+ * config.sub: update to 2014-07-28
+
+2014-07-27 Thomas E. Dickey <tom@invisible-island.net>
+
+ * configure: regen
+
+ * aclocal.m4: modified to support port to Minix3.2
+
+ * package/pkgsrc/Makefile, VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec:
+ bump
+
2014-07-15 Thomas E. Dickey <tom@invisible-island.net>
* aclocal.m4: resync with my-autoconf (no change to configure script)
Modified: projects/ipfw/contrib/byacc/MANIFEST
==============================================================================
--- projects/ipfw/contrib/byacc/MANIFEST Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/MANIFEST Thu Oct 9 15:35:28 2014 (r272826)
@@ -1,4 +1,4 @@
-MANIFEST for byacc-20140715, version t20140715
+MANIFEST for byacc-20141006, version t20141006
--------------------------------------------------------------------------------
MANIFEST this file
ACKNOWLEDGEMENTS original version of byacc - 1993
Modified: projects/ipfw/contrib/byacc/VERSION
==============================================================================
--- projects/ipfw/contrib/byacc/VERSION Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/VERSION Thu Oct 9 15:35:28 2014 (r272826)
@@ -1 +1 @@
-20140715
+20141006
Modified: projects/ipfw/contrib/byacc/aclocal.m4
==============================================================================
--- projects/ipfw/contrib/byacc/aclocal.m4 Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/aclocal.m4 Thu Oct 9 15:35:28 2014 (r272826)
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.35 2014/07/15 19:38:05 tom Exp $
+dnl $Id: aclocal.m4,v 1.37 2014/10/04 16:40:06 tom Exp $
dnl Macros for byacc configure script (Thomas E. Dickey)
dnl ---------------------------------------------------------------------------
dnl Copyright 2004-2013,2014 Thomas E. Dickey
@@ -54,7 +54,7 @@ define([CF_ACVERSION_COMPARE],
[ifelse([$8], , ,[$8])],
[ifelse([$9], , ,[$9])])])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
+dnl CF_ADD_CFLAGS version: 11 updated: 2014/07/22 05:32:57
dnl -------------
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
dnl The second parameter if given makes this macro verbose.
@@ -79,7 +79,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
@@ -116,7 +116,7 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -1085,7 +1085,7 @@ fi
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 46 updated: 2014/02/09 19:30:15
+dnl CF_XOPEN_SOURCE version: 48 updated: 2014/09/01 12:29:14
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -1136,6 +1136,9 @@ irix[[56]].*) #(vi
linux*|gnu*|mint*|k*bsd*-gnu) #(vi
CF_GNU_SOURCE
;;
+minix*) #(vi
+ cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
+ ;;
mirbsd*) #(vi
# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
cf_XOPEN_SOURCE=
@@ -1165,6 +1168,10 @@ solaris2.*) #(vi
cf_xopen_source="-D__EXTENSIONS__"
cf_cv_xopen_source=broken
;;
+sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2)
+ cf_XOPEN_SOURCE=
+ cf_POSIX_C_SOURCE=
+ ;;
*)
CF_TRY_XOPEN_SOURCE
CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
@@ -1172,7 +1179,7 @@ solaris2.*) #(vi
esac
if test -n "$cf_xopen_source" ; then
- CF_ADD_CFLAGS($cf_xopen_source)
+ CF_ADD_CFLAGS($cf_xopen_source,true)
fi
dnl In anything but the default case, we may have system-specific setting
Modified: projects/ipfw/contrib/byacc/btyaccpar.c
==============================================================================
--- projects/ipfw/contrib/byacc/btyaccpar.c Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/btyaccpar.c Thu Oct 9 15:35:28 2014 (r272826)
@@ -18,7 +18,7 @@ const char *const banner[] =
{
"/* original parser id follows */",
"/* yysccsid[] = \"@(#)yaccpar 1.9 (Berkeley) 02/21/93\" */",
- "/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */",
+ "/* (use YYMAJOR/YYMINOR for ifdefs dependent of parser version) */",
"",
"#define YYBYACC 1",
CONCAT1("#define YYMAJOR ", YYMAJOR),
@@ -56,7 +56,7 @@ const char *const tables[] =
"#if YYBTYACC",
"extern const YYINT yycindex[];",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"extern const YYINT yygindex[];",
"extern const YYINT yytable[];",
"extern const YYINT yycheck[];",
@@ -64,7 +64,7 @@ const char *const tables[] =
"#if YYBTYACC",
"extern const YYINT yyctable[];",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"#if YYDEBUG",
"extern const char *const yyname[];",
@@ -127,7 +127,7 @@ const char *const hdr_defs[] =
"#define YYLVQUEUEGROWTH 32",
"#endif",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"/* define the initial stack-sizes */",
"#ifdef YYSTACKSIZE",
@@ -172,7 +172,7 @@ const char *const hdr_defs[] =
"};",
"typedef struct YYParseState_s YYParseState;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
0
};
@@ -220,7 +220,7 @@ const char *const hdr_vars[] =
"",
"static short *yylexemes = 0;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
0
};
@@ -277,7 +277,7 @@ const char *const body_vars[] =
"",
" static short *yylexemes = 0;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
0
};
@@ -290,14 +290,14 @@ const char *const body_1[] =
"#if YYBTYACC",
"#define yytrial (yyps->save)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"#if YYDEBUG",
- "#include <stdio.h> /* needed for printf */",
+ "#include <stdio.h> /* needed for printf */",
"#endif",
"",
- "#include <stdlib.h> /* needed for malloc, etc */",
- "#include <string.h> /* needed for memset */",
+ "#include <stdlib.h> /* needed for malloc, etc */",
+ "#include <string.h> /* needed for memset */",
"",
"/* allocate initial stack or double stack size, up to YYMAXDEPTH */",
"static int yygrowstack(YYSTACKDATA *data)",
@@ -404,7 +404,7 @@ const char *const body_1[] =
" free(p);",
"}",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"#define YYABORT goto yyabort",
"#define YYREJECT goto yyabort",
@@ -416,7 +416,7 @@ const char *const body_1[] =
"#define YYVALID_NESTED do { if (yyps->save && \\",
" yyps->save->save == 0) goto yyvalid; } while(0)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"int",
"YYPARSE_DECL()",
@@ -432,7 +432,7 @@ const char *const body_2[] =
" int yynewerrflag;",
" YYParseState *yyerrctx = NULL;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" YYLTYPE yyerror_loc_range[2]; /* position of error start & end */",
"#endif",
@@ -454,7 +454,7 @@ const char *const body_2[] =
" yyps = yyNewState(0); if (yyps == 0) goto yyenomem;",
" yyps->save = 0;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yynerrs = 0;",
" yyerrflag = 0;",
" yychar = YYEMPTY;",
@@ -495,8 +495,8 @@ const char *const body_2[] =
" /* in trial mode; save scanner results for future parse attempts */",
" if (yylvp == yylvlim)",
" { /* Enlarge lexical value queue */",
- " int p = yylvp - yylvals;",
- " int s = yylvlim - yylvals;",
+ " size_t p = (size_t) (yylvp - yylvals);",
+ " size_t s = (size_t) (yylvlim - yylvals);",
"",
" s += YYLVQUEUEGROWTH;",
" if ((yylexemes = (short *) realloc(yylexemes, s * sizeof(short))) == NULL) goto yyenomem;",
@@ -524,13 +524,13 @@ const char *const body_2[] =
" }",
" /* normal operation, no conflict encountered */",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yychar = YYLEX;",
#if defined(YYBTYACC)
"#if YYBTYACC",
" } while (0);",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" if (yychar < 0) yychar = YYEOF;",
" /* if ((yychar = YYLEX) < 0) yychar = YYEOF; */",
"#if YYDEBUG",
@@ -544,7 +544,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" fprintf(stderr, \" <%s>\", YYSTYPE_TOSTRING(yychar, yylval));",
"#endif",
" fputc('\\n', stderr);",
@@ -598,12 +598,12 @@ const char *const body_2[] =
" save->state = yystate;",
" save->errflag = yyerrflag;",
" save->yystack.s_mark = save->yystack.s_base + (yystack.s_mark - yystack.s_base);",
- " memcpy (save->yystack.s_base, yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (save->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" save->yystack.l_mark = save->yystack.l_base + (yystack.l_mark - yystack.l_base);",
- " memcpy (save->yystack.l_base, yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (save->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" save->yystack.p_mark = save->yystack.p_base + (yystack.p_mark - yystack.p_base);",
- " memcpy (save->yystack.p_base, yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (save->yystack.p_base, yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
" ctry = yytable[yyn];",
" if (yyctable[ctry] == -1)",
@@ -658,7 +658,7 @@ const char *const body_2[] =
" yylexp--;",
" yychar = YYEMPTY;",
" }",
- " save->lexeme = yylvp - yylvals;",
+ " save->lexeme = (int) (yylvp - yylvals);",
" yyps->save = save;",
" }",
" if (yytable[yyn] == ctry)",
@@ -695,7 +695,7 @@ const char *const body_2[] =
" }",
" } /* End of code dealing with conflicts */",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" if (((yyn = yysindex[yystate]) != 0) && (yyn += yychar) >= 0 &&",
" yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yychar)",
" {",
@@ -754,14 +754,14 @@ const char *const body_2[] =
" yyerrctx->state = yystate;",
" yyerrctx->errflag = yyerrflag;",
" yyerrctx->yystack.s_mark = yyerrctx->yystack.s_base + (yystack.s_mark - yystack.s_base);",
- " memcpy (yyerrctx->yystack.s_base, yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yyerrctx->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" yyerrctx->yystack.l_mark = yyerrctx->yystack.l_base + (yystack.l_mark - yystack.l_base);",
- " memcpy (yyerrctx->yystack.l_base, yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (yyerrctx->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" yyerrctx->yystack.p_mark = yyerrctx->yystack.p_base + (yystack.p_mark - yystack.p_base);",
- " memcpy (yyerrctx->yystack.p_base, yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (yyerrctx->yystack.p_base, yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
- " yyerrctx->lexeme = yylvp - yylvals;",
+ " yyerrctx->lexeme = (int) (yylvp - yylvals);",
" }",
" yylvp = yylvals + save->lexeme;",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -770,12 +770,12 @@ const char *const body_2[] =
" yylexp = yylexemes + save->lexeme;",
" yychar = YYEMPTY;",
" yystack.s_mark = yystack.s_base + (save->yystack.s_mark - save->yystack.s_base);",
- " memcpy (yystack.s_base, save->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yystack.s_base, save->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" yystack.l_mark = yystack.l_base + (save->yystack.l_mark - save->yystack.l_base);",
- " memcpy (yystack.l_base, save->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (yystack.l_base, save->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" yystack.p_mark = yystack.p_base + (save->yystack.p_mark - save->yystack.p_base);",
- " memcpy (yystack.p_base, save->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (yystack.p_base, save->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
" ctry = ++save->ctry;",
" yystate = save->state;",
@@ -805,12 +805,12 @@ const char *const body_2[] =
" yylloc = yylpp[-1];",
"#endif",
" yystack.s_mark = yystack.s_base + (yyerrctx->yystack.s_mark - yyerrctx->yystack.s_base);",
- " memcpy (yystack.s_base, yyerrctx->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yystack.s_base, yyerrctx->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" yystack.l_mark = yystack.l_base + (yyerrctx->yystack.l_mark - yyerrctx->yystack.l_base);",
- " memcpy (yystack.l_base, yyerrctx->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (yystack.l_base, yyerrctx->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" yystack.p_mark = yystack.p_base + (yyerrctx->yystack.p_mark - yyerrctx->yystack.p_base);",
- " memcpy (yystack.p_base, yyerrctx->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (yystack.p_base, yyerrctx->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
" yystate = yyerrctx->state;",
" yyFreeState(yyerrctx);",
@@ -820,7 +820,7 @@ const char *const body_2[] =
" }",
" if (yynewerrflag == 0) goto yyinrecovery;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
" YYERROR_CALL(\"syntax error\");",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -876,7 +876,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" YYDESTRUCT_CALL(\"error: discarding state\",",
" yystos[*yystack.s_mark], yystack.l_mark, yystack.p_mark);",
@@ -909,7 +909,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" YYDESTRUCT_CALL(\"error: discarding token\", yychar, &yylval, &yylloc);",
"#else",
@@ -932,7 +932,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" if (yym > 0)",
" {",
" int i;",
@@ -961,7 +961,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" {",
" YYLLOC_DEFAULT(yyloc, &yystack.p_mark[1-yym], yym);",
" /* just in case YYERROR is invoked within the action, save",
@@ -998,7 +998,7 @@ const char *const trailer[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" fprintf(stderr, \"result is <%s>, \", YYSTYPE_TOSTRING(yystos[YYFINAL], yyval));",
"#endif",
" fprintf(stderr, \"shifting from state 0 to final state %d\\n\", YYFINAL);",
@@ -1030,8 +1030,8 @@ const char *const trailer[] =
" /* in trial mode; save scanner results for future parse attempts */",
" if (yylvp == yylvlim)",
" { /* Enlarge lexical value queue */",
- " int p = yylvp - yylvals;",
- " int s = yylvlim - yylvals;",
+ " size_t p = (size_t) (yylvp - yylvals);",
+ " size_t s = (size_t) (yylvlim - yylvals);",
"",
" s += YYLVQUEUEGROWTH;",
" if ((yylexemes = (short *) realloc(yylexemes, s * sizeof(short))) == NULL)",
@@ -1062,13 +1062,13 @@ const char *const trailer[] =
" }",
" /* normal operation, no conflict encountered */",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yychar = YYLEX;",
#if defined(YYBTYACC)
"#if YYBTYACC",
" } while (0);",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" if (yychar < 0) yychar = YYEOF;",
" /* if ((yychar = YYLEX) < 0) yychar = YYEOF; */",
"#if YYDEBUG",
@@ -1097,7 +1097,7 @@ const char *const trailer[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" fprintf(stderr, \"result is <%s>, \", YYSTYPE_TOSTRING(yystos[yystate], yyval));",
"#endif",
" fprintf(stderr, \"shifting from state %d to state %d\\n\", *yystack.s_mark, yystate);",
@@ -1140,17 +1140,17 @@ const char *const trailer[] =
" yylexp = yylexemes + yypath->lexeme;",
" yychar = YYEMPTY;",
" yystack.s_mark = yystack.s_base + (yypath->yystack.s_mark - yypath->yystack.s_base);",
- " memcpy (yystack.s_base, yypath->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yystack.s_base, yypath->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" yystack.l_mark = yystack.l_base + (yypath->yystack.l_mark - yypath->yystack.l_base);",
- " memcpy (yystack.l_base, yypath->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (yystack.l_base, yypath->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" yystack.p_mark = yystack.p_base + (yypath->yystack.p_mark - yypath->yystack.p_base);",
- " memcpy (yystack.p_base, yypath->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (yystack.p_base, yypath->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
" yystate = yypath->state;",
" goto yyloop;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"yyoverflow:",
" YYERROR_CALL(\"yacc stack overflow\");",
@@ -1161,7 +1161,7 @@ const char *const trailer[] =
" YYERROR_CALL(\"memory exhausted\");",
"yyabort_nomem:",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yyresult = 2;",
" goto yyreturn;",
"",
@@ -1174,7 +1174,7 @@ const char *const trailer[] =
"#if YYBTYACC",
" if (yyps->save) goto yyvalid;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yyresult = 0;",
"",
"yyreturn:",
@@ -1224,7 +1224,7 @@ const char *const trailer[] =
" yyFreeState(save);",
" }",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yyfreestack(&yystack);",
" return (yyresult);",
"}",
Modified: projects/ipfw/contrib/byacc/closure.c
==============================================================================
--- projects/ipfw/contrib/byacc/closure.c Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/closure.c Thu Oct 9 15:35:28 2014 (r272826)
@@ -1,4 +1,4 @@
-/* $Id: closure.c,v 1.10 2014/02/19 00:45:42 Tom.Shields Exp $ */
+/* $Id: closure.c,v 1.11 2014/09/18 00:40:07 tom Exp $ */
#include "defs.h"
@@ -6,6 +6,7 @@ Value_t *itemset;
Value_t *itemsetend;
unsigned *ruleset;
+static unsigned *first_base;
static unsigned *first_derives;
static unsigned *EFF;
@@ -68,7 +69,8 @@ set_first_derives(void)
rulesetsize = WORDSIZE(nrules);
varsetsize = WORDSIZE(nvars);
- first_derives = NEW2(nvars * rulesetsize, unsigned) - ntokens * rulesetsize;
+ first_base = NEW2(nvars * rulesetsize, unsigned);
+ first_derives = first_base - ntokens * rulesetsize;
set_EFF();
@@ -176,7 +178,7 @@ finalize_closure(void)
{
FREE(itemset);
FREE(ruleset);
- FREE(first_derives + ntokens * WORDSIZE(nrules));
+ FREE(first_base);
}
#ifdef DEBUG
Modified: projects/ipfw/contrib/byacc/config.sub
==============================================================================
--- projects/ipfw/contrib/byacc/config.sub Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/config.sub Thu Oct 9 15:35:28 2014 (r272826)
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2014-04-03'
+timestamp='2014-07-28'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -283,8 +283,10 @@ case $basic_machine in
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
@@ -401,8 +403,10 @@ case $basic_machine in
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa32r6-* | mipsisa32r6el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64r6-* | mipsisa64r6el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
@@ -824,6 +828,10 @@ case $basic_machine in
basic_machine=powerpc-unknown
os=-morphos
;;
+ moxiebox)
+ basic_machine=moxie-unknown
+ os=-moxiebox
+ ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -1369,7 +1377,7 @@ case $os in
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
Modified: projects/ipfw/contrib/byacc/configure
==============================================================================
--- projects/ipfw/contrib/byacc/configure Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/configure Thu Oct 9 15:35:28 2014 (r272826)
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.19 .
+# From configure.in Revision: 1.20 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20121002.
#
@@ -106,6 +106,42 @@ SHELL=${CONFIG_SHELL-/bin/sh}
: ${ac_max_here_lines=38}
ac_unique_file="main.c"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+# include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+# include <memory.h>
+# endif
+# include <string.h>
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+# include <stdint.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
# Initialize some variables set by options.
ac_init_help=
@@ -854,7 +890,7 @@ if test -z "$CONFIG_SITE"; then
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
- { echo "$as_me:857: loading site script $ac_site_file" >&5
+ { echo "$as_me:893: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
cat "$ac_site_file" >&5
. "$ac_site_file"
@@ -865,7 +901,7 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:868: loading cache $cache_file" >&5
+ { echo "$as_me:904: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -873,7 +909,7 @@ echo "$as_me: loading cache $cache_file"
esac
fi
else
- { echo "$as_me:876: creating cache $cache_file" >&5
+ { echo "$as_me:912: creating cache $cache_file" >&5
echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -889,21 +925,21 @@ for ac_var in `(set) 2>&1 |
eval ac_new_val="\$ac_env_${ac_var}_value"
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:892: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ { echo "$as_me:928: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:896: error: \`$ac_var' was not set in the previous run" >&5
+ { echo "$as_me:932: error: \`$ac_var' was not set in the previous run" >&5
echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:902: error: \`$ac_var' has changed since the previous run:" >&5
+ { echo "$as_me:938: error: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 16:12:03 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id ADDB4A2;
Thu, 9 Oct 2014 16:12:03 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 7F9B2400;
Thu, 9 Oct 2014 16:12:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s99GC3wP070418;
Thu, 9 Oct 2014 16:12:03 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s99GC2jl070414;
Thu, 9 Oct 2014 16:12:02 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201410091612.s99GC2jl070414@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Thu, 9 Oct 2014 16:12:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272828 - in projects/ipfw/sys: netgraph netpfil/ipfw
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 16:12:03 -0000
Author: melifaro
Date: Thu Oct 9 16:12:01 2014
New Revision: 272828
URL: https://svnweb.freebsd.org/changeset/base/272828
Log:
Bump ipfw module version.
Modified:
projects/ipfw/sys/netgraph/ng_ipfw.c
projects/ipfw/sys/netpfil/ipfw/ip_dummynet.c
projects/ipfw/sys/netpfil/ipfw/ip_fw2.c
projects/ipfw/sys/netpfil/ipfw/ip_fw_nat.c
Modified: projects/ipfw/sys/netgraph/ng_ipfw.c
==============================================================================
--- projects/ipfw/sys/netgraph/ng_ipfw.c Thu Oct 9 15:52:01 2014 (r272827)
+++ projects/ipfw/sys/netgraph/ng_ipfw.c Thu Oct 9 16:12:01 2014 (r272828)
@@ -90,7 +90,7 @@ static struct ng_type ng_ipfw_typestruct
.disconnect = ng_ipfw_disconnect,
};
NETGRAPH_INIT(ipfw, &ng_ipfw_typestruct);
-MODULE_DEPEND(ng_ipfw, ipfw, 2, 2, 2);
+MODULE_DEPEND(ng_ipfw, ipfw, 3, 3, 3);
/* Information we store for each hook */
struct ng_ipfw_hook_priv {
Modified: projects/ipfw/sys/netpfil/ipfw/ip_dummynet.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_dummynet.c Thu Oct 9 15:52:01 2014 (r272827)
+++ projects/ipfw/sys/netpfil/ipfw/ip_dummynet.c Thu Oct 9 16:12:01 2014 (r272828)
@@ -2294,7 +2294,7 @@ static moduledata_t dummynet_mod = {
#define DN_SI_SUB SI_SUB_PROTO_IFATTACHDOMAIN
#define DN_MODEV_ORD (SI_ORDER_ANY - 128) /* after ipfw */
DECLARE_MODULE(dummynet, dummynet_mod, DN_SI_SUB, DN_MODEV_ORD);
-MODULE_DEPEND(dummynet, ipfw, 2, 2, 2);
+MODULE_DEPEND(dummynet, ipfw, 3, 3, 3);
MODULE_VERSION(dummynet, 3);
/*
Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw2.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw2.c Thu Oct 9 15:52:01 2014 (r272827)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw2.c Thu Oct 9 16:12:01 2014 (r272828)
@@ -2877,7 +2877,7 @@ static moduledata_t ipfwmod = {
DECLARE_MODULE(ipfw, ipfwmod, IPFW_SI_SUB_FIREWALL, IPFW_MODEVENT_ORDER);
FEATURE(ipfw_ctl3, "ipfw new sockopt calls");
-MODULE_VERSION(ipfw, 2);
+MODULE_VERSION(ipfw, 3);
/* should declare some dependencies here */
/*
Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_nat.c
==============================================================================
--- projects/ipfw/sys/netpfil/ipfw/ip_fw_nat.c Thu Oct 9 15:52:01 2014 (r272827)
+++ projects/ipfw/sys/netpfil/ipfw/ip_fw_nat.c Thu Oct 9 16:12:01 2014 (r272828)
@@ -1212,7 +1212,7 @@ static moduledata_t ipfw_nat_mod = {
DECLARE_MODULE(ipfw_nat, ipfw_nat_mod, IPFW_NAT_SI_SUB_FIREWALL, SI_ORDER_ANY);
MODULE_DEPEND(ipfw_nat, libalias, 1, 1, 1);
-MODULE_DEPEND(ipfw_nat, ipfw, 2, 2, 2);
+MODULE_DEPEND(ipfw_nat, ipfw, 3, 3, 3);
MODULE_VERSION(ipfw_nat, 1);
SYSINIT(ipfw_nat_init, IPFW_NAT_SI_SUB_FIREWALL, IPFW_NAT_MODULE_ORDER,
From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 16:19:17 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 7CFFE2EE;
Thu, 9 Oct 2014 16:19:17 +0000 (UTC)
Received: from mail.ipfw.ru (mail.ipfw.ru [IPv6:2a01:4f8:120:6141::2])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 2CD1E6A2;
Thu, 9 Oct 2014 16:19:17 +0000 (UTC)
Received: from [2a02:6b8:0:401:222:4dff:fe50:cd2f] (helo=ptichko.yndx.net)
by mail.ipfw.ru with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128)
(Exim 4.82 (FreeBSD)) (envelope-from <melifaro@FreeBSD.org>)
id 1XcCRL-000Pc2-K3; Thu, 09 Oct 2014 16:03:27 +0400
Message-ID: <5436B52E.3010106@FreeBSD.org>
Date: Thu, 09 Oct 2014 20:17:50 +0400
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
rv:31.0) Gecko/20100101 Thunderbird/31.1.2
MIME-Version: 1.0
To: John Baldwin <jhb@freebsd.org>
Subject: Re: svn commit: r272515 - projects/ipfw/sys/netpfil/ipfw
References: <201410041210.s94CAX7I012628@svn.freebsd.org>
<5520708.eFNh9vYom7@ralph.baldwin.cx>
In-Reply-To: <5520708.eFNh9vYom7@ralph.baldwin.cx>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 16:19:17 -0000
On 06.10.2014 19:45, John Baldwin wrote:
> On Saturday, October 04, 2014 12:10:33 PM Alexander V. Chernikov wrote:
>> Author: melifaro
>> Date: Sat Oct 4 12:10:32 2014
>> New Revision: 272515
>> URL: https://svnweb.freebsd.org/changeset/base/272515
>>
>> Log:
>> Add "ipfw_ctl3" FEATURE to indicate presence of new ipfw interface.
>>
>> Modified:
>> projects/ipfw/sys/netpfil/ipfw/ip_fw2.c
>>
>> Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw2.c
>> ============================================================================
>> == --- projects/ipfw/sys/netpfil/ipfw/ip_fw2.c Sat Oct 4 11:40:35
>> 2014 (r272514) +++ projects/ipfw/sys/netpfil/ipfw/ip_fw2.c Sat Oct 4
>> 12:10:32 2014 (r272515) @@ -2874,6 +2874,7 @@ static moduledata_t ipfwmod =
>> {
>> #define IPFW_VNET_ORDER (IPFW_MODEVENT_ORDER + 2) /* Later still. */
>>
>> DECLARE_MODULE(ipfw, ipfwmod, IPFW_SI_SUB_FIREWALL, IPFW_MODEVENT_ORDER);
>> +FEATURE(ipfw_ctl3, "ipfw new sockopt calls");
>> MODULE_VERSION(ipfw, 2);
>> /* should declare some dependencies here */
> Would it be better to bump the module version to 3 instead? Userland programs
> can then use modfind() and modstat() to determine the version.
I've bumped ipfw module version in r272828. Actually, I've entirely
forgotten about this possibility.
However, it is a bit hard to determine module version inside
(perl|python|sh|any) script.
On the other case, FEATURE framework provides nice and easy way to
determine any "feature" status
both in C and interpreted programs.
>
From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 18:03:15 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 74DD5E0A;
Thu, 9 Oct 2014 18:03:15 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 55F16345;
Thu, 9 Oct 2014 18:03:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s99I3FO9022684;
Thu, 9 Oct 2014 18:03:15 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s99I3DGw022675;
Thu, 9 Oct 2014 18:03:13 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201410091803.s99I3DGw022675@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Thu, 9 Oct 2014 18:03:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272835 - in projects/ipfw: .
cddl/contrib/opensolaris/cmd/lockstat lib/libcrypt sys/conf sys/sys
sys/ufs/ufs usr.sbin/pw
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 18:03:15 -0000
Author: melifaro
Date: Thu Oct 9 18:03:12 2014
New Revision: 272835
URL: https://svnweb.freebsd.org/changeset/base/272835
Log:
Merge HEAD@r272834
Modified:
projects/ipfw/Makefile.inc1
projects/ipfw/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
projects/ipfw/lib/libcrypt/crypt.c
projects/ipfw/sys/conf/kern.mk
projects/ipfw/sys/sys/bus.h
projects/ipfw/sys/ufs/ufs/dir.h
projects/ipfw/usr.sbin/pw/pw_user.c
Directory Properties:
projects/ipfw/ (props changed)
projects/ipfw/cddl/ (props changed)
projects/ipfw/cddl/contrib/opensolaris/ (props changed)
projects/ipfw/sys/ (props changed)
projects/ipfw/sys/conf/ (props changed)
Modified: projects/ipfw/Makefile.inc1
==============================================================================
--- projects/ipfw/Makefile.inc1 Thu Oct 9 17:45:58 2014 (r272834)
+++ projects/ipfw/Makefile.inc1 Thu Oct 9 18:03:12 2014 (r272835)
@@ -315,7 +315,7 @@ X${COMPILER}?= ${CROSS_COMPILER_PREFIX}$
X${COMPILER}?= ${${COMPILER}}
.endif
.endfor
-XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB STRINGS
+XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS
.for BINUTIL in ${XBINUTILS}
.if defined(CROSS_BINUTILS_PREFIX)
X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
@@ -327,7 +327,8 @@ WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${
CPP="${XCPP} ${XFLAGS}" \
AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \
- RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
+ RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \
+ SIZE="${XSIZE}"
.if ${XCC:M/*}
XFLAGS= --sysroot=${WORLDTMP}
Modified: projects/ipfw/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 Thu Oct 9 17:45:58 2014 (r272834)
+++ projects/ipfw/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 Thu Oct 9 18:03:12 2014 (r272835)
@@ -21,7 +21,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 24, 2013
+.Dd October 8, 2014
.Dt LOCKSTAT 1
.Os
.Sh NAME
@@ -238,10 +238,11 @@ Average duration of the events in nanose
For the profiling event, duration means interrupt latency.
.It Lock
Address of the lock; displayed symbolically if possible.
-.It CPU+PIL
-CPU plus processor interrupt level (PIL).
-For example, if CPU 4 is interrupted while at PIL 6, this will be reported as
-cpu[4]+6.
+.It CPU+Pri_Class
+CPU plus the priority class of the interrupted thread.
+For example, if CPU 4 is interrupted while running a timeshare thread, this
+will be reported as
+.Ql cpu[4]+TShar .
.It Caller
Address of the caller; displayed symbolically if possible.
.El
Modified: projects/ipfw/lib/libcrypt/crypt.c
==============================================================================
--- projects/ipfw/lib/libcrypt/crypt.c Thu Oct 9 17:45:58 2014 (r272834)
+++ projects/ipfw/lib/libcrypt/crypt.c Thu Oct 9 18:03:12 2014 (r272835)
@@ -37,24 +37,26 @@ __FBSDID("$FreeBSD$");
#include "crypt.h"
/*
- * List of supported crypt(3) formats. The first element in the list will
- * be the default.
+ * List of supported crypt(3) formats.
+ *
+ * The default algorithm is the last entry in the list (second-to-last
+ * array element since the last is a sentinel). The reason for placing
+ * the default last rather than first is that DES needs to be at the
+ * bottom for the algorithm guessing logic in crypt(3) to work correctly,
+ * and it needs to be the default for backward compatibility.
*/
static const struct crypt_format {
const char *const name;
char *(*const func)(const char *, const char *);
const char *const magic;
} crypt_formats[] = {
- /* default format */
- { "sha512", crypt_sha512, "$6$" },
-
- /* other supported formats */
{ "md5", crypt_md5, "$1$" },
#ifdef HAS_BLOWFISH
{ "blf", crypt_blowfish, "$2" },
#endif
{ "nth", crypt_nthash, "$3$" },
{ "sha256", crypt_sha256, "$5$" },
+ { "sha512", crypt_sha512, "$6$" },
#ifdef HAS_DES
{ "des", crypt_des, "_" },
#endif
@@ -63,7 +65,8 @@ static const struct crypt_format {
{ NULL, NULL, NULL }
};
-static const struct crypt_format *crypt_format = &crypt_formats[0];
+static const struct crypt_format *crypt_format =
+ &crypt_formats[(sizeof crypt_formats / sizeof *crypt_formats) - 2];
#define DES_SALT_ALPHABET \
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
Modified: projects/ipfw/sys/conf/kern.mk
==============================================================================
--- projects/ipfw/sys/conf/kern.mk Thu Oct 9 17:45:58 2014 (r272834)
+++ projects/ipfw/sys/conf/kern.mk Thu Oct 9 18:03:12 2014 (r272835)
@@ -33,7 +33,13 @@ CWARNEXTRA?= -Wno-error-tautological-com
.endif
.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40300
-CWARNEXTRA?= -Wno-inline
+# Catch-all for all the things that are in our tree, but for which we're
+# not yet ready for this compiler. Note: we likely only really "support"
+# building with gcc 4.8 and newer. Nothing older has been tested.
+CWARNEXTRA?= -Wno-error=inline -Wno-error=enum-compare -Wno-error=unused-but-set-variable \
+ -Wno-error=aggressive-loop-optimizations -Wno-error=maybe-uninitialized \
+ -Wno-error=unused-local-typedefs -Wno-error=array-bounds -Wno-error=address \
+ -Wno-error=cast-qual -Wno-error=sequence-point -Wno-error=attributes
.endif
# External compilers may not support our format extensions. Allow them
Modified: projects/ipfw/sys/sys/bus.h
==============================================================================
--- projects/ipfw/sys/sys/bus.h Thu Oct 9 17:45:58 2014 (r272834)
+++ projects/ipfw/sys/sys/bus.h Thu Oct 9 18:03:12 2014 (r272835)
@@ -327,6 +327,7 @@ int bus_generic_detach(device_t dev);
void bus_generic_driver_added(device_t dev, driver_t *driver);
bus_dma_tag_t
bus_generic_get_dma_tag(device_t dev, device_t child);
+int bus_generic_get_domain(device_t dev, device_t child, int *domain);
struct resource_list *
bus_generic_get_resource_list (device_t, device_t);
void bus_generic_new_pass(device_t dev);
@@ -365,8 +366,6 @@ int bus_generic_teardown_intr(device_t d
int bus_generic_write_ivar(device_t dev, device_t child, int which,
uintptr_t value);
-int bus_generic_get_domain(device_t dev, device_t child, int *domain);
-
/*
* Wrapper functions for the BUS_*_RESOURCE methods to make client code
* a little simpler.
Modified: projects/ipfw/sys/ufs/ufs/dir.h
==============================================================================
--- projects/ipfw/sys/ufs/ufs/dir.h Thu Oct 9 17:45:58 2014 (r272834)
+++ projects/ipfw/sys/ufs/ufs/dir.h Thu Oct 9 18:03:12 2014 (r272835)
@@ -110,7 +110,7 @@ struct direct {
*
*/
#define DIRECTSIZ(namlen) \
- ((offsetof(struct direct, d_name) + \
+ (((uintptr_t)&((struct direct *)0)->d_name + \
((namlen)+1)*sizeof(((struct direct *)0)->d_name[0]) + 3) & ~3)
#if (BYTE_ORDER == LITTLE_ENDIAN)
#define DIRSIZ(oldfmt, dp) \
Modified: projects/ipfw/usr.sbin/pw/pw_user.c
==============================================================================
--- projects/ipfw/usr.sbin/pw/pw_user.c Thu Oct 9 17:45:58 2014 (r272834)
+++ projects/ipfw/usr.sbin/pw/pw_user.c Thu Oct 9 18:03:12 2014 (r272835)
@@ -615,7 +615,7 @@ pw_user(struct userconf * cnf, int mode,
pwd->pw_dir = pw_homepolicy(cnf, args, pwd->pw_name);
pwd->pw_shell = pw_shellpolicy(cnf, args, NULL);
lc = login_getpwclass(pwd);
- if (lc == NULL || login_setcryptfmt(lc, "md5", NULL) == NULL)
+ if (lc == NULL || login_setcryptfmt(lc, "sha512", NULL) == NULL)
warn("setting crypt(3) format");
login_close(lc);
pwd->pw_passwd = pw_password(cnf, args, pwd->pw_name);
@@ -690,7 +690,7 @@ pw_user(struct userconf * cnf, int mode,
} else {
lc = login_getpwclass(pwd);
if (lc == NULL ||
- login_setcryptfmt(lc, "md5", NULL) == NULL)
+ login_setcryptfmt(lc, "sha512", NULL) == NULL)
warn("setting crypt(3) format");
login_close(lc);
pwd->pw_passwd = pw_pwcrypt(line);
From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 18:50:38 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 212FB9C1;
Thu, 9 Oct 2014 18:50:38 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id E83E4A8C;
Thu, 9 Oct 2014 18:50:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s99Iobb0042760;
Thu, 9 Oct 2014 18:50:37 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s99IobDx042759;
Thu, 9 Oct 2014 18:50:37 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201410091850.s99IobDx042759@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Thu, 9 Oct 2014 18:50:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272837 - projects/ipfw/sys/gnu/dts/arm
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 18:50:38 -0000
Author: melifaro
Date: Thu Oct 9 18:50:37 2014
New Revision: 272837
URL: https://svnweb.freebsd.org/changeset/base/272837
Log:
Remove mergeinfo from sys/gnu/dts/arm to deal with
Missing ranges: /head/sys/gnu/dts/arm:271140
Modified:
Directory Properties:
projects/ipfw/sys/gnu/dts/arm/ (props changed)
From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 21:21:22 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id B9DF069A;
Thu, 9 Oct 2014 21:21:22 +0000 (UTC)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 92B52D14;
Thu, 9 Oct 2014 21:21:22 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
by bigwig.baldwin.cx (Postfix) with ESMTPSA id 87934B941;
Thu, 9 Oct 2014 17:21:21 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: "Alexander V. Chernikov" <melifaro@freebsd.org>
Subject: Re: svn commit: r272515 - projects/ipfw/sys/netpfil/ipfw
Date: Thu, 9 Oct 2014 17:11:28 -0400
User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20140415; KDE/4.5.5; amd64; ; )
References: <201410041210.s94CAX7I012628@svn.freebsd.org>
<5520708.eFNh9vYom7@ralph.baldwin.cx> <5436B52E.3010106@FreeBSD.org>
In-Reply-To: <5436B52E.3010106@FreeBSD.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
charset="windows-1252"
Content-Transfer-Encoding: 7bit
Message-Id: <201410091711.28587.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
(bigwig.baldwin.cx); Thu, 09 Oct 2014 17:21:21 -0400 (EDT)
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 21:21:22 -0000
On Thursday, October 09, 2014 12:17:50 pm Alexander V. Chernikov wrote:
> On 06.10.2014 19:45, John Baldwin wrote:
> > On Saturday, October 04, 2014 12:10:33 PM Alexander V. Chernikov wrote:
> >> Author: melifaro
> >> Date: Sat Oct 4 12:10:32 2014
> >> New Revision: 272515
> >> URL: https://svnweb.freebsd.org/changeset/base/272515
> >>
> >> Log:
> >> Add "ipfw_ctl3" FEATURE to indicate presence of new ipfw interface.
> >>
> >> Modified:
> >> projects/ipfw/sys/netpfil/ipfw/ip_fw2.c
> >>
> >> Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw2.c
> >> ============================================================================
> >> == --- projects/ipfw/sys/netpfil/ipfw/ip_fw2.c Sat Oct 4 11:40:35
> >> 2014 (r272514) +++ projects/ipfw/sys/netpfil/ipfw/ip_fw2.c Sat Oct 4
> >> 12:10:32 2014 (r272515) @@ -2874,6 +2874,7 @@ static moduledata_t ipfwmod =
> >> {
> >> #define IPFW_VNET_ORDER (IPFW_MODEVENT_ORDER + 2) /* Later still. */
> >>
> >> DECLARE_MODULE(ipfw, ipfwmod, IPFW_SI_SUB_FIREWALL, IPFW_MODEVENT_ORDER);
> >> +FEATURE(ipfw_ctl3, "ipfw new sockopt calls");
> >> MODULE_VERSION(ipfw, 2);
> >> /* should declare some dependencies here */
> > Would it be better to bump the module version to 3 instead? Userland programs
> > can then use modfind() and modstat() to determine the version.
> I've bumped ipfw module version in r272828. Actually, I've entirely
> forgotten about this possibility.
> However, it is a bit hard to determine module version inside
> (perl|python|sh|any) script.
> On the other case, FEATURE framework provides nice and easy way to
> determine any "feature" status
> both in C and interpreted programs.
I'll grant you that feature is convenient. Perhaps create a SYSCTL node though that
holds the current version? That is 'foo.ipfw.version' being 2 or 3 is more future
proof than 'feature.ipfw2/3/4'.
Alternatively, we could change the module code to export a dynamic sysctl tree
for all loaded modules that includes the versions, i.e. 'module.<foo>.version', etc.
--
John Baldwin
From owner-svn-src-projects@FreeBSD.ORG Fri Oct 10 21:49:00 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 53DFD536;
Fri, 10 Oct 2014 21:49:00 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 3F55E894;
Fri, 10 Oct 2014 21:49:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9ALn04R019733;
Fri, 10 Oct 2014 21:49:00 GMT (envelope-from neel@FreeBSD.org)
Received: (from neel@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9ALmxVb019724;
Fri, 10 Oct 2014 21:48:59 GMT (envelope-from neel@FreeBSD.org)
Message-Id: <201410102148.s9ALmxVb019724@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org
using -f
From: Neel Natu <neel@FreeBSD.org>
Date: Fri, 10 Oct 2014 21:48:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272916 - in projects/bhyve_svm: sys/amd64/vmm/amd
usr.sbin/bhyvectl
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Oct 2014 21:49:00 -0000
Author: neel
Date: Fri Oct 10 21:48:59 2014
New Revision: 272916
URL: https://svnweb.freebsd.org/changeset/base/272916
Log:
Fix bhyvectl so it works correctly on AMD/SVM hosts. Also, add command line
options to display some key VMCB fields.
The set of valid options that can be passed to bhyvectl now depends on the
processor type. AMD-specific options are identified by a "--vmcb" or "--avic"
in the option name. Intel-specific options are identified by a "--vmcs" in
the option name.
Submitted by: Anish Gupta (akgupt3@gmail.com)
Modified:
projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.c
projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.h
projects/bhyve_svm/usr.sbin/bhyvectl/bhyvectl.c
Modified: projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.c
==============================================================================
--- projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.c Fri Oct 10 21:22:25 2014 (r272915)
+++ projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.c Fri Oct 10 21:48:59 2014 (r272916)
@@ -111,6 +111,48 @@ vmcb_segptr(struct vmcb *vmcb, int type)
return (seg);
}
+static int
+vmcb_access(struct svm_softc *softc, int vcpu, int write, int ident,
+ uint64_t *val)
+{
+ struct vmcb *vmcb;
+ int off, bytes;
+ char *ptr;
+
+ vmcb = svm_get_vmcb(softc, vcpu);
+ off = VMCB_ACCESS_OFFSET(ident);
+ bytes = VMCB_ACCESS_BYTES(ident);
+
+ if ((off + bytes) >= sizeof (struct vmcb))
+ return (EINVAL);
+
+ ptr = (char *)vmcb;
+
+ if (!write)
+ *val = 0;
+
+ switch (bytes) {
+ case 8:
+ case 4:
+ case 2:
+ if (write)
+ memcpy(ptr + off, val, bytes);
+ else
+ memcpy(val, ptr + off, bytes);
+ break;
+ default:
+ VCPU_CTR1(softc->vm, vcpu,
+ "Invalid size %d for VMCB access: %d", bytes);
+ return (EINVAL);
+ }
+
+ /* Invalidate all VMCB state cached by h/w. */
+ if (write)
+ svm_set_dirty(softc, vcpu, 0xffffffff);
+
+ return (0);
+}
+
/*
* Read from segment selector, control and general purpose register of VMCB.
*/
@@ -126,6 +168,9 @@ vmcb_read(struct svm_softc *sc, int vcpu
state = &vmcb->state;
err = 0;
+ if (VMCB_ACCESS_OK(ident))
+ return (vmcb_access(sc, vcpu, 0, ident, retval));
+
switch (ident) {
case VM_REG_GUEST_CR0:
*retval = state->cr0;
@@ -210,6 +255,9 @@ vmcb_write(struct svm_softc *sc, int vcp
dirtyseg = 0;
err = 0;
+ if (VMCB_ACCESS_OK(ident))
+ return (vmcb_access(sc, vcpu, 1, ident, &val));
+
switch (ident) {
case VM_REG_GUEST_CR0:
state->cr0 = val;
Modified: projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.h
==============================================================================
--- projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.h Fri Oct 10 21:22:25 2014 (r272915)
+++ projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.h Fri Oct 10 21:48:59 2014 (r272916)
@@ -164,6 +164,45 @@ struct svm_softc;
#define VMCB_EXITINTINFO_VALID(x) (((x) & BIT(31)) ? 1 : 0)
#define VMCB_EXITINTINFO_EC(x) (((x) >> 32) & 0xFFFFFFFF)
+/* Offset of various VMCB fields. */
+#define VMCB_OFF_CTRL(x) (x)
+#define VMCB_OFF_STATE(x) ((x) + 0x400)
+
+#define VMCB_OFF_CR_INTERCEPT VMCB_OFF_CTRL(0x0)
+#define VMCB_OFF_DR_INTERCEPT VMCB_OFF_CTRL(0x4)
+#define VMCB_OFF_EXC_INTERCEPT VMCB_OFF_CTRL(0x8)
+#define VMCB_OFF_INST1_INTERCEPT VMCB_OFF_CTRL(0xC)
+#define VMCB_OFF_INST2_INTERCEPT VMCB_OFF_CTRL(0x10)
+#define VMCB_OFF_IO_PERM VMCB_OFF_CTRL(0x40)
+#define VMCB_OFF_MSR_PERM VMCB_OFF_CTRL(0x48)
+#define VMCB_OFF_TSC_OFFSET VMCB_OFF_CTRL(0x50)
+#define VMCB_OFF_ASID VMCB_OFF_CTRL(0x58)
+#define VMCB_OFF_TLB_CTRL VMCB_OFF_CTRL(0x5C)
+#define VMCB_OFF_VIRQ VMCB_OFF_CTRL(0x60)
+#define VMCB_OFF_EXIT_REASON VMCB_OFF_CTRL(0x70)
+#define VMCB_OFF_EXITINFO1 VMCB_OFF_CTRL(0x78)
+#define VMCB_OFF_EXITINFO2 VMCB_OFF_CTRL(0x80)
+#define VMCB_OFF_EXITINTINFO VMCB_OFF_CTRL(0x88)
+#define VMCB_OFF_AVIC_BAR VMCB_OFF_CTRL(0x98)
+#define VMCB_OFF_NPT_BASE VMCB_OFF_CTRL(0xB0)
+#define VMCB_OFF_AVIC_PAGE VMCB_OFF_CTRL(0xE0)
+#define VMCB_OFF_AVIC_LT VMCB_OFF_CTRL(0xF0)
+#define VMCB_OFF_AVIC_PT VMCB_OFF_CTRL(0xF8)
+#define VMCB_OFF_SYSENTER_CS VMCB_OFF_STATE(0x228)
+#define VMCB_OFF_SYSENTER_ESP VMCB_OFF_STATE(0x230)
+#define VMCB_OFF_SYSENTER_EIP VMCB_OFF_STATE(0x238)
+#define VMCB_OFF_GUEST_PAT VMCB_OFF_STATE(0x268)
+
+/*
+ * Encode the VMCB offset and bytes that we want to read from VMCB.
+ */
+#define VMCB_ACCESS(o, w) (0x80000000 | (((w) & 0xF) << 16) | \
+ ((o) & 0xFFF))
+#define VMCB_ACCESS_OK(v) ((v) & 0x80000000 )
+#define VMCB_ACCESS_BYTES(v) (((v) >> 16) & 0xF)
+#define VMCB_ACCESS_OFFSET(v) ((v) & 0xFFF)
+
+#ifdef _KERNEL
/* VMCB save state area segment format */
struct vmcb_segment {
uint16_t selector;
@@ -287,4 +326,5 @@ int vmcb_setdesc(void *arg, int vcpu, in
int vmcb_getdesc(void *arg, int vcpu, int ident, struct seg_desc *desc);
int vmcb_seg(struct vmcb *vmcb, int ident, struct vmcb_segment *seg);
+#endif /* _KERNEL */
#endif /* _VMCB_H_ */
Modified: projects/bhyve_svm/usr.sbin/bhyvectl/bhyvectl.c
==============================================================================
--- projects/bhyve_svm/usr.sbin/bhyvectl/bhyvectl.c Fri Oct 10 21:22:25 2014 (r272915)
+++ projects/bhyve_svm/usr.sbin/bhyvectl/bhyvectl.c Fri Oct 10 21:48:59 2014 (r272916)
@@ -37,6 +37,8 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
#include <unistd.h>
#include <libgen.h>
#include <libutil.h>
@@ -45,9 +47,12 @@ __FBSDID("$FreeBSD$");
#include <getopt.h>
#include <assert.h>
+#include <machine/cpufunc.h>
#include <machine/vmm.h>
+#include <machine/specialreg.h>
#include <vmmapi.h>
+#include "amd/vmcb.h"
#include "intel/vmcs.h"
#define MB (1UL << 20)
@@ -60,7 +65,7 @@ __FBSDID("$FreeBSD$");
static const char *progname;
static void
-usage(void)
+usage(bool cpu_intel)
{
(void)fprintf(stderr,
@@ -141,48 +146,6 @@ usage(void)
" [--get-ss]\n"
" [--get-tr]\n"
" [--get-ldtr]\n"
- " [--get-vmcs-pinbased-ctls]\n"
- " [--get-vmcs-procbased-ctls]\n"
- " [--get-vmcs-procbased-ctls2]\n"
- " [--get-vmcs-entry-interruption-info]\n"
- " [--set-vmcs-entry-interruption-info=<info>]\n"
- " [--get-vmcs-eptp]\n"
- " [--get-vmcs-guest-physical-address\n"
- " [--get-vmcs-guest-linear-address\n"
- " [--set-vmcs-exception-bitmap]\n"
- " [--get-vmcs-exception-bitmap]\n"
- " [--get-vmcs-io-bitmap-address]\n"
- " [--get-vmcs-tsc-offset]\n"
- " [--get-vmcs-guest-pat]\n"
- " [--get-vmcs-host-pat]\n"
- " [--get-vmcs-host-cr0]\n"
- " [--get-vmcs-host-cr3]\n"
- " [--get-vmcs-host-cr4]\n"
- " [--get-vmcs-host-rip]\n"
- " [--get-vmcs-host-rsp]\n"
- " [--get-vmcs-cr0-mask]\n"
- " [--get-vmcs-cr0-shadow]\n"
- " [--get-vmcs-cr4-mask]\n"
- " [--get-vmcs-cr4-shadow]\n"
- " [--get-vmcs-cr3-targets]\n"
- " [--get-vmcs-apic-access-address]\n"
- " [--get-vmcs-virtual-apic-address]\n"
- " [--get-vmcs-tpr-threshold]\n"
- " [--get-vmcs-msr-bitmap]\n"
- " [--get-vmcs-msr-bitmap-address]\n"
- " [--get-vmcs-vpid]\n"
- " [--get-vmcs-ple-gap]\n"
- " [--get-vmcs-ple-window]\n"
- " [--get-vmcs-instruction-error]\n"
- " [--get-vmcs-exit-ctls]\n"
- " [--get-vmcs-entry-ctls]\n"
- " [--get-vmcs-guest-sysenter]\n"
- " [--get-vmcs-link]\n"
- " [--get-vmcs-exit-reason]\n"
- " [--get-vmcs-exit-qualification]\n"
- " [--get-vmcs-exit-interruption-info]\n"
- " [--get-vmcs-exit-interruption-error]\n"
- " [--get-vmcs-interruptibility]\n"
" [--set-x2apic-state=<state>]\n"
" [--get-x2apic-state]\n"
" [--unassign-pptdev=<bus/slot/func>]\n"
@@ -196,8 +159,64 @@ usage(void)
" [--force-poweroff]\n"
" [--get-active-cpus]\n"
" [--get-suspended-cpus]\n"
- " [--get-intinfo]\n",
+ " [--get-intinfo]\n"
+ " [--get-eptp]\n"
+ " [--set-exception-bitmap]\n"
+ " [--get-exception-bitmap]\n"
+ " [--get-tsc-offset]\n"
+ " [--get-guest-pat]\n"
+ " [--get-io-bitmap-address]\n"
+ " [--get-msr-bitmap]\n"
+ " [--get-msr-bitmap-address]\n"
+ " [--get-guest-sysenter]\n"
+ " [--get-exit-reason]\n",
progname);
+
+ if (cpu_intel) {
+ (void)fprintf(stderr,
+ " [--get-vmcs-pinbased-ctls]\n"
+ " [--get-vmcs-procbased-ctls]\n"
+ " [--get-vmcs-procbased-ctls2]\n"
+ " [--get-vmcs-entry-interruption-info]\n"
+ " [--set-vmcs-entry-interruption-info=<info>]\n"
+ " [--get-vmcs-guest-physical-address\n"
+ " [--get-vmcs-guest-linear-address\n"
+ " [--get-vmcs-host-pat]\n"
+ " [--get-vmcs-host-cr0]\n"
+ " [--get-vmcs-host-cr3]\n"
+ " [--get-vmcs-host-cr4]\n"
+ " [--get-vmcs-host-rip]\n"
+ " [--get-vmcs-host-rsp]\n"
+ " [--get-vmcs-cr0-mask]\n"
+ " [--get-vmcs-cr0-shadow]\n"
+ " [--get-vmcs-cr4-mask]\n"
+ " [--get-vmcs-cr4-shadow]\n"
+ " [--get-vmcs-cr3-targets]\n"
+ " [--get-vmcs-apic-access-address]\n"
+ " [--get-vmcs-virtual-apic-address]\n"
+ " [--get-vmcs-tpr-threshold]\n"
+ " [--get-vmcs-vpid]\n"
+ " [--get-vmcs-instruction-error]\n"
+ " [--get-vmcs-exit-ctls]\n"
+ " [--get-vmcs-entry-ctls]\n"
+ " [--get-vmcs-link]\n"
+ " [--get-vmcs-exit-qualification]\n"
+ " [--get-vmcs-exit-interruption-info]\n"
+ " [--get-vmcs-exit-interruption-error]\n"
+ " [--get-vmcs-interruptibility]\n"
+ );
+ } else {
+ (void)fprintf(stderr,
+ " [--get-vmcb-intercepts]\n"
+ " [--get-vmcb-asid]\n"
+ " [--get-vmcb-exit-details]\n"
+ " [--get-vmcb-tlb-ctrl]\n"
+ " [--get-vmcb-virq]\n"
+ " [--get-avic-apic-bar]\n"
+ " [--get-avic-backing-page]\n"
+ " [--get-avic-table]\n"
+ );
+ }
exit(1);
}
@@ -234,6 +253,12 @@ static int unassign_pptdev, bus, slot, f
static int run;
/*
+ * VMCB specific.
+ */
+static int get_vmcb_intercept, get_vmcb_exit_details, get_vmcb_tlb_ctrl;
+static int get_vmcb_virq, get_avic_table;
+
+/*
* VMCS-specific fields
*/
static int get_pinbased_ctls, get_procbased_ctls, get_procbased_ctls2;
@@ -248,13 +273,13 @@ static int get_cr4_mask, get_cr4_shadow;
static int get_cr3_targets;
static int get_apic_access_addr, get_virtual_apic_addr, get_tpr_threshold;
static int get_msr_bitmap, get_msr_bitmap_address;
-static int get_vpid, get_ple_gap, get_ple_window;
+static int get_vpid_asid;
static int get_inst_err, get_exit_ctls, get_entry_ctls;
static int get_host_cr0, get_host_cr3, get_host_cr4;
static int get_host_rip, get_host_rsp;
static int get_guest_pat, get_host_pat;
static int get_guest_sysenter, get_vmcs_link;
-static int get_vmcs_exit_reason, get_vmcs_exit_qualification;
+static int get_exit_reason, get_vmcs_exit_qualification;
static int get_vmcs_exit_interruption_info, get_vmcs_exit_interruption_error;
static uint64_t desc_base;
@@ -289,29 +314,115 @@ dump_vm_run_exitcode(struct vm_exit *vme
printf("\tinst_type\t\t%d\n", vmexit->u.vmx.inst_type);
printf("\tinst_error\t\t%d\n", vmexit->u.vmx.inst_error);
break;
+ case VM_EXITCODE_SVM:
+ printf("\treason\t\tSVM\n");
+ printf("\texit_reason\t\t%#lx\n", vmexit->u.svm.exitcode);
+ printf("\texitinfo1\t\t%#lx\n", vmexit->u.svm.exitinfo1);
+ printf("\texitinfo2\t\t%#lx\n", vmexit->u.svm.exitinfo2);
+ break;
default:
printf("*** unknown vm run exitcode %d\n", vmexit->exitcode);
break;
}
}
-static int
-dump_vmcs_msr_bitmap(int vcpu, u_long addr)
+/* AMD 6th generation and Intel compatible MSRs */
+#define MSR_AMD6TH_START 0xC0000000
+#define MSR_AMD6TH_END 0xC0001FFF
+/* AMD 7th and 8th generation compatible MSRs */
+#define MSR_AMD7TH_START 0xC0010000
+#define MSR_AMD7TH_END 0xC0011FFF
+
+static const char *
+msr_name(uint32_t msr)
{
- int error, fd, byte, bit, readable, writeable;
- u_int msr;
- const char *bitmap;
+ static char buf[32];
- error = -1;
- bitmap = MAP_FAILED;
+ switch(msr) {
+ case MSR_TSC:
+ return ("MSR_TSC");
+ case MSR_EFER:
+ return ("MSR_EFER");
+ case MSR_STAR:
+ return ("MSR_STAR");
+ case MSR_LSTAR:
+ return ("MSR_LSTAR");
+ case MSR_CSTAR:
+ return ("MSR_CSTAR");
+ case MSR_SF_MASK:
+ return ("MSR_SF_MASK");
+ case MSR_FSBASE:
+ return ("MSR_FSBASE");
+ case MSR_GSBASE:
+ return ("MSR_GSBASE");
+ case MSR_KGSBASE:
+ return ("MSR_KGSBASE");
+ case MSR_SYSENTER_CS_MSR:
+ return ("MSR_SYSENTER_CS_MSR");
+ case MSR_SYSENTER_ESP_MSR:
+ return ("MSR_SYSENTER_ESP_MSR");
+ case MSR_SYSENTER_EIP_MSR:
+ return ("MSR_SYSENTER_EIP_MSR");
+ case MSR_PAT:
+ return ("MSR_PAT");
+ }
+ snprintf(buf, sizeof(buf), "MSR %#08x", msr);
- fd = open("/dev/mem", O_RDONLY, 0);
- if (fd < 0)
- goto done;
+ return (buf);
+}
- bitmap = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_SHARED, fd, addr);
- if (bitmap == MAP_FAILED)
- goto done;
+static inline void
+print_msr_pm(uint64_t msr, int vcpu, int readable, int writeable)
+{
+
+ if (readable || writeable) {
+ printf("%-20s[%d]\t\t%c%c\n", msr_name(msr), vcpu,
+ readable ? 'R' : '-', writeable ? 'W' : '-');
+ }
+}
+
+/*
+ * Reference APM vol2, section 15.11 MSR Intercepts.
+ */
+static void
+dump_amd_msr_pm(const char *bitmap, int vcpu)
+{
+ int byte, bit, readable, writeable;
+ uint32_t msr;
+
+ for (msr = 0; msr < 0x2000; msr++) {
+ byte = msr / 4;
+ bit = (msr % 4) * 2;
+
+ /* Look at MSRs in the range 0x00000000 to 0x00001FFF */
+ readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
+ writeable = (bitmap[byte] & (2 << bit)) ? 0 : 1;
+ print_msr_pm(msr, vcpu, readable, writeable);
+
+ /* Look at MSRs in the range 0xC0000000 to 0xC0001FFF */
+ byte += 2048;
+ readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
+ writeable = (bitmap[byte] & (2 << bit)) ? 0 : 1;
+ print_msr_pm(msr + MSR_AMD6TH_START, vcpu, readable,
+ writeable);
+
+ /* MSR 0xC0010000 to 0xC0011FF is only for AMD */
+ byte += 4096;
+ readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
+ writeable = (bitmap[byte] & (2 << bit)) ? 0 : 1;
+ print_msr_pm(msr + MSR_AMD7TH_START, vcpu, readable,
+ writeable);
+ }
+}
+
+/*
+ * Reference Intel SDM Vol3 Section 24.6.9 MSR-Bitmap Address
+ */
+static void
+dump_intel_msr_pm(const char *bitmap, int vcpu)
+{
+ int byte, bit, readable, writeable;
+ uint32_t msr;
for (msr = 0; msr < 0x2000; msr++) {
byte = msr / 8;
@@ -319,31 +430,56 @@ dump_vmcs_msr_bitmap(int vcpu, u_long ad
/* Look at MSRs in the range 0x00000000 to 0x00001FFF */
readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
- writeable = (bitmap[2048 + byte] & (1 << bit)) ? 0 : 1;
- if (readable || writeable) {
- printf("msr 0x%08x[%d]\t\t%c%c\n", msr, vcpu,
- readable ? 'R' : '-',
- writeable ? 'W' : '-');
- }
+ writeable = (bitmap[2048 + byte] & (1 << bit)) ? 0 : 1;
+ print_msr_pm(msr, vcpu, readable, writeable);
/* Look at MSRs in the range 0xC0000000 to 0xC0001FFF */
byte += 1024;
readable = (bitmap[byte] & (1 << bit)) ? 0 : 1;
- writeable = (bitmap[2048 + byte] & (1 << bit)) ? 0 : 1;
- if (readable || writeable) {
- printf("msr 0x%08x[%d]\t\t%c%c\n",
- 0xc0000000 + msr, vcpu,
- readable ? 'R' : '-',
- writeable ? 'W' : '-');
- }
+ writeable = (bitmap[2048 + byte] & (1 << bit)) ? 0 : 1;
+ print_msr_pm(msr + MSR_AMD6TH_START, vcpu, readable,
+ writeable);
+ }
+}
+
+static int
+dump_msr_bitmap(int vcpu, uint64_t addr, bool cpu_intel)
+{
+ int error, fd, map_size;
+ const char *bitmap;
+
+ error = -1;
+ bitmap = MAP_FAILED;
+
+ fd = open("/dev/mem", O_RDONLY, 0);
+ if (fd < 0) {
+ perror("Couldn't open /dev/mem");
+ goto done;
+ }
+
+ if (cpu_intel)
+ map_size = PAGE_SIZE;
+ else
+ map_size = 2 * PAGE_SIZE;
+
+ bitmap = mmap(NULL, map_size, PROT_READ, MAP_SHARED, fd, addr);
+ if (bitmap == MAP_FAILED) {
+ perror("mmap failed");
+ goto done;
}
+
+ if (cpu_intel)
+ dump_intel_msr_pm(bitmap, vcpu);
+ else
+ dump_amd_msr_pm(bitmap, vcpu);
error = 0;
done:
if (bitmap != MAP_FAILED)
- munmap((void *)bitmap, PAGE_SIZE);
+ munmap((void *)bitmap, map_size);
if (fd >= 0)
close(fd);
+
return (error);
}
@@ -361,6 +497,22 @@ vm_set_vmcs_field(struct vmctx *ctx, int
return (vm_set_register(ctx, vcpu, VMCS_IDENT(field), val));
}
+static int
+vm_get_vmcb_field(struct vmctx *ctx, int vcpu, int off, int bytes,
+ uint64_t *ret_val)
+{
+
+ return (vm_get_register(ctx, vcpu, VMCB_ACCESS(off, bytes), ret_val));
+}
+
+static int
+vm_set_vmcb_field(struct vmctx *ctx, int vcpu, int off, int bytes,
+ uint64_t val)
+{
+
+ return (vm_set_register(ctx, vcpu, VMCB_ACCESS(off, bytes), val));
+}
+
enum {
VMNAME = 1000, /* avoid collision with return values from getopt */
VCPU,
@@ -386,7 +538,7 @@ enum {
SET_TR,
SET_LDTR,
SET_X2APIC_STATE,
- SET_VMCS_EXCEPTION_BITMAP,
+ SET_EXCEPTION_BITMAP,
SET_VMCS_ENTRY_INTERRUPTION_INFO,
SET_CAP,
CAPNAME,
@@ -445,648 +597,190 @@ print_intinfo(const char *banner, uint64
printf("\n");
}
-int
-main(int argc, char *argv[])
+static bool
+cpu_vendor_intel(void)
{
- char *vmname;
- int error, ch, vcpu, ptenum;
- vm_paddr_t gpa, gpa_pmap;
- size_t len;
- struct vm_exit vmexit;
- uint64_t ctl, eptp, bm, addr, u64, pteval[4], *pte, info[2];
- struct vmctx *ctx;
- int wired;
- cpuset_t cpus;
+ u_int regs[4];
+ char cpu_vendor[13];
+
+ do_cpuid(0, regs);
+ ((u_int *)&cpu_vendor)[0] = regs[1];
+ ((u_int *)&cpu_vendor)[1] = regs[3];
+ ((u_int *)&cpu_vendor)[2] = regs[2];
+ cpu_vendor[12] = '\0';
+
+ if (strcmp(cpu_vendor, "AuthenticAMD") == 0) {
+ return (false);
+ } else if (strcmp(cpu_vendor, "GenuineIntel") == 0) {
+ return (true);
+ } else {
+ fprintf(stderr, "Unknown cpu vendor \"%s\"\n", cpu_vendor);
+ exit(1);
+ }
+}
- uint64_t cr0, cr3, cr4, dr7, rsp, rip, rflags, efer, pat;
+static int
+get_all_registers(struct vmctx *ctx, int vcpu)
+{
+ uint64_t cr0, cr3, cr4, dr7, rsp, rip, rflags, efer;
uint64_t rax, rbx, rcx, rdx, rsi, rdi, rbp;
uint64_t r8, r9, r10, r11, r12, r13, r14, r15;
- uint64_t cs, ds, es, fs, gs, ss, tr, ldtr;
+ int error;
- struct option opts[] = {
- { "vm", REQ_ARG, 0, VMNAME },
- { "cpu", REQ_ARG, 0, VCPU },
- { "set-mem", REQ_ARG, 0, SET_MEM },
- { "set-efer", REQ_ARG, 0, SET_EFER },
- { "set-cr0", REQ_ARG, 0, SET_CR0 },
- { "set-cr3", REQ_ARG, 0, SET_CR3 },
- { "set-cr4", REQ_ARG, 0, SET_CR4 },
- { "set-dr7", REQ_ARG, 0, SET_DR7 },
- { "set-rsp", REQ_ARG, 0, SET_RSP },
- { "set-rip", REQ_ARG, 0, SET_RIP },
- { "set-rax", REQ_ARG, 0, SET_RAX },
- { "set-rflags", REQ_ARG, 0, SET_RFLAGS },
- { "desc-base", REQ_ARG, 0, DESC_BASE },
- { "desc-limit", REQ_ARG, 0, DESC_LIMIT },
- { "desc-access",REQ_ARG, 0, DESC_ACCESS },
- { "set-cs", REQ_ARG, 0, SET_CS },
- { "set-ds", REQ_ARG, 0, SET_DS },
- { "set-es", REQ_ARG, 0, SET_ES },
- { "set-fs", REQ_ARG, 0, SET_FS },
- { "set-gs", REQ_ARG, 0, SET_GS },
- { "set-ss", REQ_ARG, 0, SET_SS },
- { "set-tr", REQ_ARG, 0, SET_TR },
- { "set-ldtr", REQ_ARG, 0, SET_LDTR },
- { "set-x2apic-state",REQ_ARG, 0, SET_X2APIC_STATE },
- { "set-vmcs-exception-bitmap",
- REQ_ARG, 0, SET_VMCS_EXCEPTION_BITMAP },
- { "set-vmcs-entry-interruption-info",
- REQ_ARG, 0, SET_VMCS_ENTRY_INTERRUPTION_INFO },
- { "capname", REQ_ARG, 0, CAPNAME },
- { "unassign-pptdev", REQ_ARG, 0, UNASSIGN_PPTDEV },
- { "setcap", REQ_ARG, 0, SET_CAP },
- { "get-gpa-pmap", REQ_ARG, 0, GET_GPA_PMAP },
- { "assert-lapic-lvt", REQ_ARG, 0, ASSERT_LAPIC_LVT },
- { "getcap", NO_ARG, &getcap, 1 },
- { "get-stats", NO_ARG, &get_stats, 1 },
- { "get-desc-ds",NO_ARG, &get_desc_ds, 1 },
- { "set-desc-ds",NO_ARG, &set_desc_ds, 1 },
- { "get-desc-es",NO_ARG, &get_desc_es, 1 },
- { "set-desc-es",NO_ARG, &set_desc_es, 1 },
- { "get-desc-ss",NO_ARG, &get_desc_ss, 1 },
- { "set-desc-ss",NO_ARG, &set_desc_ss, 1 },
- { "get-desc-cs",NO_ARG, &get_desc_cs, 1 },
- { "set-desc-cs",NO_ARG, &set_desc_cs, 1 },
- { "get-desc-fs",NO_ARG, &get_desc_fs, 1 },
- { "set-desc-fs",NO_ARG, &set_desc_fs, 1 },
- { "get-desc-gs",NO_ARG, &get_desc_gs, 1 },
- { "set-desc-gs",NO_ARG, &set_desc_gs, 1 },
- { "get-desc-tr",NO_ARG, &get_desc_tr, 1 },
- { "set-desc-tr",NO_ARG, &set_desc_tr, 1 },
- { "set-desc-ldtr", NO_ARG, &set_desc_ldtr, 1 },
- { "get-desc-ldtr", NO_ARG, &get_desc_ldtr, 1 },
- { "set-desc-gdtr", NO_ARG, &set_desc_gdtr, 1 },
- { "get-desc-gdtr", NO_ARG, &get_desc_gdtr, 1 },
- { "set-desc-idtr", NO_ARG, &set_desc_idtr, 1 },
- { "get-desc-idtr", NO_ARG, &get_desc_idtr, 1 },
- { "get-lowmem", NO_ARG, &get_lowmem, 1 },
- { "get-highmem",NO_ARG, &get_highmem, 1 },
- { "get-efer", NO_ARG, &get_efer, 1 },
- { "get-cr0", NO_ARG, &get_cr0, 1 },
- { "get-cr3", NO_ARG, &get_cr3, 1 },
- { "get-cr4", NO_ARG, &get_cr4, 1 },
- { "get-dr7", NO_ARG, &get_dr7, 1 },
- { "get-rsp", NO_ARG, &get_rsp, 1 },
- { "get-rip", NO_ARG, &get_rip, 1 },
- { "get-rax", NO_ARG, &get_rax, 1 },
- { "get-rbx", NO_ARG, &get_rbx, 1 },
- { "get-rcx", NO_ARG, &get_rcx, 1 },
- { "get-rdx", NO_ARG, &get_rdx, 1 },
- { "get-rsi", NO_ARG, &get_rsi, 1 },
- { "get-rdi", NO_ARG, &get_rdi, 1 },
- { "get-rbp", NO_ARG, &get_rbp, 1 },
- { "get-r8", NO_ARG, &get_r8, 1 },
- { "get-r9", NO_ARG, &get_r9, 1 },
- { "get-r10", NO_ARG, &get_r10, 1 },
- { "get-r11", NO_ARG, &get_r11, 1 },
- { "get-r12", NO_ARG, &get_r12, 1 },
- { "get-r13", NO_ARG, &get_r13, 1 },
- { "get-r14", NO_ARG, &get_r14, 1 },
- { "get-r15", NO_ARG, &get_r15, 1 },
- { "get-rflags", NO_ARG, &get_rflags, 1 },
- { "get-cs", NO_ARG, &get_cs, 1 },
- { "get-ds", NO_ARG, &get_ds, 1 },
- { "get-es", NO_ARG, &get_es, 1 },
- { "get-fs", NO_ARG, &get_fs, 1 },
- { "get-gs", NO_ARG, &get_gs, 1 },
- { "get-ss", NO_ARG, &get_ss, 1 },
- { "get-tr", NO_ARG, &get_tr, 1 },
- { "get-ldtr", NO_ARG, &get_ldtr, 1 },
- { "get-vmcs-pinbased-ctls",
- NO_ARG, &get_pinbased_ctls, 1 },
- { "get-vmcs-procbased-ctls",
- NO_ARG, &get_procbased_ctls, 1 },
- { "get-vmcs-procbased-ctls2",
- NO_ARG, &get_procbased_ctls2, 1 },
- { "get-vmcs-guest-linear-address",
- NO_ARG, &get_vmcs_gla, 1 },
- { "get-vmcs-guest-physical-address",
- NO_ARG, &get_vmcs_gpa, 1 },
- { "get-vmcs-entry-interruption-info",
- NO_ARG, &get_vmcs_entry_interruption_info, 1},
- { "get-vmcs-eptp", NO_ARG, &get_eptp, 1 },
- { "get-vmcs-exception-bitmap",
- NO_ARG, &get_exception_bitmap, 1 },
- { "get-vmcs-io-bitmap-address",
- NO_ARG, &get_io_bitmap, 1 },
- { "get-vmcs-tsc-offset", NO_ARG,&get_tsc_offset, 1 },
- { "get-vmcs-cr0-mask", NO_ARG, &get_cr0_mask, 1 },
- { "get-vmcs-cr0-shadow", NO_ARG,&get_cr0_shadow, 1 },
- { "get-vmcs-cr4-mask", NO_ARG, &get_cr4_mask, 1 },
- { "get-vmcs-cr4-shadow", NO_ARG,&get_cr4_shadow, 1 },
- { "get-vmcs-cr3-targets", NO_ARG, &get_cr3_targets, 1},
- { "get-vmcs-apic-access-address",
- NO_ARG, &get_apic_access_addr, 1},
- { "get-vmcs-virtual-apic-address",
- NO_ARG, &get_virtual_apic_addr, 1},
- { "get-vmcs-tpr-threshold",
- NO_ARG, &get_tpr_threshold, 1 },
- { "get-vmcs-msr-bitmap",
- NO_ARG, &get_msr_bitmap, 1 },
- { "get-vmcs-msr-bitmap-address",
- NO_ARG, &get_msr_bitmap_address, 1 },
- { "get-vmcs-vpid", NO_ARG, &get_vpid, 1 },
- { "get-vmcs-ple-gap", NO_ARG, &get_ple_gap, 1 },
- { "get-vmcs-ple-window", NO_ARG,&get_ple_window,1 },
- { "get-vmcs-instruction-error",
- NO_ARG, &get_inst_err, 1 },
- { "get-vmcs-exit-ctls", NO_ARG, &get_exit_ctls, 1 },
- { "get-vmcs-entry-ctls",
- NO_ARG, &get_entry_ctls, 1 },
- { "get-vmcs-guest-pat", NO_ARG, &get_guest_pat, 1 },
- { "get-vmcs-host-pat", NO_ARG, &get_host_pat, 1 },
- { "get-vmcs-host-cr0",
- NO_ARG, &get_host_cr0, 1 },
- { "get-vmcs-host-cr3",
- NO_ARG, &get_host_cr3, 1 },
- { "get-vmcs-host-cr4",
- NO_ARG, &get_host_cr4, 1 },
- { "get-vmcs-host-rip",
- NO_ARG, &get_host_rip, 1 },
- { "get-vmcs-host-rsp",
- NO_ARG, &get_host_rsp, 1 },
- { "get-vmcs-guest-sysenter",
- NO_ARG, &get_guest_sysenter, 1 },
- { "get-vmcs-link", NO_ARG, &get_vmcs_link, 1 },
- { "get-vmcs-exit-reason",
- NO_ARG, &get_vmcs_exit_reason, 1 },
- { "get-vmcs-exit-qualification",
- NO_ARG, &get_vmcs_exit_qualification, 1 },
- { "get-vmcs-exit-interruption-info",
- NO_ARG, &get_vmcs_exit_interruption_info, 1},
- { "get-vmcs-exit-interruption-error",
- NO_ARG, &get_vmcs_exit_interruption_error, 1},
- { "get-vmcs-interruptibility",
- NO_ARG, &get_vmcs_interruptibility, 1 },
- { "get-x2apic-state",NO_ARG, &get_x2apic_state, 1 },
- { "get-all", NO_ARG, &get_all, 1 },
- { "run", NO_ARG, &run, 1 },
- { "create", NO_ARG, &create, 1 },
- { "destroy", NO_ARG, &destroy, 1 },
- { "inject-nmi", NO_ARG, &inject_nmi, 1 },
- { "force-reset", NO_ARG, &force_reset, 1 },
- { "force-poweroff", NO_ARG, &force_poweroff, 1 },
- { "get-active-cpus", NO_ARG, &get_active_cpus, 1 },
- { "get-suspended-cpus", NO_ARG, &get_suspended_cpus, 1 },
- { "get-intinfo", NO_ARG, &get_intinfo, 1 },
- { NULL, 0, NULL, 0 }
- };
+ if (get_efer || get_all) {
+ error = vm_get_register(ctx, vcpu, VM_REG_GUEST_EFER, &efer);
+ if (error == 0)
+ printf("efer[%d]\t\t0x%016lx\n", vcpu, efer);
+ }
- vcpu = 0;
- vmname = NULL;
- assert_lapic_lvt = -1;
- progname = basename(argv[0]);
+ if (!error && (get_cr0 || get_all)) {
+ error = vm_get_register(ctx, vcpu, VM_REG_GUEST_CR0, &cr0);
+ if (error == 0)
+ printf("cr0[%d]\t\t0x%016lx\n", vcpu, cr0);
+ }
- while ((ch = getopt_long(argc, argv, "", opts, NULL)) != -1) {
- switch (ch) {
- case 0:
- break;
- case VMNAME:
- vmname = optarg;
- break;
- case VCPU:
- vcpu = atoi(optarg);
- break;
- case SET_MEM:
- memsize = atoi(optarg) * MB;
- memsize = roundup(memsize, 2 * MB);
- break;
- case SET_EFER:
- efer = strtoul(optarg, NULL, 0);
- set_efer = 1;
- break;
- case SET_CR0:
- cr0 = strtoul(optarg, NULL, 0);
- set_cr0 = 1;
- break;
- case SET_CR3:
- cr3 = strtoul(optarg, NULL, 0);
- set_cr3 = 1;
- break;
- case SET_CR4:
- cr4 = strtoul(optarg, NULL, 0);
- set_cr4 = 1;
- break;
- case SET_DR7:
- dr7 = strtoul(optarg, NULL, 0);
- set_dr7 = 1;
- break;
- case SET_RSP:
- rsp = strtoul(optarg, NULL, 0);
- set_rsp = 1;
- break;
- case SET_RIP:
- rip = strtoul(optarg, NULL, 0);
- set_rip = 1;
- break;
- case SET_RAX:
- rax = strtoul(optarg, NULL, 0);
- set_rax = 1;
- break;
- case SET_RFLAGS:
- rflags = strtoul(optarg, NULL, 0);
- set_rflags = 1;
- break;
- case DESC_BASE:
- desc_base = strtoul(optarg, NULL, 0);
- break;
- case DESC_LIMIT:
- desc_limit = strtoul(optarg, NULL, 0);
- break;
- case DESC_ACCESS:
- desc_access = strtoul(optarg, NULL, 0);
- break;
- case SET_CS:
- cs = strtoul(optarg, NULL, 0);
- set_cs = 1;
- break;
- case SET_DS:
- ds = strtoul(optarg, NULL, 0);
- set_ds = 1;
- break;
- case SET_ES:
- es = strtoul(optarg, NULL, 0);
- set_es = 1;
- break;
- case SET_FS:
- fs = strtoul(optarg, NULL, 0);
- set_fs = 1;
- break;
- case SET_GS:
- gs = strtoul(optarg, NULL, 0);
- set_gs = 1;
- break;
- case SET_SS:
- ss = strtoul(optarg, NULL, 0);
- set_ss = 1;
- break;
- case SET_TR:
- tr = strtoul(optarg, NULL, 0);
- set_tr = 1;
- break;
- case SET_LDTR:
- ldtr = strtoul(optarg, NULL, 0);
- set_ldtr = 1;
- break;
- case SET_X2APIC_STATE:
- x2apic_state = strtol(optarg, NULL, 0);
- set_x2apic_state = 1;
- break;
- case SET_VMCS_EXCEPTION_BITMAP:
- exception_bitmap = strtoul(optarg, NULL, 0);
- set_exception_bitmap = 1;
- break;
- case SET_VMCS_ENTRY_INTERRUPTION_INFO:
- vmcs_entry_interruption_info = strtoul(optarg, NULL, 0);
- set_vmcs_entry_interruption_info = 1;
- break;
- case SET_CAP:
- capval = strtoul(optarg, NULL, 0);
- setcap = 1;
- break;
- case GET_GPA_PMAP:
- gpa_pmap = strtoul(optarg, NULL, 0);
- get_gpa_pmap = 1;
- break;
- case CAPNAME:
- capname = optarg;
- break;
- case UNASSIGN_PPTDEV:
- unassign_pptdev = 1;
- if (sscanf(optarg, "%d/%d/%d", &bus, &slot, &func) != 3)
- usage();
- break;
- case ASSERT_LAPIC_LVT:
- assert_lapic_lvt = atoi(optarg);
- break;
- default:
- usage();
- }
+ if (!error && (get_cr3 || get_all)) {
+ error = vm_get_register(ctx, vcpu, VM_REG_GUEST_CR3, &cr3);
+ if (error == 0)
+ printf("cr3[%d]\t\t0x%016lx\n", vcpu, cr3);
}
- argc -= optind;
- argv += optind;
-
- if (vmname == NULL)
- usage();
- error = 0;
-
- if (!error && create)
- error = vm_create(vmname);
-
- if (!error) {
- ctx = vm_open(vmname);
- if (ctx == NULL)
- error = -1;
+ if (!error && (get_cr4 || get_all)) {
+ error = vm_get_register(ctx, vcpu, VM_REG_GUEST_CR4, &cr4);
+ if (error == 0)
+ printf("cr4[%d]\t\t0x%016lx\n", vcpu, cr4);
}
- if (!error && memsize)
- error = vm_setup_memory(ctx, memsize, VM_MMAP_NONE);
-
- if (!error && set_efer)
- error = vm_set_register(ctx, vcpu, VM_REG_GUEST_EFER, efer);
-
- if (!error && set_cr0)
- error = vm_set_register(ctx, vcpu, VM_REG_GUEST_CR0, cr0);
+ if (!error && (get_dr7 || get_all)) {
+ error = vm_get_register(ctx, vcpu, VM_REG_GUEST_DR7, &dr7);
+ if (error == 0)
+ printf("dr7[%d]\t\t0x%016lx\n", vcpu, dr7);
+ }
- if (!error && set_cr3)
- error = vm_set_register(ctx, vcpu, VM_REG_GUEST_CR3, cr3);
+ if (!error && (get_rsp || get_all)) {
+ error = vm_get_register(ctx, vcpu, VM_REG_GUEST_RSP, &rsp);
+ if (error == 0)
+ printf("rsp[%d]\t\t0x%016lx\n", vcpu, rsp);
+ }
- if (!error && set_cr4)
- error = vm_set_register(ctx, vcpu, VM_REG_GUEST_CR4, cr4);
+ if (!error && (get_rip || get_all)) {
+ error = vm_get_register(ctx, vcpu, VM_REG_GUEST_RIP, &rip);
+ if (error == 0)
+ printf("rip[%d]\t\t0x%016lx\n", vcpu, rip);
+ }
- if (!error && set_dr7)
- error = vm_set_register(ctx, vcpu, VM_REG_GUEST_DR7, dr7);
+ if (!error && (get_rax || get_all)) {
+ error = vm_get_register(ctx, vcpu, VM_REG_GUEST_RAX, &rax);
+ if (error == 0)
+ printf("rax[%d]\t\t0x%016lx\n", vcpu, rax);
+ }
- if (!error && set_rsp)
- error = vm_set_register(ctx, vcpu, VM_REG_GUEST_RSP, rsp);
+ if (!error && (get_rbx || get_all)) {
+ error = vm_get_register(ctx, vcpu, VM_REG_GUEST_RBX, &rbx);
+ if (error == 0)
+ printf("rbx[%d]\t\t0x%016lx\n", vcpu, rbx);
+ }
- if (!error && set_rip)
- error = vm_set_register(ctx, vcpu, VM_REG_GUEST_RIP, rip);
+ if (!error && (get_rcx || get_all)) {
+ error = vm_get_register(ctx, vcpu, VM_REG_GUEST_RCX, &rcx);
+ if (error == 0)
+ printf("rcx[%d]\t\t0x%016lx\n", vcpu, rcx);
+ }
- if (!error && set_rax)
- error = vm_set_register(ctx, vcpu, VM_REG_GUEST_RAX, rax);
+ if (!error && (get_rdx || get_all)) {
+ error = vm_get_register(ctx, vcpu, VM_REG_GUEST_RDX, &rdx);
+ if (error == 0)
+ printf("rdx[%d]\t\t0x%016lx\n", vcpu, rdx);
+ }
- if (!error && set_rflags) {
- error = vm_set_register(ctx, vcpu, VM_REG_GUEST_RFLAGS,
- rflags);
+ if (!error && (get_rsi || get_all)) {
+ error = vm_get_register(ctx, vcpu, VM_REG_GUEST_RSI, &rsi);
+ if (error == 0)
+ printf("rsi[%d]\t\t0x%016lx\n", vcpu, rsi);
}
- if (!error && set_desc_ds) {
- error = vm_set_desc(ctx, vcpu, VM_REG_GUEST_DS,
- desc_base, desc_limit, desc_access);
+ if (!error && (get_rdi || get_all)) {
+ error = vm_get_register(ctx, vcpu, VM_REG_GUEST_RDI, &rdi);
+ if (error == 0)
+ printf("rdi[%d]\t\t0x%016lx\n", vcpu, rdi);
}
- if (!error && set_desc_es) {
- error = vm_set_desc(ctx, vcpu, VM_REG_GUEST_ES,
- desc_base, desc_limit, desc_access);
+ if (!error && (get_rbp || get_all)) {
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Fri Oct 10 23:22:21 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 4DA3F953;
Fri, 10 Oct 2014 23:22:21 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 3A54715C;
Fri, 10 Oct 2014 23:22:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9ANMLGc067445;
Fri, 10 Oct 2014 23:22:21 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9ANMLmt067444;
Fri, 10 Oct 2014 23:22:21 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201410102322.s9ANMLmt067444@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 10 Oct 2014 23:22:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272920 - projects/sendfile/sys/kern
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Oct 2014 23:22:21 -0000
Author: glebius
Date: Fri Oct 10 23:22:20 2014
New Revision: 272920
URL: https://svnweb.freebsd.org/changeset/base/272920
Log:
Fix super-stupid error in r272711, which tried to fix
a stupid error in r272703.
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
Modified:
projects/sendfile/sys/kern/uipc_sockbuf.c
Modified: projects/sendfile/sys/kern/uipc_sockbuf.c
==============================================================================
--- projects/sendfile/sys/kern/uipc_sockbuf.c Fri Oct 10 23:19:34 2014 (r272919)
+++ projects/sendfile/sys/kern/uipc_sockbuf.c Fri Oct 10 23:22:20 2014 (r272920)
@@ -160,7 +160,7 @@ sbfree(struct sockbuf *sb, struct mbuf *
while (n != NULL && !(n->m_flags & M_NOTREADY)) {
n->m_flags &= ~M_BLOCKED;
sb->sb_acc += n->m_len;
- n = m->m_next;
+ n = n->m_next;
}
sb->sb_fnrdy = n;
}
From owner-svn-src-projects@FreeBSD.ORG Fri Oct 10 23:53:05 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 75F56179;
Fri, 10 Oct 2014 23:53:05 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 5D995403;
Fri, 10 Oct 2014 23:53:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9ANr52n082239;
Fri, 10 Oct 2014 23:53:05 GMT (envelope-from neel@FreeBSD.org)
Received: (from neel@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9ANqvPO082147;
Fri, 10 Oct 2014 23:52:57 GMT (envelope-from neel@FreeBSD.org)
Message-Id: <201410102352.s9ANqvPO082147@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org
using -f
From: Neel Natu <neel@FreeBSD.org>
Date: Fri, 10 Oct 2014 23:52:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272921 - in projects/bhyve_svm: . bin/sh
bin/sh/tests/builtins bin/sleep bin/sleep/tests
cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf
cddl/contrib/opensolaris/cmd/lockstat ...
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Oct 2014 23:53:05 -0000
Author: neel
Date: Fri Oct 10 23:52:56 2014
New Revision: 272921
URL: https://svnweb.freebsd.org/changeset/base/272921
Log:
IFC @r272887
Added:
projects/bhyve_svm/bin/sh/tests/builtins/lineno3.0
- copied unchanged from r272887, head/bin/sh/tests/builtins/lineno3.0
projects/bhyve_svm/bin/sh/tests/builtins/lineno3.0.stdout
- copied unchanged from r272887, head/bin/sh/tests/builtins/lineno3.0.stdout
projects/bhyve_svm/bin/sleep/tests/
- copied from r272887, head/bin/sleep/tests/
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_demo2.error
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_demo2.error
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_demo2.output
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_demo2.output
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy1.error
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy1.error
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy1.output
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy1.output
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy2.error
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy2.error
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy2.output
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy2.output
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy3.error
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy3.error
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy3.output
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy3.output
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
- copied unchanged from r272887, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
projects/bhyve_svm/contrib/byacc/test/btyacc_destroy1.y
- copied unchanged from r272887, head/contrib/byacc/test/btyacc_destroy1.y
projects/bhyve_svm/contrib/byacc/test/btyacc_destroy2.y
- copied unchanged from r272887, head/contrib/byacc/test/btyacc_destroy2.y
projects/bhyve_svm/contrib/byacc/test/btyacc_destroy3.y
- copied unchanged from r272887, head/contrib/byacc/test/btyacc_destroy3.y
projects/bhyve_svm/etc/devd/ulpt.conf
- copied unchanged from r272887, head/etc/devd/ulpt.conf
projects/bhyve_svm/gnu/usr.bin/diff/tests/
- copied from r272887, head/gnu/usr.bin/diff/tests/
projects/bhyve_svm/lib/libc/string/explicit_bzero.c
- copied unchanged from r272887, head/lib/libc/string/explicit_bzero.c
projects/bhyve_svm/lib/libpcap/pcap-netmap.c
- copied unchanged from r272887, head/lib/libpcap/pcap-netmap.c
projects/bhyve_svm/sbin/ipfw/tables.c
- copied unchanged from r272887, head/sbin/ipfw/tables.c
projects/bhyve_svm/sys/dev/mmc/host/
- copied from r272887, head/sys/dev/mmc/host/
projects/bhyve_svm/sys/dev/mrsas/mrsas_linux.c
- copied unchanged from r272887, head/sys/dev/mrsas/mrsas_linux.c
projects/bhyve_svm/sys/libkern/explicit_bzero.c
- copied unchanged from r272887, head/sys/libkern/explicit_bzero.c
projects/bhyve_svm/sys/modules/mrsas/mrsas_linux/
- copied from r272887, head/sys/modules/mrsas/mrsas_linux/
projects/bhyve_svm/sys/netinet/sctp_syscalls.c
- copied unchanged from r272887, head/sys/netinet/sctp_syscalls.c
projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_iface.c
- copied unchanged from r272887, head/sys/netpfil/ipfw/ip_fw_iface.c
projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_table.h
- copied unchanged from r272887, head/sys/netpfil/ipfw/ip_fw_table.h
projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_table_algo.c
- copied unchanged from r272887, head/sys/netpfil/ipfw/ip_fw_table_algo.c
projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_table_value.c
- copied unchanged from r272887, head/sys/netpfil/ipfw/ip_fw_table_value.c
projects/bhyve_svm/sys/sys/seq.h
- copied unchanged from r272887, head/sys/sys/seq.h
projects/bhyve_svm/tools/tools/bootparttest/stub.c
- copied unchanged from r272887, head/tools/tools/bootparttest/stub.c
projects/bhyve_svm/usr.bin/basename/tests/
- copied from r272887, head/usr.bin/basename/tests/
projects/bhyve_svm/usr.bin/cmp/tests/
- copied from r272887, head/usr.bin/cmp/tests/
projects/bhyve_svm/usr.bin/cut/tests/
- copied from r272887, head/usr.bin/cut/tests/
projects/bhyve_svm/usr.bin/dirname/tests/
- copied from r272887, head/usr.bin/dirname/tests/
projects/bhyve_svm/usr.bin/grep/tests/
- copied from r272887, head/usr.bin/grep/tests/
projects/bhyve_svm/usr.bin/gzip/tests/
- copied from r272887, head/usr.bin/gzip/tests/
projects/bhyve_svm/usr.sbin/nmtree/tests/
- copied from r272887, head/usr.sbin/nmtree/tests/
projects/bhyve_svm/usr.sbin/pw/tests/pw_modify.sh
- copied unchanged from r272887, head/usr.sbin/pw/tests/pw_modify.sh
Deleted:
projects/bhyve_svm/sys/pc98/pc98/machdep.c
projects/bhyve_svm/tools/tools/bootparttest/malloc.c
Modified:
projects/bhyve_svm/Makefile.inc1
projects/bhyve_svm/ObsoleteFiles.inc
projects/bhyve_svm/UPDATING
projects/bhyve_svm/bin/sh/eval.c
projects/bhyve_svm/bin/sh/expand.c
projects/bhyve_svm/bin/sh/jobs.c
projects/bhyve_svm/bin/sh/parser.c
projects/bhyve_svm/bin/sh/redir.c
projects/bhyve_svm/bin/sh/tests/builtins/Makefile
projects/bhyve_svm/bin/sh/trap.c
projects/bhyve_svm/bin/sleep/Makefile
projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
projects/bhyve_svm/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zdb/zdb.c
projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
projects/bhyve_svm/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
projects/bhyve_svm/cddl/lib/libdtrace/libproc_compat.h
projects/bhyve_svm/cddl/lib/libzfs/Makefile
projects/bhyve_svm/cddl/lib/libzpool/Makefile
projects/bhyve_svm/contrib/binutils/bfd/config.bfd
projects/bhyve_svm/contrib/binutils/bfd/elf32-arm.c
projects/bhyve_svm/contrib/binutils/gas/config/tc-arm.c
projects/bhyve_svm/contrib/binutils/include/elf/arm.h
projects/bhyve_svm/contrib/bsnmp/snmp_target/target_snmp.c
projects/bhyve_svm/contrib/byacc/CHANGES
projects/bhyve_svm/contrib/byacc/MANIFEST
projects/bhyve_svm/contrib/byacc/VERSION
projects/bhyve_svm/contrib/byacc/aclocal.m4
projects/bhyve_svm/contrib/byacc/btyaccpar.c
projects/bhyve_svm/contrib/byacc/closure.c
projects/bhyve_svm/contrib/byacc/config.sub
projects/bhyve_svm/contrib/byacc/configure
projects/bhyve_svm/contrib/byacc/configure.in
projects/bhyve_svm/contrib/byacc/defs.h
projects/bhyve_svm/contrib/byacc/lalr.c
projects/bhyve_svm/contrib/byacc/main.c
projects/bhyve_svm/contrib/byacc/output.c
projects/bhyve_svm/contrib/byacc/package/byacc.spec
projects/bhyve_svm/contrib/byacc/package/debian/changelog
projects/bhyve_svm/contrib/byacc/package/debian/source/format
projects/bhyve_svm/contrib/byacc/package/mingw-byacc.spec
projects/bhyve_svm/contrib/byacc/package/pkgsrc/Makefile
projects/bhyve_svm/contrib/byacc/reader.c
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/btyacc_demo.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/calc.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/calc1.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/calc2.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/calc3.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/code_calc.code.c
projects/bhyve_svm/contrib/byacc/test/btyacc/code_calc.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/code_error.code.c
projects/bhyve_svm/contrib/byacc/test/btyacc/code_error.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/empty.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_inherit1.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_inherit2.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_inherit3.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_inherit4.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_inherit5.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax1.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax10.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax11.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax12.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax13.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax14.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax15.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax16.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax17.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax18.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax19.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax2.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax20.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax21.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax22.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax23.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax24.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax25.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax26.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax27.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax3.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax4.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax5.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax6.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax7.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax7a.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax7b.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax8.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax8a.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/err_syntax9.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/error.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/grammar.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/inherit0.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/inherit1.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/inherit2.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/ok_syntax1.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/pure_calc.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/pure_error.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc-s.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc2-s.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc2.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc3-s.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc3.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc4-s.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/quote_calc4.tab.c
projects/bhyve_svm/contrib/byacc/test/btyacc/rename_debug.c
projects/bhyve_svm/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
projects/bhyve_svm/contrib/byacc/test/yacc/calc2.tab.c
projects/bhyve_svm/contrib/byacc/test/yacc/calc3.tab.c
projects/bhyve_svm/contrib/byacc/test/yacc/ok_syntax1.tab.c
projects/bhyve_svm/contrib/byacc/yacc.1
projects/bhyve_svm/contrib/libpcap/inet.c
projects/bhyve_svm/contrib/libpcap/pcap.c
projects/bhyve_svm/contrib/tcpdump/tcpdump.c
projects/bhyve_svm/etc/devd/Makefile
projects/bhyve_svm/etc/mtree/BSD.tests.dist
projects/bhyve_svm/gnu/usr.bin/Makefile
projects/bhyve_svm/gnu/usr.bin/diff/Makefile
projects/bhyve_svm/include/rpcsvc/nis.x
projects/bhyve_svm/include/strings.h
projects/bhyve_svm/lib/libc/gen/dl_iterate_phdr.3
projects/bhyve_svm/lib/libc/stdtime/strptime.3
projects/bhyve_svm/lib/libc/stdtime/strptime.c
projects/bhyve_svm/lib/libc/string/Makefile.inc
projects/bhyve_svm/lib/libc/string/Symbol.map
projects/bhyve_svm/lib/libc/string/bzero.3
projects/bhyve_svm/lib/libc/sys/accept.2
projects/bhyve_svm/lib/libcrypt/crypt.c
projects/bhyve_svm/lib/libnv/nvlist.c
projects/bhyve_svm/lib/libnv/nvlist_impl.h
projects/bhyve_svm/lib/libnv/nvpair.c
projects/bhyve_svm/lib/libnv/nvpair_impl.h
projects/bhyve_svm/lib/libpcap/Makefile
projects/bhyve_svm/lib/libpcap/config.h
projects/bhyve_svm/lib/libproc/Makefile
projects/bhyve_svm/lib/libproc/libproc.h
projects/bhyve_svm/lib/libproc/proc_sym.c
projects/bhyve_svm/lib/libproc/tests/proc_test.c
projects/bhyve_svm/lib/librtld_db/rtld_db.c
projects/bhyve_svm/lib/msun/ld128/e_lgammal_r.c
projects/bhyve_svm/lib/msun/ld80/e_lgammal_r.c
projects/bhyve_svm/lib/msun/src/e_lgamma_r.c
projects/bhyve_svm/lib/msun/src/e_lgammaf_r.c
projects/bhyve_svm/libexec/rtld-elf/rtld.c
projects/bhyve_svm/release/doc/en_US.ISO8859-1/hardware/article.xml
projects/bhyve_svm/sbin/dumpon/dumpon.8
projects/bhyve_svm/sbin/ifconfig/iflagg.c
projects/bhyve_svm/sbin/ipfw/Makefile
projects/bhyve_svm/sbin/ipfw/ipfw.8
projects/bhyve_svm/sbin/ipfw/ipfw2.c
projects/bhyve_svm/sbin/ipfw/ipfw2.h
projects/bhyve_svm/sbin/ipfw/main.c
projects/bhyve_svm/sbin/ipfw/nat.c
projects/bhyve_svm/sbin/swapon/swapon.c
projects/bhyve_svm/share/man/man4/alc.4
projects/bhyve_svm/share/man/man5/rc.conf.5
projects/bhyve_svm/share/man/man9/timeout.9
projects/bhyve_svm/share/mk/sys.mk
projects/bhyve_svm/sys/amd64/amd64/minidump_machdep.c
projects/bhyve_svm/sys/amd64/amd64/pmap.c
projects/bhyve_svm/sys/amd64/include/md_var.h
projects/bhyve_svm/sys/amd64/include/pmap.h
projects/bhyve_svm/sys/amd64/include/vmm.h (contents, props changed)
projects/bhyve_svm/sys/amd64/vmm/intel/vmx.c
projects/bhyve_svm/sys/amd64/vmm/intel/vmx_msr.c
projects/bhyve_svm/sys/amd64/vmm/vmm.c
projects/bhyve_svm/sys/arm/altera/socfpga/files.socfpga
projects/bhyve_svm/sys/arm/altera/socfpga/socfpga_machdep.c
projects/bhyve_svm/sys/arm/arm/dump_machdep.c
projects/bhyve_svm/sys/arm/arm/minidump_machdep.c
projects/bhyve_svm/sys/arm/conf/EXYNOS5.common
projects/bhyve_svm/sys/arm/conf/SOCKIT
projects/bhyve_svm/sys/arm/include/md_var.h
projects/bhyve_svm/sys/arm/samsung/exynos/exynos5_machdep.c
projects/bhyve_svm/sys/arm/samsung/exynos/files.exynos5
projects/bhyve_svm/sys/boot/common/disk.c
projects/bhyve_svm/sys/boot/common/disk.h
projects/bhyve_svm/sys/boot/common/part.c
projects/bhyve_svm/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
projects/bhyve_svm/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts
projects/bhyve_svm/sys/boot/fdt/dts/arm/exynos5420.dtsi
projects/bhyve_svm/sys/boot/fdt/dts/arm/socfpga-sockit.dts
projects/bhyve_svm/sys/boot/fdt/dts/arm/socfpga.dtsi
projects/bhyve_svm/sys/boot/i386/gptboot/gptboot.c
projects/bhyve_svm/sys/cam/cam_xpt.c
projects/bhyve_svm/sys/cam/ctl/ctl.c
projects/bhyve_svm/sys/cam/ctl/ctl_backend.h
projects/bhyve_svm/sys/cam/ctl/ctl_backend_block.c
projects/bhyve_svm/sys/cam/ctl/ctl_backend_ramdisk.c
projects/bhyve_svm/sys/cam/ctl/ctl_cmd_table.c
projects/bhyve_svm/sys/cam/ctl/ctl_frontend_cam_sim.c
projects/bhyve_svm/sys/cam/ctl/ctl_frontend_iscsi.c
projects/bhyve_svm/sys/cam/ctl/ctl_frontend_iscsi.h
projects/bhyve_svm/sys/cam/ctl/ctl_private.h
projects/bhyve_svm/sys/cam/ctl/scsi_ctl.c
projects/bhyve_svm/sys/cam/scsi/scsi_all.h
projects/bhyve_svm/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
projects/bhyve_svm/sys/cddl/compat/opensolaris/sys/assfail.h
projects/bhyve_svm/sys/cddl/compat/opensolaris/sys/kmem.h
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
projects/bhyve_svm/sys/compat/freebsd32/freebsd32_proto.h
projects/bhyve_svm/sys/compat/freebsd32/freebsd32_syscall.h
projects/bhyve_svm/sys/compat/freebsd32/freebsd32_syscalls.c
projects/bhyve_svm/sys/compat/freebsd32/freebsd32_sysent.c
projects/bhyve_svm/sys/compat/freebsd32/syscalls.master
projects/bhyve_svm/sys/conf/Makefile.arm
projects/bhyve_svm/sys/conf/NOTES
projects/bhyve_svm/sys/conf/files
projects/bhyve_svm/sys/conf/files.pc98
projects/bhyve_svm/sys/conf/kern.mk
projects/bhyve_svm/sys/conf/newvers.sh
projects/bhyve_svm/sys/conf/options
projects/bhyve_svm/sys/conf/options.pc98
projects/bhyve_svm/sys/contrib/ipfilter/netinet/fil.c
projects/bhyve_svm/sys/contrib/ipfilter/netinet/ip_dns_pxy.c
projects/bhyve_svm/sys/contrib/ipfilter/netinet/ip_dstlist.c
projects/bhyve_svm/sys/contrib/ipfilter/netinet/ip_nat.c
projects/bhyve_svm/sys/dev/acpica/acpi.c
projects/bhyve_svm/sys/dev/acpica/acpi_pci.c
projects/bhyve_svm/sys/dev/acpica/acpivar.h
projects/bhyve_svm/sys/dev/ahci/ahci.c
projects/bhyve_svm/sys/dev/alc/if_alc.c
projects/bhyve_svm/sys/dev/alc/if_alcreg.h
projects/bhyve_svm/sys/dev/alc/if_alcvar.h
projects/bhyve_svm/sys/dev/ale/if_ale.c
projects/bhyve_svm/sys/dev/ale/if_alereg.h
projects/bhyve_svm/sys/dev/cxgbe/common/t4_msg.h
projects/bhyve_svm/sys/dev/cxgbe/tom/t4_connect.c
projects/bhyve_svm/sys/dev/cxgbe/tom/t4_tom.c
projects/bhyve_svm/sys/dev/cxgbe/tom/t4_tom.h
projects/bhyve_svm/sys/dev/cxgbe/tom/t4_tom_l2t.c
projects/bhyve_svm/sys/dev/drm2/i915/intel_ringbuffer.c
projects/bhyve_svm/sys/dev/hwpmc/hwpmc_core.c
projects/bhyve_svm/sys/dev/iscsi/icl.c
projects/bhyve_svm/sys/dev/iscsi/icl.h
projects/bhyve_svm/sys/dev/iscsi/iscsi.c
projects/bhyve_svm/sys/dev/mmc/mmc.c
projects/bhyve_svm/sys/dev/mpr/mpr_sas.c
projects/bhyve_svm/sys/dev/mpr/mpr_table.c
projects/bhyve_svm/sys/dev/mrsas/mrsas.c
projects/bhyve_svm/sys/dev/mrsas/mrsas.h
projects/bhyve_svm/sys/dev/mrsas/mrsas_cam.c
projects/bhyve_svm/sys/dev/mrsas/mrsas_fp.c
projects/bhyve_svm/sys/dev/mrsas/mrsas_ioctl.c
projects/bhyve_svm/sys/dev/mrsas/mrsas_ioctl.h
projects/bhyve_svm/sys/dev/pci/pci.c
projects/bhyve_svm/sys/dev/uart/uart_bus_fdt.c
projects/bhyve_svm/sys/dev/usb/usb_freebsd.h
projects/bhyve_svm/sys/dev/usb/usb_freebsd_loader.h
projects/bhyve_svm/sys/dev/usb/usb_hub.c
projects/bhyve_svm/sys/dev/usb/usbdevs
projects/bhyve_svm/sys/dev/vt/vt_core.c
projects/bhyve_svm/sys/fs/autofs/autofs.c
projects/bhyve_svm/sys/fs/autofs/autofs.h
projects/bhyve_svm/sys/fs/autofs/autofs_vfsops.c
projects/bhyve_svm/sys/fs/autofs/autofs_vnops.c
projects/bhyve_svm/sys/fs/devfs/devfs_vnops.c
projects/bhyve_svm/sys/geom/geom_dev.c
projects/bhyve_svm/sys/i386/i386/machdep.c
projects/bhyve_svm/sys/i386/i386/minidump_machdep.c
projects/bhyve_svm/sys/i386/i386/pmap.c
projects/bhyve_svm/sys/i386/i386/vm_machdep.c
projects/bhyve_svm/sys/i386/include/md_var.h
projects/bhyve_svm/sys/i386/include/pmap.h
projects/bhyve_svm/sys/kern/bus_if.m
projects/bhyve_svm/sys/kern/imgact_elf.c
projects/bhyve_svm/sys/kern/init_sysent.c
projects/bhyve_svm/sys/kern/kern_descrip.c
projects/bhyve_svm/sys/kern/kern_event.c
projects/bhyve_svm/sys/kern/kern_exit.c
projects/bhyve_svm/sys/kern/kern_intr.c
projects/bhyve_svm/sys/kern/kern_proc.c
projects/bhyve_svm/sys/kern/kern_prot.c
projects/bhyve_svm/sys/kern/kern_racct.c
projects/bhyve_svm/sys/kern/kern_sig.c
projects/bhyve_svm/sys/kern/kern_timeout.c
projects/bhyve_svm/sys/kern/subr_bus.c
projects/bhyve_svm/sys/kern/syscalls.c
projects/bhyve_svm/sys/kern/syscalls.master
projects/bhyve_svm/sys/kern/tty.c
projects/bhyve_svm/sys/kern/uipc_syscalls.c
projects/bhyve_svm/sys/kern/vfs_bio.c
projects/bhyve_svm/sys/kern/vfs_vnops.c
projects/bhyve_svm/sys/mips/include/md_var.h
projects/bhyve_svm/sys/mips/mips/dump_machdep.c
projects/bhyve_svm/sys/mips/mips/minidump_machdep.c
projects/bhyve_svm/sys/modules/Makefile
projects/bhyve_svm/sys/modules/ipfw/Makefile
projects/bhyve_svm/sys/modules/mrsas/Makefile
projects/bhyve_svm/sys/net/ieee8023ad_lacp.c
projects/bhyve_svm/sys/net/ieee8023ad_lacp.h
projects/bhyve_svm/sys/net/if_bridge.c
projects/bhyve_svm/sys/net/if_disc.c
projects/bhyve_svm/sys/net/if_edsc.c
projects/bhyve_svm/sys/net/if_enc.c
projects/bhyve_svm/sys/net/if_gif.c
projects/bhyve_svm/sys/net/if_lagg.c
projects/bhyve_svm/sys/net/if_lagg.h
projects/bhyve_svm/sys/netgraph/ng_ipfw.c
projects/bhyve_svm/sys/netinet/ip6.h
projects/bhyve_svm/sys/netinet/ip_fw.h
projects/bhyve_svm/sys/netinet/ip_gre.c
projects/bhyve_svm/sys/netinet/sctp_input.c
projects/bhyve_svm/sys/netinet/sctp_output.c
projects/bhyve_svm/sys/netinet/sctp_output.h
projects/bhyve_svm/sys/netinet/sctp_usrreq.c
projects/bhyve_svm/sys/netinet/sctputil.c
projects/bhyve_svm/sys/netinet/tcp_output.c
projects/bhyve_svm/sys/netinet/tcp_timer.c
projects/bhyve_svm/sys/netinet/tcp_var.h
projects/bhyve_svm/sys/netinet/udp_usrreq.c
projects/bhyve_svm/sys/netinet/udp_var.h
projects/bhyve_svm/sys/netinet6/udp6_usrreq.c
projects/bhyve_svm/sys/netpfil/ipfw/ip_dummynet.c
projects/bhyve_svm/sys/netpfil/ipfw/ip_fw2.c
projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_dynamic.c
projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_log.c
projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_nat.c
projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_private.h
projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_sockopt.c
projects/bhyve_svm/sys/netpfil/ipfw/ip_fw_table.c
projects/bhyve_svm/sys/ofed/drivers/net/mlx4/mlx4.h
projects/bhyve_svm/sys/ofed/include/linux/mlx4/device.h
projects/bhyve_svm/sys/sys/bus.h
projects/bhyve_svm/sys/sys/cdefs.h
projects/bhyve_svm/sys/sys/event.h
projects/bhyve_svm/sys/sys/filedesc.h
projects/bhyve_svm/sys/sys/mbuf.h
projects/bhyve_svm/sys/sys/param.h
projects/bhyve_svm/sys/sys/racct.h
projects/bhyve_svm/sys/sys/socketvar.h
projects/bhyve_svm/sys/sys/syscall.h
projects/bhyve_svm/sys/sys/syscall.mk
projects/bhyve_svm/sys/sys/sysproto.h
projects/bhyve_svm/sys/sys/systm.h
projects/bhyve_svm/sys/sys/ucred.h
projects/bhyve_svm/sys/sys/vnode.h
projects/bhyve_svm/sys/ufs/ufs/dir.h
projects/bhyve_svm/sys/vm/uma_core.c
projects/bhyve_svm/sys/vm/vm_glue.c
projects/bhyve_svm/sys/vm/vm_pageout.c
projects/bhyve_svm/sys/x86/acpica/srat.c
projects/bhyve_svm/sys/x86/include/specialreg.h
projects/bhyve_svm/sys/x86/x86/dump_machdep.c
projects/bhyve_svm/sys/x86/x86/local_apic.c
projects/bhyve_svm/tools/build/mk/OptionalObsoleteFiles.inc
projects/bhyve_svm/tools/sched/schedgraph.py
projects/bhyve_svm/tools/tools/ath/athalq/ar9300_ds.c
projects/bhyve_svm/tools/tools/bootparttest/Makefile
projects/bhyve_svm/tools/tools/bootparttest/bootparttest.c
projects/bhyve_svm/usr.bin/basename/Makefile
projects/bhyve_svm/usr.bin/cmp/Makefile
projects/bhyve_svm/usr.bin/cut/Makefile
projects/bhyve_svm/usr.bin/dirname/Makefile
projects/bhyve_svm/usr.bin/find/function.c
projects/bhyve_svm/usr.bin/grep/Makefile
projects/bhyve_svm/usr.bin/gzip/Makefile
projects/bhyve_svm/usr.bin/mkimg/Makefile
projects/bhyve_svm/usr.bin/mkimg/ebr.c
projects/bhyve_svm/usr.bin/mkimg/mbr.c
projects/bhyve_svm/usr.bin/mkimg/mkimg.c
projects/bhyve_svm/usr.bin/mkimg/mkimg.h
projects/bhyve_svm/usr.bin/mkimg/pc98.c
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow2.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-ebr.raw.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-ebr.vmdk.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow2.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-mbr.raw.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-mbr.vmdk.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow2.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-pc98.raw.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-4096-pc98.vmdk.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow2.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-ebr.raw.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-ebr.vmdk.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow2.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-mbr.raw.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-mbr.vmdk.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow2.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-pc98.raw.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
projects/bhyve_svm/usr.bin/mkimg/tests/img-63x255-512-pc98.vmdk.gz.uu
projects/bhyve_svm/usr.bin/w/w.c
projects/bhyve_svm/usr.sbin/autofs/common.c
projects/bhyve_svm/usr.sbin/bhyve/acpi.c
projects/bhyve_svm/usr.sbin/bhyve/pci_virtio_block.c
projects/bhyve_svm/usr.sbin/bhyve/xmsr.c
projects/bhyve_svm/usr.sbin/ctladm/ctladm.8
projects/bhyve_svm/usr.sbin/newsyslog/newsyslog.c
projects/bhyve_svm/usr.sbin/nmtree/Makefile
projects/bhyve_svm/usr.sbin/nscd/query.c
projects/bhyve_svm/usr.sbin/pw/pw_user.c
projects/bhyve_svm/usr.sbin/pw/tests/Makefile
Directory Properties:
projects/bhyve_svm/ (props changed)
projects/bhyve_svm/cddl/ (props changed)
projects/bhyve_svm/cddl/contrib/opensolaris/ (props changed)
projects/bhyve_svm/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/bhyve_svm/contrib/binutils/ (props changed)
projects/bhyve_svm/contrib/byacc/ (props changed)
projects/bhyve_svm/contrib/libpcap/ (props changed)
projects/bhyve_svm/contrib/tcpdump/ (props changed)
projects/bhyve_svm/etc/ (props changed)
projects/bhyve_svm/include/ (props changed)
projects/bhyve_svm/lib/libc/ (props changed)
projects/bhyve_svm/lib/libc/stdtime/ (props changed)
projects/bhyve_svm/sbin/ (props changed)
projects/bhyve_svm/sbin/dumpon/ (props changed)
projects/bhyve_svm/sbin/ipfw/ (props changed)
projects/bhyve_svm/share/ (props changed)
projects/bhyve_svm/share/man/man4/ (props changed)
projects/bhyve_svm/sys/ (props changed)
projects/bhyve_svm/sys/amd64/vmm/ (props changed)
projects/bhyve_svm/sys/boot/ (props changed)
projects/bhyve_svm/sys/cddl/contrib/opensolaris/ (props changed)
projects/bhyve_svm/sys/conf/ (props changed)
projects/bhyve_svm/sys/contrib/ipfilter/ (props changed)
projects/bhyve_svm/usr.bin/mkimg/ (props changed)
projects/bhyve_svm/usr.sbin/bhyve/ (props changed)
Modified: projects/bhyve_svm/Makefile.inc1
==============================================================================
--- projects/bhyve_svm/Makefile.inc1 Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/Makefile.inc1 Fri Oct 10 23:52:56 2014 (r272921)
@@ -299,6 +299,10 @@ HMAKE+= PATH=${TMPPATH} METALOG=${METAL
WMAKEENV+= MK_CTF=no
.endif
+.if defined(CROSS_TOOLCHAIN)
+LOCALBASE?= /usr/local
+.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
+.endif
.if defined(CROSS_TOOLCHAIN_PREFIX)
CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
@@ -311,7 +315,7 @@ X${COMPILER}?= ${CROSS_COMPILER_PREFIX}$
X${COMPILER}?= ${${COMPILER}}
.endif
.endfor
-XBINUTILS= AS AR LD NM OBJDUMP RANLIB STRINGS
+XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS
.for BINUTIL in ${XBINUTILS}
.if defined(CROSS_BINUTILS_PREFIX)
X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
@@ -322,7 +326,9 @@ X${BINUTIL}?= ${${BINUTIL}}
WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \
CPP="${XCPP} ${XFLAGS}" \
AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
- OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
+ OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \
+ RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \
+ SIZE="${XSIZE}"
.if ${XCC:M/*}
XFLAGS= --sysroot=${WORLDTMP}
@@ -343,10 +349,14 @@ TARGET_ABI= gnueabihf
TARGET_ABI= gnueabi
.endif
.endif
+.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
+XFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib
+.else
TARGET_ABI?= unknown
TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
XFLAGS+= -target ${TARGET_TRIPLE}
.endif
+.endif
WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
@@ -1531,9 +1541,12 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \
lib/libradius lib/libsbuf lib/libtacplus \
+ lib/libgeom \
${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
+ ${_cddl_lib_libuutil} \
${_cddl_lib_libavl} \
${_cddl_lib_libzfs_core} \
+ ${_cddl_lib_libctf} \
lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_lib_libldns} \
${_secure_lib_libssh} ${_secure_lib_libssl}
@@ -1543,6 +1556,8 @@ gnu/lib/libstdc++__L: lib/msun__L
gnu/lib/libsupc++__L: gnu/lib/libstdc++__L
.endif
+lib/libgeom__L: lib/libexpat__L
+
.if defined(WITH_ATF) || ${MK_TESTS} != "no"
.if !defined(WITH_ATF)
# Ensure that the ATF libraries will be built during make libraries, even
@@ -1580,9 +1595,13 @@ lib/libopie__L lib/libtacplus__L: lib/li
_cddl_lib_libumem= cddl/lib/libumem
_cddl_lib_libnvpair= cddl/lib/libnvpair
_cddl_lib_libavl= cddl/lib/libavl
+_cddl_lib_libuutil= cddl/lib/libuutil
_cddl_lib_libzfs_core= cddl/lib/libzfs_core
+_cddl_lib_libctf= cddl/lib/libctf
_cddl_lib= cddl/lib
cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
+cddl/lib/libzfs__L: lib/libgeom__L
+cddl/lib/libctf__L: lib/libz__L
.endif
.if ${MK_CRYPT} != "no"
Modified: projects/bhyve_svm/ObsoleteFiles.inc
==============================================================================
--- projects/bhyve_svm/ObsoleteFiles.inc Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/ObsoleteFiles.inc Fri Oct 10 23:52:56 2014 (r272921)
@@ -1496,6 +1496,7 @@ OLD_LIBS+=usr/lib/libpanel.so.4
OLD_LIBS+=usr/lib/libpanelw.so.4
OLD_LIBS+=usr/lib/libpmc.so.4
OLD_LIBS+=usr/lib/libproc.so.1
+OLD_LIBS+=usr/lib/libproc.so.2
OLD_LIBS+=usr/lib/libradius.so.3
OLD_LIBS+=usr/lib/librpcsvc.so.4
OLD_LIBS+=usr/lib/libsdp.so.3
Modified: projects/bhyve_svm/UPDATING
==============================================================================
--- projects/bhyve_svm/UPDATING Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/UPDATING Fri Oct 10 23:52:56 2014 (r272921)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20141009:
+ gperf has been removed from the base system for architectures
+ that use clang. Ports that require gperf will obtain it from the
+ devel/gperf port.
+
20140923:
pjdfstest has been moved from tools/regression/pjdfstest to
contrib/pjdfstest .
Modified: projects/bhyve_svm/bin/sh/eval.c
==============================================================================
--- projects/bhyve_svm/bin/sh/eval.c Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/bin/sh/eval.c Fri Oct 10 23:52:56 2014 (r272921)
@@ -316,9 +316,10 @@ evalloop(union node *n, int flags)
loopnest++;
status = 0;
for (;;) {
- evaltree(n->nbinary.ch1, EV_TESTED);
+ if (!evalskip)
+ evaltree(n->nbinary.ch1, EV_TESTED);
if (evalskip) {
-skipping: if (evalskip == SKIPCONT && --skipcount <= 0) {
+ if (evalskip == SKIPCONT && --skipcount <= 0) {
evalskip = 0;
continue;
}
@@ -337,8 +338,6 @@ skipping: if (evalskip == SKIPCONT &&
}
evaltree(n->nbinary.ch2, flags);
status = exitstatus;
- if (evalskip)
- goto skipping;
}
loopnest--;
exitstatus = status;
@@ -648,15 +647,15 @@ evalbackcmd(union node *n, struct backcm
struct jmploc *savehandler;
struct localvar *savelocalvars;
- setstackmark(&smark);
result->fd = -1;
result->buf = NULL;
result->nleft = 0;
result->jp = NULL;
if (n == NULL) {
exitstatus = 0;
- goto out;
+ return;
}
+ setstackmark(&smark);
exitstatus = oexitstatus;
if (is_valid_fast_cmdsubst(n)) {
savelocalvars = localvars;
@@ -698,7 +697,6 @@ evalbackcmd(union node *n, struct backcm
result->fd = pip[0];
result->jp = jp;
}
-out:
popstackmark(&smark);
TRACE(("evalbackcmd done: fd=%d buf=%p nleft=%d jp=%p\n",
result->fd, result->buf, result->nleft, result->jp));
Modified: projects/bhyve_svm/bin/sh/expand.c
==============================================================================
--- projects/bhyve_svm/bin/sh/expand.c Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/bin/sh/expand.c Fri Oct 10 23:52:56 2014 (r272921)
@@ -328,24 +328,19 @@ exptilde(char *p, int flag)
done:
*p = '\0';
if (*(startp+1) == '\0') {
- if ((home = lookupvar("HOME")) == NULL)
- goto lose;
+ home = lookupvar("HOME");
} else {
- if ((pw = getpwnam(startp+1)) == NULL)
- goto lose;
- home = pw->pw_dir;
+ pw = getpwnam(startp+1);
+ home = pw != NULL ? pw->pw_dir : NULL;
}
- if (*home == '\0')
- goto lose;
*p = c;
+ if (home == NULL || *home == '\0')
+ return (startp);
if (quotes)
STPUTS_QUOTES(home, SQSYNTAX, expdest);
else
STPUTS(home, expdest);
return (p);
-lose:
- *p = c;
- return (startp);
}
Modified: projects/bhyve_svm/bin/sh/jobs.c
==============================================================================
--- projects/bhyve_svm/bin/sh/jobs.c Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/bin/sh/jobs.c Fri Oct 10 23:52:56 2014 (r272921)
@@ -373,13 +373,13 @@ showjob(struct job *jp, int mode)
strcat(statestr, " (core dumped)");
}
- for (ps = jp->ps ; ; ps++) { /* for each process */
+ for (ps = jp->ps ; procno > 0 ; ps++, procno--) { /* for each process */
if (mode == SHOWJOBS_PIDS || mode == SHOWJOBS_PGIDS) {
out1fmt("%d\n", (int)ps->pid);
- goto skip;
+ continue;
}
if (mode != SHOWJOBS_VERBOSE && ps != jp->ps)
- goto skip;
+ continue;
if (jobno == curr && ps == jp->ps)
c = '+';
else if (jobno == prev && ps == jp->ps)
@@ -410,8 +410,6 @@ showjob(struct job *jp, int mode)
out1c('\n');
} else
printjobcmd(jp);
-skip: if (--procno <= 0)
- break;
}
}
Modified: projects/bhyve_svm/bin/sh/parser.c
==============================================================================
--- projects/bhyve_svm/bin/sh/parser.c Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/bin/sh/parser.c Fri Oct 10 23:52:56 2014 (r272921)
@@ -1279,6 +1279,13 @@ readcstyleesc(char *out)
c = pgetc();
if (c == PEOF)
synerror("Unterminated quoted string");
+ if (c == '\n') {
+ plinno++;
+ if (doprompt)
+ setprompt(2);
+ else
+ setprompt(0);
+ }
}
pungetc();
return out;
Modified: projects/bhyve_svm/bin/sh/redir.c
==============================================================================
--- projects/bhyve_svm/bin/sh/redir.c Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/bin/sh/redir.c Fri Oct 10 23:52:56 2014 (r272921)
@@ -173,21 +173,12 @@ openredirect(union node *redir, char mem
fname = redir->nfile.expfname;
if ((f = open(fname, O_RDONLY)) < 0)
error("cannot open %s: %s", fname, strerror(errno));
-movefd:
- if (f != fd) {
- if (dup2(f, fd) == -1) {
- e = errno;
- close(f);
- error("%d: %s", fd, strerror(e));
- }
- close(f);
- }
break;
case NFROMTO:
fname = redir->nfile.expfname;
if ((f = open(fname, O_RDWR|O_CREAT, 0666)) < 0)
error("cannot create %s: %s", fname, strerror(errno));
- goto movefd;
+ break;
case NTO:
if (Cflag) {
fname = redir->nfile.expfname;
@@ -205,19 +196,19 @@ movefd:
} else
error("cannot create %s: %s", fname,
strerror(EEXIST));
- goto movefd;
+ break;
}
/* FALLTHROUGH */
case NCLOBBER:
fname = redir->nfile.expfname;
if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
error("cannot create %s: %s", fname, strerror(errno));
- goto movefd;
+ break;
case NAPPEND:
fname = redir->nfile.expfname;
if ((f = open(fname, O_WRONLY|O_CREAT|O_APPEND, 0666)) < 0)
error("cannot create %s: %s", fname, strerror(errno));
- goto movefd;
+ break;
case NTOFD:
case NFROMFD:
if (redir->ndup.dupfd >= 0) { /* if not ">&-" */
@@ -231,14 +222,22 @@ movefd:
} else {
close(fd);
}
- break;
+ return;
case NHERE:
case NXHERE:
f = openhere(redir);
- goto movefd;
+ break;
default:
abort();
}
+ if (f != fd) {
+ if (dup2(f, fd) == -1) {
+ e = errno;
+ close(f);
+ error("%d: %s", fd, strerror(e));
+ }
+ close(f);
+ }
}
Modified: projects/bhyve_svm/bin/sh/tests/builtins/Makefile
==============================================================================
--- projects/bhyve_svm/bin/sh/tests/builtins/Makefile Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/bin/sh/tests/builtins/Makefile Fri Oct 10 23:52:56 2014 (r272921)
@@ -100,6 +100,7 @@ FILES+= jobid2.0
FILES+= kill1.0 kill2.0
FILES+= lineno.0 lineno.0.stdout
FILES+= lineno2.0
+FILES+= lineno3.0 lineno3.0.stdout
FILES+= local1.0
FILES+= local2.0
FILES+= local3.0
Copied: projects/bhyve_svm/bin/sh/tests/builtins/lineno3.0 (from r272887, head/bin/sh/tests/builtins/lineno3.0)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/bhyve_svm/bin/sh/tests/builtins/lineno3.0 Fri Oct 10 23:52:56 2014 (r272921, copy of r272887, head/bin/sh/tests/builtins/lineno3.0)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+echo before: $LINENO
+dummy=$'a\0
+'
+echo after: $LINENO
Copied: projects/bhyve_svm/bin/sh/tests/builtins/lineno3.0.stdout (from r272887, head/bin/sh/tests/builtins/lineno3.0.stdout)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/bhyve_svm/bin/sh/tests/builtins/lineno3.0.stdout Fri Oct 10 23:52:56 2014 (r272921, copy of r272887, head/bin/sh/tests/builtins/lineno3.0.stdout)
@@ -0,0 +1,2 @@
+before: 3
+after: 6
Modified: projects/bhyve_svm/bin/sh/trap.c
==============================================================================
--- projects/bhyve_svm/bin/sh/trap.c Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/bin/sh/trap.c Fri Oct 10 23:52:56 2014 (r272921)
@@ -510,28 +510,25 @@ exitshell_savedstatus(void)
exiting_exitstatus = oexitstatus;
}
exitstatus = oexitstatus = exiting_exitstatus;
- if (setjmp(loc1.loc)) {
- goto l1;
+ if (!setjmp(loc1.loc)) {
+ handler = &loc1;
+ if ((p = trap[0]) != NULL && *p != '\0') {
+ /*
+ * Reset evalskip, or the trap on EXIT could be
+ * interrupted if the last command was a "return".
+ */
+ evalskip = 0;
+ trap[0] = NULL;
+ evalstring(p, 0);
+ }
}
- if (setjmp(loc2.loc)) {
- goto l2;
- }
- handler = &loc1;
- if ((p = trap[0]) != NULL && *p != '\0') {
- /*
- * Reset evalskip, or the trap on EXIT could be
- * interrupted if the last command was a "return".
- */
- evalskip = 0;
- trap[0] = NULL;
- evalstring(p, 0);
- }
-l1: handler = &loc2; /* probably unnecessary */
- flushall();
+ if (!setjmp(loc2.loc)) {
+ handler = &loc2; /* probably unnecessary */
+ flushall();
#if JOBS
- setjobctl(0);
+ setjobctl(0);
#endif
-l2:
+ }
if (sig != 0 && sig != SIGSTOP && sig != SIGTSTP && sig != SIGTTIN &&
sig != SIGTTOU) {
signal(sig, SIG_DFL);
Modified: projects/bhyve_svm/bin/sleep/Makefile
==============================================================================
--- projects/bhyve_svm/bin/sleep/Makefile Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/bin/sleep/Makefile Fri Oct 10 23:52:56 2014 (r272921)
@@ -1,6 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
+.include <src.opts.mk>
+
PROG= sleep
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh Fri Oct 10 23:52:56 2014 (r272921)
@@ -38,7 +38,7 @@ fi
./$exe &
pid=$!
-$dtrace -32 -qs /dev/stdin <<EOF
+$dtrace -qs /dev/stdin <<EOF
typedef struct info {
char *zi_gamename;
int zi_ndungeons;
Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 Fri Oct 10 23:52:56 2014 (r272921)
@@ -21,7 +21,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 24, 2013
+.Dd October 8, 2014
.Dt LOCKSTAT 1
.Os
.Sh NAME
@@ -238,10 +238,11 @@ Average duration of the events in nanose
For the profiling event, duration means interrupt latency.
.It Lock
Address of the lock; displayed symbolically if possible.
-.It CPU+PIL
-CPU plus processor interrupt level (PIL).
-For example, if CPU 4 is interrupted while at PIL 6, this will be reported as
-cpu[4]+6.
+.It CPU+Pri_Class
+CPU plus the priority class of the interrupted thread.
+For example, if CPU 4 is interrupted while running a timeshare thread, this
+will be reported as
+.Ql cpu[4]+TShar .
.It Caller
Address of the caller; displayed symbolically if possible.
.El
Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri Oct 10 23:52:56 2014 (r272921)
@@ -76,8 +76,10 @@
#ifndef lint
extern boolean_t zfs_recover;
+extern uint64_t zfs_arc_max, zfs_arc_meta_limit;
#else
boolean_t zfs_recover;
+uint64_t zfs_arc_max, zfs_arc_meta_limit;
#endif
const char cmdname[] = "zdb";
@@ -89,7 +91,7 @@ extern void dump_intent_log(zilog_t *);
uint64_t *zopt_object = NULL;
int zopt_objects = 0;
libzfs_handle_t *g_zfs;
-uint64_t max_inflight = 200;
+uint64_t max_inflight = 1000;
/*
* These libumem hooks provide a reasonable set of defaults for the allocator's
@@ -1461,6 +1463,11 @@ dump_deadlist(dsl_deadlist_t *dl)
if (dump_opt['d'] < 3)
return;
+ if (dl->dl_oldfmt) {
+ dump_bpobj(&dl->dl_bpobj, "old-format deadlist", 0);
+ return;
+ }
+
zdb_nicenum(dl->dl_phys->dl_used, bytes);
zdb_nicenum(dl->dl_phys->dl_comp, comp);
zdb_nicenum(dl->dl_phys->dl_uncomp, uncomp);
@@ -2377,7 +2384,7 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog
zcb->zcb_readfails = 0;
- if (dump_opt['b'] < 5 && isatty(STDERR_FILENO) &&
+ if (dump_opt['b'] < 5 &&
gethrtime() > zcb->zcb_lastprint + NANOSEC) {
uint64_t now = gethrtime();
char buf[10];
@@ -2462,9 +2469,9 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
if (!dump_opt['L']) {
vdev_t *rvd = spa->spa_root_vdev;
- for (int c = 0; c < rvd->vdev_children; c++) {
+ for (uint64_t c = 0; c < rvd->vdev_children; c++) {
vdev_t *vd = rvd->vdev_child[c];
- for (int m = 0; m < vd->vdev_ms_count; m++) {
+ for (uint64_t m = 0; m < vd->vdev_ms_count; m++) {
metaslab_t *msp = vd->vdev_ms[m];
mutex_enter(&msp->ms_lock);
metaslab_unload(msp);
@@ -2477,6 +2484,15 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
* interfaces.
*/
if (msp->ms_sm != NULL) {
+ (void) fprintf(stderr,
+ "\rloading space map for "
+ "vdev %llu of %llu, "
+ "metaslab %llu of %llu ...",
+ (longlong_t)c,
+ (longlong_t)rvd->vdev_children,
+ (longlong_t)m,
+ (longlong_t)vd->vdev_ms_count);
+
msp->ms_ops = &zdb_metaslab_ops;
VERIFY0(space_map_load(msp->ms_sm,
msp->ms_tree, SM_ALLOC));
@@ -2485,6 +2501,7 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
mutex_exit(&msp->ms_lock);
}
}
+ (void) fprintf(stderr, "\n");
}
spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER);
@@ -2594,10 +2611,12 @@ dump_block_stats(spa_t *spa)
* all async I/Os to complete.
*/
if (dump_opt['c']) {
- (void) zio_wait(spa->spa_async_zio_root);
- spa->spa_async_zio_root = zio_root(spa, NULL, NULL,
- ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE |
- ZIO_FLAG_GODFATHER);
+ for (int i = 0; i < max_ncpus; i++) {
+ (void) zio_wait(spa->spa_async_zio_root[i]);
+ spa->spa_async_zio_root[i] = zio_root(spa, NULL, NULL,
+ ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE |
+ ZIO_FLAG_GODFATHER);
+ }
}
if (zcb.zcb_haderrors) {
@@ -3483,6 +3502,12 @@ main(int argc, char **argv)
usage();
}
+ /*
+ * ZDB does not typically re-read blocks; therefore limit the ARC
+ * to 256 MB, which can be used entirely for metadata.
+ */
+ zfs_arc_max = zfs_arc_meta_limit = 256 * 1024 * 1024;
+
kernel_init(FREAD);
g_zfs = libzfs_init();
ASSERT(g_zfs != NULL);
Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Fri Oct 10 23:52:56 2014 (r272921)
@@ -2857,10 +2857,7 @@ print_pool(zpool_handle_t *zhp, list_cbd
right_justify = B_FALSE;
if (pl->pl_prop != ZPROP_INVAL) {
- if (pl->pl_prop == ZPOOL_PROP_EXPANDSZ &&
- zpool_get_prop_int(zhp, pl->pl_prop, NULL) == 0)
- propstr = "-";
- else if (zpool_get_prop(zhp, pl->pl_prop, property,
+ if (zpool_get_prop(zhp, pl->pl_prop, property,
sizeof (property), NULL, cb->cb_literal) != 0)
propstr = "-";
else
@@ -2894,21 +2891,37 @@ print_pool(zpool_handle_t *zhp, list_cbd
}
static void
-print_one_column(zpool_prop_t prop, uint64_t value, boolean_t scripted)
+print_one_column(zpool_prop_t prop, uint64_t value, boolean_t scripted,
+ boolean_t valid)
{
char propval[64];
boolean_t fixed;
size_t width = zprop_width(prop, &fixed, ZFS_TYPE_POOL);
-
- if (prop == ZPOOL_PROP_EXPANDSZ && value == 0)
- (void) strlcpy(propval, "-", sizeof (propval));
- else if (prop == ZPOOL_PROP_FRAGMENTATION && value == ZFS_FRAG_INVALID)
- (void) strlcpy(propval, "-", sizeof (propval));
- else if (prop == ZPOOL_PROP_FRAGMENTATION)
+ switch (prop) {
+ case ZPOOL_PROP_EXPANDSZ:
+ if (value == 0)
+ (void) strlcpy(propval, "-", sizeof (propval));
+ else
+ zfs_nicenum(value, propval, sizeof (propval));
+ break;
+ case ZPOOL_PROP_FRAGMENTATION:
+ if (value == ZFS_FRAG_INVALID) {
+ (void) strlcpy(propval, "-", sizeof (propval));
+ } else {
+ (void) snprintf(propval, sizeof (propval), "%llu%%",
+ value);
+ }
+ break;
+ case ZPOOL_PROP_CAPACITY:
(void) snprintf(propval, sizeof (propval), "%llu%%", value);
- else
+ break;
+ default:
zfs_nicenum(value, propval, sizeof (propval));
+ }
+
+ if (!valid)
+ (void) strlcpy(propval, "-", sizeof (propval));
if (scripted)
(void) printf("\t%s", propval);
@@ -2930,6 +2943,9 @@ print_list_stats(zpool_handle_t *zhp, co
(uint64_t **)&vs, &c) == 0);
if (name != NULL) {
+ boolean_t toplevel = (vs->vs_space != 0);
+ uint64_t cap;
+
if (scripted)
(void) printf("\t%s", name);
else if (strlen(name) + depth > cb->cb_namewidth)
@@ -2938,24 +2954,26 @@ print_list_stats(zpool_handle_t *zhp, co
(void) printf("%*s%s%*s", depth, "", name,
(int)(cb->cb_namewidth - strlen(name) - depth), "");
- /* only toplevel vdevs have capacity stats */
- if (vs->vs_space == 0) {
- if (scripted)
- (void) printf("\t-\t-\t-\t-");
- else
- (void) printf(" - - - -");
- } else {
- print_one_column(ZPOOL_PROP_SIZE, vs->vs_space,
- scripted);
- print_one_column(ZPOOL_PROP_CAPACITY, vs->vs_alloc,
- scripted);
- print_one_column(ZPOOL_PROP_FREE,
- vs->vs_space - vs->vs_alloc, scripted);
- print_one_column(ZPOOL_PROP_FRAGMENTATION,
- vs->vs_fragmentation, scripted);
- }
- print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize,
- scripted);
+ /*
+ * Print the properties for the individual vdevs. Some
+ * properties are only applicable to toplevel vdevs. The
+ * 'toplevel' boolean value is passed to the print_one_column()
+ * to indicate that the value is valid.
+ */
+ print_one_column(ZPOOL_PROP_SIZE, vs->vs_space, scripted,
+ toplevel);
+ print_one_column(ZPOOL_PROP_ALLOCATED, vs->vs_alloc, scripted,
+ toplevel);
+ print_one_column(ZPOOL_PROP_FREE, vs->vs_space - vs->vs_alloc,
+ scripted, toplevel);
+ print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize, scripted,
+ B_TRUE);
+ print_one_column(ZPOOL_PROP_FRAGMENTATION,
+ vs->vs_fragmentation, scripted,
+ (vs->vs_fragmentation != ZFS_FRAG_INVALID && toplevel));
+ cap = (vs->vs_space == 0) ? 0 :
+ (vs->vs_alloc * 100 / vs->vs_space);
+ print_one_column(ZPOOL_PROP_CAPACITY, cap, scripted, toplevel);
(void) printf("\n");
}
@@ -3024,7 +3042,8 @@ list_callback(zpool_handle_t *zhp, void
* -H Scripted mode. Don't display headers, and separate properties
* by a single tab.
* -o List of properties to display. Defaults to
- * "name,size,allocated,free,capacity,health,altroot"
+ * "name,size,allocated,free,expandsize,fragmentation,capacity,"
+ * "dedupratio,health,altroot"
* -p Diplay values in parsable (exact) format.
* -T Display a timestamp in date(1) or Unix format
*
@@ -3038,7 +3057,7 @@ zpool_do_list(int argc, char **argv)
int ret;
list_cbdata_t cb = { 0 };
static char default_props[] =
- "name,size,allocated,free,fragmentation,expandsize,capacity,"
+ "name,size,allocated,free,expandsize,fragmentation,capacity,"
"dedupratio,health,altroot";
char *props = default_props;
unsigned long interval = 0, count = 0;
Modified: projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y Fri Oct 10 23:52:56 2014 (r272921)
@@ -207,6 +207,8 @@
%type <l_tok> unary_operator
%type <l_tok> struct_or_union
+%type <l_str> dtrace_keyword_ident
+
%%
dtrace_program: d_expression DT_TOK_EOF { return (dt_node_root($1)); }
@@ -391,12 +393,18 @@ postfix_expression:
| postfix_expression DT_TOK_DOT DT_TOK_TNAME {
$$ = OP2(DT_TOK_DOT, $1, dt_node_ident($3));
}
+ | postfix_expression DT_TOK_DOT dtrace_keyword_ident {
+ $$ = OP2(DT_TOK_DOT, $1, dt_node_ident($3));
+ }
| postfix_expression DT_TOK_PTR DT_TOK_IDENT {
$$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
}
| postfix_expression DT_TOK_PTR DT_TOK_TNAME {
$$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
}
+ | postfix_expression DT_TOK_PTR dtrace_keyword_ident {
+ $$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
+ }
| postfix_expression DT_TOK_ADDADD {
$$ = OP1(DT_TOK_POSTINC, $1);
}
@@ -411,6 +419,10 @@ postfix_expression:
DT_TOK_TNAME DT_TOK_RPAR {
$$ = dt_node_offsetof($3, $5);
}
+ | DT_TOK_OFFSETOF DT_TOK_LPAR type_name DT_TOK_COMMA
+ dtrace_keyword_ident DT_TOK_RPAR {
+ $$ = dt_node_offsetof($3, $5);
+ }
| DT_TOK_XLATE DT_TOK_LT type_name DT_TOK_GT
DT_TOK_LPAR expression DT_TOK_RPAR {
$$ = OP2(DT_TOK_XLATE, dt_node_type($3), $6);
@@ -835,4 +847,15 @@ function_parameters:
| parameter_type_list { $$ = $1; }
;
+dtrace_keyword_ident:
+ DT_KEY_PROBE { $$ = DUP("probe"); }
+ | DT_KEY_PROVIDER { $$ = DUP("provider"); }
+ | DT_KEY_SELF { $$ = DUP("self"); }
+ | DT_KEY_STRING { $$ = DUP("string"); }
+ | DT_TOK_STRINGOF { $$ = DUP("stringof"); }
+ | DT_KEY_USERLAND { $$ = DUP("userland"); }
+ | DT_TOK_XLATE { $$ = DUP("xlate"); }
+ | DT_KEY_XLATOR { $$ = DUP("translator"); }
+ ;
+
%%
Modified: projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Fri Oct 10 23:52:56 2014 (r272921)
@@ -434,15 +434,10 @@ static const prmap_t *
dt_pid_fix_mod(dtrace_probedesc_t *pdp, struct ps_prochandle *P)
{
char m[MAXPATHLEN];
-#if defined(sun)
Lmid_t lmid = PR_LMID_EVERY;
-#else
- Lmid_t lmid = 0;
-#endif
const char *obj;
const prmap_t *pmp;
-#if defined(sun)
/*
* Pick apart the link map from the library name.
*/
@@ -463,20 +458,17 @@ dt_pid_fix_mod(dtrace_probedesc_t *pdp,
} else {
obj = pdp->dtpd_mod;
}
-#else
- obj = pdp->dtpd_mod;
-#endif
if ((pmp = Plmid_to_map(P, lmid, obj)) == NULL)
return (NULL);
-#if defined(sun)
(void) Pobjname(P, pmp->pr_vaddr, m, sizeof (m));
if ((obj = strrchr(m, '/')) == NULL)
obj = &m[0];
else
obj++;
+#if defined(sun)
(void) Plmid(P, pmp->pr_vaddr, &lmid);
#endif
@@ -571,9 +563,7 @@ dt_pid_usdt_mapping(void *data, const pr
{
struct ps_prochandle *P = data;
GElf_Sym sym;
-#if defined(sun)
prsyminfo_t sip;
-#endif
dof_helper_t dh;
GElf_Half e_type;
const char *mname;
@@ -852,11 +842,7 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
ctf_funcinfo_t f;
ctf_id_t argv[32];
GElf_Sym sym;
-#if defined(sun)
prsyminfo_t si;
-#else
- void *si;
-#endif
struct ps_prochandle *p;
int i, args;
char buf[DTRACE_ARGTYPELEN];
@@ -941,13 +927,11 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
pdp->dtpd_func, pdp->dtpd_provider, pdp->dtpd_mod);
goto out;
}
-#if defined(sun)
if (ctf_func_info(fp, si.prs_id, &f) == CTF_ERR) {
dt_dprintf("failed to get ctf information for %s in %s`%s\n",
pdp->dtpd_func, pdp->dtpd_provider, pdp->dtpd_mod);
goto out;
}
-#endif
(void) snprintf(buf, sizeof (buf), "%s`%s", pdp->dtpd_provider,
pdp->dtpd_mod);
@@ -977,7 +961,6 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
(void) ctf_type_qname(fp, f.ctc_return, adp->dtargd_native +
ret, DTRACE_ARGTYPELEN - ret, buf);
*nargs = 2;
-#if defined(sun)
} else {
if (ctf_func_args(fp, si.prs_id, argc, argv) == CTF_ERR)
goto out;
@@ -993,7 +976,6 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
(void) ctf_type_qname(fp, argv[i], adp->dtargd_native +
ret, DTRACE_ARGTYPELEN - ret, buf);
}
-#endif
}
out:
dt_proc_unlock(dtp, p);
Modified: projects/bhyve_svm/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Fri Oct 10 23:52:56 2014 (r272921)
@@ -22,7 +22,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
*/
@@ -304,7 +304,6 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
case ZPOOL_PROP_FREE:
case ZPOOL_PROP_FREEING:
case ZPOOL_PROP_LEAKED:
- case ZPOOL_PROP_EXPANDSZ:
if (literal) {
(void) snprintf(buf, len, "%llu",
(u_longlong_t)intval);
@@ -312,7 +311,16 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
(void) zfs_nicenum(intval, buf, len);
}
break;
-
+ case ZPOOL_PROP_EXPANDSZ:
+ if (intval == 0) {
+ (void) strlcpy(buf, "-", len);
+ } else if (literal) {
+ (void) snprintf(buf, len, "%llu",
+ (u_longlong_t)intval);
+ } else {
+ (void) zfs_nicenum(intval, buf, len);
+ }
+ break;
case ZPOOL_PROP_CAPACITY:
if (literal) {
(void) snprintf(buf, len, "%llu",
@@ -330,13 +338,11 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
(u_longlong_t)intval);
}
break;
-
case ZPOOL_PROP_DEDUPRATIO:
(void) snprintf(buf, len, "%llu.%02llux",
(u_longlong_t)(intval / 100),
(u_longlong_t)(intval % 100));
break;
-
case ZPOOL_PROP_HEALTH:
verify(nvlist_lookup_nvlist(zpool_get_config(zhp, NULL),
ZPOOL_CONFIG_VDEV_TREE, &nvroot) == 0);
Modified: projects/bhyve_svm/cddl/lib/libdtrace/libproc_compat.h
==============================================================================
--- projects/bhyve_svm/cddl/lib/libdtrace/libproc_compat.h Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/cddl/lib/libdtrace/libproc_compat.h Fri Oct 10 23:52:56 2014 (r272921)
@@ -38,7 +38,7 @@
#define Pxlookup_by_addr(p, a, n, s, sym, i) \
proc_addr2sym(p, a, n, s, sym)
#define Pxlookup_by_name(p, l, s1, s2, sym, a) \
- proc_name2sym((p), (s1), (s2), (sym))
+ proc_name2sym(p, s1, s2, sym, a)
#define Paddr_to_map proc_addr2map
#define Pcreate_error strerror
#define Pdelbkpt proc_bkptdel
@@ -46,10 +46,10 @@
#define Plmid(p, a, l) (-1)
#define Plmid_to_map(p, l, o) proc_obj2map((p), (o))
#define Plookup_by_addr proc_addr2sym
-#define Pname_to_ctf(p, obj) NULL
+#define Pname_to_ctf(p, obj) (ctf_file_t *)proc_name2ctf(p, obj)
#define Pname_to_map proc_name2map
#define Pobject_iter proc_iter_objs
-#define Pobject_iter_resolved(p, f, arg) 1
+#define Pobject_iter_resolved(p, f, arg) proc_iter_objs(p, f, arg)
#define Pobjname proc_objname
#define Pread proc_read
#define Prd_agent proc_rdagent
Modified: projects/bhyve_svm/cddl/lib/libzfs/Makefile
==============================================================================
--- projects/bhyve_svm/cddl/lib/libzfs/Makefile Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/cddl/lib/libzfs/Makefile Fri Oct 10 23:52:56 2014 (r272921)
@@ -7,8 +7,11 @@
LIB= zfs
DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
- ${LIBAVL} ${LIBZFS_CORE}
-LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core
+ ${LIBAVL} ${LIBZFS_CORE} ${LIBUUTIL} ${LIBBSDXML} ${LIBGEOM} \
+ ${LIBNVPAIR}
+
+LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
+ -lbsdxml -lgeom -lnvpair -lzfs_core
SRCS= deviceid.c \
fsshare.c \
Modified: projects/bhyve_svm/cddl/lib/libzpool/Makefile
==============================================================================
--- projects/bhyve_svm/cddl/lib/libzpool/Makefile Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/cddl/lib/libzpool/Makefile Fri Oct 10 23:52:56 2014 (r272921)
@@ -56,8 +56,9 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpt
CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys
CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
-DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ}
-LDADD= -lmd -lpthread -lz
+DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \
+ ${LIBAVL} ${LIBUMEM}
+LDADD= -lmd -lpthread -lz -lnvpair -lavl -lumem
# atomic.S doesn't like profiling.
MK_PROFILE= no
Modified: projects/bhyve_svm/contrib/binutils/bfd/config.bfd
==============================================================================
--- projects/bhyve_svm/contrib/binutils/bfd/config.bfd Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/contrib/binutils/bfd/config.bfd Fri Oct 10 23:52:56 2014 (r272921)
@@ -273,19 +273,11 @@ case "${targ}" in
targ_defvec=bfd_elf32_littlearm_vec
targ_selvecs=bfd_elf32_bigarm_vec
;;
- armeb-*-freebsd*)
+ arm*eb*-*-freebsd*)
targ_defvec=bfd_elf32_bigarm_vec
targ_selvecs=bfd_elf32_littlearm_vec
;;
- armv6eb-*-freebsd*)
- targ_defvec=bfd_elf32_bigarm_vec
- targ_selvecs=bfd_elf32_littlearm_vec
- ;;
- armv6-*-freebsd* | armv6hf-*-freebsd*)
- targ_defvec=bfd_elf32_littlearm_vec
- targ_selvecs=bfd_elf32_bigarm_vec
- ;;
- arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
+ arm-*-elf | arm*-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
arm*-*-eabi* )
targ_defvec=bfd_elf32_littlearm_vec
Modified: projects/bhyve_svm/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- projects/bhyve_svm/contrib/binutils/bfd/elf32-arm.c Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/contrib/binutils/bfd/elf32-arm.c Fri Oct 10 23:52:56 2014 (r272921)
@@ -6965,7 +6965,8 @@ elf32_arm_merge_eabi_attributes (bfd *ib
for (; in_list; in_list = in_list->next)
{
- if ((in_list->tag & 128) < 64)
+ if ((in_list->tag & 128) < 64
+ && in_list->tag != Tag_Virtualization_use)
{
_bfd_error_handler
(_("Warning: %B: Unknown EABI object attribute %d"),
Modified: projects/bhyve_svm/contrib/binutils/gas/config/tc-arm.c
==============================================================================
--- projects/bhyve_svm/contrib/binutils/gas/config/tc-arm.c Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/contrib/binutils/gas/config/tc-arm.c Fri Oct 10 23:52:56 2014 (r272921)
@@ -19395,6 +19395,12 @@ arm_fix_adjustable (fixS * fixP)
|| fixP->fx_r_type == BFD_RELOC_ARM_LDR_PC_G0)
return 0;
+ if (fixP->fx_r_type == BFD_RELOC_ARM_MOVW
+ || fixP->fx_r_type == BFD_RELOC_ARM_MOVT
+ || fixP->fx_r_type == BFD_RELOC_ARM_THUMB_MOVW
+ || fixP->fx_r_type == BFD_RELOC_ARM_THUMB_MOVT)
+ return 0;
+
return 1;
}
#endif /* defined (OBJ_ELF) || defined (OBJ_COFF) */
Modified: projects/bhyve_svm/contrib/binutils/include/elf/arm.h
==============================================================================
--- projects/bhyve_svm/contrib/binutils/include/elf/arm.h Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/contrib/binutils/include/elf/arm.h Fri Oct 10 23:52:56 2014 (r272921)
@@ -271,6 +271,8 @@ enum
Tag_ABI_optimization_goals,
Tag_ABI_FP_optimization_goals,
/* 32 is generic. */
+
+ Tag_Virtualization_use = 68,
};
#endif
Modified: projects/bhyve_svm/contrib/bsnmp/snmp_target/target_snmp.c
==============================================================================
--- projects/bhyve_svm/contrib/bsnmp/snmp_target/target_snmp.c Fri Oct 10 23:22:20 2014 (r272920)
+++ projects/bhyve_svm/contrib/bsnmp/snmp_target/target_snmp.c Fri Oct 10 23:52:56 2014 (r272921)
@@ -301,6 +301,7 @@ op_snmp_target_addrs(struct snmp_context
default:
break;
}
+ return (SNMP_ERR_NOERROR);
default:
abort();
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Sat Oct 11 03:09:35 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 77C14D00;
Sat, 11 Oct 2014 03:09:35 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 6439A96F;
Sat, 11 Oct 2014 03:09:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9B39ZTF075847;
Sat, 11 Oct 2014 03:09:35 GMT (envelope-from neel@FreeBSD.org)
Received: (from neel@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9B39YvR075845;
Sat, 11 Oct 2014 03:09:34 GMT (envelope-from neel@FreeBSD.org)
Message-Id: <201410110309.s9B39YvR075845@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org
using -f
From: Neel Natu <neel@FreeBSD.org>
Date: Sat, 11 Oct 2014 03:09:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272926 - in projects/bhyve_svm/sys: amd64/vmm/amd
x86/include
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Oct 2014 03:09:35 -0000
Author: neel
Date: Sat Oct 11 03:09:34 2014
New Revision: 272926
URL: https://svnweb.freebsd.org/changeset/base/272926
Log:
Use a consistent style for messages emitted when the module is loaded.
Modified:
projects/bhyve_svm/sys/amd64/vmm/amd/svm.c
projects/bhyve_svm/sys/x86/include/specialreg.h
Modified: projects/bhyve_svm/sys/amd64/vmm/amd/svm.c
==============================================================================
--- projects/bhyve_svm/sys/amd64/vmm/amd/svm.c Sat Oct 11 02:02:58 2014 (r272925)
+++ projects/bhyve_svm/sys/amd64/vmm/amd/svm.c Sat Oct 11 03:09:34 2014 (r272926)
@@ -174,10 +174,10 @@ svm_cleanup(void)
}
/*
- * Check for required BHyVe SVM features in a CPU.
+ * Verify that all the features required by bhyve are available.
*/
static int
-svm_cpuid_features(void)
+check_svm_features(void)
{
u_int regs[4];
@@ -185,11 +185,13 @@ svm_cpuid_features(void)
do_cpuid(0x8000000A, regs);
svm_feature = regs[3];
- printf("SVM rev: 0x%x NASID:0x%x\n", regs[0] & 0xFF, regs[1]);
+ printf("SVM: Revision %d\n", regs[0] & 0xFF);
+ printf("SVM: NumASID %u\n", regs[1]);
+
nasid = regs[1];
KASSERT(nasid > 1, ("Insufficient ASIDs for guests: %#x", nasid));
- printf("SVM Features:0x%b\n", svm_feature,
+ printf("SVM: Features 0x%b\n", svm_feature,
"\020"
"\001NP" /* Nested paging */
"\002LbrVirt" /* LBR virtualization */
@@ -199,32 +201,27 @@ svm_cpuid_features(void)
"\006VmcbClean" /* VMCB clean bits */
"\007FlushByAsid" /* Flush by ASID */
"\010DecodeAssist" /* Decode assist */
- "\011<b20>"
- "\012<b20>"
+ "\011<b8>"
+ "\012<b9>"
"\013PauseFilter"
- "\014<b20>"
+ "\014<b11>"
"\015PauseFilterThreshold"
"\016AVIC"
);
- /* SVM Lock */
- if (!(svm_feature & AMD_CPUID_SVM_SVML)) {
- printf("SVM is disabled by BIOS, please enable in BIOS.\n");
+ /* bhyve requires the Nested Paging feature */
+ if (!(svm_feature & AMD_CPUID_SVM_NP)) {
+ printf("SVM: Nested Paging feature not available.\n");
return (ENXIO);
}
- /*
- * bhyve need RVI to work.
- */
- if (!(svm_feature & AMD_CPUID_SVM_NP)) {
- printf("Missing Nested paging or RVI SVM support in processor.\n");
- return (EIO);
+ /* bhyve requires the NRIP Save feature */
+ if (!(svm_feature & AMD_CPUID_SVM_NRIP_SAVE)) {
+ printf("SVM: NRIP Save feature not available.\n");
+ return (ENXIO);
}
- if (svm_feature & AMD_CPUID_SVM_NRIP_SAVE)
- return (0);
-
- return (EIO);
+ return (0);
}
static __inline int
@@ -260,27 +257,26 @@ svm_enable(void *arg __unused)
}
/*
- * Check if a processor support SVM.
+ * Verify that SVM is enabled and the processor has all the required features.
*/
static int
is_svm_enabled(void)
{
uint64_t msr;
- /* Section 15.4 Enabling SVM from APM2. */
+ /* Section 15.4 Enabling SVM from APM2. */
if ((amd_feature2 & AMDID2_SVM) == 0) {
- printf("SVM is not supported on this processor.\n");
+ printf("SVM: not available.\n");
return (ENXIO);
}
msr = rdmsr(MSR_VM_CR);
- /* Make sure SVM is not disabled by BIOS. */
- if ((msr & VM_CR_SVMDIS) == 0) {
- return svm_cpuid_features();
+ if ((msr & VM_CR_SVMDIS) != 0) {
+ printf("SVM: disabled by BIOS.\n");
+ return (ENXIO);
}
- printf("SVM disabled by Key, consult TPM/BIOS manual.\n");
- return (ENXIO);
+ return (check_svm_features());
}
/*
Modified: projects/bhyve_svm/sys/x86/include/specialreg.h
==============================================================================
--- projects/bhyve_svm/sys/x86/include/specialreg.h Sat Oct 11 02:02:58 2014 (r272925)
+++ projects/bhyve_svm/sys/x86/include/specialreg.h Sat Oct 11 03:09:34 2014 (r272926)
@@ -786,10 +786,10 @@
#define MSR_TOP_MEM2 0xc001001d /* boundary for ram above 4G */
#define MSR_K8_UCODE_UPDATE 0xc0010020 /* update microcode */
#define MSR_MC0_CTL_MASK 0xc0010044
-#define MSR_VM_CR 0xC0010114 /* SVM: feature control */
-#define MSR_VM_HSAVE_PA 0xC0010117 /* SVM: host save area address */
+#define MSR_VM_CR 0xc0010114 /* SVM: feature control */
+#define MSR_VM_HSAVE_PA 0xc0010117 /* SVM: host save area address */
-/* AMD VM_CR related */
+/* MSR_VM_CR related */
#define VM_CR_SVMDIS 0x10 /* SVM: disabled by BIOS */
/* VIA ACE crypto featureset: for via_feature_rng */
From owner-svn-src-projects@FreeBSD.ORG Sat Oct 11 03:19:27 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 65F5CE6A;
Sat, 11 Oct 2014 03:19:27 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 523E5A34;
Sat, 11 Oct 2014 03:19:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9B3JRw1080505;
Sat, 11 Oct 2014 03:19:27 GMT (envelope-from neel@FreeBSD.org)
Received: (from neel@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9B3JR41080504;
Sat, 11 Oct 2014 03:19:27 GMT (envelope-from neel@FreeBSD.org)
Message-Id: <201410110319.s9B3JR41080504@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org
using -f
From: Neel Natu <neel@FreeBSD.org>
Date: Sat, 11 Oct 2014 03:19:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272927 - projects/bhyve_svm/sys/amd64/vmm/amd
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Oct 2014 03:19:27 -0000
Author: neel
Date: Sat Oct 11 03:19:26 2014
New Revision: 272927
URL: https://svnweb.freebsd.org/changeset/base/272927
Log:
style(9) fixes.
Get rid of unused headers.
Modified:
projects/bhyve_svm/sys/amd64/vmm/amd/npt.c
Modified: projects/bhyve_svm/sys/amd64/vmm/amd/npt.c
==============================================================================
--- projects/bhyve_svm/sys/amd64/vmm/amd/npt.c Sat Oct 11 03:09:34 2014 (r272926)
+++ projects/bhyve_svm/sys/amd64/vmm/amd/npt.c Sat Oct 11 03:19:26 2014 (r272927)
@@ -37,13 +37,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_extern.h>
#include <machine/pmap.h>
-#include <machine/md_var.h>
-#include <machine/vmparam.h>
-#include <machine/vmm.h>
-
-#include "svm.h"
-#include "vmcb.h"
-#include "svm_softc.h"
+
#include "npt.h"
SYSCTL_DECL(_hw_vmm);
@@ -54,6 +48,7 @@ SYSCTL_INT(_hw_vmm_npt, OID_AUTO, pmap_f
&npt_flags, 0, NULL);
#define NPT_IPIMASK 0xFF
+
/*
* AMD nested page table init.
*/
@@ -70,8 +65,6 @@ svm_npt_init(int ipinum)
return (0);
}
-
-
static int
npt_pinit(pmap_t pmap)
{
From owner-svn-src-projects@FreeBSD.ORG Sat Oct 11 03:21:34 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 246CDF95;
Sat, 11 Oct 2014 03:21:34 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 11408AD9;
Sat, 11 Oct 2014 03:21:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9B3LXcc084205;
Sat, 11 Oct 2014 03:21:33 GMT (envelope-from neel@FreeBSD.org)
Received: (from neel@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9B3LX0w084204;
Sat, 11 Oct 2014 03:21:33 GMT (envelope-from neel@FreeBSD.org)
Message-Id: <201410110321.s9B3LX0w084204@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org
using -f
From: Neel Natu <neel@FreeBSD.org>
Date: Sat, 11 Oct 2014 03:21:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272928 - projects/bhyve_svm/sys/amd64/vmm/amd
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Oct 2014 03:21:34 -0000
Author: neel
Date: Sat Oct 11 03:21:33 2014
New Revision: 272928
URL: https://svnweb.freebsd.org/changeset/base/272928
Log:
Get rid of unused forward declaration of 'struct svm_softc'.
Modified:
projects/bhyve_svm/sys/amd64/vmm/amd/npt.h
Modified: projects/bhyve_svm/sys/amd64/vmm/amd/npt.h
==============================================================================
--- projects/bhyve_svm/sys/amd64/vmm/amd/npt.h Sat Oct 11 03:19:26 2014 (r272927)
+++ projects/bhyve_svm/sys/amd64/vmm/amd/npt.h Sat Oct 11 03:21:33 2014 (r272928)
@@ -29,9 +29,8 @@
#ifndef _SVM_NPT_H_
#define _SVM_NPT_H_
-struct svm_softc;
-
int svm_npt_init(int ipinum);
struct vmspace *svm_npt_alloc(vm_offset_t min, vm_offset_t max);
void svm_npt_free(struct vmspace *vmspace);
+
#endif /* _SVM_NPT_H_ */
From owner-svn-src-projects@FreeBSD.ORG Sat Oct 11 04:41:22 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 683BFA7A;
Sat, 11 Oct 2014 04:41:22 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 53AFA1C0;
Sat, 11 Oct 2014 04:41:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9B4fMsp021263;
Sat, 11 Oct 2014 04:41:22 GMT (envelope-from neel@FreeBSD.org)
Received: (from neel@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9B4fLNe021190;
Sat, 11 Oct 2014 04:41:21 GMT (envelope-from neel@FreeBSD.org)
Message-Id: <201410110441.s9B4fLNe021190@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org
using -f
From: Neel Natu <neel@FreeBSD.org>
Date: Sat, 11 Oct 2014 04:41:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272929 - projects/bhyve_svm/sys/amd64/vmm/amd
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Oct 2014 04:41:22 -0000
Author: neel
Date: Sat Oct 11 04:41:21 2014
New Revision: 272929
URL: https://svnweb.freebsd.org/changeset/base/272929
Log:
Get rid of unused headers.
Restrict scope of malloc types M_SVM and M_SVM_VLAPIC by making them static.
Replace ERR() with KASSERT().
style(9) cleanup.
Modified:
projects/bhyve_svm/sys/amd64/vmm/amd/svm.c
projects/bhyve_svm/sys/amd64/vmm/amd/svm.h
projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.h
Modified: projects/bhyve_svm/sys/amd64/vmm/amd/svm.c
==============================================================================
--- projects/bhyve_svm/sys/amd64/vmm/amd/svm.c Sat Oct 11 03:21:33 2014 (r272928)
+++ projects/bhyve_svm/sys/amd64/vmm/amd/svm.c Sat Oct 11 04:41:21 2014 (r272929)
@@ -43,16 +43,11 @@ __FBSDID("$FreeBSD$");
#include <machine/psl.h>
#include <machine/pmap.h>
#include <machine/md_var.h>
-#include <machine/vmparam.h>
#include <machine/specialreg.h>
-#include <machine/segments.h>
#include <machine/smp.h>
#include <machine/vmm.h>
-#include <machine/vmm_dev.h>
#include <machine/vmm_instruction_emul.h>
-#include <x86/apicreg.h>
-
#include "vmm_lapic.h"
#include "vmm_stat.h"
#include "vmm_ktr.h"
@@ -99,8 +94,8 @@ static uint32_t vmcb_clean = VMCB_CACHE_
SYSCTL_INT(_hw_vmm_svm, OID_AUTO, vmcb_clean, CTLFLAG_RDTUN, &vmcb_clean,
0, NULL);
-MALLOC_DEFINE(M_SVM, "svm", "svm");
-MALLOC_DEFINE(M_SVM_VLAPIC, "svm-vlapic", "svm-vlapic");
+static MALLOC_DEFINE(M_SVM, "svm", "svm");
+static MALLOC_DEFINE(M_SVM_VLAPIC, "svm-vlapic", "svm-vlapic");
/* Per-CPU context area. */
extern struct pcpu __pcpu[];
@@ -132,38 +127,32 @@ static VMM_STAT_AMD(VMEXIT_VINTR, "VM ex
static int svm_setreg(void *arg, int vcpu, int ident, uint64_t val);
-/*
- * Common function to enable or disabled SVM for a CPU.
- */
-static int
-cpu_svm_enable_disable(boolean_t enable)
+static __inline int
+flush_by_asid(void)
{
- uint64_t efer_msr;
-
- efer_msr = rdmsr(MSR_EFER);
- if (enable)
- efer_msr |= EFER_SVM;
- else
- efer_msr &= ~EFER_SVM;
+ return (svm_feature & AMD_CPUID_SVM_FLUSH_BY_ASID);
+}
- wrmsr(MSR_EFER, efer_msr);
+static __inline int
+decode_assist(void)
+{
- return(0);
+ return (svm_feature & AMD_CPUID_SVM_DECODE_ASSIST);
}
-/*
- * Disable SVM on a CPU.
- */
static void
svm_disable(void *arg __unused)
{
+ uint64_t efer;
- (void)cpu_svm_enable_disable(FALSE);
+ efer = rdmsr(MSR_EFER);
+ efer &= ~EFER_SVM;
+ wrmsr(MSR_EFER, efer);
}
/*
- * Disable SVM for all CPUs.
+ * Disable SVM on all CPUs.
*/
static int
svm_cleanup(void)
@@ -224,72 +213,52 @@ check_svm_features(void)
return (0);
}
-static __inline int
-flush_by_asid(void)
-{
-
- return (svm_feature & AMD_CPUID_SVM_FLUSH_BY_ASID);
-}
-
-static __inline int
-decode_assist(void)
-{
-
- return (svm_feature & AMD_CPUID_SVM_DECODE_ASSIST);
-}
-
-/*
- * Enable SVM for a CPU.
- */
static void
svm_enable(void *arg __unused)
{
- uint64_t hsave_pa;
+ uint64_t efer;
- (void)cpu_svm_enable_disable(TRUE);
+ efer = rdmsr(MSR_EFER);
+ efer |= EFER_SVM;
+ wrmsr(MSR_EFER, efer);
- hsave_pa = vtophys(hsave[curcpu]);
- wrmsr(MSR_VM_HSAVE_PA, hsave_pa);
-
- if (rdmsr(MSR_VM_HSAVE_PA) != hsave_pa) {
- panic("VM_HSAVE_PA is wrong on CPU%d\n", curcpu);
- }
+ wrmsr(MSR_VM_HSAVE_PA, vtophys(hsave[curcpu]));
}
/*
- * Verify that SVM is enabled and the processor has all the required features.
+ * Return 1 if SVM is enabled on this processor and 0 otherwise.
*/
static int
-is_svm_enabled(void)
+svm_available(void)
{
uint64_t msr;
/* Section 15.4 Enabling SVM from APM2. */
if ((amd_feature2 & AMDID2_SVM) == 0) {
printf("SVM: not available.\n");
- return (ENXIO);
+ return (0);
}
msr = rdmsr(MSR_VM_CR);
if ((msr & VM_CR_SVMDIS) != 0) {
printf("SVM: disabled by BIOS.\n");
- return (ENXIO);
+ return (0);
}
- return (check_svm_features());
+ return (1);
}
-/*
- * Enable SVM on CPU and initialize nested page table h/w.
- */
static int
svm_init(int ipinum)
{
- int err, cpu;
+ int error, cpu;
+
+ if (!svm_available())
+ return (ENXIO);
- err = is_svm_enabled();
- if (err)
- return (err);
+ error = check_svm_features();
+ if (error)
+ return (error);
vmcb_clean &= VMCB_CACHE_DEFAULT;
@@ -307,7 +276,7 @@ svm_init(int ipinum)
svm_msr_init();
svm_npt_init(ipinum);
- /* Start SVM on all CPUs */
+ /* Enable SVM on all CPUs */
smp_rendezvous(NULL, svm_enable, NULL, NULL);
return (0);
@@ -316,19 +285,10 @@ svm_init(int ipinum)
static void
svm_restore(void)
{
+
svm_enable(NULL);
}
-/*
- * Get index and bit position for a MSR in MSR permission
- * bitmap. Two bits are used for each MSR, lower bit is
- * for read and higher bit is for write.
- */
-static int
-svm_msr_index(uint64_t msr, int *index, int *bit)
-{
- uint32_t base, off;
-
/* Pentium compatible MSRs */
#define MSR_PENTIUM_START 0
#define MSR_PENTIUM_END 0x1FFF
@@ -339,6 +299,15 @@ svm_msr_index(uint64_t msr, int *index,
#define MSR_AMD7TH_START 0xC0010000UL
#define MSR_AMD7TH_END 0xC0011FFFUL
+/*
+ * Get the index and bit position for a MSR in permission bitmap.
+ * Two bits are used for each MSR: lower bit for read and higher bit for write.
+ */
+static int
+svm_msr_index(uint64_t msr, int *index, int *bit)
+{
+ uint32_t base, off;
+
*index = -1;
*bit = (msr % 4) * 2;
base = 0;
@@ -362,53 +331,43 @@ svm_msr_index(uint64_t msr, int *index,
return (0);
}
- return (EIO);
+ return (EINVAL);
}
/*
- * Give virtual cpu the complete access to MSR(read & write).
+ * Allow vcpu to read or write the 'msr' without trapping into the hypervisor.
*/
-static int
+static void
svm_msr_perm(uint8_t *perm_bitmap, uint64_t msr, bool read, bool write)
{
- int index, bit, err;
-
- err = svm_msr_index(msr, &index, &bit);
- if (err) {
- ERR("MSR 0x%lx is not writeable by guest.\n", msr);
- return (err);
- }
+ int index, bit, error;
- if (index < 0 || index > (SVM_MSR_BITMAP_SIZE)) {
- ERR("MSR 0x%lx index out of range(%d).\n", msr, index);
- return (EINVAL);
- }
- if (bit < 0 || bit > 8) {
- ERR("MSR 0x%lx bit out of range(%d).\n", msr, bit);
- return (EINVAL);
- }
+ error = svm_msr_index(msr, &index, &bit);
+ KASSERT(error == 0, ("%s: invalid msr %#lx", __func__, msr));
+ KASSERT(index >= 0 && index < SVM_MSR_BITMAP_SIZE,
+ ("%s: invalid index %d for msr %#lx", __func__, index, msr));
+ KASSERT(bit >= 0 && bit <= 6, ("%s: invalid bit position %d "
+ "msr %#lx", __func__, bit, msr));
- /* Disable intercept for read and write. */
if (read)
perm_bitmap[index] &= ~(1UL << bit);
+
if (write)
perm_bitmap[index] &= ~(2UL << bit);
- CTR2(KTR_VMM, "Guest has control:0x%x on SVM:MSR(0x%lx).\n",
- (perm_bitmap[index] >> bit) & 0x3, msr);
-
- return (0);
}
-static int
+static void
svm_msr_rw_ok(uint8_t *perm_bitmap, uint64_t msr)
{
- return svm_msr_perm(perm_bitmap, msr, true, true);
+
+ svm_msr_perm(perm_bitmap, msr, true, true);
}
-static int
+static void
svm_msr_rd_ok(uint8_t *perm_bitmap, uint64_t msr)
{
- return svm_msr_perm(perm_bitmap, msr, true, false);
+
+ svm_msr_perm(perm_bitmap, msr, true, false);
}
static __inline int
@@ -449,12 +408,14 @@ svm_set_intercept(struct svm_softc *sc,
static __inline void
svm_disable_intercept(struct svm_softc *sc, int vcpu, int off, uint32_t bitmask)
{
+
svm_set_intercept(sc, vcpu, off, bitmask, 0);
}
static __inline void
svm_enable_intercept(struct svm_softc *sc, int vcpu, int off, uint32_t bitmask)
{
+
svm_set_intercept(sc, vcpu, off, bitmask, 1);
}
@@ -542,7 +503,7 @@ vmcb_init(struct svm_softc *sc, int vcpu
}
/*
- * Initialise a virtual machine.
+ * Initialize a virtual machine.
*/
static void *
svm_vminit(struct vm *vm, pmap_t pmap)
@@ -552,20 +513,19 @@ svm_vminit(struct vm *vm, pmap_t pmap)
vm_paddr_t msrpm_pa, iopm_pa, pml4_pa;
int i;
- svm_sc = (struct svm_softc *)malloc(sizeof (struct svm_softc),
- M_SVM, M_WAITOK | M_ZERO);
-
+ svm_sc = malloc(sizeof (struct svm_softc), M_SVM, M_WAITOK | M_ZERO);
svm_sc->vm = vm;
svm_sc->nptp = (vm_offset_t)vtophys(pmap->pm_pml4);
/*
- * Intercept MSR access to all MSRs except GSBASE, FSBASE,... etc.
- */
- memset(svm_sc->msr_bitmap, 0xFF, sizeof(svm_sc->msr_bitmap));
+ * Intercept read and write accesses to all MSRs.
+ */
+ memset(svm_sc->msr_bitmap, 0xFF, sizeof(svm_sc->msr_bitmap));
/*
- * Following MSR can be completely controlled by virtual machines
- * since access to following are translated to access to VMCB.
+ * Access to the following MSRs is redirected to the VMCB when the
+ * guest is executing. Therefore it is safe to allow the guest to
+ * read/write these MSRs directly without hypervisor involvement.
*/
svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_GSBASE);
svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_FSBASE);
@@ -578,8 +538,6 @@ svm_vminit(struct vm *vm, pmap_t pmap)
svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_SYSENTER_CS_MSR);
svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_SYSENTER_ESP_MSR);
svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_SYSENTER_EIP_MSR);
-
- /* For Nested Paging/RVI only. */
svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_PAT);
svm_msr_rd_ok(svm_sc->msr_bitmap, MSR_TSC);
@@ -589,14 +547,12 @@ svm_vminit(struct vm *vm, pmap_t pmap)
*/
svm_msr_rd_ok(svm_sc->msr_bitmap, MSR_EFER);
- /* Intercept access to all I/O ports. */
+ /* Intercept access to all I/O ports. */
memset(svm_sc->iopm_bitmap, 0xFF, sizeof(svm_sc->iopm_bitmap));
- /* Cache physical address for multiple vcpus. */
iopm_pa = vtophys(svm_sc->iopm_bitmap);
msrpm_pa = vtophys(svm_sc->msr_bitmap);
pml4_pa = svm_sc->nptp;
-
for (i = 0; i < VM_MAXCPU; i++) {
vcpu = svm_get_vcpu(svm_sc, i);
vcpu->lastcpu = NOCPU;
@@ -791,13 +747,13 @@ svm_handle_io(struct svm_softc *svm_sc,
}
static int
-svm_npf_paging(uint64_t exitinfo1)
+npf_fault_type(uint64_t exitinfo1)
{
if (exitinfo1 & VMCB_NPF_INFO1_W)
return (VM_PROT_WRITE);
-
- return (VM_PROT_READ);
+ else
+ return (VM_PROT_READ);
}
static bool
@@ -1368,7 +1324,7 @@ svm_vmexit(struct svm_softc *svm_sc, int
} else if (vm_mem_allocated(svm_sc->vm, info2)) {
vmexit->exitcode = VM_EXITCODE_PAGING;
vmexit->u.paging.gpa = info2;
- vmexit->u.paging.fault_type = svm_npf_paging(info1);
+ vmexit->u.paging.fault_type = npf_fault_type(info1);
vmm_stat_incr(svm_sc->vm, vcpu, VMEXIT_NESTED_FAULT, 1);
VCPU_CTR3(svm_sc->vm, vcpu, "nested page fault "
"on gpa %#lx/%#lx at rip %#lx",
@@ -1759,6 +1715,20 @@ check_asid(struct svm_softc *sc, int vcp
("ASID mismatch: %u/%u", ctrl->asid, vcpustate->asid.num));
}
+static __inline void
+disable_gintr(void)
+{
+
+ __asm __volatile("clgi" : : :);
+}
+
+static __inline void
+enable_gintr(void)
+{
+
+ __asm __volatile("stgi" : : :);
+}
+
/*
* Start vcpu with specified RIP.
*/
@@ -1912,69 +1882,52 @@ svm_vmrun(void *arg, int vcpu, register_
return (0);
}
-/*
- * Cleanup for virtual machine.
- */
static void
svm_vmcleanup(void *arg)
{
- struct svm_softc *svm_sc;
-
- svm_sc = arg;
-
- VCPU_CTR0(svm_sc->vm, 0, "SVM:cleanup\n");
+ struct svm_softc *sc = arg;
- free(svm_sc, M_SVM);
+ free(sc, M_SVM);
}
-/*
- * Return pointer to hypervisor saved register state.
- */
static register_t *
swctx_regptr(struct svm_regctx *regctx, int reg)
{
switch (reg) {
- case VM_REG_GUEST_RBX:
- return (®ctx->sctx_rbx);
- case VM_REG_GUEST_RCX:
- return (®ctx->sctx_rcx);
- case VM_REG_GUEST_RDX:
- return (®ctx->sctx_rdx);
- case VM_REG_GUEST_RDI:
- return (®ctx->sctx_rdi);
- case VM_REG_GUEST_RSI:
- return (®ctx->sctx_rsi);
- case VM_REG_GUEST_RBP:
- return (®ctx->sctx_rbp);
- case VM_REG_GUEST_R8:
- return (®ctx->sctx_r8);
- case VM_REG_GUEST_R9:
- return (®ctx->sctx_r9);
- case VM_REG_GUEST_R10:
- return (®ctx->sctx_r10);
- case VM_REG_GUEST_R11:
- return (®ctx->sctx_r11);
- case VM_REG_GUEST_R12:
- return (®ctx->sctx_r12);
- case VM_REG_GUEST_R13:
- return (®ctx->sctx_r13);
- case VM_REG_GUEST_R14:
- return (®ctx->sctx_r14);
- case VM_REG_GUEST_R15:
- return (®ctx->sctx_r15);
- default:
- ERR("Unknown register requested, reg=%d.\n", reg);
- break;
+ case VM_REG_GUEST_RBX:
+ return (®ctx->sctx_rbx);
+ case VM_REG_GUEST_RCX:
+ return (®ctx->sctx_rcx);
+ case VM_REG_GUEST_RDX:
+ return (®ctx->sctx_rdx);
+ case VM_REG_GUEST_RDI:
+ return (®ctx->sctx_rdi);
+ case VM_REG_GUEST_RSI:
+ return (®ctx->sctx_rsi);
+ case VM_REG_GUEST_RBP:
+ return (®ctx->sctx_rbp);
+ case VM_REG_GUEST_R8:
+ return (®ctx->sctx_r8);
+ case VM_REG_GUEST_R9:
+ return (®ctx->sctx_r9);
+ case VM_REG_GUEST_R10:
+ return (®ctx->sctx_r10);
+ case VM_REG_GUEST_R11:
+ return (®ctx->sctx_r11);
+ case VM_REG_GUEST_R12:
+ return (®ctx->sctx_r12);
+ case VM_REG_GUEST_R13:
+ return (®ctx->sctx_r13);
+ case VM_REG_GUEST_R14:
+ return (®ctx->sctx_r14);
+ case VM_REG_GUEST_R15:
+ return (®ctx->sctx_r15);
+ default:
+ return (NULL);
}
-
- return (NULL);
}
-/*
- * Interface to read guest registers.
- * This can be SVM h/w saved or hypervisor saved register.
- */
static int
svm_getreg(void *arg, int vcpu, int ident, uint64_t *val)
{
@@ -1998,14 +1951,10 @@ svm_getreg(void *arg, int vcpu, int iden
return (0);
}
- ERR("SVM_ERR:reg type %x is not saved in VMCB.\n", ident);
+ VCPU_CTR1(svm_sc->vm, vcpu, "svm_getreg: unknown register %#x", ident);
return (EINVAL);
}
-/*
- * Interface to write to guest registers.
- * This can be SVM h/w saved or hypervisor saved register.
- */
static int
svm_setreg(void *arg, int vcpu, int ident, uint64_t val)
{
@@ -2035,7 +1984,7 @@ svm_setreg(void *arg, int vcpu, int iden
* whether 'running' is true/false.
*/
- ERR("SVM_ERR:reg type %x is not saved in VMCB.\n", ident);
+ VCPU_CTR1(svm_sc->vm, vcpu, "svm_setreg: unknown register %#x", ident);
return (EINVAL);
}
@@ -2109,7 +2058,7 @@ svm_vlapic_init(void *arg, int vcpuid)
vlapic->apic_page = (struct LAPIC *)&svm_sc->apic_page[vcpuid];
vlapic_init(vlapic);
-
+
return (vlapic);
}
Modified: projects/bhyve_svm/sys/amd64/vmm/amd/svm.h
==============================================================================
--- projects/bhyve_svm/sys/amd64/vmm/amd/svm.h Sat Oct 11 03:21:33 2014 (r272928)
+++ projects/bhyve_svm/sys/amd64/vmm/amd/svm.h Sat Oct 11 04:41:21 2014 (r272929)
@@ -29,10 +29,6 @@
#ifndef _SVM_H_
#define _SVM_H_
-#define BIT(n) (1ULL << n)
-#define ERR(fmt, args...) \
- printf("SVM ERROR:%s " fmt "\n", __func__, ##args);
-
/*
* Guest register state that is saved outside the VMCB.
*/
@@ -55,18 +51,4 @@ struct svm_regctx {
void svm_launch(uint64_t pa, struct svm_regctx *);
-static __inline void
-disable_gintr(void)
-{
-
- __asm __volatile("clgi" : : :);
-}
-
-static __inline void
-enable_gintr(void)
-{
-
- __asm __volatile("stgi" : : :);
-}
-
#endif /* _SVM_H_ */
Modified: projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.h
==============================================================================
--- projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.h Sat Oct 11 03:21:33 2014 (r272928)
+++ projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.h Sat Oct 11 04:41:21 2014 (r272929)
@@ -31,6 +31,8 @@
struct svm_softc;
+#define BIT(n) (1ULL << n)
+
/*
* Secure Virtual Machine: AMD64 Programmer's Manual Vol2, Chapter 15
* Layout of VMCB: AMD64 Programmer's Manual Vol2, Appendix B
From owner-svn-src-projects@FreeBSD.ORG Sat Oct 11 04:57:17 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id E7F90C25;
Sat, 11 Oct 2014 04:57:17 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id D48C434C;
Sat, 11 Oct 2014 04:57:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9B4vHcY027474;
Sat, 11 Oct 2014 04:57:17 GMT (envelope-from neel@FreeBSD.org)
Received: (from neel@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9B4vHnP027473;
Sat, 11 Oct 2014 04:57:17 GMT (envelope-from neel@FreeBSD.org)
Message-Id: <201410110457.s9B4vHnP027473@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org
using -f
From: Neel Natu <neel@FreeBSD.org>
Date: Sat, 11 Oct 2014 04:57:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272930 - projects/bhyve_svm/sys/amd64/vmm/amd
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Oct 2014 04:57:18 -0000
Author: neel
Date: Sat Oct 11 04:57:17 2014
New Revision: 272930
URL: https://svnweb.freebsd.org/changeset/base/272930
Log:
Remove extraneous comments.
Modified:
projects/bhyve_svm/sys/amd64/vmm/amd/svm_softc.h
Modified: projects/bhyve_svm/sys/amd64/vmm/amd/svm_softc.h
==============================================================================
--- projects/bhyve_svm/sys/amd64/vmm/amd/svm_softc.h Sat Oct 11 04:41:21 2014 (r272929)
+++ projects/bhyve_svm/sys/amd64/vmm/amd/svm_softc.h Sat Oct 11 04:57:17 2014 (r272930)
@@ -38,7 +38,8 @@ struct asid {
};
/*
- * svm_vpcu contains SVM VMCB state and vcpu register state.
+ * XXX separate out 'struct vmcb' from 'svm_vcpu' to avoid wasting space
+ * due to VMCB alignment requirements.
*/
struct svm_vcpu {
struct vmcb vmcb; /* hardware saved vcpu context */
@@ -54,29 +55,12 @@ struct svm_vcpu {
* SVM softc, one per virtual machine.
*/
struct svm_softc {
- /*
- * IO permission map, VMCB.ctrl.iopm_base_pa should point to this.
- * If a bit is set, access to I/O port is intercepted.
- */
- uint8_t iopm_bitmap[SVM_IO_BITMAP_SIZE];
-
- /*
- * MSR permission bitmap, VMCB.ctrl.msrpm_base_pa should point to this.
- * Two bits are used for each MSR with the LSB used for read access
- * and the MSB used for write access. A value of '1' indicates that
- * the operation is intercepted.
- */
- uint8_t msr_bitmap[SVM_MSR_BITMAP_SIZE];
-
+ uint8_t iopm_bitmap[SVM_IO_BITMAP_SIZE]; /* shared by all vcpus */
+ uint8_t msr_bitmap[SVM_MSR_BITMAP_SIZE]; /* shared by all vcpus */
uint8_t apic_page[VM_MAXCPU][PAGE_SIZE];
- /* Nested Paging */
- vm_offset_t nptp;
-
- /* Virtual machine pointer. */
- struct vm *vm;
-
- /* Guest VCPU h/w and s/w context. */
struct svm_vcpu vcpu[VM_MAXCPU];
+ vm_offset_t nptp; /* nested page table */
+ struct vm *vm;
} __aligned(PAGE_SIZE);
CTASSERT((offsetof(struct svm_softc, nptp) & PAGE_MASK) == 0);
From owner-svn-src-projects@FreeBSD.ORG Sat Oct 11 17:16:27 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 01EECA13;
Sat, 11 Oct 2014 17:16:27 +0000 (UTC)
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))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id DCD97F02;
Sat, 11 Oct 2014 17:16:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9BHGQAv077133;
Sat, 11 Oct 2014 17:16:26 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9BHGKqd076982;
Sat, 11 Oct 2014 17:16:20 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201410111716.s9BHGKqd076982@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Sat, 11 Oct 2014 17:16:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272945 - in projects/routing: . bin/sh
bin/sh/tests/builtins bin/sleep bin/sleep/tests
cddl/contrib/opensolaris/cmd/dtrace
cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf cddl...
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.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Oct 2014 17:16:27 -0000
Author: melifaro
Date: Sat Oct 11 17:16:18 2014
New Revision: 272945
URL: https://svnweb.freebsd.org/changeset/base/272945
Log:
Merge HEAD@r272944.
Added:
projects/routing/bin/sh/tests/builtins/lineno3.0
- copied unchanged from r272944, head/bin/sh/tests/builtins/lineno3.0
projects/routing/bin/sh/tests/builtins/lineno3.0.stdout
- copied unchanged from r272944, head/bin/sh/tests/builtins/lineno3.0.stdout
projects/routing/bin/sleep/tests/
- copied from r272944, head/bin/sleep/tests/
projects/routing/contrib/byacc/test/btyacc/btyacc_demo2.error
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_demo2.error
projects/routing/contrib/byacc/test/btyacc/btyacc_demo2.output
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_demo2.output
projects/routing/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
projects/routing/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
projects/routing/contrib/byacc/test/btyacc/btyacc_destroy1.error
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_destroy1.error
projects/routing/contrib/byacc/test/btyacc/btyacc_destroy1.output
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_destroy1.output
projects/routing/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
projects/routing/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
projects/routing/contrib/byacc/test/btyacc/btyacc_destroy2.error
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_destroy2.error
projects/routing/contrib/byacc/test/btyacc/btyacc_destroy2.output
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_destroy2.output
projects/routing/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
projects/routing/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
projects/routing/contrib/byacc/test/btyacc/btyacc_destroy3.error
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_destroy3.error
projects/routing/contrib/byacc/test/btyacc/btyacc_destroy3.output
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_destroy3.output
projects/routing/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
projects/routing/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
- copied unchanged from r272944, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
projects/routing/contrib/byacc/test/btyacc_destroy1.y
- copied unchanged from r272944, head/contrib/byacc/test/btyacc_destroy1.y
projects/routing/contrib/byacc/test/btyacc_destroy2.y
- copied unchanged from r272944, head/contrib/byacc/test/btyacc_destroy2.y
projects/routing/contrib/byacc/test/btyacc_destroy3.y
- copied unchanged from r272944, head/contrib/byacc/test/btyacc_destroy3.y
projects/routing/contrib/netbsd-tests/
- copied from r272944, head/contrib/netbsd-tests/
projects/routing/etc/devd/ulpt.conf
- copied unchanged from r272944, head/etc/devd/ulpt.conf
projects/routing/gnu/usr.bin/diff/tests/
- copied from r272944, head/gnu/usr.bin/diff/tests/
projects/routing/lib/libc/string/explicit_bzero.c
- copied unchanged from r272944, head/lib/libc/string/explicit_bzero.c
projects/routing/lib/libpcap/pcap-netmap.c
- copied unchanged from r272944, head/lib/libpcap/pcap-netmap.c
projects/routing/release/amd64/mk-vmimage.sh
- copied unchanged from r272944, head/release/amd64/mk-vmimage.sh
projects/routing/release/i386/mk-vmimage.sh
- copied unchanged from r272944, head/release/i386/mk-vmimage.sh
projects/routing/sbin/ipfw/tables.c
- copied unchanged from r272944, head/sbin/ipfw/tables.c
projects/routing/sys/arm/altera/socfpga/socfpga_mp.c
- copied unchanged from r272944, head/sys/arm/altera/socfpga/socfpga_mp.c
projects/routing/sys/arm/arm/syscall.c
- copied unchanged from r272944, head/sys/arm/arm/syscall.c
projects/routing/sys/contrib/dev/acpica/common/acgetline.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/common/acgetline.c
projects/routing/sys/contrib/dev/acpica/common/ahids.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/common/ahids.c
projects/routing/sys/contrib/dev/acpica/common/ahuuids.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/common/ahuuids.c
projects/routing/sys/contrib/dev/acpica/common/cmfsize.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/common/cmfsize.c
projects/routing/sys/contrib/dev/acpica/compiler/aslascii.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/compiler/aslascii.c
projects/routing/sys/contrib/dev/acpica/compiler/aslmapenter.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/compiler/aslmapenter.c
projects/routing/sys/contrib/dev/acpica/compiler/aslmapoutput.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/compiler/aslmapoutput.c
projects/routing/sys/contrib/dev/acpica/compiler/aslmaputils.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/compiler/aslmaputils.c
projects/routing/sys/contrib/dev/acpica/compiler/aslmessages.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/compiler/aslmessages.c
projects/routing/sys/contrib/dev/acpica/compiler/aslparser.y
- copied unchanged from r272944, head/sys/contrib/dev/acpica/compiler/aslparser.y
projects/routing/sys/contrib/dev/acpica/compiler/aslrules.y
- copied unchanged from r272944, head/sys/contrib/dev/acpica/compiler/aslrules.y
projects/routing/sys/contrib/dev/acpica/compiler/aslsupport.y
- copied unchanged from r272944, head/sys/contrib/dev/acpica/compiler/aslsupport.y
projects/routing/sys/contrib/dev/acpica/compiler/asltokens.y
- copied unchanged from r272944, head/sys/contrib/dev/acpica/compiler/asltokens.y
projects/routing/sys/contrib/dev/acpica/compiler/asltypes.y
- copied unchanged from r272944, head/sys/contrib/dev/acpica/compiler/asltypes.y
projects/routing/sys/contrib/dev/acpica/components/debugger/dbtest.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/components/debugger/dbtest.c
projects/routing/sys/contrib/dev/acpica/components/tables/tbdata.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/components/tables/tbdata.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utfileio.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/components/utilities/utfileio.c
projects/routing/sys/contrib/dev/acpica/components/utilities/uthex.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/components/utilities/uthex.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utprint.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/components/utilities/utprint.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utuuid.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/components/utilities/utuuid.c
projects/routing/sys/contrib/dev/acpica/include/platform/acenvex.h
- copied unchanged from r272944, head/sys/contrib/dev/acpica/include/platform/acenvex.h
projects/routing/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c
- copied unchanged from r272944, head/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c
projects/routing/sys/dev/mmc/host/
- copied from r272944, head/sys/dev/mmc/host/
projects/routing/sys/dev/mrsas/mrsas_linux.c
- copied unchanged from r272944, head/sys/dev/mrsas/mrsas_linux.c
projects/routing/sys/dev/uart/uart_dev_msm.c
- copied unchanged from r272944, head/sys/dev/uart/uart_dev_msm.c
projects/routing/sys/dev/uart/uart_dev_msm.h
- copied unchanged from r272944, head/sys/dev/uart/uart_dev_msm.h
projects/routing/sys/dev/xen/xenstore/
- copied from r272944, head/sys/dev/xen/xenstore/
projects/routing/sys/libkern/explicit_bzero.c
- copied unchanged from r272944, head/sys/libkern/explicit_bzero.c
projects/routing/sys/libkern/murmur3_32.c
- copied unchanged from r272944, head/sys/libkern/murmur3_32.c
projects/routing/sys/modules/mrsas/mrsas_linux/
- copied from r272944, head/sys/modules/mrsas/mrsas_linux/
projects/routing/sys/netinet/sctp_syscalls.c
- copied unchanged from r272944, head/sys/netinet/sctp_syscalls.c
projects/routing/sys/netpfil/ipfw/ip_fw_iface.c
- copied unchanged from r272944, head/sys/netpfil/ipfw/ip_fw_iface.c
projects/routing/sys/netpfil/ipfw/ip_fw_table.h
- copied unchanged from r272944, head/sys/netpfil/ipfw/ip_fw_table.h
projects/routing/sys/netpfil/ipfw/ip_fw_table_algo.c
- copied unchanged from r272944, head/sys/netpfil/ipfw/ip_fw_table_algo.c
projects/routing/sys/netpfil/ipfw/ip_fw_table_value.c
- copied unchanged from r272944, head/sys/netpfil/ipfw/ip_fw_table_value.c
projects/routing/sys/sys/seq.h
- copied unchanged from r272944, head/sys/sys/seq.h
projects/routing/sys/x86/xen/xen_msi.c
- copied unchanged from r272944, head/sys/x86/xen/xen_msi.c
projects/routing/sys/x86/xen/xen_pci.c
- copied unchanged from r272944, head/sys/x86/xen/xen_pci.c
projects/routing/sys/xen/xen_msi.h
- copied unchanged from r272944, head/sys/xen/xen_msi.h
projects/routing/tools/tools/bootparttest/stub.c
- copied unchanged from r272944, head/tools/tools/bootparttest/stub.c
projects/routing/usr.bin/basename/tests/
- copied from r272944, head/usr.bin/basename/tests/
projects/routing/usr.bin/cmp/tests/
- copied from r272944, head/usr.bin/cmp/tests/
projects/routing/usr.bin/cut/tests/
- copied from r272944, head/usr.bin/cut/tests/
projects/routing/usr.bin/dirname/tests/
- copied from r272944, head/usr.bin/dirname/tests/
projects/routing/usr.bin/grep/tests/
- copied from r272944, head/usr.bin/grep/tests/
projects/routing/usr.bin/gzip/tests/
- copied from r272944, head/usr.bin/gzip/tests/
projects/routing/usr.sbin/nmtree/tests/
- copied from r272944, head/usr.sbin/nmtree/tests/
projects/routing/usr.sbin/pw/tests/
- copied from r272944, head/usr.sbin/pw/tests/
Deleted:
projects/routing/lib/libc/arm/Symbol_oabi.map
projects/routing/sys/contrib/dev/acpica/compiler/aslcompiler.y
projects/routing/sys/modules/acpi/acpi/
projects/routing/sys/pc98/pc98/machdep.c
projects/routing/sys/xen/xenstore/xenstore.c
projects/routing/sys/xen/xenstore/xenstore_dev.c
projects/routing/tools/tools/bootparttest/malloc.c
Modified:
projects/routing/Makefile.inc1
projects/routing/ObsoleteFiles.inc
projects/routing/UPDATING
projects/routing/bin/sh/eval.c
projects/routing/bin/sh/expand.c
projects/routing/bin/sh/jobs.c
projects/routing/bin/sh/parser.c
projects/routing/bin/sh/redir.c
projects/routing/bin/sh/tests/builtins/Makefile
projects/routing/bin/sh/trap.c
projects/routing/bin/sleep/Makefile
projects/routing/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
projects/routing/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
projects/routing/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c
projects/routing/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
projects/routing/cddl/lib/libdtrace/libproc_compat.h
projects/routing/cddl/lib/libzfs/Makefile
projects/routing/cddl/lib/libzpool/Makefile
projects/routing/contrib/binutils/bfd/config.bfd
projects/routing/contrib/binutils/bfd/elf32-arm.c
projects/routing/contrib/binutils/bfd/elf32-ppc.c
projects/routing/contrib/binutils/bfd/elf64-ppc.c
projects/routing/contrib/binutils/gas/config/tc-arm.c
projects/routing/contrib/binutils/gas/config/tc-ppc.c
projects/routing/contrib/binutils/include/elf/arm.h
projects/routing/contrib/binutils/ld/emulparams/elf32ppc_fbsd.sh
projects/routing/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh
projects/routing/contrib/bsnmp/snmp_target/target_snmp.c
projects/routing/contrib/byacc/CHANGES
projects/routing/contrib/byacc/MANIFEST
projects/routing/contrib/byacc/VERSION
projects/routing/contrib/byacc/aclocal.m4
projects/routing/contrib/byacc/btyaccpar.c
projects/routing/contrib/byacc/closure.c
projects/routing/contrib/byacc/config.sub
projects/routing/contrib/byacc/configure
projects/routing/contrib/byacc/configure.in
projects/routing/contrib/byacc/defs.h
projects/routing/contrib/byacc/lalr.c
projects/routing/contrib/byacc/main.c
projects/routing/contrib/byacc/output.c
projects/routing/contrib/byacc/package/byacc.spec
projects/routing/contrib/byacc/package/debian/changelog
projects/routing/contrib/byacc/package/debian/source/format
projects/routing/contrib/byacc/package/mingw-byacc.spec
projects/routing/contrib/byacc/package/pkgsrc/Makefile
projects/routing/contrib/byacc/reader.c
projects/routing/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
projects/routing/contrib/byacc/test/btyacc/btyacc_demo.tab.c
projects/routing/contrib/byacc/test/btyacc/calc.tab.c
projects/routing/contrib/byacc/test/btyacc/calc1.tab.c
projects/routing/contrib/byacc/test/btyacc/calc2.tab.c
projects/routing/contrib/byacc/test/btyacc/calc3.tab.c
projects/routing/contrib/byacc/test/btyacc/code_calc.code.c
projects/routing/contrib/byacc/test/btyacc/code_calc.tab.c
projects/routing/contrib/byacc/test/btyacc/code_error.code.c
projects/routing/contrib/byacc/test/btyacc/code_error.tab.c
projects/routing/contrib/byacc/test/btyacc/empty.tab.c
projects/routing/contrib/byacc/test/btyacc/err_inherit1.tab.c
projects/routing/contrib/byacc/test/btyacc/err_inherit2.tab.c
projects/routing/contrib/byacc/test/btyacc/err_inherit3.tab.c
projects/routing/contrib/byacc/test/btyacc/err_inherit4.tab.c
projects/routing/contrib/byacc/test/btyacc/err_inherit5.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax1.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax10.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax11.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax12.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax13.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax14.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax15.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax16.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax17.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax18.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax19.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax2.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax20.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax21.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax22.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax23.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax24.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax25.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax26.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax27.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax3.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax4.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax5.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax6.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax7.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax7a.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax7b.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax8.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax8a.tab.c
projects/routing/contrib/byacc/test/btyacc/err_syntax9.tab.c
projects/routing/contrib/byacc/test/btyacc/error.tab.c
projects/routing/contrib/byacc/test/btyacc/grammar.tab.c
projects/routing/contrib/byacc/test/btyacc/inherit0.tab.c
projects/routing/contrib/byacc/test/btyacc/inherit1.tab.c
projects/routing/contrib/byacc/test/btyacc/inherit2.tab.c
projects/routing/contrib/byacc/test/btyacc/ok_syntax1.tab.c
projects/routing/contrib/byacc/test/btyacc/pure_calc.tab.c
projects/routing/contrib/byacc/test/btyacc/pure_error.tab.c
projects/routing/contrib/byacc/test/btyacc/quote_calc-s.tab.c
projects/routing/contrib/byacc/test/btyacc/quote_calc.tab.c
projects/routing/contrib/byacc/test/btyacc/quote_calc2-s.tab.c
projects/routing/contrib/byacc/test/btyacc/quote_calc2.tab.c
projects/routing/contrib/byacc/test/btyacc/quote_calc3-s.tab.c
projects/routing/contrib/byacc/test/btyacc/quote_calc3.tab.c
projects/routing/contrib/byacc/test/btyacc/quote_calc4-s.tab.c
projects/routing/contrib/byacc/test/btyacc/quote_calc4.tab.c
projects/routing/contrib/byacc/test/btyacc/rename_debug.c
projects/routing/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
projects/routing/contrib/byacc/test/yacc/calc2.tab.c
projects/routing/contrib/byacc/test/yacc/calc3.tab.c
projects/routing/contrib/byacc/test/yacc/ok_syntax1.tab.c
projects/routing/contrib/byacc/yacc.1
projects/routing/contrib/libpcap/inet.c
projects/routing/contrib/libpcap/pcap.c
projects/routing/contrib/tcpdump/tcpdump.c
projects/routing/etc/devd/Makefile
projects/routing/etc/mtree/BSD.tests.dist
projects/routing/etc/rc.subr
projects/routing/gnu/lib/csu/Makefile
projects/routing/gnu/lib/libgcc/Makefile
projects/routing/gnu/lib/libgcov/Makefile
projects/routing/gnu/lib/libstdc++/Makefile
projects/routing/gnu/lib/libsupc++/Makefile
projects/routing/gnu/usr.bin/Makefile
projects/routing/gnu/usr.bin/cc/Makefile.inc
projects/routing/gnu/usr.bin/cc/cc_tools/Makefile
projects/routing/gnu/usr.bin/diff/Makefile
projects/routing/include/rpcsvc/nis.x
projects/routing/include/strings.h
projects/routing/lib/clang/clang.build.mk
projects/routing/lib/libc/arm/Makefile.inc
projects/routing/lib/libc/arm/aeabi/Makefile.inc
projects/routing/lib/libc/arm/gen/Makefile.inc
projects/routing/lib/libc/gen/dl_iterate_phdr.3
projects/routing/lib/libc/powerpc/gen/_ctx_start.S
projects/routing/lib/libc/powerpc/gen/_setjmp.S
projects/routing/lib/libc/powerpc/gen/eabi.S
projects/routing/lib/libc/powerpc/gen/fabs.S
projects/routing/lib/libc/powerpc/gen/setjmp.S
projects/routing/lib/libc/powerpc/gen/sigsetjmp.S
projects/routing/lib/libc/powerpc/sys/brk.S
projects/routing/lib/libc/powerpc/sys/exect.S
projects/routing/lib/libc/powerpc/sys/pipe.S
projects/routing/lib/libc/powerpc/sys/ptrace.S
projects/routing/lib/libc/powerpc/sys/sbrk.S
projects/routing/lib/libc/powerpc64/gen/_ctx_start.S
projects/routing/lib/libc/powerpc64/gen/_setjmp.S
projects/routing/lib/libc/powerpc64/gen/fabs.S
projects/routing/lib/libc/powerpc64/gen/setjmp.S
projects/routing/lib/libc/powerpc64/gen/sigsetjmp.S
projects/routing/lib/libc/powerpc64/sys/brk.S
projects/routing/lib/libc/powerpc64/sys/exect.S
projects/routing/lib/libc/powerpc64/sys/pipe.S
projects/routing/lib/libc/powerpc64/sys/ptrace.S
projects/routing/lib/libc/powerpc64/sys/sbrk.S
projects/routing/lib/libc/quad/Makefile.inc
projects/routing/lib/libc/stdtime/strptime.3
projects/routing/lib/libc/stdtime/strptime.c
projects/routing/lib/libc/string/Makefile.inc
projects/routing/lib/libc/string/Symbol.map
projects/routing/lib/libc/string/bzero.3
projects/routing/lib/libc/sys/accept.2
projects/routing/lib/libcompiler_rt/Makefile
projects/routing/lib/libcrypt/crypt.c
projects/routing/lib/libnv/nvlist.c
projects/routing/lib/libnv/nvlist_impl.h
projects/routing/lib/libnv/nvpair.c
projects/routing/lib/libnv/nvpair_impl.h
projects/routing/lib/libpam/modules/pam_login_access/pam_login_access.c
projects/routing/lib/libpcap/Makefile
projects/routing/lib/libpcap/config.h
projects/routing/lib/libproc/Makefile
projects/routing/lib/libproc/libproc.h
projects/routing/lib/libproc/proc_sym.c
projects/routing/lib/libproc/tests/proc_test.c
projects/routing/lib/librtld_db/rtld_db.c
projects/routing/lib/libstand/Makefile
projects/routing/lib/msun/ld128/e_lgammal_r.c
projects/routing/lib/msun/ld80/e_lgammal_r.c
projects/routing/lib/msun/src/e_lgamma_r.c
projects/routing/lib/msun/src/e_lgammaf_r.c
projects/routing/libexec/rtld-elf/Makefile
projects/routing/libexec/rtld-elf/rtld.c
projects/routing/release/Makefile
projects/routing/release/doc/en_US.ISO8859-1/hardware/article.xml
projects/routing/release/release.conf.sample
projects/routing/release/release.sh
projects/routing/sbin/dumpon/dumpon.8
projects/routing/sbin/ifconfig/ifconfig.8
projects/routing/sbin/ifconfig/iflagg.c
projects/routing/sbin/ipfw/Makefile
projects/routing/sbin/ipfw/ipfw.8
projects/routing/sbin/ipfw/ipfw2.c
projects/routing/sbin/ipfw/ipfw2.h
projects/routing/sbin/ipfw/main.c
projects/routing/sbin/ipfw/nat.c
projects/routing/sbin/iscontrol/iscontrol.8
projects/routing/sbin/swapon/swapon.c
projects/routing/share/man/man4/alc.4
projects/routing/share/man/man4/icmp.4
projects/routing/share/man/man4/iscsi_initiator.4
projects/routing/share/man/man4/lagg.4
projects/routing/share/man/man4/sfxge.4
projects/routing/share/man/man4/ucom.4
projects/routing/share/man/man4/udplite.4
projects/routing/share/man/man4/urndis.4
projects/routing/share/man/man4/urtwn.4
projects/routing/share/man/man5/rc.conf.5
projects/routing/share/man/man7/release.7
projects/routing/share/man/man9/sleepqueue.9
projects/routing/share/man/man9/timeout.9
projects/routing/share/mk/bsd.dep.mk
projects/routing/share/mk/bsd.endian.mk
projects/routing/share/mk/bsd.port.mk
projects/routing/share/mk/bsd.port.subdir.mk
projects/routing/share/mk/bsd.progs.mk
projects/routing/share/mk/src.opts.mk
projects/routing/share/mk/sys.mk
projects/routing/sys/amd64/amd64/machdep.c
projects/routing/sys/amd64/amd64/minidump_machdep.c
projects/routing/sys/amd64/amd64/pmap.c
projects/routing/sys/amd64/include/md_var.h
projects/routing/sys/amd64/include/pmap.h
projects/routing/sys/amd64/include/vmm.h (contents, props changed)
projects/routing/sys/amd64/vmm/intel/vmx.c
projects/routing/sys/amd64/vmm/intel/vmx_msr.c
projects/routing/sys/amd64/vmm/vmm.c
projects/routing/sys/arm/allwinner/timer.c
projects/routing/sys/arm/altera/socfpga/files.socfpga
projects/routing/sys/arm/altera/socfpga/socfpga_machdep.c
projects/routing/sys/arm/arm/dump_machdep.c
projects/routing/sys/arm/arm/minidump_machdep.c
projects/routing/sys/arm/arm/physmem.c
projects/routing/sys/arm/arm/trap.c
projects/routing/sys/arm/conf/EXYNOS5.common
projects/routing/sys/arm/conf/SOCKIT
projects/routing/sys/arm/include/md_var.h
projects/routing/sys/arm/samsung/exynos/exynos5_machdep.c
projects/routing/sys/arm/samsung/exynos/files.exynos5
projects/routing/sys/boot/arm/ixp425/boot2/Makefile
projects/routing/sys/boot/common/disk.c
projects/routing/sys/boot/common/disk.h
projects/routing/sys/boot/common/part.c
projects/routing/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
projects/routing/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts
projects/routing/sys/boot/fdt/dts/arm/exynos5420.dtsi
projects/routing/sys/boot/fdt/dts/arm/socfpga-sockit.dts
projects/routing/sys/boot/fdt/dts/arm/socfpga.dtsi
projects/routing/sys/boot/i386/gptboot/gptboot.c
projects/routing/sys/boot/libstand32/Makefile
projects/routing/sys/boot/powerpc/ofw/ldscript.powerpc
projects/routing/sys/boot/powerpc/ps3/ldscript.powerpc
projects/routing/sys/boot/powerpc/uboot/ldscript.powerpc
projects/routing/sys/cam/cam_xpt.c
projects/routing/sys/cam/ctl/ctl.c
projects/routing/sys/cam/ctl/ctl_backend.h
projects/routing/sys/cam/ctl/ctl_backend_block.c
projects/routing/sys/cam/ctl/ctl_backend_ramdisk.c
projects/routing/sys/cam/ctl/ctl_cmd_table.c
projects/routing/sys/cam/ctl/ctl_frontend_cam_sim.c
projects/routing/sys/cam/ctl/ctl_frontend_iscsi.c
projects/routing/sys/cam/ctl/ctl_frontend_iscsi.h
projects/routing/sys/cam/ctl/ctl_ioctl.h
projects/routing/sys/cam/ctl/ctl_private.h
projects/routing/sys/cam/ctl/ctl_tpc.c
projects/routing/sys/cam/ctl/scsi_ctl.c
projects/routing/sys/cam/scsi/scsi_all.h
projects/routing/sys/cam/scsi/scsi_xpt.c
projects/routing/sys/cddl/boot/zfs/lz4.c
projects/routing/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
projects/routing/sys/cddl/compat/opensolaris/sys/assfail.h
projects/routing/sys/cddl/compat/opensolaris/sys/kmem.h
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
projects/routing/sys/compat/freebsd32/freebsd32_proto.h
projects/routing/sys/compat/freebsd32/freebsd32_syscall.h
projects/routing/sys/compat/freebsd32/freebsd32_syscalls.c
projects/routing/sys/compat/freebsd32/freebsd32_sysent.c
projects/routing/sys/compat/freebsd32/syscalls.master
projects/routing/sys/conf/Makefile.arm
projects/routing/sys/conf/NOTES
projects/routing/sys/conf/files
projects/routing/sys/conf/files.amd64
projects/routing/sys/conf/files.arm
projects/routing/sys/conf/files.i386
projects/routing/sys/conf/files.pc98
projects/routing/sys/conf/kern.mk
projects/routing/sys/conf/kern.opts.mk
projects/routing/sys/conf/ldscript.powerpc
projects/routing/sys/conf/ldscript.powerpc64
projects/routing/sys/conf/newvers.sh
projects/routing/sys/conf/options
projects/routing/sys/conf/options.pc98
projects/routing/sys/contrib/dev/acpica/acpica_prep.sh
projects/routing/sys/contrib/dev/acpica/changes.txt (contents, props changed)
projects/routing/sys/contrib/dev/acpica/common/adfile.c
projects/routing/sys/contrib/dev/acpica/common/adisasm.c
projects/routing/sys/contrib/dev/acpica/common/adwalk.c
projects/routing/sys/contrib/dev/acpica/common/ahpredef.c
projects/routing/sys/contrib/dev/acpica/common/dmextern.c
projects/routing/sys/contrib/dev/acpica/common/dmrestag.c
projects/routing/sys/contrib/dev/acpica/common/dmtable.c
projects/routing/sys/contrib/dev/acpica/common/dmtbdump.c
projects/routing/sys/contrib/dev/acpica/common/dmtbinfo.c
projects/routing/sys/contrib/dev/acpica/common/getopt.c
projects/routing/sys/contrib/dev/acpica/compiler/aslanalyze.c
projects/routing/sys/contrib/dev/acpica/compiler/aslbtypes.c
projects/routing/sys/contrib/dev/acpica/compiler/aslcodegen.c
projects/routing/sys/contrib/dev/acpica/compiler/aslcompile.c
projects/routing/sys/contrib/dev/acpica/compiler/aslcompiler.h
projects/routing/sys/contrib/dev/acpica/compiler/aslcompiler.l
projects/routing/sys/contrib/dev/acpica/compiler/asldefine.h
projects/routing/sys/contrib/dev/acpica/compiler/aslerror.c
projects/routing/sys/contrib/dev/acpica/compiler/aslfileio.c
projects/routing/sys/contrib/dev/acpica/compiler/aslfiles.c
projects/routing/sys/contrib/dev/acpica/compiler/aslfold.c
projects/routing/sys/contrib/dev/acpica/compiler/aslglobal.h
projects/routing/sys/contrib/dev/acpica/compiler/aslhex.c
projects/routing/sys/contrib/dev/acpica/compiler/asllength.c
projects/routing/sys/contrib/dev/acpica/compiler/asllisting.c
projects/routing/sys/contrib/dev/acpica/compiler/asllistsup.c
projects/routing/sys/contrib/dev/acpica/compiler/aslload.c
projects/routing/sys/contrib/dev/acpica/compiler/asllookup.c
projects/routing/sys/contrib/dev/acpica/compiler/aslmain.c
projects/routing/sys/contrib/dev/acpica/compiler/aslmap.c
projects/routing/sys/contrib/dev/acpica/compiler/aslmessages.h
projects/routing/sys/contrib/dev/acpica/compiler/aslmethod.c
projects/routing/sys/contrib/dev/acpica/compiler/aslnamesp.c
projects/routing/sys/contrib/dev/acpica/compiler/asloffset.c
projects/routing/sys/contrib/dev/acpica/compiler/aslopcodes.c
projects/routing/sys/contrib/dev/acpica/compiler/asloperands.c
projects/routing/sys/contrib/dev/acpica/compiler/aslopt.c
projects/routing/sys/contrib/dev/acpica/compiler/asloptions.c
projects/routing/sys/contrib/dev/acpica/compiler/aslpredef.c
projects/routing/sys/contrib/dev/acpica/compiler/aslprepkg.c
projects/routing/sys/contrib/dev/acpica/compiler/aslresource.c
projects/routing/sys/contrib/dev/acpica/compiler/aslrestype1.c
projects/routing/sys/contrib/dev/acpica/compiler/aslrestype1i.c
projects/routing/sys/contrib/dev/acpica/compiler/aslrestype2.c
projects/routing/sys/contrib/dev/acpica/compiler/aslrestype2d.c
projects/routing/sys/contrib/dev/acpica/compiler/aslrestype2e.c
projects/routing/sys/contrib/dev/acpica/compiler/aslrestype2q.c
projects/routing/sys/contrib/dev/acpica/compiler/aslrestype2s.c
projects/routing/sys/contrib/dev/acpica/compiler/aslrestype2w.c
projects/routing/sys/contrib/dev/acpica/compiler/aslstartup.c
projects/routing/sys/contrib/dev/acpica/compiler/aslstubs.c
projects/routing/sys/contrib/dev/acpica/compiler/aslsupport.l
projects/routing/sys/contrib/dev/acpica/compiler/asltransform.c
projects/routing/sys/contrib/dev/acpica/compiler/asltree.c
projects/routing/sys/contrib/dev/acpica/compiler/asltypes.h
projects/routing/sys/contrib/dev/acpica/compiler/aslutils.c
projects/routing/sys/contrib/dev/acpica/compiler/asluuid.c
projects/routing/sys/contrib/dev/acpica/compiler/aslwalks.c
projects/routing/sys/contrib/dev/acpica/compiler/aslxref.c
projects/routing/sys/contrib/dev/acpica/compiler/dtcompile.c
projects/routing/sys/contrib/dev/acpica/compiler/dtcompiler.h
projects/routing/sys/contrib/dev/acpica/compiler/dtexpress.c
projects/routing/sys/contrib/dev/acpica/compiler/dtfield.c
projects/routing/sys/contrib/dev/acpica/compiler/dtio.c
projects/routing/sys/contrib/dev/acpica/compiler/dtparser.l
projects/routing/sys/contrib/dev/acpica/compiler/dtparser.y
projects/routing/sys/contrib/dev/acpica/compiler/dtsubtable.c
projects/routing/sys/contrib/dev/acpica/compiler/dttable.c
projects/routing/sys/contrib/dev/acpica/compiler/dttemplate.c
projects/routing/sys/contrib/dev/acpica/compiler/dttemplate.h
projects/routing/sys/contrib/dev/acpica/compiler/dtutils.c
projects/routing/sys/contrib/dev/acpica/compiler/preprocess.h
projects/routing/sys/contrib/dev/acpica/compiler/prexpress.c
projects/routing/sys/contrib/dev/acpica/compiler/prmacros.c
projects/routing/sys/contrib/dev/acpica/compiler/prparser.l
projects/routing/sys/contrib/dev/acpica/compiler/prparser.y
projects/routing/sys/contrib/dev/acpica/compiler/prscan.c
projects/routing/sys/contrib/dev/acpica/compiler/prutils.c
projects/routing/sys/contrib/dev/acpica/components/debugger/dbcmds.c
projects/routing/sys/contrib/dev/acpica/components/debugger/dbconvert.c
projects/routing/sys/contrib/dev/acpica/components/debugger/dbdisply.c
projects/routing/sys/contrib/dev/acpica/components/debugger/dbexec.c
projects/routing/sys/contrib/dev/acpica/components/debugger/dbfileio.c
projects/routing/sys/contrib/dev/acpica/components/debugger/dbhistry.c
projects/routing/sys/contrib/dev/acpica/components/debugger/dbinput.c
projects/routing/sys/contrib/dev/acpica/components/debugger/dbmethod.c
projects/routing/sys/contrib/dev/acpica/components/debugger/dbnames.c
projects/routing/sys/contrib/dev/acpica/components/debugger/dbstats.c
projects/routing/sys/contrib/dev/acpica/components/debugger/dbutils.c
projects/routing/sys/contrib/dev/acpica/components/debugger/dbxface.c
projects/routing/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
projects/routing/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
projects/routing/sys/contrib/dev/acpica/components/disassembler/dmnames.c
projects/routing/sys/contrib/dev/acpica/components/disassembler/dmobject.c
projects/routing/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
projects/routing/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
projects/routing/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
projects/routing/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
projects/routing/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c
projects/routing/sys/contrib/dev/acpica/components/disassembler/dmutils.c
projects/routing/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
projects/routing/sys/contrib/dev/acpica/components/dispatcher/dsargs.c
projects/routing/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
projects/routing/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
projects/routing/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
projects/routing/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
projects/routing/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
projects/routing/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
projects/routing/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
projects/routing/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
projects/routing/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
projects/routing/sys/contrib/dev/acpica/components/dispatcher/dswload.c
projects/routing/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
projects/routing/sys/contrib/dev/acpica/components/dispatcher/dswscope.c
projects/routing/sys/contrib/dev/acpica/components/dispatcher/dswstate.c
projects/routing/sys/contrib/dev/acpica/components/events/evevent.c
projects/routing/sys/contrib/dev/acpica/components/events/evglock.c
projects/routing/sys/contrib/dev/acpica/components/events/evgpe.c
projects/routing/sys/contrib/dev/acpica/components/events/evgpeblk.c
projects/routing/sys/contrib/dev/acpica/components/events/evgpeinit.c
projects/routing/sys/contrib/dev/acpica/components/events/evgpeutil.c
projects/routing/sys/contrib/dev/acpica/components/events/evhandler.c
projects/routing/sys/contrib/dev/acpica/components/events/evmisc.c
projects/routing/sys/contrib/dev/acpica/components/events/evregion.c
projects/routing/sys/contrib/dev/acpica/components/events/evrgnini.c
projects/routing/sys/contrib/dev/acpica/components/events/evsci.c
projects/routing/sys/contrib/dev/acpica/components/events/evxface.c
projects/routing/sys/contrib/dev/acpica/components/events/evxfevnt.c
projects/routing/sys/contrib/dev/acpica/components/events/evxfgpe.c
projects/routing/sys/contrib/dev/acpica/components/events/evxfregn.c
projects/routing/sys/contrib/dev/acpica/components/executer/exconfig.c
projects/routing/sys/contrib/dev/acpica/components/executer/exconvrt.c
projects/routing/sys/contrib/dev/acpica/components/executer/excreate.c
projects/routing/sys/contrib/dev/acpica/components/executer/exdebug.c
projects/routing/sys/contrib/dev/acpica/components/executer/exdump.c
projects/routing/sys/contrib/dev/acpica/components/executer/exfield.c
projects/routing/sys/contrib/dev/acpica/components/executer/exfldio.c
projects/routing/sys/contrib/dev/acpica/components/executer/exmisc.c
projects/routing/sys/contrib/dev/acpica/components/executer/exmutex.c
projects/routing/sys/contrib/dev/acpica/components/executer/exnames.c
projects/routing/sys/contrib/dev/acpica/components/executer/exoparg1.c
projects/routing/sys/contrib/dev/acpica/components/executer/exoparg2.c
projects/routing/sys/contrib/dev/acpica/components/executer/exoparg3.c
projects/routing/sys/contrib/dev/acpica/components/executer/exoparg6.c
projects/routing/sys/contrib/dev/acpica/components/executer/exprep.c
projects/routing/sys/contrib/dev/acpica/components/executer/exregion.c
projects/routing/sys/contrib/dev/acpica/components/executer/exresnte.c
projects/routing/sys/contrib/dev/acpica/components/executer/exresolv.c
projects/routing/sys/contrib/dev/acpica/components/executer/exresop.c
projects/routing/sys/contrib/dev/acpica/components/executer/exstore.c
projects/routing/sys/contrib/dev/acpica/components/executer/exstoren.c
projects/routing/sys/contrib/dev/acpica/components/executer/exstorob.c
projects/routing/sys/contrib/dev/acpica/components/executer/exsystem.c
projects/routing/sys/contrib/dev/acpica/components/executer/exutils.c
projects/routing/sys/contrib/dev/acpica/components/hardware/hwacpi.c
projects/routing/sys/contrib/dev/acpica/components/hardware/hwesleep.c
projects/routing/sys/contrib/dev/acpica/components/hardware/hwgpe.c
projects/routing/sys/contrib/dev/acpica/components/hardware/hwpci.c
projects/routing/sys/contrib/dev/acpica/components/hardware/hwregs.c
projects/routing/sys/contrib/dev/acpica/components/hardware/hwsleep.c
projects/routing/sys/contrib/dev/acpica/components/hardware/hwtimer.c
projects/routing/sys/contrib/dev/acpica/components/hardware/hwvalid.c
projects/routing/sys/contrib/dev/acpica/components/hardware/hwxface.c
projects/routing/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsaccess.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsalloc.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsarguments.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsconvert.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsdump.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nseval.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsinit.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsload.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsnames.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsobject.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsparse.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nspredef.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsrepair.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nssearch.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsutils.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nswalk.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsxfname.c
projects/routing/sys/contrib/dev/acpica/components/namespace/nsxfobj.c
projects/routing/sys/contrib/dev/acpica/components/parser/psargs.c
projects/routing/sys/contrib/dev/acpica/components/parser/psloop.c
projects/routing/sys/contrib/dev/acpica/components/parser/psobject.c
projects/routing/sys/contrib/dev/acpica/components/parser/psopcode.c
projects/routing/sys/contrib/dev/acpica/components/parser/psopinfo.c
projects/routing/sys/contrib/dev/acpica/components/parser/psparse.c
projects/routing/sys/contrib/dev/acpica/components/parser/psscope.c
projects/routing/sys/contrib/dev/acpica/components/parser/pstree.c
projects/routing/sys/contrib/dev/acpica/components/parser/psutils.c
projects/routing/sys/contrib/dev/acpica/components/parser/pswalk.c
projects/routing/sys/contrib/dev/acpica/components/parser/psxface.c
projects/routing/sys/contrib/dev/acpica/components/resources/rsaddr.c
projects/routing/sys/contrib/dev/acpica/components/resources/rscalc.c
projects/routing/sys/contrib/dev/acpica/components/resources/rscreate.c
projects/routing/sys/contrib/dev/acpica/components/resources/rsdump.c
projects/routing/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
projects/routing/sys/contrib/dev/acpica/components/resources/rsinfo.c
projects/routing/sys/contrib/dev/acpica/components/resources/rsio.c
projects/routing/sys/contrib/dev/acpica/components/resources/rsirq.c
projects/routing/sys/contrib/dev/acpica/components/resources/rslist.c
projects/routing/sys/contrib/dev/acpica/components/resources/rsmemory.c
projects/routing/sys/contrib/dev/acpica/components/resources/rsmisc.c
projects/routing/sys/contrib/dev/acpica/components/resources/rsserial.c
projects/routing/sys/contrib/dev/acpica/components/resources/rsutils.c
projects/routing/sys/contrib/dev/acpica/components/resources/rsxface.c
projects/routing/sys/contrib/dev/acpica/components/tables/tbfadt.c
projects/routing/sys/contrib/dev/acpica/components/tables/tbfind.c
projects/routing/sys/contrib/dev/acpica/components/tables/tbinstal.c
projects/routing/sys/contrib/dev/acpica/components/tables/tbprint.c
projects/routing/sys/contrib/dev/acpica/components/tables/tbutils.c
projects/routing/sys/contrib/dev/acpica/components/tables/tbxface.c
projects/routing/sys/contrib/dev/acpica/components/tables/tbxfload.c
projects/routing/sys/contrib/dev/acpica/components/tables/tbxfroot.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utaddress.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utalloc.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utbuffer.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utcache.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utcopy.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utdebug.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utdecode.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utdelete.c
projects/routing/sys/contrib/dev/acpica/components/utilities/uterror.c
projects/routing/sys/contrib/dev/acpica/components/utilities/uteval.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utexcep.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utglobal.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utids.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utinit.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utlock.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utmath.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utmisc.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utmutex.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utobject.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utosi.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utownerid.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utpredef.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utresrc.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utstate.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utstring.c
projects/routing/sys/contrib/dev/acpica/components/utilities/uttrack.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utxface.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utxferror.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utxfinit.c
projects/routing/sys/contrib/dev/acpica/components/utilities/utxfmutex.c
projects/routing/sys/contrib/dev/acpica/include/acapps.h
projects/routing/sys/contrib/dev/acpica/include/acbuffer.h
projects/routing/sys/contrib/dev/acpica/include/accommon.h
projects/routing/sys/contrib/dev/acpica/include/acconfig.h
projects/routing/sys/contrib/dev/acpica/include/acdebug.h
projects/routing/sys/contrib/dev/acpica/include/acdisasm.h
projects/routing/sys/contrib/dev/acpica/include/acdispat.h
projects/routing/sys/contrib/dev/acpica/include/acevents.h
projects/routing/sys/contrib/dev/acpica/include/acexcep.h
projects/routing/sys/contrib/dev/acpica/include/acglobal.h
projects/routing/sys/contrib/dev/acpica/include/achware.h
projects/routing/sys/contrib/dev/acpica/include/acinterp.h
projects/routing/sys/contrib/dev/acpica/include/aclocal.h
projects/routing/sys/contrib/dev/acpica/include/acmacros.h
projects/routing/sys/contrib/dev/acpica/include/acnames.h
projects/routing/sys/contrib/dev/acpica/include/acnamesp.h
projects/routing/sys/contrib/dev/acpica/include/acobject.h
projects/routing/sys/contrib/dev/acpica/include/acopcode.h
projects/routing/sys/contrib/dev/acpica/include/acoutput.h
projects/routing/sys/contrib/dev/acpica/include/acparser.h
projects/routing/sys/contrib/dev/acpica/include/acpi.h
projects/routing/sys/contrib/dev/acpica/include/acpiosxf.h
projects/routing/sys/contrib/dev/acpica/include/acpixf.h
projects/routing/sys/contrib/dev/acpica/include/acpredef.h
projects/routing/sys/contrib/dev/acpica/include/acresrc.h
projects/routing/sys/contrib/dev/acpica/include/acrestyp.h
projects/routing/sys/contrib/dev/acpica/include/acstruct.h
projects/routing/sys/contrib/dev/acpica/include/actables.h
projects/routing/sys/contrib/dev/acpica/include/actbl.h
projects/routing/sys/contrib/dev/acpica/include/actbl1.h
projects/routing/sys/contrib/dev/acpica/include/actbl2.h
projects/routing/sys/contrib/dev/acpica/include/actbl3.h
projects/routing/sys/contrib/dev/acpica/include/actypes.h
projects/routing/sys/contrib/dev/acpica/include/acutils.h
projects/routing/sys/contrib/dev/acpica/include/amlcode.h
projects/routing/sys/contrib/dev/acpica/include/amlresrc.h
projects/routing/sys/contrib/dev/acpica/include/platform/acenv.h
projects/routing/sys/contrib/dev/acpica/include/platform/acfreebsd.h
projects/routing/sys/contrib/dev/acpica/include/platform/acgcc.h
projects/routing/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
projects/routing/sys/contrib/ipfilter/netinet/fil.c
projects/routing/sys/contrib/ipfilter/netinet/ip_dns_pxy.c
projects/routing/sys/contrib/ipfilter/netinet/ip_dstlist.c
projects/routing/sys/contrib/ipfilter/netinet/ip_nat.c
projects/routing/sys/dev/acpica/Osd/OsdSchedule.c
projects/routing/sys/dev/acpica/Osd/OsdTable.c
projects/routing/sys/dev/acpica/acpi.c
projects/routing/sys/dev/acpica/acpi_pci.c
projects/routing/sys/dev/acpica/acpivar.h
projects/routing/sys/dev/ahci/ahci.c
projects/routing/sys/dev/alc/if_alc.c
projects/routing/sys/dev/alc/if_alcreg.h
projects/routing/sys/dev/alc/if_alcvar.h
projects/routing/sys/dev/ale/if_ale.c
projects/routing/sys/dev/ale/if_alereg.h
projects/routing/sys/dev/ctau/if_ct.c
projects/routing/sys/dev/cx/if_cx.c
projects/routing/sys/dev/cxgbe/common/t4_msg.h
projects/routing/sys/dev/cxgbe/tom/t4_connect.c
projects/routing/sys/dev/cxgbe/tom/t4_tom.c
projects/routing/sys/dev/cxgbe/tom/t4_tom.h
projects/routing/sys/dev/cxgbe/tom/t4_tom_l2t.c
projects/routing/sys/dev/digi/digi_isa.c
projects/routing/sys/dev/drm2/i915/intel_ringbuffer.c
projects/routing/sys/dev/e1000/if_igb.c
projects/routing/sys/dev/hwpmc/hwpmc_core.c
projects/routing/sys/dev/iscsi/icl.c
projects/routing/sys/dev/iscsi/icl.h
projects/routing/sys/dev/iscsi/iscsi.c
projects/routing/sys/dev/iscsi_initiator/isc_cam.c
projects/routing/sys/dev/isp/isp_library.c
projects/routing/sys/dev/mc146818/mc146818.c
projects/routing/sys/dev/mmc/mmc.c
projects/routing/sys/dev/mpr/mpr_sas.c
projects/routing/sys/dev/mpr/mpr_table.c
projects/routing/sys/dev/mrsas/mrsas.c
projects/routing/sys/dev/mrsas/mrsas.h
projects/routing/sys/dev/mrsas/mrsas_cam.c
projects/routing/sys/dev/mrsas/mrsas_fp.c
projects/routing/sys/dev/mrsas/mrsas_ioctl.c
projects/routing/sys/dev/mrsas/mrsas_ioctl.h
projects/routing/sys/dev/pci/pci.c
projects/routing/sys/dev/sfxge/common/efsys.h
projects/routing/sys/dev/sfxge/sfxge.c
projects/routing/sys/dev/sfxge/sfxge.h
projects/routing/sys/dev/sfxge/sfxge_dma.c
projects/routing/sys/dev/sfxge/sfxge_ev.c
projects/routing/sys/dev/sfxge/sfxge_intr.c
projects/routing/sys/dev/sfxge/sfxge_port.c
projects/routing/sys/dev/sfxge/sfxge_rx.c
projects/routing/sys/dev/sfxge/sfxge_rx.h
projects/routing/sys/dev/sfxge/sfxge_tx.c
projects/routing/sys/dev/sfxge/sfxge_tx.h
projects/routing/sys/dev/uart/uart.h
projects/routing/sys/dev/uart/uart_bus_fdt.c
projects/routing/sys/dev/uart/uart_dev_imx.c
projects/routing/sys/dev/usb/controller/xhci.c
projects/routing/sys/dev/usb/controller/xhci.h
projects/routing/sys/dev/usb/usb_dev.c
projects/routing/sys/dev/usb/usb_freebsd.h
projects/routing/sys/dev/usb/usb_freebsd_loader.h
projects/routing/sys/dev/usb/usb_hub.c
projects/routing/sys/dev/usb/usbdevs
projects/routing/sys/dev/usb/wlan/if_urtwn.c
projects/routing/sys/dev/vt/vt.h
projects/routing/sys/dev/vt/vt_core.c
projects/routing/sys/dev/xen/balloon/balloon.c
projects/routing/sys/dev/xen/blkback/blkback.c
projects/routing/sys/fs/autofs/autofs.c
projects/routing/sys/fs/autofs/autofs.h
projects/routing/sys/fs/autofs/autofs_vfsops.c
projects/routing/sys/fs/autofs/autofs_vnops.c
projects/routing/sys/fs/devfs/devfs_vnops.c
projects/routing/sys/fs/nfs/nfs_commonsubs.c
projects/routing/sys/fs/nfs/nfs_var.h
projects/routing/sys/fs/nfs/nfsproto.h
projects/routing/sys/fs/nfsserver/nfs_nfsdport.c
projects/routing/sys/fs/nfsserver/nfs_nfsdserv.c
projects/routing/sys/fs/nfsserver/nfs_nfsdstate.c
projects/routing/sys/geom/geom_dev.c
projects/routing/sys/i386/i386/machdep.c
projects/routing/sys/i386/i386/minidump_machdep.c
projects/routing/sys/i386/i386/pmap.c
projects/routing/sys/i386/i386/vm_machdep.c
projects/routing/sys/i386/include/md_var.h
projects/routing/sys/i386/include/pmap.h
projects/routing/sys/i386/xen/pmap.c
projects/routing/sys/kern/bus_if.m
projects/routing/sys/kern/imgact_elf.c
projects/routing/sys/kern/init_sysent.c
projects/routing/sys/kern/kern_descrip.c
projects/routing/sys/kern/kern_event.c
projects/routing/sys/kern/kern_exit.c
projects/routing/sys/kern/kern_intr.c
projects/routing/sys/kern/kern_mbuf.c
projects/routing/sys/kern/kern_proc.c
projects/routing/sys/kern/kern_prot.c
projects/routing/sys/kern/kern_racct.c
projects/routing/sys/kern/kern_sig.c
projects/routing/sys/kern/kern_timeout.c
projects/routing/sys/kern/subr_bus.c
projects/routing/sys/kern/subr_witness.c
projects/routing/sys/kern/sys_process.c
projects/routing/sys/kern/syscalls.c
projects/routing/sys/kern/syscalls.master
projects/routing/sys/kern/tty.c
projects/routing/sys/kern/uipc_syscalls.c
projects/routing/sys/kern/vfs_bio.c
projects/routing/sys/kern/vfs_subr.c
projects/routing/sys/kern/vfs_vnops.c
projects/routing/sys/mips/include/md_var.h
projects/routing/sys/mips/mips/dump_machdep.c
projects/routing/sys/mips/mips/minidump_machdep.c
projects/routing/sys/modules/Makefile
projects/routing/sys/modules/ipfw/Makefile
projects/routing/sys/modules/mrsas/Makefile
projects/routing/sys/modules/ncr/Makefile
projects/routing/sys/modules/zfs/Makefile
projects/routing/sys/net/ieee8023ad_lacp.c
projects/routing/sys/net/ieee8023ad_lacp.h
projects/routing/sys/net/if_bridge.c
projects/routing/sys/net/if_disc.c
projects/routing/sys/net/if_edsc.c
projects/routing/sys/net/if_enc.c
projects/routing/sys/net/if_epair.c
projects/routing/sys/net/if_gif.c
projects/routing/sys/net/if_lagg.c
projects/routing/sys/net/if_lagg.h
projects/routing/sys/net/if_vlan.c
projects/routing/sys/net/radix.c
projects/routing/sys/netgraph/ng_ipfw.c
projects/routing/sys/netinet/in_mcast.c
projects/routing/sys/netinet/in_rmx.c
projects/routing/sys/netinet/ip6.h
projects/routing/sys/netinet/ip_divert.c
projects/routing/sys/netinet/ip_fw.h
projects/routing/sys/netinet/ip_gre.c
projects/routing/sys/netinet/ip_icmp.c
projects/routing/sys/netinet/ip_output.c
projects/routing/sys/netinet/sctp_input.c
projects/routing/sys/netinet/sctp_output.c
projects/routing/sys/netinet/sctp_output.h
projects/routing/sys/netinet/sctp_usrreq.c
projects/routing/sys/netinet/sctputil.c
projects/routing/sys/netinet/tcp_output.c
projects/routing/sys/netinet/tcp_timer.c
projects/routing/sys/netinet/tcp_var.h
projects/routing/sys/netinet/udp_usrreq.c
projects/routing/sys/netinet/udp_var.h
projects/routing/sys/netinet6/in6.h
projects/routing/sys/netinet6/in6_cksum.c
projects/routing/sys/netinet6/in6_rmx.c
projects/routing/sys/netinet6/ip6_output.c
projects/routing/sys/netinet6/udp6_usrreq.c
projects/routing/sys/netipsec/ipsec_input.c
projects/routing/sys/netpfil/ipfw/ip_dummynet.c
projects/routing/sys/netpfil/ipfw/ip_fw2.c
projects/routing/sys/netpfil/ipfw/ip_fw_dynamic.c
projects/routing/sys/netpfil/ipfw/ip_fw_log.c
projects/routing/sys/netpfil/ipfw/ip_fw_nat.c
projects/routing/sys/netpfil/ipfw/ip_fw_private.h
projects/routing/sys/netpfil/ipfw/ip_fw_sockopt.c
projects/routing/sys/netpfil/ipfw/ip_fw_table.c
projects/routing/sys/netpfil/pf/pf.c
projects/routing/sys/netpfil/pf/pf_table.c
projects/routing/sys/ofed/drivers/net/mlx4/mlx4.h
projects/routing/sys/ofed/include/linux/mlx4/device.h
projects/routing/sys/sparc64/sparc64/support.S
projects/routing/sys/sys/bus.h
projects/routing/sys/sys/cdefs.h
projects/routing/sys/sys/event.h
projects/routing/sys/sys/filedesc.h
projects/routing/sys/sys/hash.h
projects/routing/sys/sys/mbuf.h
projects/routing/sys/sys/param.h
projects/routing/sys/sys/racct.h
projects/routing/sys/sys/socketvar.h
projects/routing/sys/sys/syscall.h
projects/routing/sys/sys/syscall.mk
projects/routing/sys/sys/sysproto.h
projects/routing/sys/sys/systm.h
projects/routing/sys/sys/ucred.h
projects/routing/sys/sys/vnode.h
projects/routing/sys/ufs/ufs/dir.h
projects/routing/sys/vm/uma_core.c
projects/routing/sys/vm/vm_fault.c
projects/routing/sys/vm/vm_glue.c
projects/routing/sys/vm/vm_pageout.c
projects/routing/sys/x86/acpica/srat.c
projects/routing/sys/x86/include/init.h
projects/routing/sys/x86/include/specialreg.h
projects/routing/sys/x86/x86/dump_machdep.c
projects/routing/sys/x86/x86/local_apic.c
projects/routing/sys/x86/xen/pv.c
projects/routing/sys/x86/xen/xen_intr.c
projects/routing/sys/x86/xen/xen_nexus.c
projects/routing/sys/xen/interface/physdev.h
projects/routing/sys/xen/xen_intr.h
projects/routing/sys/xen/xenstore/xenstore_internal.h
projects/routing/tools/build/mk/OptionalObsoleteFiles.inc
projects/routing/tools/sched/schedgraph.py
projects/routing/tools/tools/ath/athalq/ar9300_ds.c
projects/routing/tools/tools/bootparttest/Makefile
projects/routing/tools/tools/bootparttest/bootparttest.c
projects/routing/usr.bin/basename/Makefile
projects/routing/usr.bin/cmp/Makefile
projects/routing/usr.bin/cut/Makefile
projects/routing/usr.bin/dirname/Makefile
projects/routing/usr.bin/find/function.c
projects/routing/usr.bin/grep/Makefile
projects/routing/usr.bin/gzip/Makefile
projects/routing/usr.bin/mkimg/Makefile
projects/routing/usr.bin/mkimg/ebr.c
projects/routing/usr.bin/mkimg/image.c
projects/routing/usr.bin/mkimg/mbr.c
projects/routing/usr.bin/mkimg/mkimg.c
projects/routing/usr.bin/mkimg/mkimg.h
projects/routing/usr.bin/mkimg/pc98.c
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-ebr.qcow2.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-ebr.raw.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-ebr.vmdk.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-mbr.qcow2.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-mbr.raw.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-mbr.vmdk.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow2.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-pc98.raw.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-4096-pc98.vmdk.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-ebr.qcow2.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-ebr.raw.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-ebr.vmdk.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-mbr.qcow2.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-mbr.raw.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-mbr.vmdk.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow2.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-pc98.raw.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
projects/routing/usr.bin/mkimg/tests/img-63x255-512-pc98.vmdk.gz.uu
projects/routing/usr.bin/mkimg/vhd.c
projects/routing/usr.bin/sort/sort.c
projects/routing/usr.bin/w/w.c
projects/routing/usr.sbin/acpi/acpiconf/Makefile
projects/routing/usr.sbin/acpi/acpidb/Makefile
projects/routing/usr.sbin/acpi/acpidb/acpidb.c
projects/routing/usr.sbin/acpi/acpidump/Makefile
projects/routing/usr.sbin/acpi/acpidump/acpi.c
projects/routing/usr.sbin/acpi/iasl/Makefile
projects/routing/usr.sbin/autofs/common.c
projects/routing/usr.sbin/bhyve/acpi.c
projects/routing/usr.sbin/bhyve/pci_virtio_block.c
projects/routing/usr.sbin/bhyve/xmsr.c
projects/routing/usr.sbin/bsdinstall/distextract/distextract.c
projects/routing/usr.sbin/bsdinstall/distfetch/distfetch.c
projects/routing/usr.sbin/ctladm/ctladm.8
projects/routing/usr.sbin/ctladm/ctladm.c
projects/routing/usr.sbin/ctld/kernel.c
projects/routing/usr.sbin/newsyslog/newsyslog.c
projects/routing/usr.sbin/nmtree/Makefile
projects/routing/usr.sbin/nscd/query.c
projects/routing/usr.sbin/pw/Makefile
projects/routing/usr.sbin/pw/pw_user.c
Directory Properties:
projects/routing/ (props changed)
projects/routing/cddl/ (props changed)
projects/routing/cddl/contrib/opensolaris/ (props changed)
projects/routing/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/routing/contrib/binutils/ (props changed)
projects/routing/contrib/byacc/ (props changed)
projects/routing/contrib/libpcap/ (props changed)
projects/routing/contrib/tcpdump/ (props changed)
projects/routing/etc/ (props changed)
projects/routing/gnu/lib/ (props changed)
projects/routing/gnu/usr.bin/cc/cc_tools/ (props changed)
projects/routing/include/ (props changed)
projects/routing/lib/libc/ (props changed)
projects/routing/lib/libc/stdtime/ (props changed)
projects/routing/sbin/ (props changed)
projects/routing/sbin/dumpon/ (props changed)
projects/routing/sbin/ipfw/ (props changed)
projects/routing/share/ (props changed)
projects/routing/share/man/man4/ (props changed)
projects/routing/sys/ (props changed)
projects/routing/sys/amd64/vmm/ (props changed)
projects/routing/sys/boot/ (props changed)
projects/routing/sys/boot/powerpc/ofw/ (props changed)
projects/routing/sys/cddl/contrib/opensolaris/ (props changed)
projects/routing/sys/conf/ (props changed)
projects/routing/sys/contrib/dev/acpica/ (props changed)
projects/routing/sys/contrib/dev/acpica/common/ (props changed)
projects/routing/sys/contrib/dev/acpica/compiler/ (props changed)
projects/routing/sys/contrib/dev/acpica/components/debugger/ (props changed)
projects/routing/sys/contrib/dev/acpica/components/disassembler/ (props changed)
projects/routing/sys/contrib/dev/acpica/components/dispatcher/ (props changed)
projects/routing/sys/contrib/dev/acpica/components/events/ (props changed)
projects/routing/sys/contrib/dev/acpica/components/executer/ (props changed)
projects/routing/sys/contrib/dev/acpica/components/hardware/ (props changed)
projects/routing/sys/contrib/dev/acpica/components/namespace/ (props changed)
projects/routing/sys/contrib/dev/acpica/components/parser/ (props changed)
projects/routing/sys/contrib/dev/acpica/components/resources/ (props changed)
projects/routing/sys/contrib/dev/acpica/components/tables/ (props changed)
projects/routing/sys/contrib/dev/acpica/components/utilities/ (props changed)
projects/routing/sys/contrib/dev/acpica/include/ (props changed)
projects/routing/sys/contrib/dev/acpica/os_specific/ (props changed)
projects/routing/sys/contrib/ipfilter/ (props changed)
projects/routing/usr.bin/mkimg/ (props changed)
projects/routing/usr.sbin/bhyve/ (props changed)
Modified: projects/routing/Makefile.inc1
==============================================================================
--- projects/routing/Makefile.inc1 Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/Makefile.inc1 Sat Oct 11 17:16:18 2014 (r272945)
@@ -299,6 +299,10 @@ HMAKE+= PATH=${TMPPATH} METALOG=${METAL
WMAKEENV+= MK_CTF=no
.endif
+.if defined(CROSS_TOOLCHAIN)
+LOCALBASE?= /usr/local
+.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
+.endif
.if defined(CROSS_TOOLCHAIN_PREFIX)
CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
@@ -311,7 +315,7 @@ X${COMPILER}?= ${CROSS_COMPILER_PREFIX}$
X${COMPILER}?= ${${COMPILER}}
.endif
.endfor
-XBINUTILS= AS AR LD NM OBJDUMP RANLIB STRINGS
+XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS
.for BINUTIL in ${XBINUTILS}
.if defined(CROSS_BINUTILS_PREFIX)
X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
@@ -322,7 +326,9 @@ X${BINUTIL}?= ${${BINUTIL}}
WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \
CPP="${XCPP} ${XFLAGS}" \
AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
- OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
+ OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \
+ RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \
+ SIZE="${XSIZE}"
.if ${XCC:M/*}
XFLAGS= --sysroot=${WORLDTMP}
@@ -336,17 +342,21 @@ XFLAGS+= -B${CROSS_BINUTILS_PREFIX}
.else
XFLAGS+= -B${WORLDTMP}/usr/bin
.endif
-.if ${TARGET} == "arm" && ${MK_ARM_EABI} != "no"
-.if ${TARGET_ARCH:M*eb*} == ""
-TARGET_ABI= gnueabi
-.elif ${TARGET_ARCH} == "armv6hf"
+.if ${TARGET} == "arm"
+.if ${TARGET_ARCH:M*hf*} != ""
TARGET_ABI= gnueabihf
+.else
+TARGET_ABI= gnueabi
.endif
.endif
+.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
+XFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib
+.else
TARGET_ABI?= unknown
TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
XFLAGS+= -target ${TARGET_TRIPLE}
.endif
+.endif
WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
@@ -1531,9 +1541,12 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \
lib/libradius lib/libsbuf lib/libtacplus \
+ lib/libgeom \
${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
+ ${_cddl_lib_libuutil} \
${_cddl_lib_libavl} \
${_cddl_lib_libzfs_core} \
+ ${_cddl_lib_libctf} \
lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_lib_libldns} \
${_secure_lib_libssh} ${_secure_lib_libssl}
@@ -1543,6 +1556,8 @@ gnu/lib/libstdc++__L: lib/msun__L
gnu/lib/libsupc++__L: gnu/lib/libstdc++__L
.endif
+lib/libgeom__L: lib/libexpat__L
+
.if defined(WITH_ATF) || ${MK_TESTS} != "no"
.if !defined(WITH_ATF)
# Ensure that the ATF libraries will be built during make libraries, even
@@ -1580,9 +1595,13 @@ lib/libopie__L lib/libtacplus__L: lib/li
_cddl_lib_libumem= cddl/lib/libumem
_cddl_lib_libnvpair= cddl/lib/libnvpair
_cddl_lib_libavl= cddl/lib/libavl
+_cddl_lib_libuutil= cddl/lib/libuutil
_cddl_lib_libzfs_core= cddl/lib/libzfs_core
+_cddl_lib_libctf= cddl/lib/libctf
_cddl_lib= cddl/lib
cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
+cddl/lib/libzfs__L: lib/libgeom__L
+cddl/lib/libctf__L: lib/libz__L
.endif
.if ${MK_CRYPT} != "no"
Modified: projects/routing/ObsoleteFiles.inc
==============================================================================
--- projects/routing/ObsoleteFiles.inc Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/ObsoleteFiles.inc Sat Oct 11 17:16:18 2014 (r272945)
@@ -43,6 +43,9 @@ OLD_FILES+=usr/share/man/man9/sleepq_cal
OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz
# 20140917: hv_kvpd rc.d script removed in favor of devd configuration
OLD_FILES+=etc/rc.d/hv_kvpd
+# 20140917: libnv was accidentally being installed to /usr/lib instead of /lib
+OLD_LIBS+=usr/lib/libnv.a
+OLD_LIBS+=usr/lib/libnv.so.0
# 20140814: libopie version bump
OLD_LIBS+=usr/lib/libopie.so.7
OLD_LIBS+=usr/lib32/libopie.so.7
@@ -1493,6 +1496,7 @@ OLD_LIBS+=usr/lib/libpanel.so.4
OLD_LIBS+=usr/lib/libpanelw.so.4
OLD_LIBS+=usr/lib/libpmc.so.4
OLD_LIBS+=usr/lib/libproc.so.1
+OLD_LIBS+=usr/lib/libproc.so.2
OLD_LIBS+=usr/lib/libradius.so.3
OLD_LIBS+=usr/lib/librpcsvc.so.4
OLD_LIBS+=usr/lib/libsdp.so.3
Modified: projects/routing/UPDATING
==============================================================================
--- projects/routing/UPDATING Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/UPDATING Sat Oct 11 17:16:18 2014 (r272945)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20141009:
+ gperf has been removed from the base system for architectures
+ that use clang. Ports that require gperf will obtain it from the
+ devel/gperf port.
+
20140923:
pjdfstest has been moved from tools/regression/pjdfstest to
contrib/pjdfstest .
Modified: projects/routing/bin/sh/eval.c
==============================================================================
--- projects/routing/bin/sh/eval.c Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/bin/sh/eval.c Sat Oct 11 17:16:18 2014 (r272945)
@@ -316,9 +316,10 @@ evalloop(union node *n, int flags)
loopnest++;
status = 0;
for (;;) {
- evaltree(n->nbinary.ch1, EV_TESTED);
+ if (!evalskip)
+ evaltree(n->nbinary.ch1, EV_TESTED);
if (evalskip) {
-skipping: if (evalskip == SKIPCONT && --skipcount <= 0) {
+ if (evalskip == SKIPCONT && --skipcount <= 0) {
evalskip = 0;
continue;
}
@@ -337,8 +338,6 @@ skipping: if (evalskip == SKIPCONT &&
}
evaltree(n->nbinary.ch2, flags);
status = exitstatus;
- if (evalskip)
- goto skipping;
}
loopnest--;
exitstatus = status;
@@ -648,15 +647,15 @@ evalbackcmd(union node *n, struct backcm
struct jmploc *savehandler;
struct localvar *savelocalvars;
- setstackmark(&smark);
result->fd = -1;
result->buf = NULL;
result->nleft = 0;
result->jp = NULL;
if (n == NULL) {
exitstatus = 0;
- goto out;
+ return;
}
+ setstackmark(&smark);
exitstatus = oexitstatus;
if (is_valid_fast_cmdsubst(n)) {
savelocalvars = localvars;
@@ -698,7 +697,6 @@ evalbackcmd(union node *n, struct backcm
result->fd = pip[0];
result->jp = jp;
}
-out:
popstackmark(&smark);
TRACE(("evalbackcmd done: fd=%d buf=%p nleft=%d jp=%p\n",
result->fd, result->buf, result->nleft, result->jp));
Modified: projects/routing/bin/sh/expand.c
==============================================================================
--- projects/routing/bin/sh/expand.c Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/bin/sh/expand.c Sat Oct 11 17:16:18 2014 (r272945)
@@ -328,24 +328,19 @@ exptilde(char *p, int flag)
done:
*p = '\0';
if (*(startp+1) == '\0') {
- if ((home = lookupvar("HOME")) == NULL)
- goto lose;
+ home = lookupvar("HOME");
} else {
- if ((pw = getpwnam(startp+1)) == NULL)
- goto lose;
- home = pw->pw_dir;
+ pw = getpwnam(startp+1);
+ home = pw != NULL ? pw->pw_dir : NULL;
}
- if (*home == '\0')
- goto lose;
*p = c;
+ if (home == NULL || *home == '\0')
+ return (startp);
if (quotes)
STPUTS_QUOTES(home, SQSYNTAX, expdest);
else
STPUTS(home, expdest);
return (p);
-lose:
- *p = c;
- return (startp);
}
Modified: projects/routing/bin/sh/jobs.c
==============================================================================
--- projects/routing/bin/sh/jobs.c Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/bin/sh/jobs.c Sat Oct 11 17:16:18 2014 (r272945)
@@ -373,13 +373,13 @@ showjob(struct job *jp, int mode)
strcat(statestr, " (core dumped)");
}
- for (ps = jp->ps ; ; ps++) { /* for each process */
+ for (ps = jp->ps ; procno > 0 ; ps++, procno--) { /* for each process */
if (mode == SHOWJOBS_PIDS || mode == SHOWJOBS_PGIDS) {
out1fmt("%d\n", (int)ps->pid);
- goto skip;
+ continue;
}
if (mode != SHOWJOBS_VERBOSE && ps != jp->ps)
- goto skip;
+ continue;
if (jobno == curr && ps == jp->ps)
c = '+';
else if (jobno == prev && ps == jp->ps)
@@ -410,8 +410,6 @@ showjob(struct job *jp, int mode)
out1c('\n');
} else
printjobcmd(jp);
-skip: if (--procno <= 0)
- break;
}
}
Modified: projects/routing/bin/sh/parser.c
==============================================================================
--- projects/routing/bin/sh/parser.c Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/bin/sh/parser.c Sat Oct 11 17:16:18 2014 (r272945)
@@ -1279,6 +1279,13 @@ readcstyleesc(char *out)
c = pgetc();
if (c == PEOF)
synerror("Unterminated quoted string");
+ if (c == '\n') {
+ plinno++;
+ if (doprompt)
+ setprompt(2);
+ else
+ setprompt(0);
+ }
}
pungetc();
return out;
Modified: projects/routing/bin/sh/redir.c
==============================================================================
--- projects/routing/bin/sh/redir.c Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/bin/sh/redir.c Sat Oct 11 17:16:18 2014 (r272945)
@@ -173,21 +173,12 @@ openredirect(union node *redir, char mem
fname = redir->nfile.expfname;
if ((f = open(fname, O_RDONLY)) < 0)
error("cannot open %s: %s", fname, strerror(errno));
-movefd:
- if (f != fd) {
- if (dup2(f, fd) == -1) {
- e = errno;
- close(f);
- error("%d: %s", fd, strerror(e));
- }
- close(f);
- }
break;
case NFROMTO:
fname = redir->nfile.expfname;
if ((f = open(fname, O_RDWR|O_CREAT, 0666)) < 0)
error("cannot create %s: %s", fname, strerror(errno));
- goto movefd;
+ break;
case NTO:
if (Cflag) {
fname = redir->nfile.expfname;
@@ -205,19 +196,19 @@ movefd:
} else
error("cannot create %s: %s", fname,
strerror(EEXIST));
- goto movefd;
+ break;
}
/* FALLTHROUGH */
case NCLOBBER:
fname = redir->nfile.expfname;
if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
error("cannot create %s: %s", fname, strerror(errno));
- goto movefd;
+ break;
case NAPPEND:
fname = redir->nfile.expfname;
if ((f = open(fname, O_WRONLY|O_CREAT|O_APPEND, 0666)) < 0)
error("cannot create %s: %s", fname, strerror(errno));
- goto movefd;
+ break;
case NTOFD:
case NFROMFD:
if (redir->ndup.dupfd >= 0) { /* if not ">&-" */
@@ -231,14 +222,22 @@ movefd:
} else {
close(fd);
}
- break;
+ return;
case NHERE:
case NXHERE:
f = openhere(redir);
- goto movefd;
+ break;
default:
abort();
}
+ if (f != fd) {
+ if (dup2(f, fd) == -1) {
+ e = errno;
+ close(f);
+ error("%d: %s", fd, strerror(e));
+ }
+ close(f);
+ }
}
Modified: projects/routing/bin/sh/tests/builtins/Makefile
==============================================================================
--- projects/routing/bin/sh/tests/builtins/Makefile Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/bin/sh/tests/builtins/Makefile Sat Oct 11 17:16:18 2014 (r272945)
@@ -100,6 +100,7 @@ FILES+= jobid2.0
FILES+= kill1.0 kill2.0
FILES+= lineno.0 lineno.0.stdout
FILES+= lineno2.0
+FILES+= lineno3.0 lineno3.0.stdout
FILES+= local1.0
FILES+= local2.0
FILES+= local3.0
Copied: projects/routing/bin/sh/tests/builtins/lineno3.0 (from r272944, head/bin/sh/tests/builtins/lineno3.0)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/routing/bin/sh/tests/builtins/lineno3.0 Sat Oct 11 17:16:18 2014 (r272945, copy of r272944, head/bin/sh/tests/builtins/lineno3.0)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+echo before: $LINENO
+dummy=$'a\0
+'
+echo after: $LINENO
Copied: projects/routing/bin/sh/tests/builtins/lineno3.0.stdout (from r272944, head/bin/sh/tests/builtins/lineno3.0.stdout)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/routing/bin/sh/tests/builtins/lineno3.0.stdout Sat Oct 11 17:16:18 2014 (r272945, copy of r272944, head/bin/sh/tests/builtins/lineno3.0.stdout)
@@ -0,0 +1,2 @@
+before: 3
+after: 6
Modified: projects/routing/bin/sh/trap.c
==============================================================================
--- projects/routing/bin/sh/trap.c Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/bin/sh/trap.c Sat Oct 11 17:16:18 2014 (r272945)
@@ -510,28 +510,25 @@ exitshell_savedstatus(void)
exiting_exitstatus = oexitstatus;
}
exitstatus = oexitstatus = exiting_exitstatus;
- if (setjmp(loc1.loc)) {
- goto l1;
+ if (!setjmp(loc1.loc)) {
+ handler = &loc1;
+ if ((p = trap[0]) != NULL && *p != '\0') {
+ /*
+ * Reset evalskip, or the trap on EXIT could be
+ * interrupted if the last command was a "return".
+ */
+ evalskip = 0;
+ trap[0] = NULL;
+ evalstring(p, 0);
+ }
}
- if (setjmp(loc2.loc)) {
- goto l2;
- }
- handler = &loc1;
- if ((p = trap[0]) != NULL && *p != '\0') {
- /*
- * Reset evalskip, or the trap on EXIT could be
- * interrupted if the last command was a "return".
- */
- evalskip = 0;
- trap[0] = NULL;
- evalstring(p, 0);
- }
-l1: handler = &loc2; /* probably unnecessary */
- flushall();
+ if (!setjmp(loc2.loc)) {
+ handler = &loc2; /* probably unnecessary */
+ flushall();
#if JOBS
- setjobctl(0);
+ setjobctl(0);
#endif
-l2:
+ }
if (sig != 0 && sig != SIGSTOP && sig != SIGTSTP && sig != SIGTTIN &&
sig != SIGTTOU) {
signal(sig, SIG_DFL);
Modified: projects/routing/bin/sleep/Makefile
==============================================================================
--- projects/routing/bin/sleep/Makefile Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/bin/sleep/Makefile Sat Oct 11 17:16:18 2014 (r272945)
@@ -1,6 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
+.include <src.opts.mk>
+
PROG= sleep
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: projects/routing/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
==============================================================================
--- projects/routing/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Sat Oct 11 17:16:18 2014 (r272945)
@@ -710,6 +710,9 @@ list_probe(dtrace_hdl_t *dtp, const dtra
if (g_verbose && dtrace_probe_info(dtp, pdp, &p) == 0)
print_probe_info(&p);
+ if (g_intr != 0)
+ return (1);
+
return (0);
}
@@ -1220,11 +1223,34 @@ intr(int signo)
g_impatient = 1;
}
+static void
+installsighands(void)
+{
+ struct sigaction act, oact;
+
+ (void) sigemptyset(&act.sa_mask);
+ act.sa_flags = 0;
+ act.sa_handler = intr;
+
+ if (sigaction(SIGINT, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGINT, &act, NULL);
+
+ if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGTERM, &act, NULL);
+
+#if !defined(sun)
+ if (sigaction(SIGPIPE, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGPIPE, &act, NULL);
+
+ if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGUSR1, &act, NULL);
+#endif
+}
+
int
main(int argc, char *argv[])
{
dtrace_bufdesc_t buf;
- struct sigaction act, oact;
dtrace_status_t status[2];
dtrace_optval_t opt;
dtrace_cmd_t *dcp;
@@ -1776,6 +1802,8 @@ main(int argc, char *argv[])
if (g_ofile != NULL && (g_ofp = fopen(g_ofile, "a")) == NULL)
fatal("failed to open output file '%s'", g_ofile);
+ installsighands();
+
oprintf("%5s %10s %17s %33s %s\n",
"ID", "PROVIDER", "MODULE", "FUNCTION", "NAME");
@@ -1861,20 +1889,7 @@ main(int argc, char *argv[])
if (opt != DTRACEOPT_UNSET)
notice("allowing destructive actions\n");
- (void) sigemptyset(&act.sa_mask);
- act.sa_flags = 0;
- act.sa_handler = intr;
-
- if (sigaction(SIGINT, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
- (void) sigaction(SIGINT, &act, NULL);
-
- if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
- (void) sigaction(SIGTERM, &act, NULL);
-
-#if !defined(sun)
- if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
- (void) sigaction(SIGUSR1, &act, NULL);
-#endif
+ installsighands();
/*
* Now that tracing is active and we are ready to consume trace data,
Modified: projects/routing/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
==============================================================================
--- projects/routing/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh Sat Oct 11 17:16:18 2014 (r272945)
@@ -38,7 +38,7 @@ fi
./$exe &
pid=$!
-$dtrace -32 -qs /dev/stdin <<EOF
+$dtrace -qs /dev/stdin <<EOF
typedef struct info {
char *zi_gamename;
int zi_ndungeons;
Modified: projects/routing/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
==============================================================================
--- projects/routing/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 Sat Oct 11 17:16:18 2014 (r272945)
@@ -21,7 +21,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 24, 2013
+.Dd October 8, 2014
.Dt LOCKSTAT 1
.Os
.Sh NAME
@@ -238,10 +238,11 @@ Average duration of the events in nanose
For the profiling event, duration means interrupt latency.
.It Lock
Address of the lock; displayed symbolically if possible.
-.It CPU+PIL
-CPU plus processor interrupt level (PIL).
-For example, if CPU 4 is interrupted while at PIL 6, this will be reported as
-cpu[4]+6.
+.It CPU+Pri_Class
+CPU plus the priority class of the interrupted thread.
+For example, if CPU 4 is interrupted while running a timeshare thread, this
+will be reported as
+.Ql cpu[4]+TShar .
.It Caller
Address of the caller; displayed symbolically if possible.
.El
Modified: projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c Sat Oct 11 17:16:18 2014 (r272945)
@@ -76,8 +76,10 @@
#ifndef lint
extern boolean_t zfs_recover;
+extern uint64_t zfs_arc_max, zfs_arc_meta_limit;
#else
boolean_t zfs_recover;
+uint64_t zfs_arc_max, zfs_arc_meta_limit;
#endif
const char cmdname[] = "zdb";
@@ -89,7 +91,7 @@ extern void dump_intent_log(zilog_t *);
uint64_t *zopt_object = NULL;
int zopt_objects = 0;
libzfs_handle_t *g_zfs;
-uint64_t max_inflight = 200;
+uint64_t max_inflight = 1000;
/*
* These libumem hooks provide a reasonable set of defaults for the allocator's
@@ -1461,6 +1463,11 @@ dump_deadlist(dsl_deadlist_t *dl)
if (dump_opt['d'] < 3)
return;
+ if (dl->dl_oldfmt) {
+ dump_bpobj(&dl->dl_bpobj, "old-format deadlist", 0);
+ return;
+ }
+
zdb_nicenum(dl->dl_phys->dl_used, bytes);
zdb_nicenum(dl->dl_phys->dl_comp, comp);
zdb_nicenum(dl->dl_phys->dl_uncomp, uncomp);
@@ -2377,7 +2384,7 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog
zcb->zcb_readfails = 0;
- if (dump_opt['b'] < 5 && isatty(STDERR_FILENO) &&
+ if (dump_opt['b'] < 5 &&
gethrtime() > zcb->zcb_lastprint + NANOSEC) {
uint64_t now = gethrtime();
char buf[10];
@@ -2462,9 +2469,9 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
if (!dump_opt['L']) {
vdev_t *rvd = spa->spa_root_vdev;
- for (int c = 0; c < rvd->vdev_children; c++) {
+ for (uint64_t c = 0; c < rvd->vdev_children; c++) {
vdev_t *vd = rvd->vdev_child[c];
- for (int m = 0; m < vd->vdev_ms_count; m++) {
+ for (uint64_t m = 0; m < vd->vdev_ms_count; m++) {
metaslab_t *msp = vd->vdev_ms[m];
mutex_enter(&msp->ms_lock);
metaslab_unload(msp);
@@ -2477,6 +2484,15 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
* interfaces.
*/
if (msp->ms_sm != NULL) {
+ (void) fprintf(stderr,
+ "\rloading space map for "
+ "vdev %llu of %llu, "
+ "metaslab %llu of %llu ...",
+ (longlong_t)c,
+ (longlong_t)rvd->vdev_children,
+ (longlong_t)m,
+ (longlong_t)vd->vdev_ms_count);
+
msp->ms_ops = &zdb_metaslab_ops;
VERIFY0(space_map_load(msp->ms_sm,
msp->ms_tree, SM_ALLOC));
@@ -2485,6 +2501,7 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
mutex_exit(&msp->ms_lock);
}
}
+ (void) fprintf(stderr, "\n");
}
spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER);
@@ -2594,10 +2611,12 @@ dump_block_stats(spa_t *spa)
* all async I/Os to complete.
*/
if (dump_opt['c']) {
- (void) zio_wait(spa->spa_async_zio_root);
- spa->spa_async_zio_root = zio_root(spa, NULL, NULL,
- ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE |
- ZIO_FLAG_GODFATHER);
+ for (int i = 0; i < max_ncpus; i++) {
+ (void) zio_wait(spa->spa_async_zio_root[i]);
+ spa->spa_async_zio_root[i] = zio_root(spa, NULL, NULL,
+ ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE |
+ ZIO_FLAG_GODFATHER);
+ }
}
if (zcb.zcb_haderrors) {
@@ -3483,6 +3502,12 @@ main(int argc, char **argv)
usage();
}
+ /*
+ * ZDB does not typically re-read blocks; therefore limit the ARC
+ * to 256 MB, which can be used entirely for metadata.
+ */
+ zfs_arc_max = zfs_arc_meta_limit = 256 * 1024 * 1024;
+
kernel_init(FREAD);
g_zfs = libzfs_init();
ASSERT(g_zfs != NULL);
Modified: projects/routing/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/routing/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Oct 11 17:16:18 2014 (r272945)
@@ -2857,10 +2857,7 @@ print_pool(zpool_handle_t *zhp, list_cbd
right_justify = B_FALSE;
if (pl->pl_prop != ZPROP_INVAL) {
- if (pl->pl_prop == ZPOOL_PROP_EXPANDSZ &&
- zpool_get_prop_int(zhp, pl->pl_prop, NULL) == 0)
- propstr = "-";
- else if (zpool_get_prop(zhp, pl->pl_prop, property,
+ if (zpool_get_prop(zhp, pl->pl_prop, property,
sizeof (property), NULL, cb->cb_literal) != 0)
propstr = "-";
else
@@ -2894,21 +2891,37 @@ print_pool(zpool_handle_t *zhp, list_cbd
}
static void
-print_one_column(zpool_prop_t prop, uint64_t value, boolean_t scripted)
+print_one_column(zpool_prop_t prop, uint64_t value, boolean_t scripted,
+ boolean_t valid)
{
char propval[64];
boolean_t fixed;
size_t width = zprop_width(prop, &fixed, ZFS_TYPE_POOL);
-
- if (prop == ZPOOL_PROP_EXPANDSZ && value == 0)
- (void) strlcpy(propval, "-", sizeof (propval));
- else if (prop == ZPOOL_PROP_FRAGMENTATION && value == ZFS_FRAG_INVALID)
- (void) strlcpy(propval, "-", sizeof (propval));
- else if (prop == ZPOOL_PROP_FRAGMENTATION)
+ switch (prop) {
+ case ZPOOL_PROP_EXPANDSZ:
+ if (value == 0)
+ (void) strlcpy(propval, "-", sizeof (propval));
+ else
+ zfs_nicenum(value, propval, sizeof (propval));
+ break;
+ case ZPOOL_PROP_FRAGMENTATION:
+ if (value == ZFS_FRAG_INVALID) {
+ (void) strlcpy(propval, "-", sizeof (propval));
+ } else {
+ (void) snprintf(propval, sizeof (propval), "%llu%%",
+ value);
+ }
+ break;
+ case ZPOOL_PROP_CAPACITY:
(void) snprintf(propval, sizeof (propval), "%llu%%", value);
- else
+ break;
+ default:
zfs_nicenum(value, propval, sizeof (propval));
+ }
+
+ if (!valid)
+ (void) strlcpy(propval, "-", sizeof (propval));
if (scripted)
(void) printf("\t%s", propval);
@@ -2930,6 +2943,9 @@ print_list_stats(zpool_handle_t *zhp, co
(uint64_t **)&vs, &c) == 0);
if (name != NULL) {
+ boolean_t toplevel = (vs->vs_space != 0);
+ uint64_t cap;
+
if (scripted)
(void) printf("\t%s", name);
else if (strlen(name) + depth > cb->cb_namewidth)
@@ -2938,24 +2954,26 @@ print_list_stats(zpool_handle_t *zhp, co
(void) printf("%*s%s%*s", depth, "", name,
(int)(cb->cb_namewidth - strlen(name) - depth), "");
- /* only toplevel vdevs have capacity stats */
- if (vs->vs_space == 0) {
- if (scripted)
- (void) printf("\t-\t-\t-\t-");
- else
- (void) printf(" - - - -");
- } else {
- print_one_column(ZPOOL_PROP_SIZE, vs->vs_space,
- scripted);
- print_one_column(ZPOOL_PROP_CAPACITY, vs->vs_alloc,
- scripted);
- print_one_column(ZPOOL_PROP_FREE,
- vs->vs_space - vs->vs_alloc, scripted);
- print_one_column(ZPOOL_PROP_FRAGMENTATION,
- vs->vs_fragmentation, scripted);
- }
- print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize,
- scripted);
+ /*
+ * Print the properties for the individual vdevs. Some
+ * properties are only applicable to toplevel vdevs. The
+ * 'toplevel' boolean value is passed to the print_one_column()
+ * to indicate that the value is valid.
+ */
+ print_one_column(ZPOOL_PROP_SIZE, vs->vs_space, scripted,
+ toplevel);
+ print_one_column(ZPOOL_PROP_ALLOCATED, vs->vs_alloc, scripted,
+ toplevel);
+ print_one_column(ZPOOL_PROP_FREE, vs->vs_space - vs->vs_alloc,
+ scripted, toplevel);
+ print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize, scripted,
+ B_TRUE);
+ print_one_column(ZPOOL_PROP_FRAGMENTATION,
+ vs->vs_fragmentation, scripted,
+ (vs->vs_fragmentation != ZFS_FRAG_INVALID && toplevel));
+ cap = (vs->vs_space == 0) ? 0 :
+ (vs->vs_alloc * 100 / vs->vs_space);
+ print_one_column(ZPOOL_PROP_CAPACITY, cap, scripted, toplevel);
(void) printf("\n");
}
@@ -3024,7 +3042,8 @@ list_callback(zpool_handle_t *zhp, void
* -H Scripted mode. Don't display headers, and separate properties
* by a single tab.
* -o List of properties to display. Defaults to
- * "name,size,allocated,free,capacity,health,altroot"
+ * "name,size,allocated,free,expandsize,fragmentation,capacity,"
+ * "dedupratio,health,altroot"
* -p Diplay values in parsable (exact) format.
* -T Display a timestamp in date(1) or Unix format
*
@@ -3038,7 +3057,7 @@ zpool_do_list(int argc, char **argv)
int ret;
list_cbdata_t cb = { 0 };
static char default_props[] =
- "name,size,allocated,free,fragmentation,expandsize,capacity,"
+ "name,size,allocated,free,expandsize,fragmentation,capacity,"
"dedupratio,health,altroot";
char *props = default_props;
unsigned long interval = 0, count = 0;
Modified: projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
==============================================================================
--- projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y Sat Oct 11 17:16:18 2014 (r272945)
@@ -207,6 +207,8 @@
%type <l_tok> unary_operator
%type <l_tok> struct_or_union
+%type <l_str> dtrace_keyword_ident
+
%%
dtrace_program: d_expression DT_TOK_EOF { return (dt_node_root($1)); }
@@ -391,12 +393,18 @@ postfix_expression:
| postfix_expression DT_TOK_DOT DT_TOK_TNAME {
$$ = OP2(DT_TOK_DOT, $1, dt_node_ident($3));
}
+ | postfix_expression DT_TOK_DOT dtrace_keyword_ident {
+ $$ = OP2(DT_TOK_DOT, $1, dt_node_ident($3));
+ }
| postfix_expression DT_TOK_PTR DT_TOK_IDENT {
$$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
}
| postfix_expression DT_TOK_PTR DT_TOK_TNAME {
$$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
}
+ | postfix_expression DT_TOK_PTR dtrace_keyword_ident {
+ $$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
+ }
| postfix_expression DT_TOK_ADDADD {
$$ = OP1(DT_TOK_POSTINC, $1);
}
@@ -411,6 +419,10 @@ postfix_expression:
DT_TOK_TNAME DT_TOK_RPAR {
$$ = dt_node_offsetof($3, $5);
}
+ | DT_TOK_OFFSETOF DT_TOK_LPAR type_name DT_TOK_COMMA
+ dtrace_keyword_ident DT_TOK_RPAR {
+ $$ = dt_node_offsetof($3, $5);
+ }
| DT_TOK_XLATE DT_TOK_LT type_name DT_TOK_GT
DT_TOK_LPAR expression DT_TOK_RPAR {
$$ = OP2(DT_TOK_XLATE, dt_node_type($3), $6);
@@ -835,4 +847,15 @@ function_parameters:
| parameter_type_list { $$ = $1; }
;
+dtrace_keyword_ident:
+ DT_KEY_PROBE { $$ = DUP("probe"); }
+ | DT_KEY_PROVIDER { $$ = DUP("provider"); }
+ | DT_KEY_SELF { $$ = DUP("self"); }
+ | DT_KEY_STRING { $$ = DUP("string"); }
+ | DT_TOK_STRINGOF { $$ = DUP("stringof"); }
+ | DT_KEY_USERLAND { $$ = DUP("userland"); }
+ | DT_TOK_XLATE { $$ = DUP("xlate"); }
+ | DT_KEY_XLATOR { $$ = DUP("translator"); }
+ ;
+
%%
Modified: projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
==============================================================================
--- projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Sat Oct 11 17:16:18 2014 (r272945)
@@ -434,15 +434,10 @@ static const prmap_t *
dt_pid_fix_mod(dtrace_probedesc_t *pdp, struct ps_prochandle *P)
{
char m[MAXPATHLEN];
-#if defined(sun)
Lmid_t lmid = PR_LMID_EVERY;
-#else
- Lmid_t lmid = 0;
-#endif
const char *obj;
const prmap_t *pmp;
-#if defined(sun)
/*
* Pick apart the link map from the library name.
*/
@@ -463,20 +458,17 @@ dt_pid_fix_mod(dtrace_probedesc_t *pdp,
} else {
obj = pdp->dtpd_mod;
}
-#else
- obj = pdp->dtpd_mod;
-#endif
if ((pmp = Plmid_to_map(P, lmid, obj)) == NULL)
return (NULL);
-#if defined(sun)
(void) Pobjname(P, pmp->pr_vaddr, m, sizeof (m));
if ((obj = strrchr(m, '/')) == NULL)
obj = &m[0];
else
obj++;
+#if defined(sun)
(void) Plmid(P, pmp->pr_vaddr, &lmid);
#endif
@@ -571,9 +563,7 @@ dt_pid_usdt_mapping(void *data, const pr
{
struct ps_prochandle *P = data;
GElf_Sym sym;
-#if defined(sun)
prsyminfo_t sip;
-#endif
dof_helper_t dh;
GElf_Half e_type;
const char *mname;
@@ -852,11 +842,7 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
ctf_funcinfo_t f;
ctf_id_t argv[32];
GElf_Sym sym;
-#if defined(sun)
prsyminfo_t si;
-#else
- void *si;
-#endif
struct ps_prochandle *p;
int i, args;
char buf[DTRACE_ARGTYPELEN];
@@ -941,13 +927,11 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
pdp->dtpd_func, pdp->dtpd_provider, pdp->dtpd_mod);
goto out;
}
-#if defined(sun)
if (ctf_func_info(fp, si.prs_id, &f) == CTF_ERR) {
dt_dprintf("failed to get ctf information for %s in %s`%s\n",
pdp->dtpd_func, pdp->dtpd_provider, pdp->dtpd_mod);
goto out;
}
-#endif
(void) snprintf(buf, sizeof (buf), "%s`%s", pdp->dtpd_provider,
pdp->dtpd_mod);
@@ -977,7 +961,6 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
(void) ctf_type_qname(fp, f.ctc_return, adp->dtargd_native +
ret, DTRACE_ARGTYPELEN - ret, buf);
*nargs = 2;
-#if defined(sun)
} else {
if (ctf_func_args(fp, si.prs_id, argc, argv) == CTF_ERR)
goto out;
@@ -993,7 +976,6 @@ dt_pid_get_types(dtrace_hdl_t *dtp, cons
(void) ctf_type_qname(fp, argv[i], adp->dtargd_native +
ret, DTRACE_ARGTYPELEN - ret, buf);
}
-#endif
}
out:
dt_proc_unlock(dtp, p);
Modified: projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Sat Oct 11 17:16:18 2014 (r272945)
@@ -22,7 +22,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
*/
@@ -304,7 +304,6 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
case ZPOOL_PROP_FREE:
case ZPOOL_PROP_FREEING:
case ZPOOL_PROP_LEAKED:
- case ZPOOL_PROP_EXPANDSZ:
if (literal) {
(void) snprintf(buf, len, "%llu",
(u_longlong_t)intval);
@@ -312,7 +311,16 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
(void) zfs_nicenum(intval, buf, len);
}
break;
-
+ case ZPOOL_PROP_EXPANDSZ:
+ if (intval == 0) {
+ (void) strlcpy(buf, "-", len);
+ } else if (literal) {
+ (void) snprintf(buf, len, "%llu",
+ (u_longlong_t)intval);
+ } else {
+ (void) zfs_nicenum(intval, buf, len);
+ }
+ break;
case ZPOOL_PROP_CAPACITY:
if (literal) {
(void) snprintf(buf, len, "%llu",
@@ -330,13 +338,11 @@ zpool_get_prop(zpool_handle_t *zhp, zpoo
(u_longlong_t)intval);
}
break;
-
case ZPOOL_PROP_DEDUPRATIO:
(void) snprintf(buf, len, "%llu.%02llux",
(u_longlong_t)(intval / 100),
(u_longlong_t)(intval % 100));
break;
-
case ZPOOL_PROP_HEALTH:
verify(nvlist_lookup_nvlist(zpool_get_config(zhp, NULL),
ZPOOL_CONFIG_VDEV_TREE, &nvroot) == 0);
Modified: projects/routing/cddl/lib/libdtrace/libproc_compat.h
==============================================================================
--- projects/routing/cddl/lib/libdtrace/libproc_compat.h Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/cddl/lib/libdtrace/libproc_compat.h Sat Oct 11 17:16:18 2014 (r272945)
@@ -38,7 +38,7 @@
#define Pxlookup_by_addr(p, a, n, s, sym, i) \
proc_addr2sym(p, a, n, s, sym)
#define Pxlookup_by_name(p, l, s1, s2, sym, a) \
- proc_name2sym((p), (s1), (s2), (sym))
+ proc_name2sym(p, s1, s2, sym, a)
#define Paddr_to_map proc_addr2map
#define Pcreate_error strerror
#define Pdelbkpt proc_bkptdel
@@ -46,10 +46,10 @@
#define Plmid(p, a, l) (-1)
#define Plmid_to_map(p, l, o) proc_obj2map((p), (o))
#define Plookup_by_addr proc_addr2sym
-#define Pname_to_ctf(p, obj) NULL
+#define Pname_to_ctf(p, obj) (ctf_file_t *)proc_name2ctf(p, obj)
#define Pname_to_map proc_name2map
#define Pobject_iter proc_iter_objs
-#define Pobject_iter_resolved(p, f, arg) 1
+#define Pobject_iter_resolved(p, f, arg) proc_iter_objs(p, f, arg)
#define Pobjname proc_objname
#define Pread proc_read
#define Prd_agent proc_rdagent
Modified: projects/routing/cddl/lib/libzfs/Makefile
==============================================================================
--- projects/routing/cddl/lib/libzfs/Makefile Sat Oct 11 16:34:01 2014 (r272944)
+++ projects/routing/cddl/lib/libzfs/Makefile Sat Oct 11 17:16:18 2014 (r272945)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Sat Oct 11 20:13:09 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 0CC95D6B;
Sat, 11 Oct 2014 20:13:09 +0000 (UTC)
Received: from mail.ipfw.ru (mail.ipfw.ru [IPv6:2a01:4f8:120:6141::2])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id C0B58272;
Sat, 11 Oct 2014 20:13:08 +0000 (UTC)
Received: from secured.by.ipfw.ru ([95.143.220.47] helo=[10.0.0.120])
by mail.ipfw.ru with esmtpsa (TLSv1:AES128-SHA:128)
(Exim 4.82 (FreeBSD)) (envelope-from <melifaro@ipfw.ru>)
id 1Xcz2f-000CSn-IY; Sat, 11 Oct 2014 19:57:13 +0400
Content-Type: text/plain; charset=windows-1252
Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\))
Subject: Re: svn commit: r272515 - projects/ipfw/sys/netpfil/ipfw
From: "Alexander V. Chernikov" <melifaro@ipfw.ru>
In-Reply-To: <201410091711.28587.jhb@freebsd.org>
Date: Sun, 12 Oct 2014 00:13:00 +0400
Content-Transfer-Encoding: quoted-printable
Message-Id: <AC6B3AB3-30C2-44BC-933F-A37F14F01C90@ipfw.ru>
References: <201410041210.s94CAX7I012628@svn.freebsd.org>
<5520708.eFNh9vYom7@ralph.baldwin.cx> <5436B52E.3010106@FreeBSD.org>
<201410091711.28587.jhb@freebsd.org>
To: John Baldwin <jhb@freebsd.org>
X-Mailer: Apple Mail (2.1878.6)
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org,
"Alexander V. Chernikov" <melifaro@freebsd.org>
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Oct 2014 20:13:09 -0000
On 10 Oct 2014, at 01:11, John Baldwin <jhb@freebsd.org> wrote:
> On Thursday, October 09, 2014 12:17:50 pm Alexander V. Chernikov =
wrote:
>> On 06.10.2014 19:45, John Baldwin wrote:
>>> On Saturday, October 04, 2014 12:10:33 PM Alexander V. Chernikov =
wrote:
>>>> Author: melifaro
>>>> Date: Sat Oct 4 12:10:32 2014
>>>> New Revision: 272515
>>>> URL: https://svnweb.freebsd.org/changeset/base/272515
>>>>=20
>>>> Log:
>>>> Add "ipfw_ctl3" FEATURE to indicate presence of new ipfw =
interface.
>>>>=20
>>>> Modified:
>>>> projects/ipfw/sys/netpfil/ipfw/ip_fw2.c
>>>>=20
>>>> Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw2.c
>>>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
>>>> =3D=3D --- projects/ipfw/sys/netpfil/ipfw/ip_fw2.c Sat Oct 4 =
11:40:35
>>>> 2014 (r272514) +++ projects/ipfw/sys/netpfil/ipfw/ip_fw2.c =
Sat Oct 4
>>>> 12:10:32 2014 (r272515) @@ -2874,6 +2874,7 @@ static =
moduledata_t ipfwmod =3D
>>>> {
>>>> #define IPFW_VNET_ORDER (IPFW_MODEVENT_ORDER + 2) /* =
Later still. */
>>>>=20
>>>> DECLARE_MODULE(ipfw, ipfwmod, IPFW_SI_SUB_FIREWALL, =
IPFW_MODEVENT_ORDER);
>>>> +FEATURE(ipfw_ctl3, "ipfw new sockopt calls");
>>>> MODULE_VERSION(ipfw, 2);
>>>> /* should declare some dependencies here */
>>> Would it be better to bump the module version to 3 instead? =
Userland programs
>>> can then use modfind() and modstat() to determine the version.
>> I've bumped ipfw module version in r272828. Actually, I've entirely=20=
>> forgotten about this possibility.
>> However, it is a bit hard to determine module version inside=20
>> (perl|python|sh|any) script.
>> On the other case, FEATURE framework provides nice and easy way to=20
>> determine any "feature" status
>> both in C and interpreted programs.
>=20
> I'll grant you that feature is convenient. Perhaps create a SYSCTL =
node though that
> holds the current version? That is 'foo.ipfw.version' being 2 or 3 is =
more future
> proof than 'feature.ipfw2/3/4=92.
No, this is not about new _ipfw_ version. I=92m unsure if all these =
changes are large enough to name ipfw
as =93ipfw3=94. This is just an indication that all ipfw-related =
sockopts are available via single setsockopt called
IP_FW3. Maybe naming is not the best - I=92m open to any suggestion.=20
However, I=92m not sure why should I invent additional sysctls instead =
of using standard interface.
>=20
> Alternatively, we could change the module code to export a dynamic =
sysctl tree
> for all loaded modules that includes the versions, i.e. =
'module.<foo>.version', etc.
>=20
> --=20
> John Baldwin
>=20