svn commit: r248526 - in user/attilio/vmobj-readlock: . bin/cp bin/ls bin/mkdir bin/mv bin/ps bin/rm bin/rmdir bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/...

Tue Mar 19 17:13:51 UTC 2013

Author: attilio
Date: Tue Mar 19 17:13:47 2013
New Revision: 248526
URL: http://svnweb.freebsd.org/changeset/base/248526

Log:
  Merge from vmcontention.

Added:
  user/attilio/vmobj-readlock/contrib/unvis/
     - copied from r248525, user/attilio/vmcontention/contrib/unvis/
  user/attilio/vmobj-readlock/contrib/vis/
     - copied from r248525, user/attilio/vmcontention/contrib/vis/
  user/attilio/vmobj-readlock/share/examples/bhyve/
     - copied from r248525, user/attilio/vmcontention/share/examples/bhyve/
  user/attilio/vmobj-readlock/sys/cddl/dev/fbt/fbt_powerpc.c
     - copied unchanged from r248525, user/attilio/vmcontention/sys/cddl/dev/fbt/fbt_powerpc.c
  user/attilio/vmobj-readlock/sys/libkern/arm/aeabi_unwind.c
     - copied unchanged from r248525, user/attilio/vmcontention/sys/libkern/arm/aeabi_unwind.c
  user/attilio/vmobj-readlock/sys/libkern/arm/memset.S
     - copied unchanged from r248525, user/attilio/vmcontention/sys/libkern/arm/memset.S
  user/attilio/vmobj-readlock/tools/regression/bin/sh/builtins/wait6.0
     - copied unchanged from r248525, user/attilio/vmcontention/tools/regression/bin/sh/builtins/wait6.0
  user/attilio/vmobj-readlock/tools/regression/bin/sh/builtins/wait7.0
     - copied unchanged from r248525, user/attilio/vmcontention/tools/regression/bin/sh/builtins/wait7.0
Deleted:
  user/attilio/vmobj-readlock/share/man/man4/vinum.4
  user/attilio/vmobj-readlock/usr.bin/unvis/unvis.1
  user/attilio/vmobj-readlock/usr.bin/unvis/unvis.c
  user/attilio/vmobj-readlock/usr.bin/vis/extern.h
  user/attilio/vmobj-readlock/usr.bin/vis/foldit.c
  user/attilio/vmobj-readlock/usr.bin/vis/vis.1
  user/attilio/vmobj-readlock/usr.bin/vis/vis.c
