svn commit: r271894 - in projects/bhyve_svm: . bin/csh cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf cddl/contrib/opensolaris/cmd/...

Sat Sep 20 06:27:47 UTC 2014

Author: neel
Date: Sat Sep 20 06:27:37 2014
New Revision: 271894
URL: http://svnweb.freebsd.org/changeset/base/271894

Log:
  IFC @r271887

Added:
  projects/bhyve_svm/etc/devd/hyperv.conf
     - copied unchanged from r271887, head/etc/devd/hyperv.conf
  projects/bhyve_svm/sys/boot/efi/include/eficonsctl.h
     - copied unchanged from r271887, head/sys/boot/efi/include/eficonsctl.h
  projects/bhyve_svm/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c
     - copied unchanged from r271887, head/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c
  projects/bhyve_svm/sys/compat/linux/linux_timer.c
     - copied unchanged from r271887, head/sys/compat/linux/linux_timer.c
  projects/bhyve_svm/sys/compat/linux/linux_timer.h
     - copied unchanged from r271887, head/sys/compat/linux/linux_timer.h
  projects/bhyve_svm/sys/dev/drm2/i915/i915_gem_context.c
     - copied unchanged from r271887, head/sys/dev/drm2/i915/i915_gem_context.c
  projects/bhyve_svm/sys/dev/rl/
     - copied from r271887, head/sys/dev/rl/
Deleted:
  projects/bhyve_svm/etc/rc.d/hv_kvpd
  projects/bhyve_svm/sys/pci/if_rl.c
  projects/bhyve_svm/sys/pci/if_rlreg.h