Modified:
  user/attilio/vmobj-readlock/ObsoleteFiles.inc
  user/attilio/vmobj-readlock/bin/cp/cp.1
  user/attilio/vmobj-readlock/bin/ls/ls.1
  user/attilio/vmobj-readlock/bin/mkdir/mkdir.1
  user/attilio/vmobj-readlock/bin/mv/mv.1
  user/attilio/vmobj-readlock/bin/ps/ps.1
  user/attilio/vmobj-readlock/bin/rm/rm.1
  user/attilio/vmobj-readlock/bin/rmdir/rmdir.1
  user/attilio/vmobj-readlock/bin/sh/jobs.c
  user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  user/attilio/vmobj-readlock/contrib/binutils/gas/config/tc-arm.c
  user/attilio/vmobj-readlock/contrib/libc-vis/unvis.3
  user/attilio/vmobj-readlock/contrib/libc-vis/unvis.c
  user/attilio/vmobj-readlock/contrib/libc-vis/vis.3
  user/attilio/vmobj-readlock/contrib/libc-vis/vis.c
  user/attilio/vmobj-readlock/contrib/libc-vis/vis.h
  user/attilio/vmobj-readlock/contrib/tzdata/africa
  user/attilio/vmobj-readlock/contrib/tzdata/antarctica
  user/attilio/vmobj-readlock/contrib/tzdata/asia
  user/attilio/vmobj-readlock/contrib/tzdata/australasia
  user/attilio/vmobj-readlock/contrib/tzdata/europe
  user/attilio/vmobj-readlock/contrib/tzdata/northamerica
  user/attilio/vmobj-readlock/contrib/tzdata/southamerica
  user/attilio/vmobj-readlock/contrib/tzdata/zone.tab
  user/attilio/vmobj-readlock/crypto/openssh/sshd_config
  user/attilio/vmobj-readlock/etc/mtree/BSD.usr.dist
  user/attilio/vmobj-readlock/etc/rc.d/savecore
  user/attilio/vmobj-readlock/gnu/lib/libgcc/Makefile
  user/attilio/vmobj-readlock/lib/libc/gen/Makefile.inc
  user/attilio/vmobj-readlock/lib/libc/gen/Symbol.map
  user/attilio/vmobj-readlock/lib/libc/stdlib/realpath.3
  user/attilio/vmobj-readlock/lib/libc/sys/chflags.2
  user/attilio/vmobj-readlock/lib/libc/sys/mlock.2
  user/attilio/vmobj-readlock/lib/libipsec/test-policy.c
  user/attilio/vmobj-readlock/lib/libutil/pidfile.c
  user/attilio/vmobj-readlock/lib/libvmmapi/vmmapi.c
  user/attilio/vmobj-readlock/lib/libvmmapi/vmmapi.h
  user/attilio/vmobj-readlock/sbin/ccdconfig/ccdconfig.8
  user/attilio/vmobj-readlock/sbin/ffsinfo/ffsinfo.8
  user/attilio/vmobj-readlock/sbin/geom/class/concat/gconcat.8
  user/attilio/vmobj-readlock/sbin/geom/class/eli/geom_eli.c
  user/attilio/vmobj-readlock/sbin/geom/class/mirror/gmirror.8
  user/attilio/vmobj-readlock/sbin/geom/class/raid/graid.8
  user/attilio/vmobj-readlock/sbin/geom/class/stripe/gstripe.8
  user/attilio/vmobj-readlock/sbin/gvinum/gvinum.8
  user/attilio/vmobj-readlock/sbin/hastctl/hastctl.8
  user/attilio/vmobj-readlock/sbin/hastctl/hastctl.c
  user/attilio/vmobj-readlock/sbin/hastd/hastd.8
  user/attilio/vmobj-readlock/sbin/hastd/secondary.c
  user/attilio/vmobj-readlock/sbin/hastd/subr.c
  user/attilio/vmobj-readlock/sbin/ldconfig/ldconfig.8
  user/attilio/vmobj-readlock/sbin/recoverdisk/recoverdisk.c
  user/attilio/vmobj-readlock/share/examples/Makefile
  user/attilio/vmobj-readlock/share/man/man4/Makefile
  user/attilio/vmobj-readlock/share/man/man4/ccd.4
  user/attilio/vmobj-readlock/share/man/man4/geom.4
  user/attilio/vmobj-readlock/share/man/man4/iwn.4
  user/attilio/vmobj-readlock/share/man/man4/psm.4
  user/attilio/vmobj-readlock/share/man/man4/udp.4
  user/attilio/vmobj-readlock/share/misc/bsd-family-tree
  user/attilio/vmobj-readlock/sys/amd64/amd64/pmap.c
  user/attilio/vmobj-readlock/sys/amd64/vmm/intel/vmx.c
  user/attilio/vmobj-readlock/sys/amd64/vmm/vmm.c
  user/attilio/vmobj-readlock/sys/amd64/vmm/vmm_stat.c
  user/attilio/vmobj-readlock/sys/amd64/vmm/vmm_stat.h
  user/attilio/vmobj-readlock/sys/arm/arm/bcopy_page.S
  user/attilio/vmobj-readlock/sys/arm/arm/bcopyinout.S
  user/attilio/vmobj-readlock/sys/arm/arm/bcopyinout_xscale.S
  user/attilio/vmobj-readlock/sys/arm/arm/blockio.S
  user/attilio/vmobj-readlock/sys/arm/arm/bus_space_asm_generic.S
  user/attilio/vmobj-readlock/sys/arm/arm/copystr.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_arm10.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_arm11.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_arm11x6.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_arm7tdmi.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_arm8.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_arm9.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_armv4.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_armv5.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_armv5_ec.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_armv6.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_armv7.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_fa526.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_ixp12x0.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_pj4b.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_sa1.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_sa11x0.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_sheeva.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_xscale.S
  user/attilio/vmobj-readlock/sys/arm/arm/cpufunc_asm_xscale_c3.S
  user/attilio/vmobj-readlock/sys/arm/arm/db_trace.c
  user/attilio/vmobj-readlock/sys/arm/arm/elf_trampoline.c
  user/attilio/vmobj-readlock/sys/arm/arm/exception.S
  user/attilio/vmobj-readlock/sys/arm/arm/fiq_subr.S
  user/attilio/vmobj-readlock/sys/arm/arm/fusu.S
  user/attilio/vmobj-readlock/sys/arm/arm/in_cksum_arm.S
  user/attilio/vmobj-readlock/sys/arm/arm/irq_dispatch.S
  user/attilio/vmobj-readlock/sys/arm/arm/locore.S
  user/attilio/vmobj-readlock/sys/arm/arm/pmap-v6.c
  user/attilio/vmobj-readlock/sys/arm/arm/pmap.c
  user/attilio/vmobj-readlock/sys/arm/arm/setcpsr.S
  user/attilio/vmobj-readlock/sys/arm/arm/support.S
  user/attilio/vmobj-readlock/sys/arm/arm/swtch.S
  user/attilio/vmobj-readlock/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  user/attilio/vmobj-readlock/sys/arm/include/asm.h
  user/attilio/vmobj-readlock/sys/arm/include/bus.h
  user/attilio/vmobj-readlock/sys/arm/include/pmap.h
  user/attilio/vmobj-readlock/sys/arm/ti/cpsw/if_cpsw.c
  user/attilio/vmobj-readlock/sys/arm/ti/ti_mmchs.c
  user/attilio/vmobj-readlock/sys/cam/ata/ata_da.c
  user/attilio/vmobj-readlock/sys/cam/cam_ccb.h
  user/attilio/vmobj-readlock/sys/cam/cam_periph.c
  user/attilio/vmobj-readlock/sys/cam/scsi/scsi_all.c
  user/attilio/vmobj-readlock/sys/cam/scsi/scsi_all.h
  user/attilio/vmobj-readlock/sys/cam/scsi/scsi_cd.c
  user/attilio/vmobj-readlock/sys/cam/scsi/scsi_da.c
  user/attilio/vmobj-readlock/sys/cddl/compat/opensolaris/sys/sig.h
  user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  user/attilio/vmobj-readlock/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S
  user/attilio/vmobj-readlock/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
  user/attilio/vmobj-readlock/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
  user/attilio/vmobj-readlock/sys/compat/ndis/kern_ndis.c
  user/attilio/vmobj-readlock/sys/conf/Makefile.arm
  user/attilio/vmobj-readlock/sys/conf/NOTES
  user/attilio/vmobj-readlock/sys/conf/files
  user/attilio/vmobj-readlock/sys/conf/files.arm
  user/attilio/vmobj-readlock/sys/dev/acpica/acpi_powerres.c
  user/attilio/vmobj-readlock/sys/dev/ahci/ahci.c
  user/attilio/vmobj-readlock/sys/dev/ath/if_ath.c
  user/attilio/vmobj-readlock/sys/dev/ath/if_ath_rx_edma.c
  user/attilio/vmobj-readlock/sys/dev/ath/if_ath_sysctl.c
  user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tx.c
  user/attilio/vmobj-readlock/sys/dev/ath/if_athvar.h
  user/attilio/vmobj-readlock/sys/dev/atkbdc/psm.c
  user/attilio/vmobj-readlock/sys/dev/fdt/fdt_common.c
  user/attilio/vmobj-readlock/sys/dev/fdt/fdtbus.c
  user/attilio/vmobj-readlock/sys/dev/fdt/simplebus.c
  user/attilio/vmobj-readlock/sys/dev/md/md.c
  user/attilio/vmobj-readlock/sys/dev/puc/pucdata.c
  user/attilio/vmobj-readlock/sys/dev/siis/siis.c
  user/attilio/vmobj-readlock/sys/dev/sis/if_sis.c
  user/attilio/vmobj-readlock/sys/dev/sis/if_sisreg.h
  user/attilio/vmobj-readlock/sys/dev/sound/pcm/sndstat.c
  user/attilio/vmobj-readlock/sys/dev/usb/serial/u3g.c
  user/attilio/vmobj-readlock/sys/dev/usb/usbdevs
  user/attilio/vmobj-readlock/sys/dev/usb/wlan/if_run.c
  user/attilio/vmobj-readlock/sys/fs/cd9660/cd9660_vnops.c
  user/attilio/vmobj-readlock/sys/fs/ext2fs/ext2_balloc.c
  user/attilio/vmobj-readlock/sys/fs/ext2fs/ext2_vnops.c
  user/attilio/vmobj-readlock/sys/fs/msdosfs/msdosfs_vnops.c
  user/attilio/vmobj-readlock/sys/fs/nfsclient/nfs_clbio.c
  user/attilio/vmobj-readlock/sys/fs/tmpfs/tmpfs_vnops.c
  user/attilio/vmobj-readlock/sys/fs/udf/udf_vnops.c
  user/attilio/vmobj-readlock/sys/geom/gate/g_gate.c
  user/attilio/vmobj-readlock/sys/geom/geom.h
  user/attilio/vmobj-readlock/sys/geom/geom_disk.c
  user/attilio/vmobj-readlock/sys/geom/geom_disk.h
  user/attilio/vmobj-readlock/sys/geom/geom_io.c
  user/attilio/vmobj-readlock/sys/geom/geom_vfs.c
  user/attilio/vmobj-readlock/sys/geom/part/g_part.c
  user/attilio/vmobj-readlock/sys/i386/i386/pmap.c
  user/attilio/vmobj-readlock/sys/i386/xen/pmap.c
  user/attilio/vmobj-readlock/sys/ia64/ia64/pmap.c
  user/attilio/vmobj-readlock/sys/kern/capabilities.conf
  user/attilio/vmobj-readlock/sys/kern/kern_physio.c
  user/attilio/vmobj-readlock/sys/kern/kern_racct.c
  user/attilio/vmobj-readlock/sys/kern/kern_sig.c
  user/attilio/vmobj-readlock/sys/kern/kern_synch.c
  user/attilio/vmobj-readlock/sys/kern/subr_bus_dma.c
  user/attilio/vmobj-readlock/sys/kern/subr_param.c
  user/attilio/vmobj-readlock/sys/kern/subr_sleepqueue.c
  user/attilio/vmobj-readlock/sys/kern/subr_trap.c
  user/attilio/vmobj-readlock/sys/kern/uipc_mbuf.c
  user/attilio/vmobj-readlock/sys/kern/uipc_sockbuf.c
  user/attilio/vmobj-readlock/sys/kern/uipc_syscalls.c
  user/attilio/vmobj-readlock/sys/kern/vfs_aio.c
  user/attilio/vmobj-readlock/sys/kern/vfs_bio.c
  user/attilio/vmobj-readlock/sys/kern/vfs_cluster.c
  user/attilio/vmobj-readlock/sys/kern/vfs_syscalls.c
  user/attilio/vmobj-readlock/sys/kern/vfs_vnops.c
  user/attilio/vmobj-readlock/sys/libkern/arm/divsi3.S
  user/attilio/vmobj-readlock/sys/libkern/arm/ffs.S
  user/attilio/vmobj-readlock/sys/libkern/arm/ldivmod.S
  user/attilio/vmobj-readlock/sys/libkern/arm/memcpy.S
  user/attilio/vmobj-readlock/sys/mips/mips/pmap.c
  user/attilio/vmobj-readlock/sys/modules/dtrace/Makefile
  user/attilio/vmobj-readlock/sys/modules/dtrace/dtraceall/dtraceall.c
  user/attilio/vmobj-readlock/sys/modules/dtrace/fbt/Makefile
  user/attilio/vmobj-readlock/sys/modules/uart/Makefile
  user/attilio/vmobj-readlock/sys/net/bridgestp.c
  user/attilio/vmobj-readlock/sys/net/if_gre.c
  user/attilio/vmobj-readlock/sys/net/pfil.c
  user/attilio/vmobj-readlock/sys/net/pfil.h
  user/attilio/vmobj-readlock/sys/net/rtsock.c
  user/attilio/vmobj-readlock/sys/netinet/igmp.c
  user/attilio/vmobj-readlock/sys/netinet/ip_carp.c
  user/attilio/vmobj-readlock/sys/netinet/ip_input.c
  user/attilio/vmobj-readlock/sys/netinet/ip_mroute.c
  user/attilio/vmobj-readlock/sys/netinet/ip_options.c
  user/attilio/vmobj-readlock/sys/netinet/ip_output.c
  user/attilio/vmobj-readlock/sys/netinet/libalias/alias.c
  user/attilio/vmobj-readlock/sys/netinet/tcp_output.c
  user/attilio/vmobj-readlock/sys/netinet/tcp_subr.c
  user/attilio/vmobj-readlock/sys/netinet6/icmp6.c
  user/attilio/vmobj-readlock/sys/netinet6/ip6_input.c
  user/attilio/vmobj-readlock/sys/netinet6/ip6_mroute.c
  user/attilio/vmobj-readlock/sys/netinet6/ip6_output.c
  user/attilio/vmobj-readlock/sys/netinet6/mld6.c
  user/attilio/vmobj-readlock/sys/netinet6/nd6_nbr.c
  user/attilio/vmobj-readlock/sys/netipsec/key.c
  user/attilio/vmobj-readlock/sys/netpfil/ipfw/ip_fw2.c
  user/attilio/vmobj-readlock/sys/netpfil/ipfw/ip_fw_private.h
  user/attilio/vmobj-readlock/sys/netpfil/pf/pf.c
  user/attilio/vmobj-readlock/sys/nfs/nfs_common.c
  user/attilio/vmobj-readlock/sys/nfsclient/nfs_bio.c
  user/attilio/vmobj-readlock/sys/powerpc/aim/mmu_oea.c
  user/attilio/vmobj-readlock/sys/powerpc/aim/mmu_oea64.c
  user/attilio/vmobj-readlock/sys/powerpc/aim/trap.c
  user/attilio/vmobj-readlock/sys/powerpc/aim/trap_subr32.S
  user/attilio/vmobj-readlock/sys/powerpc/aim/trap_subr64.S
  user/attilio/vmobj-readlock/sys/powerpc/booke/pmap.c
  user/attilio/vmobj-readlock/sys/powerpc/powerpc/mmu_if.m
  user/attilio/vmobj-readlock/sys/powerpc/powerpc/pmap_dispatch.c
  user/attilio/vmobj-readlock/sys/sparc64/sparc64/pmap.c
  user/attilio/vmobj-readlock/sys/sys/bio.h
  user/attilio/vmobj-readlock/sys/sys/buf.h
  user/attilio/vmobj-readlock/sys/sys/mbuf.h
  user/attilio/vmobj-readlock/sys/sys/mount.h
  user/attilio/vmobj-readlock/sys/sys/mouse.h
  user/attilio/vmobj-readlock/sys/sys/param.h
  user/attilio/vmobj-readlock/sys/sys/signalvar.h
  user/attilio/vmobj-readlock/sys/sys/sleepqueue.h
  user/attilio/vmobj-readlock/sys/sys/systm.h
  user/attilio/vmobj-readlock/sys/sys/vnode.h
  user/attilio/vmobj-readlock/sys/ufs/ffs/ffs_alloc.c
  user/attilio/vmobj-readlock/sys/ufs/ffs/ffs_balloc.c
  user/attilio/vmobj-readlock/sys/ufs/ffs/ffs_rawread.c
  user/attilio/vmobj-readlock/sys/ufs/ffs/ffs_vfsops.c
  user/attilio/vmobj-readlock/sys/ufs/ffs/ffs_vnops.c
  user/attilio/vmobj-readlock/sys/ufs/ufs/ufs_extern.h
  user/attilio/vmobj-readlock/sys/ufs/ufs/ufs_vnops.c
  user/attilio/vmobj-readlock/sys/vm/_vm_radix.h
  user/attilio/vmobj-readlock/sys/vm/pmap.h
  user/attilio/vmobj-readlock/sys/vm/swap_pager.c
  user/attilio/vmobj-readlock/sys/vm/swap_pager.h
  user/attilio/vmobj-readlock/sys/vm/vm.h
  user/attilio/vmobj-readlock/sys/vm/vm_init.c
  user/attilio/vmobj-readlock/sys/vm/vm_kern.c
  user/attilio/vmobj-readlock/sys/vm/vm_page.c
  user/attilio/vmobj-readlock/sys/vm/vm_radix.c
  user/attilio/vmobj-readlock/sys/vm/vm_radix.h
  user/attilio/vmobj-readlock/sys/vm/vm_reserv.c
  user/attilio/vmobj-readlock/sys/vm/vnode_pager.c
  user/attilio/vmobj-readlock/sys/xdr/xdr_mbuf.c
  user/attilio/vmobj-readlock/tools/regression/pjdfstest/tests/misc.sh
  user/attilio/vmobj-readlock/tools/regression/security/cap_test/cap_test_capabilities.c
  user/attilio/vmobj-readlock/usr.bin/find/find.h
  user/attilio/vmobj-readlock/usr.bin/find/function.c
  user/attilio/vmobj-readlock/usr.bin/head/head.1
  user/attilio/vmobj-readlock/usr.bin/renice/renice.8
  user/attilio/vmobj-readlock/usr.bin/script/script.1
  user/attilio/vmobj-readlock/usr.bin/tail/tail.1
  user/attilio/vmobj-readlock/usr.bin/unvis/Makefile
  user/attilio/vmobj-readlock/usr.bin/vis/Makefile
  user/attilio/vmobj-readlock/usr.sbin/ac/ac.8
  user/attilio/vmobj-readlock/usr.sbin/bhyve/acpi.c
  user/attilio/vmobj-readlock/usr.sbin/bhyve/bhyverun.c
  user/attilio/vmobj-readlock/usr.sbin/bhyve/bhyverun.h
  user/attilio/vmobj-readlock/usr.sbin/bhyve/mptbl.c
  user/attilio/vmobj-readlock/usr.sbin/bhyve/pci_emul.c
  user/attilio/vmobj-readlock/usr.sbin/bhyve/pci_virtio_block.c
  user/attilio/vmobj-readlock/usr.sbin/bhyve/pci_virtio_net.c
  user/attilio/vmobj-readlock/usr.sbin/bhyvectl/bhyvectl.c
  user/attilio/vmobj-readlock/usr.sbin/bhyveload/bhyveload.8
  user/attilio/vmobj-readlock/usr.sbin/bhyveload/bhyveload.c
  user/attilio/vmobj-readlock/usr.sbin/moused/moused.c
Directory Properties:
  user/attilio/vmobj-readlock/   (props changed)
  user/attilio/vmobj-readlock/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  user/attilio/vmobj-readlock/contrib/binutils/   (props changed)
  user/attilio/vmobj-readlock/contrib/libc-vis/   (props changed)
  user/attilio/vmobj-readlock/contrib/tzdata/   (props changed)
  user/attilio/vmobj-readlock/crypto/openssh/   (props changed)
  user/attilio/vmobj-readlock/gnu/lib/   (props changed)
  user/attilio/vmobj-readlock/lib/libc/   (props changed)
  user/attilio/vmobj-readlock/lib/libutil/   (props changed)
  user/attilio/vmobj-readlock/lib/libvmmapi/   (props changed)
  user/attilio/vmobj-readlock/sbin/   (props changed)
  user/attilio/vmobj-readlock/share/man/man4/   (props changed)
  user/attilio/vmobj-readlock/sys/   (props changed)
  user/attilio/vmobj-readlock/sys/amd64/vmm/   (props changed)
  user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmobj-readlock/sys/conf/   (props changed)
  user/attilio/vmobj-readlock/usr.sbin/bhyve/   (props changed)
  user/attilio/vmobj-readlock/usr.sbin/bhyvectl/   (props changed)
  user/attilio/vmobj-readlock/usr.sbin/bhyveload/   (props changed)