Modified:
  projects/bhyve_svm/Makefile.inc1
  projects/bhyve_svm/ObsoleteFiles.inc
  projects/bhyve_svm/bin/csh/Makefile
  projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c
  projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh
  projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh
  projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh
  projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh
  projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
  projects/bhyve_svm/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c
  projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c
  projects/bhyve_svm/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/bhyve_svm/contrib/atf/NEWS
  projects/bhyve_svm/contrib/atf/atf-c/macros_h_test.c
  projects/bhyve_svm/contrib/one-true-awk/awk.1
  projects/bhyve_svm/contrib/one-true-awk/main.c
  projects/bhyve_svm/contrib/one-true-awk/run.c
  projects/bhyve_svm/etc/defaults/rc.conf
  projects/bhyve_svm/etc/devd/Makefile
  projects/bhyve_svm/etc/mail/Makefile
  projects/bhyve_svm/etc/rc.d/Makefile
  projects/bhyve_svm/include/unistd.h
  projects/bhyve_svm/kerberos5/lib/libasn1/Makefile
  projects/bhyve_svm/lib/libc/Makefile
  projects/bhyve_svm/lib/libc/gen/nlist.c
  projects/bhyve_svm/lib/libc/sys/mmap.2
  projects/bhyve_svm/lib/libgeom/geom_stats.c
  projects/bhyve_svm/lib/libnv/nvpair.c
  projects/bhyve_svm/lib/libunbound/Makefile
  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/release/picobsd/tinyware/simple_httpd/simple_httpd.c
  projects/bhyve_svm/release/scripts/pkg-stage.sh
  projects/bhyve_svm/sbin/ifconfig/ifconfig.8
  projects/bhyve_svm/sbin/savecore/savecore.c
  projects/bhyve_svm/share/man/man4/lagg.4
  projects/bhyve_svm/share/man/man4/malo.4
  projects/bhyve_svm/share/man/man9/Makefile
  projects/bhyve_svm/share/man/man9/SDT.9
  projects/bhyve_svm/share/man/man9/altq.9
  projects/bhyve_svm/sys/amd64/amd64/fpu.c
  projects/bhyve_svm/sys/amd64/amd64/pmap.c
  projects/bhyve_svm/sys/amd64/linux32/linux.h
  projects/bhyve_svm/sys/amd64/linux32/linux32_dummy.c
  projects/bhyve_svm/sys/amd64/linux32/linux32_proto.h
  projects/bhyve_svm/sys/amd64/linux32/linux32_syscall.h
  projects/bhyve_svm/sys/amd64/linux32/linux32_syscalls.c
  projects/bhyve_svm/sys/amd64/linux32/linux32_sysent.c
  projects/bhyve_svm/sys/amd64/linux32/linux32_systrace_args.c
  projects/bhyve_svm/sys/amd64/linux32/syscalls.master
  projects/bhyve_svm/sys/arm/allwinner/if_emac.c
  projects/bhyve_svm/sys/arm/at91/if_ate.c
  projects/bhyve_svm/sys/arm/at91/if_macb.c
  projects/bhyve_svm/sys/arm/cavium/cns11xx/if_ece.c
  projects/bhyve_svm/sys/arm/lpc/if_lpe.c
  projects/bhyve_svm/sys/arm/ti/cpsw/if_cpsw.c
  projects/bhyve_svm/sys/arm/xscale/ixp425/if_npe.c
  projects/bhyve_svm/sys/boot/amd64/boot1.efi/boot1.c
  projects/bhyve_svm/sys/boot/amd64/efi/bootinfo.c
  projects/bhyve_svm/sys/boot/efi/libefi/libefi.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_block.c
  projects/bhyve_svm/sys/cam/ctl/ctl_cmd_table.c
  projects/bhyve_svm/sys/cam/ctl/ctl_tpc.c
  projects/bhyve_svm/sys/cam/scsi/scsi_all.h
  projects/bhyve_svm/sys/cddl/compat/opensolaris/sys/sdt.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/bpobj.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/spa_misc.c
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  projects/bhyve_svm/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
  projects/bhyve_svm/sys/cddl/dev/fbt/powerpc/fbt_isa.c
  projects/bhyve_svm/sys/compat/linprocfs/linprocfs.c
  projects/bhyve_svm/sys/conf/files
  projects/bhyve_svm/sys/conf/files.amd64
  projects/bhyve_svm/sys/conf/files.i386
  projects/bhyve_svm/sys/conf/files.pc98
  projects/bhyve_svm/sys/contrib/altq/altq/if_altq.h
  projects/bhyve_svm/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
  projects/bhyve_svm/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub.c
  projects/bhyve_svm/sys/dev/acpica/acpi.c
  projects/bhyve_svm/sys/dev/ae/if_ae.c
  projects/bhyve_svm/sys/dev/age/if_age.c
  projects/bhyve_svm/sys/dev/alc/if_alc.c
  projects/bhyve_svm/sys/dev/ale/if_ale.c
  projects/bhyve_svm/sys/dev/altera/atse/if_atse.c
  projects/bhyve_svm/sys/dev/an/if_an.c
  projects/bhyve_svm/sys/dev/ath/if_ath.c
  projects/bhyve_svm/sys/dev/ath/if_ath_rx.c
  projects/bhyve_svm/sys/dev/ath/if_ath_rx_edma.c
  projects/bhyve_svm/sys/dev/ath/if_ath_tx.c
  projects/bhyve_svm/sys/dev/ath/if_athvar.h
  projects/bhyve_svm/sys/dev/bfe/if_bfe.c
  projects/bhyve_svm/sys/dev/bge/if_bge.c
  projects/bhyve_svm/sys/dev/bm/if_bm.c
  projects/bhyve_svm/sys/dev/bwi/if_bwi.c
  projects/bhyve_svm/sys/dev/bwn/if_bwn.c
  projects/bhyve_svm/sys/dev/bxe/bxe.c
  projects/bhyve_svm/sys/dev/bxe/bxe_stats.c
  projects/bhyve_svm/sys/dev/bxe/bxe_stats.h
  projects/bhyve_svm/sys/dev/bxe/ecore_sp.h
  projects/bhyve_svm/sys/dev/cadence/if_cgem.c
  projects/bhyve_svm/sys/dev/cas/if_cas.c
  projects/bhyve_svm/sys/dev/ce/if_ce.c
  projects/bhyve_svm/sys/dev/cm/smc90cx6.c
  projects/bhyve_svm/sys/dev/cp/if_cp.c
  projects/bhyve_svm/sys/dev/cs/if_cs.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_main.c
  projects/bhyve_svm/sys/dev/dc/if_dc.c
  projects/bhyve_svm/sys/dev/de/if_de.c
  projects/bhyve_svm/sys/dev/drm2/drm_gem_names.c
  projects/bhyve_svm/sys/dev/drm2/drm_gem_names.h
  projects/bhyve_svm/sys/dev/drm2/i915/i915_dma.c
  projects/bhyve_svm/sys/dev/drm2/i915/i915_drm.h
  projects/bhyve_svm/sys/dev/drm2/i915/i915_drv.c
  projects/bhyve_svm/sys/dev/drm2/i915/i915_drv.h
  projects/bhyve_svm/sys/dev/drm2/i915/i915_gem.c
  projects/bhyve_svm/sys/dev/drm2/i915/i915_gem_execbuffer.c
  projects/bhyve_svm/sys/dev/drm2/i915/i915_gem_gtt.c
  projects/bhyve_svm/sys/dev/drm2/i915/i915_irq.c
  projects/bhyve_svm/sys/dev/drm2/i915/i915_reg.h
  projects/bhyve_svm/sys/dev/drm2/i915/intel_ringbuffer.c
  projects/bhyve_svm/sys/dev/drm2/i915/intel_ringbuffer.h
  projects/bhyve_svm/sys/dev/e1000/if_em.c
  projects/bhyve_svm/sys/dev/e1000/if_igb.c
  projects/bhyve_svm/sys/dev/e1000/if_igb.h
  projects/bhyve_svm/sys/dev/e1000/if_lem.c
  projects/bhyve_svm/sys/dev/ed/if_ed.c
  projects/bhyve_svm/sys/dev/en/midway.c
  projects/bhyve_svm/sys/dev/ep/if_ep.c
  projects/bhyve_svm/sys/dev/ex/if_ex.c
  projects/bhyve_svm/sys/dev/fatm/if_fatm.c
  projects/bhyve_svm/sys/dev/fe/if_fe.c
  projects/bhyve_svm/sys/dev/ffec/if_ffec.c
  projects/bhyve_svm/sys/dev/firewire/firewire.c
  projects/bhyve_svm/sys/dev/firewire/firewire.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/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/fwohcivar.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_targ.c
  projects/bhyve_svm/sys/dev/fxp/if_fxp.c
  projects/bhyve_svm/sys/dev/gem/if_gem.c
  projects/bhyve_svm/sys/dev/gxemul/ether/if_gx.c
  projects/bhyve_svm/sys/dev/hatm/if_hatm_rx.c
  projects/bhyve_svm/sys/dev/hatm/if_hatm_tx.c
  projects/bhyve_svm/sys/dev/hme/if_hme.c
  projects/bhyve_svm/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/bhyve_svm/sys/dev/ie/if_ie.c
  projects/bhyve_svm/sys/dev/if_ndis/if_ndis.c
  projects/bhyve_svm/sys/dev/iicbus/if_ic.c
  projects/bhyve_svm/sys/dev/ipw/if_ipw.c
  projects/bhyve_svm/sys/dev/iscsi/iscsi.c
  projects/bhyve_svm/sys/dev/isp/isp_freebsd.c
  projects/bhyve_svm/sys/dev/isp/isp_freebsd.h
  projects/bhyve_svm/sys/dev/iwi/if_iwi.c
  projects/bhyve_svm/sys/dev/iwn/if_iwn.c
  projects/bhyve_svm/sys/dev/ixl/i40e_alloc.h
  projects/bhyve_svm/sys/dev/ixl/i40e_osdep.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/le/am7990.c
  projects/bhyve_svm/sys/dev/le/am79900.c
  projects/bhyve_svm/sys/dev/le/lance.c
  projects/bhyve_svm/sys/dev/lge/if_lge.c
  projects/bhyve_svm/sys/dev/lmc/if_lmc.c
  projects/bhyve_svm/sys/dev/malo/if_malo.c
  projects/bhyve_svm/sys/dev/mge/if_mge.c
  projects/bhyve_svm/sys/dev/mii/rgephy.c
  projects/bhyve_svm/sys/dev/mii/rlphy.c
  projects/bhyve_svm/sys/dev/mii/rlswitch.c
  projects/bhyve_svm/sys/dev/msk/if_msk.c
  projects/bhyve_svm/sys/dev/mwl/if_mwl.c
  projects/bhyve_svm/sys/dev/mxge/if_mxge.c
  projects/bhyve_svm/sys/dev/my/if_my.c
  projects/bhyve_svm/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c
  projects/bhyve_svm/sys/dev/netmap/if_lem_netmap.h
  projects/bhyve_svm/sys/dev/netmap/if_re_netmap.h
  projects/bhyve_svm/sys/dev/nfe/if_nfe.c
  projects/bhyve_svm/sys/dev/nge/if_nge.c
  projects/bhyve_svm/sys/dev/oce/oce_if.c
  projects/bhyve_svm/sys/dev/patm/if_patm_rx.c
  projects/bhyve_svm/sys/dev/patm/if_patm_tx.c
  projects/bhyve_svm/sys/dev/pcn/if_pcn.c
  projects/bhyve_svm/sys/dev/pdq/pdq_ifsubr.c
  projects/bhyve_svm/sys/dev/ppbus/if_plip.c
  projects/bhyve_svm/sys/dev/qlxgbe/ql_hw.c
  projects/bhyve_svm/sys/dev/qlxgbe/ql_isr.c
  projects/bhyve_svm/sys/dev/qlxge/qls_isr.c
  projects/bhyve_svm/sys/dev/ral/rt2560.c
  projects/bhyve_svm/sys/dev/ral/rt2661.c
  projects/bhyve_svm/sys/dev/ral/rt2860.c
  projects/bhyve_svm/sys/dev/re/if_re.c
  projects/bhyve_svm/sys/dev/rt/if_rt.c
  projects/bhyve_svm/sys/dev/sbni/if_sbni.c
  projects/bhyve_svm/sys/dev/sf/if_sf.c
  projects/bhyve_svm/sys/dev/sge/if_sge.c
  projects/bhyve_svm/sys/dev/sis/if_sis.c
  projects/bhyve_svm/sys/dev/sk/if_sk.c
  projects/bhyve_svm/sys/dev/smc/if_smc.c
  projects/bhyve_svm/sys/dev/sn/if_sn.c
  projects/bhyve_svm/sys/dev/snc/dp83932.c
  projects/bhyve_svm/sys/dev/ste/if_ste.c
  projects/bhyve_svm/sys/dev/stge/if_stge.c
  projects/bhyve_svm/sys/dev/tl/if_tl.c
  projects/bhyve_svm/sys/dev/tsec/if_tsec.c
  projects/bhyve_svm/sys/dev/tx/if_tx.c
  projects/bhyve_svm/sys/dev/usb/net/if_aue.c
  projects/bhyve_svm/sys/dev/usb/net/if_axe.c
  projects/bhyve_svm/sys/dev/usb/net/if_axge.c
  projects/bhyve_svm/sys/dev/usb/net/if_cdce.c
  projects/bhyve_svm/sys/dev/usb/net/if_cue.c
  projects/bhyve_svm/sys/dev/usb/net/if_ipheth.c
  projects/bhyve_svm/sys/dev/usb/net/if_kue.c
  projects/bhyve_svm/sys/dev/usb/net/if_mos.c
  projects/bhyve_svm/sys/dev/usb/net/if_rue.c
  projects/bhyve_svm/sys/dev/usb/net/if_smsc.c
  projects/bhyve_svm/sys/dev/usb/net/if_udav.c
  projects/bhyve_svm/sys/dev/usb/net/if_urndis.c
  projects/bhyve_svm/sys/dev/usb/net/if_usie.c
  projects/bhyve_svm/sys/dev/usb/net/uhso.c
  projects/bhyve_svm/sys/dev/usb/net/usb_ethernet.c
  projects/bhyve_svm/sys/dev/usb/serial/u3g.c
  projects/bhyve_svm/sys/dev/usb/usbdevs
  projects/bhyve_svm/sys/dev/usb/wlan/if_rsu.c
  projects/bhyve_svm/sys/dev/usb/wlan/if_rum.c
  projects/bhyve_svm/sys/dev/usb/wlan/if_run.c
  projects/bhyve_svm/sys/dev/usb/wlan/if_uath.c
  projects/bhyve_svm/sys/dev/usb/wlan/if_upgt.c
  projects/bhyve_svm/sys/dev/usb/wlan/if_ural.c
  projects/bhyve_svm/sys/dev/usb/wlan/if_urtw.c
  projects/bhyve_svm/sys/dev/usb/wlan/if_urtwn.c
  projects/bhyve_svm/sys/dev/usb/wlan/if_zyd.c
  projects/bhyve_svm/sys/dev/vge/if_vge.c
  projects/bhyve_svm/sys/dev/virtio/network/if_vtnet.c
  projects/bhyve_svm/sys/dev/vr/if_vr.c
  projects/bhyve_svm/sys/dev/vt/vt.h
  projects/bhyve_svm/sys/dev/vt/vt_buf.c
  projects/bhyve_svm/sys/dev/vt/vt_core.c
  projects/bhyve_svm/sys/dev/vx/if_vx.c
  projects/bhyve_svm/sys/dev/vxge/vxge.c
  projects/bhyve_svm/sys/dev/wb/if_wb.c
  projects/bhyve_svm/sys/dev/wl/if_wl.c
  projects/bhyve_svm/sys/dev/wpi/if_wpi.c
  projects/bhyve_svm/sys/dev/wtap/if_wtap.c
  projects/bhyve_svm/sys/dev/xe/if_xe.c
  projects/bhyve_svm/sys/dev/xen/netback/netback.c
  projects/bhyve_svm/sys/dev/xen/netfront/netfront.c
  projects/bhyve_svm/sys/dev/xl/if_xl.c
  projects/bhyve_svm/sys/fs/autofs/autofs.c
  projects/bhyve_svm/sys/i386/i386/pmap.c
  projects/bhyve_svm/sys/i386/linux/linux.h
  projects/bhyve_svm/sys/i386/linux/linux_machdep.c
  projects/bhyve_svm/sys/i386/linux/linux_proto.h
  projects/bhyve_svm/sys/i386/linux/linux_syscall.h
  projects/bhyve_svm/sys/i386/linux/linux_syscalls.c
  projects/bhyve_svm/sys/i386/linux/linux_sysent.c
  projects/bhyve_svm/sys/i386/linux/linux_systrace_args.c
  projects/bhyve_svm/sys/i386/linux/syscalls.master
  projects/bhyve_svm/sys/kern/kern_intr.c
  projects/bhyve_svm/sys/kern/sched_ule.c
  projects/bhyve_svm/sys/mips/adm5120/if_admsw.c
  projects/bhyve_svm/sys/mips/atheros/if_arge.c
  projects/bhyve_svm/sys/mips/cavium/ciu.c
  projects/bhyve_svm/sys/mips/cavium/if_octm.c
  projects/bhyve_svm/sys/mips/cavium/octe/ethernet-rx.c
  projects/bhyve_svm/sys/mips/cavium/octe/ethernet-tx.c
  projects/bhyve_svm/sys/mips/idt/if_kr.c
  projects/bhyve_svm/sys/mips/nlm/dev/net/xlpge.c
  projects/bhyve_svm/sys/mips/rmi/dev/nlge/if_nlge.c
  projects/bhyve_svm/sys/mips/rmi/dev/xlr/rge.c
  projects/bhyve_svm/sys/modules/bce/Makefile
  projects/bhyve_svm/sys/modules/bxe/Makefile
  projects/bhyve_svm/sys/modules/drm2/i915kms/Makefile
  projects/bhyve_svm/sys/modules/linux/Makefile
  projects/bhyve_svm/sys/modules/rl/Makefile
  projects/bhyve_svm/sys/modules/zfs/Makefile
  projects/bhyve_svm/sys/net/if.c
  projects/bhyve_svm/sys/net/if_arcsubr.c
  projects/bhyve_svm/sys/net/if_atmsubr.c
  projects/bhyve_svm/sys/net/if_bridge.c
  projects/bhyve_svm/sys/net/if_debug.c
  projects/bhyve_svm/sys/net/if_disc.c
  projects/bhyve_svm/sys/net/if_edsc.c
  projects/bhyve_svm/sys/net/if_epair.c
  projects/bhyve_svm/sys/net/if_ethersubr.c
  projects/bhyve_svm/sys/net/if_faith.c
  projects/bhyve_svm/sys/net/if_fddisubr.c
  projects/bhyve_svm/sys/net/if_fwsubr.c
  projects/bhyve_svm/sys/net/if_gif.c
  projects/bhyve_svm/sys/net/if_gre.c
  projects/bhyve_svm/sys/net/if_iso88025subr.c
  projects/bhyve_svm/sys/net/if_lagg.c
  projects/bhyve_svm/sys/net/if_lagg.h
  projects/bhyve_svm/sys/net/if_loop.c
  projects/bhyve_svm/sys/net/if_mib.c
  projects/bhyve_svm/sys/net/if_spppfr.c
  projects/bhyve_svm/sys/net/if_spppsubr.c
  projects/bhyve_svm/sys/net/if_stf.c
  projects/bhyve_svm/sys/net/if_tap.c
  projects/bhyve_svm/sys/net/if_tun.c
  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/rtsock.c
  projects/bhyve_svm/sys/net80211/ieee80211.c
  projects/bhyve_svm/sys/net80211/ieee80211_adhoc.c
  projects/bhyve_svm/sys/net80211/ieee80211_hostap.c
  projects/bhyve_svm/sys/net80211/ieee80211_input.c
  projects/bhyve_svm/sys/net80211/ieee80211_mesh.c
  projects/bhyve_svm/sys/net80211/ieee80211_monitor.c
  projects/bhyve_svm/sys/net80211/ieee80211_output.c
  projects/bhyve_svm/sys/net80211/ieee80211_sta.c
  projects/bhyve_svm/sys/net80211/ieee80211_superg.c
  projects/bhyve_svm/sys/net80211/ieee80211_wds.c
  projects/bhyve_svm/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
  projects/bhyve_svm/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
  projects/bhyve_svm/sys/netgraph/ng_device.c
  projects/bhyve_svm/sys/netgraph/ng_eiface.c
  projects/bhyve_svm/sys/netgraph/ng_iface.c
  projects/bhyve_svm/sys/netgraph/ng_ppp.c
  projects/bhyve_svm/sys/netgraph/ng_sppp.c
  projects/bhyve_svm/sys/netgraph/ng_tty.c
  projects/bhyve_svm/sys/netinet/ip_gre.c
  projects/bhyve_svm/sys/netinet/ip_output.c
  projects/bhyve_svm/sys/netipsec/ipsec_input.c
  projects/bhyve_svm/sys/netipsec/ipsec_output.c
  projects/bhyve_svm/sys/netpfil/pf/if_pflog.c
  projects/bhyve_svm/sys/netpfil/pf/if_pfsync.c
  projects/bhyve_svm/sys/powerpc/powerpc/intr_machdep.c
  projects/bhyve_svm/sys/powerpc/ps3/if_glc.c
  projects/bhyve_svm/sys/powerpc/pseries/phyp_llan.c
  projects/bhyve_svm/sys/sparc64/pci/psycho.c
  projects/bhyve_svm/sys/sparc64/sparc64/intr_machdep.c
  projects/bhyve_svm/sys/sys/interrupt.h
  projects/bhyve_svm/sys/sys/param.h
  projects/bhyve_svm/sys/sys/timex.h
  projects/bhyve_svm/sys/vm/vm_mmap.c
  projects/bhyve_svm/sys/x86/x86/intr_machdep.c
  projects/bhyve_svm/tools/build/mk/OptionalObsoleteFiles.inc
  projects/bhyve_svm/tools/regression/pjdfstest/Makefile
  projects/bhyve_svm/usr.bin/grep/Makefile
  projects/bhyve_svm/usr.bin/mkimg/apm.c
  projects/bhyve_svm/usr.bin/mkimg/bsd.c
  projects/bhyve_svm/usr.bin/mkimg/ebr.c
  projects/bhyve_svm/usr.bin/mkimg/gpt.c
  projects/bhyve_svm/usr.bin/mkimg/mbr.c
  projects/bhyve_svm/usr.bin/mkimg/mkimg.h
  projects/bhyve_svm/usr.bin/mkimg/pc98.c
  projects/bhyve_svm/usr.bin/mkimg/scheme.c
  projects/bhyve_svm/usr.bin/mkimg/scheme.h
  projects/bhyve_svm/usr.bin/mkimg/vtoc8.c
  projects/bhyve_svm/usr.sbin/bhyve/bhyve.8
  projects/bhyve_svm/usr.sbin/ctld/ctld.c
  projects/bhyve_svm/usr.sbin/lpr/lpd/printjob.c
  projects/bhyve_svm/usr.sbin/makefs/ffs.c
  projects/bhyve_svm/usr.sbin/mfiutil/mfi_properties.c
  projects/bhyve_svm/usr.sbin/mtree/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/atf/   (props changed)
  projects/bhyve_svm/contrib/one-true-awk/   (props changed)
  projects/bhyve_svm/etc/   (props changed)
  projects/bhyve_svm/include/   (props changed)
  projects/bhyve_svm/lib/libc/   (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/boot/   (props changed)
  projects/bhyve_svm/sys/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve_svm/sys/conf/   (props changed)
  projects/bhyve_svm/sys/dev/hyperv/   (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	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/Makefile.inc1	Sat Sep 20 06:27:37 2014	(r271894)
@@ -352,6 +352,7 @@ WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAG
 
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 # 32 bit world
+LIB32_OBJTREE=	${OBJTREE}${.CURDIR}/world32
 LIB32TMP=	${OBJTREE}${.CURDIR}/lib32
 
 .if ${TARGET_ARCH} == "amd64"
@@ -387,7 +388,7 @@ LIB32FLAGS+=		--sysroot=${WORLDTMP}
 .endif
 
 # Yes, the flags are redundant.
-LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
+LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${LIB32_OBJTREE} \
 		_SHLIBDIRPREFIX=${LIB32TMP} \
 		_LDSCRIPTROOT=${LIB32TMP} \
 		VERSION="${VERSION}" \
@@ -611,7 +612,7 @@ build32:
 	cd ${.CURDIR}/${_dir}; \
 	    WORLDTMP=${WORLDTMP} \
 	    MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
-	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
+	    MAKEOBJDIRPREFIX=${LIB32_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \
 	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 	    build-tools
 .endfor

Modified: projects/bhyve_svm/ObsoleteFiles.inc
==============================================================================
--- projects/bhyve_svm/ObsoleteFiles.inc	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/ObsoleteFiles.inc	Sat Sep 20 06:27:37 2014	(r271894)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20140917: hv_kvpd rc.d script removed in favor of devd configuration
+OLD_FILES+=etc/rc.d/hv_kvpd
 # 20140814: libopie version bump
 OLD_LIBS+=usr/lib/libopie.so.7
 OLD_LIBS+=usr/lib32/libopie.so.7

Modified: projects/bhyve_svm/bin/csh/Makefile
==============================================================================
--- projects/bhyve_svm/bin/csh/Makefile	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/bin/csh/Makefile	Sat Sep 20 06:27:37 2014	(r271894)
@@ -94,7 +94,7 @@ GENHDRS+= iconv.h
 SRCS+=	iconv_stub.c
 
 iconv.h: ${.CURDIR}/iconv_stub.h
-	cp ${.CURDIR}/iconv_stub.h ${.TARGET}
+	cp -f ${.CURDIR}/iconv_stub.h ${.TARGET}
 .endif
 .endif
 

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -34,14 +34,14 @@
  * leading underscores.
  */
 
-#pragma weak _go = go
-
 static int
 go(int a)
 {
 	return (a + 1);
 }
 
+#pragma weak _go = go
+
 static void
 handle(int sig)
 {

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh	Sat Sep 20 06:27:37 2014	(r271894)
@@ -29,6 +29,7 @@ dtrace=$1
 t="season_8_mountain_of_madness_t"
 pid=$$
 
-rc=`$dtrace -n "BEGIN{ trace(pid$pid`$t)0); }"`
+$dtrace -n "BEGIN{ trace(pid$pid\`$t)0); }"
+rc=$?
 
 exit $rc

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh	Sat Sep 20 06:27:37 2014	(r271894)
@@ -30,6 +30,7 @@ dtrace=$1
 t="season_8_mountain_of_madness_t"
 pid=$$
 
-rc=`$dtrace -n "BEGIN{ trace(pid`$t)0); }"` -p $pid
+$dtrace -n "BEGIN{ trace(pid$pid\`$t)0); }" -p $pid
+rc=$?
 
 exit $rc

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh	Sat Sep 20 06:27:37 2014	(r271894)
@@ -25,7 +25,7 @@ if [ $# != 1 ]; then
 fi
 
 dtrace=$1
-t="season_7_lisa_the_vegetrian_t *"
+t="season_7_lisa_the_vegetarian_t *"
 exe="tst.aouttype.exe"
 
 elfdump -c "./$exe" | grep -Fq 'sh_name: .SUNW_ctf' 
@@ -37,7 +37,8 @@ fi
 ./$exe &
 pid=$!
 
-rc=`$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"`
+$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"
+rc=$?
 
 kill -9 $pid
 

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh	Sat Sep 20 06:27:37 2014	(r271894)
@@ -38,7 +38,8 @@ fi
 ./$exe &
 pid=$!
 
-rc=`$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"`
+$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"
+rc=$?
 
 kill -9 $pid
 

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -653,6 +653,7 @@ get_replication(nvlist_t *nvroot, boolea
 			dontreport = 0;
 			vdev_size = -1ULL;
 			for (c = 0; c < children; c++) {
+				boolean_t is_replacing, is_spare;
 				nvlist_t *cnv = child[c];
 				char *path;
 				struct stat64 statbuf;
@@ -669,16 +670,19 @@ get_replication(nvlist_t *nvroot, boolea
 				 * If this is a replacing or spare vdev, then
 				 * get the real first child of the vdev.
 				 */
-				if (strcmp(childtype,
-				    VDEV_TYPE_REPLACING) == 0 ||
-				    strcmp(childtype, VDEV_TYPE_SPARE) == 0) {
+				is_replacing = strcmp(childtype,
+				    VDEV_TYPE_REPLACING) == 0;
+				is_spare = strcmp(childtype,
+				    VDEV_TYPE_SPARE) == 0;
+				if (is_replacing || is_spare) {
 					nvlist_t **rchild;
 					uint_t rchildren;
 
 					verify(nvlist_lookup_nvlist_array(cnv,
 					    ZPOOL_CONFIG_CHILDREN, &rchild,
 					    &rchildren) == 0);
-					assert(rchildren == 2);
+					assert((is_replacing && rchildren == 2)
+					    || (is_spare && rchildren >= 2));
 					cnv = rchild[0];
 
 					verify(nvlist_lookup_string(cnv,

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -274,7 +274,7 @@ ctf_fdopen(int fd, int *errp)
 	 */
 	if (nbytes >= (ssize_t) sizeof (Elf32_Ehdr) &&
 	    bcmp(&hdr.e32.e_ident[EI_MAG0], ELFMAG, SELFMAG) == 0) {
-#ifdef	_BIG_ENDIAN
+#if BYTE_ORDER == _BIG_ENDIAN
 		uchar_t order = ELFDATA2MSB;
 #else
 		uchar_t order = ELFDATA2LSB;

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -167,7 +167,7 @@ print_bitfield(dt_printarg_t *pap, ulong
 	 * to the lowest 'size' bytes in 'value', and we need to shift based on
 	 * the offset from the end of the data, not the offset of the start.
 	 */
-#ifdef _BIG_ENDIAN
+#if BYTE_ORDER == _BIG_ENDIAN
 	buf += sizeof (value) - size;
 	off += ep->cte_bits;
 #endif
@@ -178,7 +178,7 @@ print_bitfield(dt_printarg_t *pap, ulong
 	 * Offsets are counted from opposite ends on little- and
 	 * big-endian machines.
 	 */
-#ifdef _BIG_ENDIAN
+#if BYTE_ORDER == _BIG_ENDIAN
 	shift = NBBY - shift;
 #endif
 

Modified: projects/bhyve_svm/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- projects/bhyve_svm/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -1457,6 +1457,12 @@ zfs_setprop_error(libzfs_handle_t *hdl, 
 		(void) zfs_error(hdl, EZFS_DSREADONLY, errbuf);
 		break;
 
+	case E2BIG:
+		zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+		    "property value too long"));
+		(void) zfs_error(hdl, EZFS_BADPROP, errbuf);
+		break;
+
 	case ENOTSUP:
 		zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
 		    "pool and or dataset must be upgraded to set this "

Modified: projects/bhyve_svm/contrib/atf/NEWS
==============================================================================
--- projects/bhyve_svm/contrib/atf/NEWS	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/contrib/atf/NEWS	Sat Sep 20 06:27:37 2014	(r271894)
@@ -14,6 +14,9 @@ the 'tools' directory for your own consu
 * Removed the deprecated tools.  This includes atf-config, atf-report,
   atf-run and atf-version.
 
+* Issue #8: Fixed atf-c/macros_test:use test failures spotted by the clang
+  that ships with FreeBSD 11.0-CURRENT.
+
 
 Changes in version 0.19
 ***********************

Modified: projects/bhyve_svm/contrib/atf/atf-c/macros_h_test.c
==============================================================================
--- projects/bhyve_svm/contrib/atf/atf-c/macros_h_test.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/contrib/atf/atf-c/macros_h_test.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -87,6 +87,7 @@ ATF_TC(TEST_MACRO_1);
 ATF_TC_HEAD(TEST_MACRO_1, tc) { if (tc != NULL) {} }
 ATF_TC_BODY(TEST_MACRO_1, tc) { if (tc != NULL) {} }
 atf_tc_t *test_name_1 = &ATF_TC_NAME(TEST_MACRO_1);
+atf_tc_pack_t *test_pack_1 = &ATF_TC_PACK_NAME(TEST_MACRO_1);
 void (*head_1)(atf_tc_t *) = ATF_TC_HEAD_NAME(TEST_MACRO_1);
 void (*body_1)(const atf_tc_t *) = ATF_TC_BODY_NAME(TEST_MACRO_1);
 ATF_TC_WITH_CLEANUP(TEST_MACRO_2);
@@ -94,10 +95,12 @@ ATF_TC_HEAD(TEST_MACRO_2, tc) { if (tc !
 ATF_TC_BODY(TEST_MACRO_2, tc) { if (tc != NULL) {} }
 ATF_TC_CLEANUP(TEST_MACRO_2, tc) { if (tc != NULL) {} }
 atf_tc_t *test_name_2 = &ATF_TC_NAME(TEST_MACRO_2);
+atf_tc_pack_t *test_pack_2 = &ATF_TC_PACK_NAME(TEST_MACRO_2);
 void (*head_2)(atf_tc_t *) = ATF_TC_HEAD_NAME(TEST_MACRO_2);
 void (*body_2)(const atf_tc_t *) = ATF_TC_BODY_NAME(TEST_MACRO_2);
 void (*cleanup_2)(const atf_tc_t *) = ATF_TC_CLEANUP_NAME(TEST_MACRO_2);
 ATF_TC_WITHOUT_HEAD(TEST_MACRO_3);
 ATF_TC_BODY(TEST_MACRO_3, tc) { if (tc != NULL) {} }
 atf_tc_t *test_name_3 = &ATF_TC_NAME(TEST_MACRO_3);
+atf_tc_pack_t *test_pack_3 = &ATF_TC_PACK_NAME(TEST_MACRO_3);
 void (*body_3)(const atf_tc_t *) = ATF_TC_BODY_NAME(TEST_MACRO_3);

Modified: projects/bhyve_svm/contrib/one-true-awk/awk.1
==============================================================================
--- projects/bhyve_svm/contrib/one-true-awk/awk.1	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/contrib/one-true-awk/awk.1	Sat Sep 20 06:27:37 2014	(r271894)
@@ -208,7 +208,7 @@ or of
 if no argument.
 .TP
 .B rand
-random number on (0,1)
+random number on [0,1)
 .TP
 .B srand
 sets seed for

Modified: projects/bhyve_svm/contrib/one-true-awk/main.c
==============================================================================
--- projects/bhyve_svm/contrib/one-true-awk/main.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/contrib/one-true-awk/main.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
 	signal(SIGFPE, fpecatch);
 
 	srand_seed = 1;
-	srand(srand_seed);
+	srandom((unsigned long) srand_seed);
 
 	yyin = NULL;
 	symtab = makesymtab(NSYMTAB/NSYMTAB);

Modified: projects/bhyve_svm/contrib/one-true-awk/run.c
==============================================================================
--- projects/bhyve_svm/contrib/one-true-awk/run.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/contrib/one-true-awk/run.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -1521,8 +1521,10 @@ Cell *bltin(Node **a, int n)	/* builtin 
 		u = (Awkfloat) system(getsval(x)) / 256;   /* 256 is unix-dep */
 		break;
 	case FRAND:
-		/* in principle, rand() returns something in 0..RAND_MAX */
-		u = (Awkfloat) (rand() % RAND_MAX) / RAND_MAX;
+		/* random() returns numbers in [0..2^31-1]
+		 * in order to get a number in [0, 1), divide it by 2^31
+		 */
+		u = (Awkfloat) random() / (0x7fffffffL + 0x1UL);
 		break;
 	case FSRAND:
 		if (isrec(x))	/* no argument provided */
@@ -1530,7 +1532,7 @@ Cell *bltin(Node **a, int n)	/* builtin 
 		else
 			u = getfval(x);
 		tmp = u;
-		srand((unsigned int) u);
+		srandom((unsigned long) u);
 		u = srand_seed;
 		srand_seed = tmp;
 		break;

Modified: projects/bhyve_svm/etc/defaults/rc.conf
==============================================================================
--- projects/bhyve_svm/etc/defaults/rc.conf	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/etc/defaults/rc.conf	Sat Sep 20 06:27:37 2014	(r271894)
@@ -684,8 +684,6 @@ jail_enable="NO"	# Set to NO to disable 
 jail_parallel_start="NO"	# Start jails in the background
 jail_list=""		# Space separated list of names of jails
 
-hv_kvpd_enable="NO"	# Start the Hyper-V key-value Pair Driver hv_kvp(4)
-
 ##############################################################
 ### Define source_rc_confs, the mechanism used by /etc/rc.* ##
 ### scripts to source rc_conf_files overrides safely.	    ##

Modified: projects/bhyve_svm/etc/devd/Makefile
==============================================================================
--- projects/bhyve_svm/etc/devd/Makefile	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/etc/devd/Makefile	Sat Sep 20 06:27:37 2014	(r271894)
@@ -18,6 +18,10 @@ FILES+=	uath.conf usb.conf
 FILES+=	zfs.conf
 .endif
 
+.if ${MK_HYPERV} != "no"
+FILES+=	hyperv.conf
+.endif
+
 NO_OBJ=
 FILESDIR=	/etc/devd
 FILESMODE=	644

Copied: projects/bhyve_svm/etc/devd/hyperv.conf (from r271887, head/etc/devd/hyperv.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_svm/etc/devd/hyperv.conf	Sat Sep 20 06:27:37 2014	(r271894, copy of r271887, head/etc/devd/hyperv.conf)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+#
+# Hyper-V specific events
+
+notify 10 {
+	match "system"		"DEVFS";
+	match "subsystem"	"CDEV";
+	match "type"		"CREATE";
+	match "cdev"		"hv_kvp_dev";
+	action "/usr/sbin/hv_kvp_daemon";
+};
+
+notify 10 {
+	match "system"		"DEVFS";
+	match "subsystem"	"CDEV";
+	match "type"		"DESTROY";
+	match "cdev"		"hv_kvp_dev";
+	action "pkill -x hv_kvp_daemon";
+};

Modified: projects/bhyve_svm/etc/mail/Makefile
==============================================================================
--- projects/bhyve_svm/etc/mail/Makefile	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/etc/mail/Makefile	Sat Sep 20 06:27:37 2014	(r271894)
@@ -69,7 +69,7 @@ SENDMAIL_MC!=           hostname
 SENDMAIL_MC:=           ${SENDMAIL_MC}.mc
 
 ${SENDMAIL_MC}:
-	cp freebsd.mc ${SENDMAIL_MC}
+	cp -f freebsd.mc ${SENDMAIL_MC}
 .endif
 
 .ifndef SENDMAIL_SUBMIT_MC
@@ -77,7 +77,7 @@ SENDMAIL_SUBMIT_MC!=	hostname
 SENDMAIL_SUBMIT_MC:=	${SENDMAIL_SUBMIT_MC}.submit.mc
 
 ${SENDMAIL_SUBMIT_MC}:
-	cp freebsd.submit.mc ${SENDMAIL_SUBMIT_MC}
+	cp -f freebsd.submit.mc ${SENDMAIL_SUBMIT_MC}
 .endif
 
 INSTALL_CF=		${SENDMAIL_MC:R}.cf

Modified: projects/bhyve_svm/etc/rc.d/Makefile
==============================================================================
--- projects/bhyve_svm/etc/rc.d/Makefile	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/etc/rc.d/Makefile	Sat Sep 20 06:27:37 2014	(r271894)
@@ -57,7 +57,6 @@ FILES=	DAEMON \
 	hostid \
 	hostid_save \
 	hostname \
-	${_hv_kvpd} \
 	inetd \
 	initrandom \
 	ip6addrctl \
@@ -193,10 +192,6 @@ _ubthidhci=	ubthidhci
 _casperd=	casperd
 .endif
 
-.if ${MK_HYPERV} != "no"
-_hv_kvpd=	hv_kvpd
-.endif
-
 .if ${MK_UNBOUND} != "no"
 _unbound=	local_unbound
 .endif

Modified: projects/bhyve_svm/include/unistd.h
==============================================================================
--- projects/bhyve_svm/include/unistd.h	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/include/unistd.h	Sat Sep 20 06:27:37 2014	(r271894)
@@ -453,7 +453,6 @@ int	 encrypt(char *, int);
 long	 gethostid(void);
 int	 lockf(int, int, off_t);
 int	 nice(int);
-int	 setpgrp(pid_t _pid, pid_t _pgrp); /* obsoleted by setpgid() */
 int	 setregid(gid_t, gid_t);
 int	 setreuid(uid_t, uid_t);
 
@@ -567,6 +566,7 @@ int	 setkey(const char *);
 int	 setlogin(const char *);
 int	 setloginclass(const char *);
 void	*setmode(const char *);
+int	 setpgrp(pid_t, pid_t);			/* obsoleted by setpgid() */
 void	 setproctitle(const char *_fmt, ...) __printf0like(1, 2);
 int	 setresgid(gid_t, gid_t, gid_t);
 int	 setresuid(uid_t, uid_t, uid_t);

Modified: projects/bhyve_svm/kerberos5/lib/libasn1/Makefile
==============================================================================
--- projects/bhyve_svm/kerberos5/lib/libasn1/Makefile	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/kerberos5/lib/libasn1/Makefile	Sat Sep 20 06:27:37 2014	(r271894)
@@ -112,10 +112,10 @@ ${GEN_KX509}: kx509.asn1
 .SUFFIXES: .h .c .x .hx
 
 .x.c:
-	cp ${.IMPSRC} ${.TARGET}
+	cp -f ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cp ${.IMPSRC} ${.TARGET}
+	cp -f ${.IMPSRC} ${.TARGET}
 	
 .include <bsd.lib.mk>
 

Modified: projects/bhyve_svm/lib/libc/Makefile
==============================================================================
--- projects/bhyve_svm/lib/libc/Makefile	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/lib/libc/Makefile	Sat Sep 20 06:27:37 2014	(r271894)
@@ -151,11 +151,11 @@ KSRCS=	bcmp.c ffs.c ffsl.c fls.c flsl.c 
 libkern: libkern.gen libkern.${LIBC_ARCH}
 
 libkern.gen: ${KQSRCS} ${KSRCS}
-	cp -p ${LIBC_SRCTOP}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern
+	cp -fp ${LIBC_SRCTOP}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern
 
 libkern.${LIBC_ARCH}:: ${KMSRCS}
 .if defined(KMSRCS) && !empty(KMSRCS)
-	cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH}
+	cp -fp ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH}
 .endif
 
 .include <bsd.lib.mk>

Modified: projects/bhyve_svm/lib/libc/gen/nlist.c
==============================================================================
--- projects/bhyve_svm/lib/libc/gen/nlist.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/lib/libc/gen/nlist.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -268,7 +268,7 @@ __elf_fdnlist(fd, list)
 	}
 
 	/* mmap section header table */
-	base = mmap(NULL, (size_t)shdr_size, PROT_READ, 0, fd,
+	base = mmap(NULL, (size_t)shdr_size, PROT_READ, MAP_PRIVATE, fd,
 	    (off_t)ehdr.e_shoff);
 	if (base == MAP_FAILED)
 		return (-1);
@@ -301,7 +301,7 @@ __elf_fdnlist(fd, list)
 	 * making the memory allocation permanent as with malloc/free
 	 * (i.e., munmap will return it to the system).
 	 */
-	base = mmap(NULL, (size_t)symstrsize, PROT_READ, 0, fd,
+	base = mmap(NULL, (size_t)symstrsize, PROT_READ, MAP_PRIVATE, fd,
 	    (off_t)symstroff);
 	if (base == MAP_FAILED)
 		goto done;

Modified: projects/bhyve_svm/lib/libc/sys/mmap.2
==============================================================================
--- projects/bhyve_svm/lib/libc/sys/mmap.2	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/lib/libc/sys/mmap.2	Sat Sep 20 06:27:37 2014	(r271894)
@@ -28,7 +28,7 @@
 .\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
 .\" $FreeBSD$
 .\"
-.Dd September 15, 2014
+.Dd September 17, 2014
 .Dt MMAP 2
 .Os
 .Sh NAME
@@ -176,11 +176,6 @@ already exists within the range.
 .It Dv MAP_HASSEMAPHORE
 Notify the kernel that the region may contain semaphores and that special
 handling may be necessary.
-.It Dv MAP_INHERIT
-This flag never operated as advertised and is no longer supported.
-Please refer to
-.Xr minherit 2
-for further information.
 .It Dv MAP_NOCORE
 Region is not included in a core file.
 .It Dv MAP_NOSYNC
@@ -300,14 +295,6 @@ The
 system call does not unmap pages, see
 .Xr munmap 2
 for further information.
-.Pp
-The current design does not allow a process to specify the location of
-swap space.
-In the future we may define an additional mapping type,
-.Dv MAP_SWAP ,
-in which
-the file descriptor argument specifies a file or device to which swapping
-should be done.
 .Sh NOTES
 Although this implementation does not impose any alignment restrictions on
 the

Modified: projects/bhyve_svm/lib/libgeom/geom_stats.c
==============================================================================
--- projects/bhyve_svm/lib/libgeom/geom_stats.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/lib/libgeom/geom_stats.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -68,7 +68,7 @@ geom_stats_resync(void)
 		return;
 	for (;;) {
 		p = mmap(statp, (npages + 1) * pagesize, 
-		    PROT_READ, 0, statsfd, 0);
+		    PROT_READ, MAP_SHARED, statsfd, 0);
 		if (p == MAP_FAILED)
 			break;
 		else
@@ -90,7 +90,7 @@ geom_stats_open(void)
 		return (errno);
 	pagesize = getpagesize();
 	spp = pagesize / sizeof(struct devstat);
-	p = mmap(NULL, pagesize, PROT_READ, 0, statsfd, 0);
+	p = mmap(NULL, pagesize, PROT_READ, MAP_SHARED, statsfd, 0);
 	if (p == MAP_FAILED) {
 		error = errno;
 		close(statsfd);

Modified: projects/bhyve_svm/lib/libnv/nvpair.c
==============================================================================
--- projects/bhyve_svm/lib/libnv/nvpair.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/lib/libnv/nvpair.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -963,7 +963,8 @@ nvpair_createv_nvlist(const nvlist_t *va
 	    namefmt, nameap);
 	if (nvp == NULL)
 		nvlist_destroy(nvl);
-	nvlist_set_parent(nvl, nvp);
+	else
+		nvlist_set_parent(nvl, nvp);
 
 	return (nvp);
 }

Modified: projects/bhyve_svm/lib/libunbound/Makefile
==============================================================================
--- projects/bhyve_svm/lib/libunbound/Makefile	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/lib/libunbound/Makefile	Sat Sep 20 06:27:37 2014	(r271894)
@@ -33,7 +33,7 @@ LDADD+=	-lssl -lcrypto -lpthread
 
 # Misnamed file in upstream source
 configlexer.l: configlexer.lex
-	cp -p ${.ALLSRC} ${.TARGET}
+	cp -fp ${.ALLSRC} ${.TARGET}
 CLEANFILES+= configlexer.l
 
 # Symbol prefix for lex and yacc

Modified: projects/bhyve_svm/lib/msun/ld128/e_lgammal_r.c
==============================================================================
--- projects/bhyve_svm/lib/msun/ld128/e_lgammal_r.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/lib/msun/ld128/e_lgammal_r.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -241,7 +241,11 @@ lgammal_r(long double x, int *signgamp)
 	*signgamp = 1;
 	if((hx & 0x7fff) == 0x7fff)	/* x is +-Inf or NaN */
 		return x*x;
-	if((hx==0||hx==0x8000)&&lx==0) return one/vzero;
+	if((hx==0||hx==0x8000)&&lx==0) {
+	    if (hx&0x8000)
+		*signgamp = -1;
+	    return one/vzero;
+	}
 
    /* purge off tiny and negative arguments */
 	if(fabsl(x)<0x1p-119L) {

Modified: projects/bhyve_svm/lib/msun/ld80/e_lgammal_r.c
==============================================================================
--- projects/bhyve_svm/lib/msun/ld80/e_lgammal_r.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/lib/msun/ld80/e_lgammal_r.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -261,7 +261,11 @@ lgammal_r(long double x, int *signgamp)
 	*signgamp = 1;
 	if((hx & 0x7fff) == 0x7fff)	/* x is +-Inf or NaN */
 		return x*x;
-	if((hx==0||hx==0x8000)&&lx==0) return one/vzero;
+	if((hx==0||hx==0x8000)&&lx==0) {
+	    if (hx&0x8000)
+		*signgamp = -1;
+	    return one/vzero;
+	}
 
 	ENTERI();
 

Modified: projects/bhyve_svm/lib/msun/src/e_lgamma_r.c
==============================================================================
--- projects/bhyve_svm/lib/msun/src/e_lgamma_r.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/lib/msun/src/e_lgamma_r.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -214,7 +214,11 @@ __ieee754_lgamma_r(double x, int *signga
 	*signgamp = 1;
 	ix = hx&0x7fffffff;
 	if(ix>=0x7ff00000) return x*x;
-	if((ix|lx)==0) return one/vzero;
+	if((ix|lx)==0) {
+	   if(hx<0)
+		*signgamp = -1;
+	    return one/vzero;
+	}
 	if(ix<0x3b900000) {	/* |x|<2**-70, return -log(|x|) */
 	    if(hx<0) {
 	        *signgamp = -1;

Modified: projects/bhyve_svm/lib/msun/src/e_lgammaf_r.c
==============================================================================
--- projects/bhyve_svm/lib/msun/src/e_lgammaf_r.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/lib/msun/src/e_lgammaf_r.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -132,7 +132,11 @@ __ieee754_lgammaf_r(float x, int *signga
 	*signgamp = 1;
 	ix = hx&0x7fffffff;
 	if(ix>=0x7f800000) return x*x;
-	if(ix==0) return one/vzero;
+	if(ix==0) {
+	    if(hx<0)
+		*signgamp = -1;
+	    return one/vzero;
+	}
 	if(ix<0x35000000) {	/* |x|<2**-21, return -log(|x|) */
 	    if(hx<0) {
 	        *signgamp = -1;

Modified: projects/bhyve_svm/release/picobsd/tinyware/simple_httpd/simple_httpd.c
==============================================================================
--- projects/bhyve_svm/release/picobsd/tinyware/simple_httpd/simple_httpd.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/release/picobsd/tinyware/simple_httpd/simple_httpd.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -160,8 +160,8 @@ http_date(void)
 void
 http_output(const char *html)
 {
-        write(con_sock, html, strlen(html));
-        write(con_sock, "\r\n", 2);
+	write(con_sock, html, strlen(html));
+	write(con_sock, "\r\n", 2);
 }
 
 
@@ -172,30 +172,30 @@ http_output(const char *html)
 void
 log_line(char *req)
 {
-        char            log_buff[256];
-        char            msg[1024];
-	char            env_host[80], env_addr[80];
-	long            addr;
-	FILE           *log;
+	char	log_buff[256];
+	char	msg[1024];
+	char	env_host[80], env_addr[80];
+	long	addr;
+	FILE	*log;
 
 	strcpy(log_buff,inet_ntoa(source.sin_addr));
 	sprintf(env_addr, "REMOTE_ADDR=%s",log_buff);
 
-        addr=inet_addr(log_buff);
-        
-        strcpy(msg,adate());
-        strcat(msg,"    ");                 
-        hst=gethostbyaddr((char*) &addr, 4, AF_INET);
+	addr=inet_addr(log_buff);
+
+	strcpy(msg,adate());
+	strcat(msg,"    ");
+	hst=gethostbyaddr((char*) &addr, 4, AF_INET);
 
 	/* If DNS hostname exists */
-        if (hst) {
+	if (hst) {
 	  strcat(msg,hst->h_name);
 	  sprintf(env_host, "REMOTE_HOST=%s",hst->h_name);
 	}
-        strcat(msg," (");
-        strcat(msg,log_buff);
-        strcat(msg,")   ");
-        strcat(msg,req);
+	strcat(msg," (");
+	strcat(msg,log_buff);
+	strcat(msg,")   ");
+	strcat(msg,req);
 
 	if (daemonize) {
 	  log=fopen(logfile,"a");
@@ -226,8 +226,8 @@ http_request(void)
 
 	lg = read(con_sock, req, 1024);
 
-        if ((p=strstr(req,"\n"))) *p=0;
-        if ((p=strstr(req,"\r"))) *p=0;
+	if ((p=strstr(req,"\n"))) *p=0;
+	if ((p=strstr(req,"\r"))) *p=0;
 
 	log_line(req);
 
@@ -253,40 +253,40 @@ http_request(void)
 	filename = strtok(NULL, " ");
 
 	c = strtok(NULL, " ");
-	if (fetch_mode != NULL) filename=fetch_mode; 
-	if (filename == NULL || 
-            strlen(filename)==1) filename="/index.html"; 
+	if (fetch_mode != NULL) filename=fetch_mode;
+	if (filename == NULL ||
+	    strlen(filename)==1) filename="/index.html";
 
-	while (filename[0]== '/') filename++;        
+	while (filename[0]== '/') filename++;
 	
-        /* CGI handling.  Untested */
-        if (!strncmp(filename,"cgi-bin/",8))           
-           {
-           par=0;
-           if ((par=strstr(filename,"?")))                        
-              {
-               *par=0;            
-                par++;      
-              } 
-           if (access(filename,X_OK)) goto conti;
-           stat (filename,&file_status);
-           if (setuid(file_status.st_uid)) return;
-           if (seteuid(file_status.st_uid)) return;
-           if (!fork())
-              {
-               close(1);
-               dup(con_sock);
-               /*printf("HTTP/1.0 200 OK\nContent-type: text/html\n\n\n");*/
+	/* CGI handling.  Untested */
+	if (!strncmp(filename,"cgi-bin/",8))
+	   {
+	   par=0;
+	   if ((par=strstr(filename,"?")))
+	      {
+	       *par=0;
+	        par++;
+	      } 
+	   if (access(filename,X_OK)) goto conti;
+	   stat (filename,&file_status);
+	   if (setuid(file_status.st_uid)) return;
+	   if (seteuid(file_status.st_uid)) return;
+	   if (!fork())
+	      {
+	       close(1);
+	       dup(con_sock);
+	       /*printf("HTTP/1.0 200 OK\nContent-type: text/html\n\n\n");*/
 	       printf("HTTP/1.0 200 OK\r\n");
-               /* Plug in environment variable, others in log_line */
+	       /* Plug in environment variable, others in log_line */
 	       setenv("SERVER_SOFTWARE", "FreeBSD/PicoBSD", 1);
 
 	       execlp (filename,filename,par,(char *)0);
-              } 
-            wait(&i);
-            return;
-            }
-        conti:
+	      } 
+	    wait(&i);
+	    return;
+	    }
+	conti:
 	if (filename == NULL) {
 	  http_output(http_405[0]);
 	  http_output(http_405[1]);
@@ -307,8 +307,8 @@ http_request(void)
 	/* Open filename */
 	fd = open(filename, O_RDONLY);
 	if (fd < 0) {
-	        http_output(http_404[0]);
-	        http_output(http_404[1]);
+		http_output(http_404[0]);
+		http_output(http_404[1]);
 		goto end_request;
 	}
 
@@ -325,7 +325,7 @@ http_request(void)
 	  http_output(http_404[1]);
 	  goto end_request2;
 	}
-     
+
 	/* Past this point we are serving either a GET or HEAD */
 	/* Print all the header info */
 	http_output(http_200);
@@ -371,14 +371,14 @@ end_request:
 int
 main(int argc, char *argv[])
 {
-        int ch, ld;
-	int             httpd_group = 65534;
-        pid_t server_pid;
-  
+	int ch, ld;
+	pid_t httpd_group = 65534;
+	pid_t server_pid;
+
 	/* Default for html directory */
 	strcpy (homedir,getenv("HOME"));
-        if (!geteuid()) strcpy (homedir,"/httphome");
-           else         strcat (homedir,"/httphome");
+	if (!geteuid())	strcpy (homedir,"/httphome");
+	   else		strcat (homedir,"/httphome");
 
 	/* Defaults for log file */
 	if (geteuid()) {
@@ -420,10 +420,10 @@ main(int argc, char *argv[])
 	    printf("usage: simple_httpd [[-d directory][-g grpid][-l logfile][-p port][-vD]]\n");
 	    exit(1);
 	    /* NOTREACHED */
-	  }                           
+	  }
 
 	/* Not running as root and no port supplied, assume 1080 */
-        if ((http_port == 80) && geteuid()) {
+	if ((http_port == 80) && geteuid()) {
 	  http_port = 1080;
 	}
 
@@ -437,15 +437,15 @@ main(int argc, char *argv[])
 	}
 
 	/* Create log file if it doesn't exit */
-	if ((access(logfile,W_OK)) && daemonize) { 
-	  ld = open (logfile,O_WRONLY);         
+	if ((access(logfile,W_OK)) && daemonize) {
+	  ld = open (logfile,O_WRONLY);
 	  chmod (logfile,00600);
 	  close(ld);
 	}
 
-        init_servconnection();                  
+	init_servconnection();
 
-        if (verbose) {
+	if (verbose) {
 	  printf("Server started with options \n"); 
 	  printf("port: %d\n",http_port);
 	  if (fetch_mode == NULL) printf("html home: %s\n",homedir);
@@ -453,7 +453,7 @@ main(int argc, char *argv[])
 	}
 
 	/* httpd is spawned */
-        if (daemonize) {
+	if (daemonize) {
 	  if ((server_pid = fork()) != 0) {
 	    wait3(0,WNOHANG,0);
 	    if (verbose) printf("pid: %d\n",server_pid);
@@ -462,16 +462,17 @@ main(int argc, char *argv[])
 	  wait3(0,WNOHANG,0);
 	}
 
-	if (fetch_mode == NULL) setpgrp(0,httpd_group);
+	if (fetch_mode == NULL)
+		setpgrp((pid_t)0, httpd_group);
 
 	/* How many connections do you want? 
 	 * Keep this lower than the available number of processes
 	 */
-        if (listen(http_sock,15) < 0) exit(1);
+	if (listen(http_sock,15) < 0) exit(1);
 
-        label:	
+	label:	
 	wait_connection();
-    
+
 	if (fork()) {
 	  wait3(0,WNOHANG,0);
 	  close(con_sock);
@@ -488,13 +489,13 @@ main(int argc, char *argv[])
 char *
 adate(void)
 {
-        static char out[50];
-        time_t now;
-        struct tm *t;
-        time(&now);
-        t = localtime(&now);
-        sprintf(out, "%02d:%02d:%02d %02d/%02d/%02d",
-                     t->tm_hour, t->tm_min, t->tm_sec,
-                     t->tm_mday, t->tm_mon+1, t->tm_year );
-        return out;
+	static char out[50];
+	time_t now;
+	struct tm *t;
+	time(&now);
+	t = localtime(&now);
+	sprintf(out, "%02d:%02d:%02d %02d/%02d/%02d",
+		     t->tm_hour, t->tm_min, t->tm_sec,
+		     t->tm_mday, t->tm_mon+1, t->tm_year );
+	return out;
 }

Modified: projects/bhyve_svm/release/scripts/pkg-stage.sh
==============================================================================
--- projects/bhyve_svm/release/scripts/pkg-stage.sh	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/release/scripts/pkg-stage.sh	Sat Sep 20 06:27:37 2014	(r271894)
@@ -50,6 +50,12 @@ ${PKGCMD} -vv
 ${PKGCMD} update -f
 ${PKGCMD} fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGES}
 
+# Create the 'Latest/pkg.txz' symlink so 'pkg bootstrap' works
+# using the on-disc packages.
+mkdir -p ${PKG_REPODIR}/Latest
+(cd ${PKG_REPODIR}/Latest && \
+	ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).txz pkg.txz)
+
 ${PKGCMD} repo ${PKG_REPODIR}
 
 # Always exit '0', even if pkg(8) complains about conflicts.

Modified: projects/bhyve_svm/sbin/ifconfig/ifconfig.8
==============================================================================
--- projects/bhyve_svm/sbin/ifconfig/ifconfig.8	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/sbin/ifconfig/ifconfig.8	Sat Sep 20 06:27:37 2014	(r271894)
@@ -2332,8 +2332,8 @@ from the aggregation interface.
 .It Cm laggproto Ar proto
 Set the aggregation protocol.
 The default is failover.
-The available options are failover, fec, lacp, loadbalance, roundrobin and
-none.
+The available options are failover, lacp, loadbalance, roundrobin, broadcast
+and none.
 .It Cm lagghash Ar option Ns Oo , Ns Ar option Oc
 Set the packet layers to hash for aggregation protocols which load balance.
 The default is

Modified: projects/bhyve_svm/sbin/savecore/savecore.c
==============================================================================
--- projects/bhyve_svm/sbin/savecore/savecore.c	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/sbin/savecore/savecore.c	Sat Sep 20 06:27:37 2014	(r271894)
@@ -151,7 +151,10 @@ getbounds(void) {
 	}
 
 	if (fgets(buf, sizeof buf, fp) == NULL) {
-		syslog(LOG_WARNING, "unable to read from bounds, using 0");
+		if (feof(fp))
+			syslog(LOG_WARNING, "bounds file is empty, using 0");
+		else
+			syslog(LOG_WARNING, "bounds file: %s", strerror(errno));
 		fclose(fp);
 		return (ret);
 	}
@@ -160,6 +163,7 @@ getbounds(void) {
 	ret = (int)strtol(buf, NULL, 10);
 	if (ret == 0 && (errno == EINVAL || errno == ERANGE))
 		syslog(LOG_WARNING, "invalid value found in bounds, using 0");
+	fclose(fp);
 	return (ret);
 }
 

Modified: projects/bhyve_svm/share/man/man4/lagg.4
==============================================================================
--- projects/bhyve_svm/share/man/man4/lagg.4	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/share/man/man4/lagg.4	Sat Sep 20 06:27:37 2014	(r271894)
@@ -61,10 +61,10 @@ option.
 The driver currently supports the aggregation protocols
 .Ic failover
 (the default),
-.Ic fec ,
 .Ic lacp ,
 .Ic loadbalance ,
 .Ic roundrobin ,
+.Ic broadcast ,
 and
 .Ic none .
 The protocols determine which ports are used for outgoing traffic
@@ -86,9 +86,6 @@ This constraint can be relaxed by settin
 .Xr sysctl 8
 variable to a nonzero value,
 which is useful for certain bridged network setups.
-.It Ic fec
-Supports Cisco EtherChannel.
-This is an alias for
 .Ic loadbalance
 mode.
 .It Ic lacp
@@ -113,6 +110,9 @@ available, the VLAN tag, and the IP sour
 Distributes outgoing traffic using a round-robin scheduler
 through all active ports and accepts incoming traffic from
 any active port.
+.It Ic broadcast
+Sends frames to all ports of the LAG and receives frames on
+any port of the LAG.
 .It Ic none
 This protocol is intended to do nothing: it disables any traffic without
 disabling the

Modified: projects/bhyve_svm/share/man/man4/malo.4
==============================================================================
--- projects/bhyve_svm/share/man/man4/malo.4	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/share/man/man4/malo.4	Sat Sep 20 06:27:37 2014	(r271894)
@@ -31,7 +31,7 @@
 .\"
 .\" $FreeBSD$
 .\"/
-.Dd October 21, 2009
+.Dd September 20, 2014
 .Dt MALO 4
 .Os
 .Sh NAME
@@ -49,7 +49,7 @@ kernel configuration file:
 .Ed
 .Pp
 Alternatively, to load the driver as a
-module at boot time, place the following lines in
+module at boot time, place the following line in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
 if_malo_load="YES"
@@ -84,6 +84,15 @@ the archive and running
 in the
 .Pa malo-firmware-1.4
 directory.
+.Pp
+To load the
+.Nm malofw
+firmware kernel module at boot time, place the following
+line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+malofw_load="YES"
+.Ed
 .Sh HARDWARE
 The following cards are among those supported by the
 .Nm

Modified: projects/bhyve_svm/share/man/man9/Makefile
==============================================================================
--- projects/bhyve_svm/share/man/man9/Makefile	Sat Sep 20 06:05:24 2014	(r271893)
+++ projects/bhyve_svm/share/man/man9/Makefile	Sat Sep 20 06:27:37 2014	(r271894)
@@ -1390,6 +1390,7 @@ MLINKS+=taskqueue.9 TASK_INIT.9 \
 	taskqueue.9 TASK_INITIALIZER.9 \
 	taskqueue.9 taskqueue_block.9 \
 	taskqueue.9 taskqueue_cancel.9 \
+	taskqueue.9 taskqueue_cancel_timeout.9 \
 	taskqueue.9 taskqueue_create.9 \
 	taskqueue.9 taskqueue_create_fast.9 \
 	taskqueue.9 TASKQUEUE_DECLARE.9 \
@@ -1397,14 +1398,20 @@ MLINKS+=taskqueue.9 TASK_INIT.9 \
 	taskqueue.9 TASKQUEUE_DEFINE_THREAD.9 \
 	taskqueue.9 taskqueue_drain.9 \
 	taskqueue.9 taskqueue_drain_all.9 \
+	taskqueue.9 taskqueue_drain_timeout.9 \
 	taskqueue.9 taskqueue_enqueue.9 \
 	taskqueue.9 taskqueue_enqueue_fast.9 \
+	taskqueue.9 taskqueue_enqueue_timeout.9 \
 	taskqueue.9 TASKQUEUE_FAST_DEFINE.9 \
 	taskqueue.9 TASKQUEUE_FAST_DEFINE_THREAD.9 \
 	taskqueue.9 taskqueue_free.9 \
 	taskqueue.9 taskqueue_member.9 \
 	taskqueue.9 taskqueue_run.9 \
-	taskqueue.9 taskqueue_unblock.9
+	taskqueue.9 taskqueue_set_callback.9 \
+	taskqueue.9 taskqueue_start_threads.9 \
+	taskqueue.9 taskqueue_start_threads_pinned.9 \
+	taskqueue.9 taskqueue_unblock.9 \
+	taskqueue.9 TIMEOUT_TASK_INIT.9
 MLINKS+=time.9 boottime.9 \
 	time.9 time_second.9 \

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