Modified: user/attilio/vmobj-readlock/ObsoleteFiles.inc
==============================================================================

--- user/attilio/vmobj-readlock/ObsoleteFiles.inc	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/ObsoleteFiles.inc	Tue Mar 19 17:13:47 2013	(r248526)
@@ -38,6 +38,7 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+OLD_FILES+=usr/share/man/man4/vinum.4.gz
 # 20130311: Ports are no more available via cvsup
 OLD_FILES+=usr/share/examples/cvsup/ports-supfile
 OLD_FILES+=usr/share/examples/cvsup/refuse

Modified: user/attilio/vmobj-readlock/bin/cp/cp.1
==============================================================================
--- user/attilio/vmobj-readlock/bin/cp/cp.1	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/bin/cp/cp.1	Tue Mar 19 17:13:47 2013	(r248526)
@@ -32,7 +32,7 @@
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd September 4, 2012
+.Dd March 15, 2013
 .Dt CP 1
 .Os
 .Sh NAME
@@ -251,6 +251,27 @@ signal, the current input and output fil
 will be written to the standard output.
 .Sh EXIT STATUS
 .Ex -std
+.Sh EXAMPLES
+Make a copy of file
+.Pa foo
+named
+.Pa bar :
+.Pp
+.Dl $ cp foo bar
+.Pp
+Copy a group of files to the
+.Pa /tmp
+directory:
+.Pp
+.Dl $ cp *.txt /tmp
+.Pp
+Copy the directory
+.Pa junk
+and all of its contents (including any subdirectories) to the
+.Pa /tmp
+directory:
+.Pp
+.Dl $ cp -R junk /tmp
 .Sh COMPATIBILITY
 Historic versions of the
 .Nm

Modified: user/attilio/vmobj-readlock/bin/ls/ls.1
==============================================================================
--- user/attilio/vmobj-readlock/bin/ls/ls.1	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/bin/ls/ls.1	Tue Mar 19 17:13:47 2013	(r248526)
@@ -32,7 +32,7 @@
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
 .\" $FreeBSD$
 .\"
-.Dd November 8, 2012
+.Dd March 15, 2013
 .Dt LS 1
 .Os
 .Sh NAME
@@ -718,6 +718,24 @@ for more information.
 .El
 .Sh EXIT STATUS
 .Ex -std
+.Sh EXAMPLES
+List the contents of the current working directory in long format:
+.Pp
+.Dl $ ls -l
+.Pp
+In addition to listing the contents of the current working directory in
+long format, show inode numbers, file flags (see
+.Xr chflags 1 ) ,
+and suffix each filename with a symbol representing its file type:
+.Pp
+.Dl $ ls -lioF
+.Pp
+List the files in
+.Pa /var/log ,
+sorting the output such that the mostly recently modified entries are
+printed first:
+.Pp
+.Dl $ ls -lt /var/log
 .Sh COMPATIBILITY
 The group field is now automatically included in the long listing for
 files in order to be compatible with the

Modified: user/attilio/vmobj-readlock/bin/mkdir/mkdir.1
==============================================================================
--- user/attilio/vmobj-readlock/bin/mkdir/mkdir.1	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/bin/mkdir/mkdir.1	Tue Mar 19 17:13:47 2013	(r248526)
@@ -32,7 +32,7 @@
 .\"	@(#)mkdir.1	8.2 (Berkeley) 1/25/94
 .\" $FreeBSD$
 .\"
-.Dd January 25, 1994
+.Dd March 15, 2013
 .Dt MKDIR 1
 .Os
 .Sh NAME
@@ -87,6 +87,23 @@ Be verbose when creating directories, li
 The user must have write permission in the parent directory.
 .Sh EXIT STATUS
 .Ex -std
+.Sh EXAMPLES
+Create a directory named
+.Pa foobar :
+.Pp
+.Dl $ mkdir foobar
+.Pp
+Create a directory named
+.Pa foobar
+and set its file mode to 700:
+.Pp
+.Dl $ mkdir -m 700 foobar
+.Pp
+Create a directory named
+.Pa cow/horse/monkey ,
+creating any non-existent intermediate directories as necessary:
+.Pp
+.Dl $ mkdir -p cow/horse/monkey
 .Sh COMPATIBILITY
 The
 .Fl v

Modified: user/attilio/vmobj-readlock/bin/mv/mv.1
==============================================================================
--- user/attilio/vmobj-readlock/bin/mv/mv.1	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/bin/mv/mv.1	Tue Mar 19 17:13:47 2013	(r248526)
@@ -32,7 +32,7 @@
 .\"	@(#)mv.1	8.1 (Berkeley) 5/31/93
 .\" $FreeBSD$
 .\"
-.Dd August 28, 2012
+.Dd March 15, 2013
 .Dt MV 1
 .Os
 .Sh NAME
@@ -155,6 +155,16 @@ rm -rf source_file
 .Ed
 .Sh EXIT STATUS
 .Ex -std
+.Sh EXAMPLES
+Rename file
+.Pa foo
+to
+.Pa bar ,
+overwriting
+.Pa bar
+if it already exists:
+.Pp
+.Dl $ mv -f foo bar
 .Sh COMPATIBILITY
 The
 .Fl h ,

Modified: user/attilio/vmobj-readlock/bin/ps/ps.1
==============================================================================
--- user/attilio/vmobj-readlock/bin/ps/ps.1	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/bin/ps/ps.1	Tue Mar 19 17:13:47 2013	(r248526)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd February 7, 2013
+.Dd March 15, 2013
 .Dt PS 1
 .Os
 .Sh NAME
@@ -689,6 +689,10 @@ attempts to automatically determine the 
 .It Pa /boot/kernel/kernel
 default system namelist
 .El
+.Sh EXAMPLES
+Display information on all system processes:
+.Pp
+.Dl $ ps -auxw
 .Sh SEE ALSO
 .Xr kill 1 ,
 .Xr pgrep 1 ,

Modified: user/attilio/vmobj-readlock/bin/rm/rm.1
==============================================================================
--- user/attilio/vmobj-readlock/bin/rm/rm.1	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/bin/rm/rm.1	Tue Mar 19 17:13:47 2013	(r248526)
@@ -32,7 +32,7 @@
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
 .\" $FreeBSD$
 .\"
-.Dd October 31, 2010
+.Dd March 15, 2013
 .Dt RM 1
 .Os
 .Sh NAME
@@ -193,6 +193,19 @@ When
 is specified with
 .Fl f
 the file will be overwritten and removed even if it has hard links.
+.Sh EXAMPLES
+Recursively remove all files contained within the
+.Pa foobar
+directory hierarchy:
+.Pp
+.Dl $ rm -rf foobar
+.Pp
+Either of these commands will remove the file
+.Pa -f :
+.Bd -literal -offset indent
+$ rm -- -f
+$ rm ./-f
+.Ed
 .Sh COMPATIBILITY
 The
 .Nm

Modified: user/attilio/vmobj-readlock/bin/rmdir/rmdir.1
==============================================================================
--- user/attilio/vmobj-readlock/bin/rmdir/rmdir.1	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/bin/rmdir/rmdir.1	Tue Mar 19 17:13:47 2013	(r248526)
@@ -32,7 +32,7 @@
 .\"	@(#)rmdir.1	8.1 (Berkeley) 5/31/93
 .\" $FreeBSD$
 .\"
-.Dd March 21, 2004
+.Dd March 15, 2013
 .Dt RMDIR 1
 .Os
 .Sh NAME
@@ -86,6 +86,18 @@ successfully.
 .It Li >0
 An error occurred.
 .El
+.Sh EXAMPLES
+Remove the directory
+.Pa foobar ,
+if it is empty:
+.Pp
+.Dl $ rmdir foobar
+.Pp
+Remove all directories up to and including
+.Pa cow ,
+stopping at the first non-empty directory (if any):
+.Pp
+.Dl $ rmdir -p cow/horse/monkey
 .Sh SEE ALSO
 .Xr rm 1
 .Sh STANDARDS

Modified: user/attilio/vmobj-readlock/bin/sh/jobs.c
==============================================================================
--- user/attilio/vmobj-readlock/bin/sh/jobs.c	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/bin/sh/jobs.c	Tue Mar 19 17:13:47 2013	(r248526)
@@ -458,14 +458,15 @@ freejob(struct job *jp)
 
 
 int
-waitcmd(int argc, char **argv)
+waitcmd(int argc __unused, char **argv __unused)
 {
 	struct job *job;
 	int status, retval;
 	struct job *jp;
 
-	if (argc > 1) {
-		job = getjob(argv[1]);
+	nextopt("");
+	if (*argptr != NULL) {
+		job = getjob(*argptr);
 	} else {
 		job = NULL;
 	}

Modified: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Mar 19 17:13:47 2013	(r248526)
@@ -1225,6 +1225,7 @@ dump_bpobj(bpobj_t *bpo, char *name, int
 				continue;
 			}
 			dump_bpobj(&subbpo, "subobj", indent + 1);
+			bpobj_close(&subbpo);
 		}
 	} else {
 		(void) printf("    %*s: object %llu, %llu blkptrs, %s\n",

Modified: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Tue Mar 19 17:13:47 2013	(r248526)
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 10, 2013
+.Dd March 1, 2013
 .Dt ZFS 8
 .Os
 .Sh NAME

Modified: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Tue Mar 19 17:13:47 2013	(r248526)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 15, 2012
+.Dd March 14, 2013
 .Dt ZPOOL 8
 .Os
 .Sh NAME
@@ -1608,14 +1608,15 @@ is specified, the command exits after
 .Ar count
 reports are printed.
 .Pp
-If a scrub or resilver is in progress, this command reports the percentage done
-and the estimated time to completion. Both of these are only approximate,
+If a scrub or resilver is in progress, this command reports the percentage
+done and the estimated time to completion. Both of these are only approximate,
 because the amount of data in the pool and the other workloads on the system
 can change.
 .Bl -tag -width indent
 .It Fl x
 Only display status for pools that are exhibiting errors or are otherwise
 unavailable.
+Warnings about pools not using the latest on-disk format will not be included.
 .It Fl v
 Displays verbose data error information, printing out a complete list of all
 data errors since the last complete pool scrub.

Modified: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Tue Mar 19 17:13:47 2013	(r248526)
@@ -4031,7 +4031,10 @@ status_callback(zpool_handle_t *zhp, voi
 	 * If we were given 'zpool status -x', only report those pools with
 	 * problems.
 	 */
-	if (reason == ZPOOL_STATUS_OK && cbp->cb_explain) {
+	if (cbp->cb_explain &&
+	    (reason == ZPOOL_STATUS_OK ||
+	    reason == ZPOOL_STATUS_VERSION_OLDER ||
+	    reason == ZPOOL_STATUS_FEAT_DISABLED)) {
 		if (!cbp->cb_allpools) {
 			(void) printf(gettext("pool '%s' is healthy\n"),
 			    zpool_get_name(zhp));

Modified: user/attilio/vmobj-readlock/contrib/binutils/gas/config/tc-arm.c
==============================================================================
--- user/attilio/vmobj-readlock/contrib/binutils/gas/config/tc-arm.c	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/contrib/binutils/gas/config/tc-arm.c	Tue Mar 19 17:13:47 2013	(r248526)
@@ -651,6 +651,7 @@ struct asm_opcode
 
 #define BAD_ARGS	_("bad arguments to instruction")
 #define BAD_PC		_("r15 not allowed here")
+#define BAD_SP		_("r13 not allowed here")
 #define BAD_COND	_("instruction cannot be conditional")
 #define BAD_OVERLAP	_("registers may not be the same")
 #define BAD_HIREG	_("lo register required")
@@ -659,6 +660,7 @@ struct asm_opcode
 #define BAD_BRANCH	_("branch must be last instruction in IT block")
 #define BAD_NOT_IT	_("instruction not allowed in IT block")
 #define BAD_FPU		_("selected FPU does not support instruction")
+#define BAD_VMRS	_("APSR_nzcv may only be used with fpscr")
 
 static struct hash_control *arm_ops_hsh;
 static struct hash_control *arm_cond_hsh;
@@ -5164,10 +5166,6 @@ parse_neon_mov (char **str, int *which_o
              Case 10: VMOV.F32 <Sd>, #<imm>
              Case 11: VMOV.F64 <Dd>, #<imm>  */
         inst.operands[i].immisfloat = 1;
-      else if (parse_big_immediate (&ptr, i) == SUCCESS)
-          /* Case 2: VMOV<c><q>.<dt> <Qd>, #<imm>
-             Case 3: VMOV<c><q>.<dt> <Dd>, #<imm>  */
-        ;
       else if ((val = arm_typed_reg_parse (&ptr, REG_TYPE_NSDQ, &rtype,
                                            &optype)) != FAIL)
         {
@@ -5207,6 +5205,10 @@ parse_neon_mov (char **str, int *which_o
               inst.operands[i++].present = 1;
             }
         }
+      else if (parse_big_immediate (&ptr, i) == SUCCESS)
+          /* Case 2: VMOV<c><q>.<dt> <Qd>, #<imm>
+             Case 3: VMOV<c><q>.<dt> <Dd>, #<imm>  */
+        ;
       else
         {
           first_error (_("expected <Rm> or <Dm> or <Qm> operand"));
@@ -7096,6 +7098,64 @@ do_vfp_nsyn_msr (void)
 }
 
 static void
+do_vfp_vmrs (void)
+{
+  int rt;
+
+  /* The destination register can be r0-r14 or APSR_nzcv */
+  if (inst.operands[0].reg > 14)
+    {
+      inst.error = BAD_PC;
+      return;
+    }
+
+  /* If the destination is r13 and not in ARM mode then unprefictable */
+  if (thumb_mode && inst.operands[0].reg == REG_SP)
+    {
+      inst.error = BAD_SP;
+      return;
+    }
+
+  /* If the destination is APSR_nzcv */
+  if (inst.operands[0].isvec && inst.operands[1].reg != 1)
+    {
+      inst.error = BAD_VMRS;
+      return;
+    }
+
+  if (inst.operands[0].isvec)
+    rt = 15;
+  else
+    rt = inst.operands[0].reg;
+
+  /* Or in the registers to use */
+  inst.instruction |= rt << 12;
+  inst.instruction |= inst.operands[1].reg << 16;
+}
+
+static void
+do_vfp_vmsr (void)
+{
+  /* The destination register can be r0-r14 or APSR_nzcv */
+  if (inst.operands[1].reg > 14)
+    {
+      inst.error = BAD_PC;
+      return;
+    }
+
+  /* If the destination is r13 and not in ARM mode then unprefictable */
+  if (thumb_mode && inst.operands[0].reg == REG_SP)
+    {
+      inst.error = BAD_SP;
+      return;
+    }
+
+  /* Or in the registers to use */
+  inst.instruction |= inst.operands[1].reg << 12;
+  inst.instruction |= inst.operands[0].reg << 16;
+}
+
+static void
 do_mrs (void)
 {
   if (do_vfp_nsyn_mrs () == SUCCESS)
@@ -15726,6 +15786,8 @@ static const struct asm_opcode insns[] =
  cCE(ftouizs,	ebc0ac0, 2, (RVS, RVS),	      vfp_sp_monadic),
  cCE(fmrx,	ef00a10, 2, (RR, RVC),	      rd_rn),
  cCE(fmxr,	ee00a10, 2, (RVC, RR),	      rn_rd),
+ cCE(vmrs,	ef00a10, 2, (APSR_RR, RVC),   vfp_vmrs),
+ cCE(vmsr,	ee00a10, 2, (RVC, RR),        vfp_vmsr),
 
   /* Memory operations.	 */
  cCE(flds,	d100a00, 2, (RVS, ADDRGLDC),  vfp_sp_ldst),

Modified: user/attilio/vmobj-readlock/contrib/libc-vis/unvis.3
==============================================================================
--- user/attilio/vmobj-readlock/contrib/libc-vis/unvis.3	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/contrib/libc-vis/unvis.3	Tue Mar 19 17:13:47 2013	(r248526)
@@ -1,4 +1,4 @@
-.\"	$NetBSD: unvis.3,v 1.23 2011/03/17 14:06:29 wiz Exp $
+.\"	$NetBSD: unvis.3,v 1.27 2012/12/15 07:34:36 wiz Exp $
 .\"	$FreeBSD$
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -126,15 +126,17 @@ The
 function has several return codes that must be handled properly.
 They are:
 .Bl -tag -width UNVIS_VALIDPUSH
-.It Li \&0 (zero)
+.It Li \&0 No (zero)
 Another character is necessary; nothing has been recognized yet.
 .It Dv UNVIS_VALID
 A valid character has been recognized and is available at the location
-pointed to by cp.
+pointed to by
+.Fa cp .
 .It Dv UNVIS_VALIDPUSH
 A valid character has been recognized and is available at the location
-pointed to by cp; however, the character currently passed in should
-be passed in again.
+pointed to by
+.Fa cp ;
+however, the character currently passed in should be passed in again.
 .It Dv UNVIS_NOCHAR
 A valid sequence was detected, but no character was produced.
 This return code is necessary to indicate a logical break between characters.
@@ -150,7 +152,7 @@ one more time with flag set to
 to extract any remaining character (the character passed in is ignored).
 .Pp
 The
-.Ar flag
+.Fa flag
 argument is also used to specify the encoding style of the source.
 If set to
 .Dv VIS_HTTPSTYLE
@@ -161,7 +163,8 @@ will decode URI strings as specified in 
 If set to
 .Dv VIS_HTTP1866 ,
 .Fn unvis
-will decode URI strings as specified in RFC 1866.
+will decode entity references and numeric character references
+as specified in RFC 1866.
 If set to
 .Dv VIS_MIMESTYLE ,
 .Fn unvis
@@ -169,7 +172,9 @@ will decode MIME Quoted-Printable string
 If set to
 .Dv VIS_NOESCAPE ,
 .Fn unvis
-will not decode \e quoted characters.
+will not decode
+.Ql \e
+quoted characters.
 .Pp
 The following code fragment illustrates a proper use of
 .Fn unvis .
@@ -204,7 +209,7 @@ The functions
 and
 .Fn strnunvisx
 will return \-1 on error and set
-.Va errno 
+.Va errno
 to:
 .Bl -tag -width Er
 .It Bq Er EINVAL
@@ -212,7 +217,7 @@ An invalid escape sequence was detected,
 .El
 .Pp
 In addition the functions
-.Fn strnunvis 
+.Fn strnunvis
 and
 .Fn strnunvisx
 will can also set
@@ -244,4 +249,14 @@ and
 functions appeared in
 .Nx 6.0
 and
-.Fx 10.0 .
+.Fx 9.2 .
+.Sh BUGS
+The names
+.Dv VIS_HTTP1808
+and
+.Dv VIS_HTTP1866
+are wrong.
+Percent-encoding was defined in RFC 1738, the original RFC for URL.
+RFC 1866 defines HTML 2.0, an application of SGML, from which it
+inherits concepts of numeric character references and entity
+references.

Modified: user/attilio/vmobj-readlock/contrib/libc-vis/unvis.c
==============================================================================
--- user/attilio/vmobj-readlock/contrib/libc-vis/unvis.c	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/contrib/libc-vis/unvis.c	Tue Mar 19 17:13:47 2013	(r248526)
@@ -1,4 +1,4 @@
-/*	$NetBSD: unvis.c,v 1.40 2012/12/14 21:31:01 christos Exp $	*/
+/*	$NetBSD: unvis.c,v 1.41 2012/12/15 04:29:53 matt Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: unvis.c,v 1.40 2012/12/14 21:31:01 christos Exp $");
+__RCSID("$NetBSD: unvis.c,v 1.41 2012/12/15 04:29:53 matt Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 __FBSDID("$FreeBSD$");
@@ -90,7 +90,7 @@ __weak_alias(strnunvisx,_strnunvisx)
  * RFC 1866
  */
 static const struct nv {
-	const char name[7];
+	char name[7];
 	uint8_t value;
 } nv[] = {
 	{ "AElig",	198 }, /* capital AE diphthong (ligature)  */

Modified: user/attilio/vmobj-readlock/contrib/libc-vis/vis.3
==============================================================================
--- user/attilio/vmobj-readlock/contrib/libc-vis/vis.3	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/contrib/libc-vis/vis.3	Tue Mar 19 17:13:47 2013	(r248526)
@@ -1,4 +1,4 @@
-.\"	$NetBSD: vis.3,v 1.29 2012/12/14 22:55:59 christos Exp $
+.\"	$NetBSD: vis.3,v 1.39 2013/02/20 20:05:26 christos Exp $
 .\"	$FreeBSD$
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)vis.3	8.1 (Berkeley) 6/9/93
 .\"
-.Dd December 14, 2012
+.Dd February 19, 2013
 .Dt VIS 3
 .Os
 .Sh NAME
@@ -40,12 +40,14 @@
 .Nm strnvis ,
 .Nm strvisx ,
 .Nm strnvisx ,
+.Nm strenvisx ,
 .Nm svis ,
 .Nm snvis ,
 .Nm strsvis ,
 .Nm strsnvis ,
-.Nm strsvisx
-.Nm strsnvisx
+.Nm strsvisx ,
+.Nm strsnvisx ,
+.Nm strsenvisx
 .Nd visually encode characters
 .Sh LIBRARY
 .Lb libc
@@ -63,6 +65,8 @@
 .Fn strvisx "char *dst" "const char *src" "size_t len" "int flag"
 .Ft int
 .Fn strnvisx "char *dst" "size_t dlen" "const char *src" "size_t len" "int flag"
+.Ft int
+.Fn strenvisx "char *dst" "size_t dlen" "const char *src" "size_t len" "int flag" "int *cerr_ptr"
 .Ft char *
 .Fn svis "char *dst" "int c" "int flag" "int nextc" "const char *extra"
 .Ft char *
@@ -75,6 +79,8 @@
 .Fn strsvisx "char *dst" "const char *src" "size_t len" "int flag" "const char *extra"
 .Ft int
 .Fn strsnvisx "char *dst" "size_t dlen" "const char *src" "size_t len" "int flag" "const char *extra"
+.Ft int
+.Fn strsenvisx "char *dst" "size_t dlen" "const char *src" "size_t len" "int flag" "const char *extra" "int *cerr_ptr"
 .Sh DESCRIPTION
 The
 .Fn vis
@@ -89,11 +95,11 @@ needs no encoding, it is copied in unalt
 The string is null terminated, and a pointer to the end of the string is
 returned.
 The maximum length of any encoding is four
-characters (not including the trailing
+bytes (not including the trailing
 .Dv NUL ) ;
 thus, when
 encoding a set of characters into a buffer, the size of the buffer should
-be four times the number of characters encoded, plus one for the trailing
+be four times the number of bytes encoded, plus one for the trailing
 .Dv NUL .
 The flag parameter is used for altering the default range of
 characters considered for encoding and for altering the visual
@@ -142,16 +148,17 @@ terminate
 The size of
 .Fa dst
 must be four times the number
-of characters encoded from
+of bytes encoded from
 .Fa src
 (plus one for the
 .Dv NUL ) .
 Both
-forms return the number of characters in dst (not including
-the trailing
+forms return the number of characters in
+.Fa dst
+(not including the trailing
 .Dv NUL ) .
 The
-.Dq n
+.Dq Nm n
 versions of the functions also take an additional argument
 .Fa dlen
 that indicates the length of the
@@ -159,7 +166,7 @@ that indicates the length of the
 buffer.
 If
 .Fa dlen
-is not large enough to fix the converted string then the
+is not large enough to fit the converted string then the
 .Fn strnvis
 and
 .Fn strnvisx
@@ -167,6 +174,14 @@ functions return \-1 and set
 .Va errno
 to
 .Dv ENOSPC .
+The
+.Fn strenvisx
+function takes an additional argument,
+.Fa cerr_ptr ,
+that is used to pass in and out a multibyte conversion error flag.
+This is useful when processing single characters at a time when
+it is possible that the locale may be set to something other
+than the locale of the characters in the input data.
 .Pp
 The functions
 .Fn svis ,
@@ -174,16 +189,18 @@ The functions
 .Fn strsvis ,
 .Fn strsnvis ,
 .Fn strsvisx ,
+.Fn strsnvisx ,
 and
-.Fn strsnvisx
+.Fn strsenvisx
 correspond to
 .Fn vis ,
 .Fn nvis ,
 .Fn strvis ,
 .Fn strnvis ,
 .Fn strvisx ,
+.Fn strnvisx ,
 and
-.Fn strnvisx
+.Fn strenvisx
 but have an additional argument
 .Fa extra ,
 pointing to a
@@ -214,14 +231,13 @@ and
 .Fn strnvisx ) ,
 and the type of representation used.
 By default, all non-graphic characters,
-except space, tab, and newline are encoded.
-(See
-.Xr isgraph 3 . )
+except space, tab, and newline are encoded (see
+.Xr isgraph 3 ) .
 The following flags
 alter this:
 .Bl -tag -width VIS_WHITEX
 .It Dv VIS_GLOB
-Also encode magic characters
+Also encode the magic characters
 .Ql ( * ,
 .Ql \&? ,
 .Ql \&[
@@ -243,11 +259,13 @@ Synonym for
 \&|
 .Dv VIS_NL .
 .It Dv VIS_SAFE
-Only encode "unsafe" characters.
+Only encode
+.Dq unsafe
+characters.
 Unsafe means control characters which may cause common terminals to perform
 unexpected functions.
 Currently this form allows space, tab, newline, backspace, bell, and
-return - in addition to all graphic characters - unencoded.
+return \(em in addition to all graphic characters \(em unencoded.
 .El
 .Pp
 (The above flags have no effect for
@@ -287,8 +305,8 @@ Use an
 to represent meta characters (characters with the 8th
 bit set), and use caret
 .Ql ^
-to represent control characters see
-.Pf ( Xr iscntrl 3 ) .
+to represent control characters (see
+.Xr iscntrl 3 ) .
 The following formats are used:
 .Bl -tag -width xxxxx
 .It Dv \e^C
@@ -335,19 +353,20 @@ Use C-style backslash sequences to repre
 characters.
 The following sequences are used to represent the indicated characters:
 .Bd -unfilled -offset indent
-.Li \ea Tn  - BEL No (007)
-.Li \eb Tn  - BS No (010)
-.Li \ef Tn  - NP No (014)
-.Li \en Tn  - NL No (012)
-.Li \er Tn  - CR No (015)
-.Li \es Tn  - SP No (040)
-.Li \et Tn  - HT No (011)
-.Li \ev Tn  - VT No (013)
-.Li \e0 Tn  - NUL No (000)
+.Li \ea Tn  \(em BEL No (007)
+.Li \eb Tn  \(em BS No (010)
+.Li \ef Tn  \(em NP No (014)
+.Li \en Tn  \(em NL No (012)
+.Li \er Tn  \(em CR No (015)
+.Li \es Tn  \(em SP No (040)
+.Li \et Tn  \(em HT No (011)
+.Li \ev Tn  \(em VT No (013)
+.Li \e0 Tn  \(em NUL No (000)
 .Ed
 .Pp
-When using this format, the nextc parameter is looked at to determine
-if a
+When using this format, the
+.Fa nextc
+parameter is looked at to determine if a
 .Dv NUL
 character can be encoded as
 .Ql \e0
@@ -374,8 +393,8 @@ represents a lower case hexadecimal digi
 .It Dv VIS_MIMESTYLE
 Use MIME Quoted-Printable encoding as described in RFC 2045, only don't
 break lines and don't handle CRLF.
-The form is:
-.Ql %XX
+The form is
+.Ql =XX
 where
 .Em X
 represents an upper case hexadecimal digit.
@@ -392,6 +411,41 @@ meta characters as
 .Ql M-C ) .
 With this flag set, the encoding is
 ambiguous and non-invertible.
+.Sh MULTIBYTE CHARACTER SUPPORT
+These functions support multibyte character input.
+The encoding conversion is influenced by the setting of the
+.Ev LC_CTYPE
+environment variable which defines the set of characters
+that can be copied without encoding.
+.Pp
+When 8-bit data is present in the input,
+.Ev LC_CTYPE
+must be set to the correct locale or to the C locale.
+If the locales of the data and the conversion are mismatched,
+multibyte character recognition may fail and encoding will be performed
+byte-by-byte instead.
+.Pp
+As noted above,
+.Fa dst
+must be four times the number of bytes processed from
+.Fa src .
+But note that each multibyte character can be up to
+.Dv MB_LEN_MAX
+bytes
+.\" (see
+.\" .Xr multibyte 3 )
+so in terms of multibyte characters,
+.Fa dst
+must be four times
+.Dv MB_LEN_MAX
+times the number of characters processed from
+.Fa src .
+.Sh ENVIRONMENT
+.Bl -tag -width ".Ev LC_CTYPE"
+.It Ev LC_CTYPE
+Specify the locale of the input data.
+Set to C if the input data locale is unknown.
+.El
 .Sh ERRORS
 The functions
 .Fn nvis
@@ -407,11 +461,11 @@ and
 .Fn strsnvisx ,
 will return \-1 when the
 .Fa dlen
-destination buffer length size is not enough to perform the conversion while
+destination buffer size is not enough to perform the conversion while
 setting
 .Va errno
 to:
-.Bl -tag -width Er
+.Bl -tag -width ".Bq Er ENOSPC"
 .It Bq Er ENOSPC
 The destination buffer size is not large enough to perform the conversion.
 .El
@@ -419,18 +473,23 @@ The destination buffer size is not large
 .Xr unvis 1 ,
 .Xr vis 1 ,
 .Xr glob 3 ,
+.\" .Xr multibyte 3 ,
 .Xr unvis 3
 .Rs
 .%A T. Berners-Lee
 .%T Uniform Resource Locators (URL)
-.%O RFC1738
+.%O "RFC 1738"
+.Re
+.Rs
+.%T "Multipurpose Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies"
+.%O "RFC 2045"
 .Re
 .Sh HISTORY
 The
 .Fn vis ,
 .Fn strvis ,
 and
-.Fa strvisx
+.Fn strvisx
 functions first appeared in
 .Bx 4.4 .
 The
@@ -441,7 +500,7 @@ and
 functions appeared in
 .Nx 1.5
 and
-.Fx 10.0 .
+.Fx 9.2 .
 The buffer size limited versions of the functions
 .Po Fn nvis ,
 .Fn strnvis ,
@@ -451,6 +510,9 @@ The buffer size limited versions of the 
 and
 .Fn strsnvisx Pc
 appeared in
-.Nx 6.0
 and
-.Fx 10.0 .
+.Fx 9.2 .
+Myltibyte character support was added in
+.Nx 7.0
+and
+.Fx 9.2 .

Modified: user/attilio/vmobj-readlock/contrib/libc-vis/vis.c
==============================================================================
--- user/attilio/vmobj-readlock/contrib/libc-vis/vis.c	Tue Mar 19 16:57:04 2013	(r248525)
+++ user/attilio/vmobj-readlock/contrib/libc-vis/vis.c	Tue Mar 19 17:13:47 2013	(r248526)
@@ -1,4 +1,4 @@
-/*	$NetBSD: vis.c,v 1.45 2012/12/14 21:38:18 christos Exp $	*/
+/*	$NetBSD: vis.c,v 1.60 2013/02/21 16:21:20 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -57,19 +57,23 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vis.c,v 1.45 2012/12/14 21:38:18 christos Exp $");
+__RCSID("$NetBSD: vis.c,v 1.60 2013/02/21 16:21:20 joerg Exp $");
 #endif /* LIBC_SCCS and not lint */
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#define	_DIAGASSERT(x)	assert(x)
+#endif
 
 #include "namespace.h"
 #include <sys/types.h>
+#include <sys/param.h>
 
 #include <assert.h>
 #include <vis.h>
 #include <errno.h>
 #include <stdlib.h>
-
-#define	_DIAGASSERT(x)	assert(x)
+#include <wchar.h>
+#include <wctype.h>
 
 #ifdef __weak_alias
 __weak_alias(strvisx,_strvisx)
@@ -81,65 +85,66 @@ __weak_alias(strvisx,_strvisx)
 #include <stdio.h>
 #include <string.h>
 
-static char *do_svis(char *, size_t *, int, int, int, const char *);
+/*
+ * The reason for going through the trouble to deal with character encodings
+ * in vis(3), is that we use this to safe encode output of commands. This
+ * safe encoding varies depending on the character set. For example if we
+ * display ps output in French, we don't want to display French characters
+ * as M-foo.
+ */
+
+static wchar_t *do_svis(wchar_t *, wint_t, int, wint_t, const wchar_t *);
 
 #undef BELL
-#define BELL '\a'
+#define BELL L'\a'
+
+#define iswoctal(c)	(((u_char)(c)) >= L'0' && ((u_char)(c)) <= L'7')
+#define iswwhite(c)	(c == L' ' || c == L'\t' || c == L'\n')
+#define iswsafe(c)	(c == L'\b' || c == BELL || c == L'\r')
+#define xtoa(c)		L"0123456789abcdef"[c]
+#define XTOA(c)		L"0123456789ABCDEF"[c]
 
-#define isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
-#define iswhite(c)	(c == ' ' || c == '\t' || c == '\n')
-#define issafe(c)	(c == '\b' || c == BELL || c == '\r')
-#define xtoa(c)		"0123456789abcdef"[c]
-#define XTOA(c)		"0123456789ABCDEF"[c]
-
-#define MAXEXTRAS	9
-
-#define MAKEEXTRALIST(flag, extra, orig_str)				      \
-do {									      \
-	const char *orig = orig_str;					      \
-	const char *o = orig;						      \
-	char *e;							      \
-	while (*o++)							      \
-		continue;						      \
-	extra = malloc((size_t)((o - orig) + MAXEXTRAS));		      \
-	if (!extra) break;						      \
-	for (o = orig, e = extra; (*e++ = *o++) != '\0';)		      \
-		continue;						      \
-	e--;								      \
-	if (flag & VIS_GLOB) {						      \
-		*e++ = '*';						      \
-		*e++ = '?';						      \
-		*e++ = '[';						      \
-		*e++ = '#';						      \
-	}								      \
-	if (flag & VIS_SP) *e++ = ' ';					      \
-	if (flag & VIS_TAB) *e++ = '\t';				      \
-	if (flag & VIS_NL) *e++ = '\n';					      \
-	if ((flag & VIS_NOSLASH) == 0) *e++ = '\\';			      \
-	*e = '\0';							      \
-} while (/*CONSTCOND*/0)
+#define MAXEXTRAS	10
+
+#if !HAVE_NBTOOL_CONFIG_H
+#ifndef __NetBSD__
+/*
+ * On NetBSD MB_LEN_MAX is currently 32 which does not fit on any integer
+ * integral type and it is probably wrong, since currently the maximum
+ * number of bytes and character needs is 6. Until this is fixed, the
+ * loops below are using sizeof(uint64_t) - 1 instead of MB_LEN_MAX, and
+ * the assertion is commented out.
+ */
+#ifdef __FreeBSD__
+/*
+ * On FreeBSD including <sys/systm.h> for CTASSERT only works in kernel
+ * mode.
+ */
+#ifndef CTASSERT
+#define CTASSERT(x)             _CTASSERT(x, __LINE__)
+#define _CTASSERT(x, y)         __CTASSERT(x, y)
+#define __CTASSERT(x, y)        typedef char __assert ## y[(x) ? 1 : -1]
+#endif
+#endif /* __FreeBSD__ */
+CTASSERT(MB_LEN_MAX <= sizeof(uint64_t));
+#endif /* !__NetBSD__ */
+#endif
 
 /*
  * This is do_hvis, for HTTP style (RFC 1808)
  */
-static char *
-do_hvis(char *dst, size_t *dlen, int c, int flag, int nextc, const char *extra)
+static wchar_t *
+do_hvis(wchar_t *dst, wint_t c, int flags, wint_t nextc, const wchar_t *extra)
 {

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
