Date: Sun, 30 Jun 2013 13:10:38 GMT From: syuu@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253731 - in soc2013/syuu/bhyve_usb: . bin/ed bin/sh contrib/libstdc++ contrib/libstdc++/libsupc++ contrib/smbfs/mount_smbfs crypto/heimdal crypto/heimdal/lib/gssapi/gssapi crypto/op... Message-ID: <201306301310.r5UDAcgb055407@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: syuu Date: Sun Jun 30 13:10:38 2013 New Revision: 253731 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253731 Log: sync with head Added: soc2013/syuu/bhyve_usb/etc/rc.d/swap - copied unchanged from r253730, mirror/FreeBSD/head/etc/rc.d/swap soc2013/syuu/bhyve_usb/etc/rc.d/swaplate - copied unchanged from r253730, mirror/FreeBSD/head/etc/rc.d/swaplate soc2013/syuu/bhyve_usb/sbin/nvmecontrol/devlist.c - copied unchanged from r253730, mirror/FreeBSD/head/sbin/nvmecontrol/devlist.c soc2013/syuu/bhyve_usb/sbin/nvmecontrol/firmware.c - copied unchanged from r253730, mirror/FreeBSD/head/sbin/nvmecontrol/firmware.c soc2013/syuu/bhyve_usb/sbin/nvmecontrol/identify.c - copied unchanged from r253730, mirror/FreeBSD/head/sbin/nvmecontrol/identify.c soc2013/syuu/bhyve_usb/sbin/nvmecontrol/logpage.c - copied unchanged from r253730, mirror/FreeBSD/head/sbin/nvmecontrol/logpage.c soc2013/syuu/bhyve_usb/sbin/nvmecontrol/nvmecontrol.h - copied unchanged from r253730, mirror/FreeBSD/head/sbin/nvmecontrol/nvmecontrol.h soc2013/syuu/bhyve_usb/sbin/nvmecontrol/perftest.c - copied unchanged from r253730, mirror/FreeBSD/head/sbin/nvmecontrol/perftest.c soc2013/syuu/bhyve_usb/sbin/nvmecontrol/reset.c - copied unchanged from r253730, mirror/FreeBSD/head/sbin/nvmecontrol/reset.c soc2013/syuu/bhyve_usb/sys/arm/arm/generic_timer.c - copied unchanged from r253730, mirror/FreeBSD/head/sys/arm/arm/generic_timer.c soc2013/syuu/bhyve_usb/sys/arm/conf/ARNDALE - copied unchanged from r253730, mirror/FreeBSD/head/sys/arm/conf/ARNDALE soc2013/syuu/bhyve_usb/sys/arm/samsung/ - copied from r253730, mirror/FreeBSD/head/sys/arm/samsung/ soc2013/syuu/bhyve_usb/sys/boot/fdt/dts/exynos5250-arndale.dts - copied unchanged from r253730, mirror/FreeBSD/head/sys/boot/fdt/dts/exynos5250-arndale.dts soc2013/syuu/bhyve_usb/sys/boot/fdt/dts/exynos5250.dtsi - copied unchanged from r253730, mirror/FreeBSD/head/sys/boot/fdt/dts/exynos5250.dtsi soc2013/syuu/bhyve_usb/sys/kern/subr_vmem.c - copied unchanged from r253730, mirror/FreeBSD/head/sys/kern/subr_vmem.c soc2013/syuu/bhyve_usb/sys/sys/vmem.h - copied unchanged from r253730, mirror/FreeBSD/head/sys/sys/vmem.h Deleted: soc2013/syuu/bhyve_usb/contrib/smbfs/mount_smbfs/Makefile soc2013/syuu/bhyve_usb/etc/rc.d/encswap soc2013/syuu/bhyve_usb/etc/rc.d/swap1 Modified: soc2013/syuu/bhyve_usb/ (props changed) soc2013/syuu/bhyve_usb/bin/ed/re.c soc2013/syuu/bhyve_usb/bin/sh/eval.c soc2013/syuu/bhyve_usb/contrib/libstdc++/ (props changed) soc2013/syuu/bhyve_usb/contrib/libstdc++/libsupc++/unwind-cxx.h soc2013/syuu/bhyve_usb/crypto/heimdal/ (props changed) soc2013/syuu/bhyve_usb/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h soc2013/syuu/bhyve_usb/crypto/openssh/ (props changed) soc2013/syuu/bhyve_usb/crypto/openssh/sshd_config soc2013/syuu/bhyve_usb/crypto/openssh/sshd_config.5 soc2013/syuu/bhyve_usb/etc/defaults/rc.conf soc2013/syuu/bhyve_usb/etc/mtree/BSD.include.dist soc2013/syuu/bhyve_usb/etc/mtree/BSD.usr.dist soc2013/syuu/bhyve_usb/etc/network.subr soc2013/syuu/bhyve_usb/etc/rc.d/Makefile soc2013/syuu/bhyve_usb/etc/rc.d/addswap soc2013/syuu/bhyve_usb/etc/rc.d/fsck soc2013/syuu/bhyve_usb/etc/rc.d/mdconfig soc2013/syuu/bhyve_usb/include/Makefile soc2013/syuu/bhyve_usb/include/gssapi/gssapi.h soc2013/syuu/bhyve_usb/include/paths.h soc2013/syuu/bhyve_usb/lib/Makefile soc2013/syuu/bhyve_usb/lib/libfetch/fetch.c soc2013/syuu/bhyve_usb/lib/libprocstat/Makefile soc2013/syuu/bhyve_usb/lib/libprocstat/common_kvm.h soc2013/syuu/bhyve_usb/lib/libprocstat/libprocstat.c soc2013/syuu/bhyve_usb/lib/librt/sigev_thread.c soc2013/syuu/bhyve_usb/lib/libutil/ (props changed) soc2013/syuu/bhyve_usb/lib/libutil/login_times.c soc2013/syuu/bhyve_usb/rescue/rescue/Makefile soc2013/syuu/bhyve_usb/sbin/ (props changed) soc2013/syuu/bhyve_usb/sbin/hastd/refcnt.h soc2013/syuu/bhyve_usb/sbin/ifconfig/af_nd6.c soc2013/syuu/bhyve_usb/sbin/mdconfig/mdconfig.8 soc2013/syuu/bhyve_usb/sbin/mount/mount.8 soc2013/syuu/bhyve_usb/sbin/mount/mount.c soc2013/syuu/bhyve_usb/sbin/nvmecontrol/Makefile soc2013/syuu/bhyve_usb/sbin/nvmecontrol/nvmecontrol.8 soc2013/syuu/bhyve_usb/sbin/nvmecontrol/nvmecontrol.c soc2013/syuu/bhyve_usb/sbin/swapon/swapon.8 soc2013/syuu/bhyve_usb/sbin/swapon/swapon.c soc2013/syuu/bhyve_usb/share/examples/Makefile soc2013/syuu/bhyve_usb/share/examples/etc/README.examples soc2013/syuu/bhyve_usb/share/examples/etc/make.conf soc2013/syuu/bhyve_usb/share/man/man5/fstab.5 soc2013/syuu/bhyve_usb/share/man/man9/locking.9 soc2013/syuu/bhyve_usb/share/mk/bsd.libnames.mk soc2013/syuu/bhyve_usb/sys/ (props changed) soc2013/syuu/bhyve_usb/sys/amd64/include/acpica_machdep.h soc2013/syuu/bhyve_usb/sys/amd64/vmm/ (props changed) soc2013/syuu/bhyve_usb/sys/amd64/vmm/x86.c soc2013/syuu/bhyve_usb/sys/arm/arm/cpufunc.c soc2013/syuu/bhyve_usb/sys/arm/arm/db_trace.c soc2013/syuu/bhyve_usb/sys/arm/arm/exception.S soc2013/syuu/bhyve_usb/sys/arm/arm/gic.c soc2013/syuu/bhyve_usb/sys/arm/arm/identcpu.c soc2013/syuu/bhyve_usb/sys/arm/include/armreg.h soc2013/syuu/bhyve_usb/sys/arm/include/asmacros.h soc2013/syuu/bhyve_usb/sys/arm/include/intr.h soc2013/syuu/bhyve_usb/sys/arm/ti/am335x/am335x_lcd.c soc2013/syuu/bhyve_usb/sys/arm/versatile/versatile_pci.c soc2013/syuu/bhyve_usb/sys/arm/versatile/versatile_sic.c soc2013/syuu/bhyve_usb/sys/boot/ (props changed) soc2013/syuu/bhyve_usb/sys/cam/cam_ccb.h soc2013/syuu/bhyve_usb/sys/cam/scsi/scsi_xpt.c soc2013/syuu/bhyve_usb/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c soc2013/syuu/bhyve_usb/sys/cddl/contrib/opensolaris/ (props changed) soc2013/syuu/bhyve_usb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c soc2013/syuu/bhyve_usb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c soc2013/syuu/bhyve_usb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c soc2013/syuu/bhyve_usb/sys/cddl/dev/dtmalloc/dtmalloc.c soc2013/syuu/bhyve_usb/sys/conf/ (props changed) soc2013/syuu/bhyve_usb/sys/conf/NOTES soc2013/syuu/bhyve_usb/sys/conf/files soc2013/syuu/bhyve_usb/sys/conf/files.amd64 soc2013/syuu/bhyve_usb/sys/conf/files.arm soc2013/syuu/bhyve_usb/sys/conf/files.i386 soc2013/syuu/bhyve_usb/sys/conf/files.ia64 soc2013/syuu/bhyve_usb/sys/conf/files.mips soc2013/syuu/bhyve_usb/sys/conf/files.pc98 soc2013/syuu/bhyve_usb/sys/conf/files.powerpc soc2013/syuu/bhyve_usb/sys/conf/files.sparc64 soc2013/syuu/bhyve_usb/sys/conf/options soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/ (props changed) soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/acpica_prep.sh soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/changes.txt (contents, props changed) soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/common/ (props changed) soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/common/dmrestag.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/common/dmtable.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/common/dmtbdump.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/common/dmtbinfo.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/compiler/ (props changed) soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/compiler/aslcompile.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/compiler/aslmessages.h soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/compiler/asltree.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/compiler/aslutils.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/compiler/dtfield.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/compiler/dtio.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/compiler/dttable.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/compiler/dttemplate.h soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/compiler/dtutils.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/compiler/preprocess.h soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/compiler/prscan.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/debugger/ (props changed) soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/debugger/dbcmds.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/debugger/dbdisply.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/debugger/dbinput.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/debugger/dbnames.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/disassembler/ (props changed) soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/disassembler/dmopcode.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/events/ (props changed) soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/events/evgpeinit.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/executer/ (props changed) soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/executer/exdump.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/namespace/ (props changed) soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/namespace/nsdump.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/namespace/nsrepair2.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/namespace/nsxfname.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/resources/ (props changed) soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/resources/rsdump.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/resources/rsutils.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/tables/ (props changed) soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/tables/tbxfroot.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/utilities/ (props changed) soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/utilities/uteval.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/components/utilities/utstring.c soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/include/ (props changed) soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/include/acdisasm.h soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/include/acpixf.h soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/include/actables.h soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/include/actypes.h soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/include/acutils.h soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/include/platform/acfreebsd.h soc2013/syuu/bhyve_usb/sys/contrib/dev/acpica/os_specific/ (props changed) soc2013/syuu/bhyve_usb/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c soc2013/syuu/bhyve_usb/sys/dev/acpi_support/atk0110.c soc2013/syuu/bhyve_usb/sys/dev/acpica/acpi_pcib_acpi.c soc2013/syuu/bhyve_usb/sys/dev/ath/if_ath_rx_edma.c soc2013/syuu/bhyve_usb/sys/dev/bce/if_bce.c soc2013/syuu/bhyve_usb/sys/dev/bce/if_bcereg.h soc2013/syuu/bhyve_usb/sys/dev/bge/if_bge.c soc2013/syuu/bhyve_usb/sys/dev/bge/if_bgereg.h soc2013/syuu/bhyve_usb/sys/dev/cxgbe/t4_main.c soc2013/syuu/bhyve_usb/sys/dev/isci/scil/sati_passthrough.c soc2013/syuu/bhyve_usb/sys/dev/iwn/if_iwn.c soc2013/syuu/bhyve_usb/sys/dev/nvme/nvme.h soc2013/syuu/bhyve_usb/sys/dev/nvme/nvme_ctrlr.c soc2013/syuu/bhyve_usb/sys/dev/nvme/nvme_private.h soc2013/syuu/bhyve_usb/sys/dev/nvme/nvme_qpair.c soc2013/syuu/bhyve_usb/sys/dev/pci/pci.c soc2013/syuu/bhyve_usb/sys/dev/pci/pci_private.h soc2013/syuu/bhyve_usb/sys/dev/re/if_re.c soc2013/syuu/bhyve_usb/sys/dev/uart/uart.h soc2013/syuu/bhyve_usb/sys/dev/uart/uart_bus_fdt.c soc2013/syuu/bhyve_usb/sys/dev/uart/uart_cpu_fdt.c soc2013/syuu/bhyve_usb/sys/dev/uart/uart_subr.c soc2013/syuu/bhyve_usb/sys/dev/usb/serial/u3g.c soc2013/syuu/bhyve_usb/sys/dev/usb/usbdevs soc2013/syuu/bhyve_usb/sys/dev/usb/wlan/if_urtwn.c soc2013/syuu/bhyve_usb/sys/dev/xen/blkfront/blkfront.c soc2013/syuu/bhyve_usb/sys/dev/xen/blkfront/block.h soc2013/syuu/bhyve_usb/sys/fs/ext2fs/ext2_extern.h soc2013/syuu/bhyve_usb/sys/fs/ext2fs/ext2_lookup.c soc2013/syuu/bhyve_usb/sys/fs/ext2fs/ext2_vfsops.c soc2013/syuu/bhyve_usb/sys/fs/smbfs/smbfs_node.c soc2013/syuu/bhyve_usb/sys/fs/smbfs/smbfs_vfsops.c soc2013/syuu/bhyve_usb/sys/fs/smbfs/smbfs_vnops.c soc2013/syuu/bhyve_usb/sys/geom/geom_io.c soc2013/syuu/bhyve_usb/sys/i386/include/acpica_machdep.h soc2013/syuu/bhyve_usb/sys/ia64/include/acpica_machdep.h soc2013/syuu/bhyve_usb/sys/kern/Make.tags.inc soc2013/syuu/bhyve_usb/sys/kern/kern_clock.c soc2013/syuu/bhyve_usb/sys/kern/kern_descrip.c soc2013/syuu/bhyve_usb/sys/kern/kern_synch.c soc2013/syuu/bhyve_usb/sys/kern/subr_bus.c soc2013/syuu/bhyve_usb/sys/kern/sys_generic.c soc2013/syuu/bhyve_usb/sys/kern/vfs_bio.c soc2013/syuu/bhyve_usb/sys/modules/Makefile soc2013/syuu/bhyve_usb/sys/net80211/ieee80211_ioctl.c soc2013/syuu/bhyve_usb/sys/netsmb/smb_conn.c soc2013/syuu/bhyve_usb/sys/sys/bus.h soc2013/syuu/bhyve_usb/sys/sys/malloc.h soc2013/syuu/bhyve_usb/sys/sys/socketvar.h soc2013/syuu/bhyve_usb/sys/sys/stdatomic.h soc2013/syuu/bhyve_usb/sys/vm/uma_core.c soc2013/syuu/bhyve_usb/sys/vm/vm.h soc2013/syuu/bhyve_usb/sys/vm/vm_init.c soc2013/syuu/bhyve_usb/sys/vm/vm_kern.c soc2013/syuu/bhyve_usb/sys/vm/vm_kern.h soc2013/syuu/bhyve_usb/sys/vm/vm_object.c soc2013/syuu/bhyve_usb/sys/vm/vm_pager.c soc2013/syuu/bhyve_usb/sys/vm/vm_pager.h soc2013/syuu/bhyve_usb/usr.bin/Makefile soc2013/syuu/bhyve_usb/usr.bin/Makefile.amd64 soc2013/syuu/bhyve_usb/usr.bin/Makefile.i386 soc2013/syuu/bhyve_usb/usr.bin/Makefile.ia64 soc2013/syuu/bhyve_usb/usr.bin/Makefile.powerpc soc2013/syuu/bhyve_usb/usr.bin/Makefile.sparc64 soc2013/syuu/bhyve_usb/usr.bin/calendar/ (props changed) soc2013/syuu/bhyve_usb/usr.bin/calendar/calendars/calendar.freebsd soc2013/syuu/bhyve_usb/usr.bin/kdump/kdump.c soc2013/syuu/bhyve_usb/usr.sbin/Makefile.amd64 soc2013/syuu/bhyve_usb/usr.sbin/Makefile.i386 soc2013/syuu/bhyve_usb/usr.sbin/Makefile.ia64 soc2013/syuu/bhyve_usb/usr.sbin/Makefile.powerpc soc2013/syuu/bhyve_usb/usr.sbin/Makefile.sparc64 soc2013/syuu/bhyve_usb/usr.sbin/acpi/acpidb/acpidb.c soc2013/syuu/bhyve_usb/usr.sbin/acpi/acpidump/acpi.c soc2013/syuu/bhyve_usb/usr.sbin/bhyve/ (props changed) soc2013/syuu/bhyve_usb/usr.sbin/bhyve/atpic.c soc2013/syuu/bhyve_usb/usr.sbin/bhyve/pci_emul.c soc2013/syuu/bhyve_usb/usr.sbin/newsyslog/newsyslog.c soc2013/syuu/bhyve_usb/usr.sbin/pkg_install/add/extract.c soc2013/syuu/bhyve_usb/usr.sbin/pkg_install/create/pl.c soc2013/syuu/bhyve_usb/usr.sbin/pkg_install/lib/exec.c soc2013/syuu/bhyve_usb/usr.sbin/pw/pw_user.c Modified: soc2013/syuu/bhyve_usb/bin/ed/re.c ============================================================================== --- soc2013/syuu/bhyve_usb/bin/ed/re.c Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/bin/ed/re.c Sun Jun 30 13:10:38 2013 (r253731) @@ -89,7 +89,7 @@ default: break; case '[': - if ((nd = parse_char_class(++nd)) == NULL) { + if ((nd = parse_char_class(nd + 1)) == NULL) { errmsg = "unbalanced brackets ([])"; return NULL; } Modified: soc2013/syuu/bhyve_usb/bin/sh/eval.c ============================================================================== --- soc2013/syuu/bhyve_usb/bin/sh/eval.c Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/bin/sh/eval.c Sun Jun 30 13:10:38 2013 (r253731) @@ -589,7 +589,8 @@ pip[1] = -1; if (lp->next) { if (pipe(pip) < 0) { - close(prevfd); + if (prevfd >= 0) + close(prevfd); error("Pipe call failed: %s", strerror(errno)); } } Modified: soc2013/syuu/bhyve_usb/contrib/libstdc++/libsupc++/unwind-cxx.h ============================================================================== --- soc2013/syuu/bhyve_usb/contrib/libstdc++/libsupc++/unwind-cxx.h Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/contrib/libstdc++/libsupc++/unwind-cxx.h Sun Jun 30 13:10:38 2013 (r253731) @@ -133,7 +133,7 @@ // throws, and if bad_exception needs to be thrown. Called from the // compiler. extern "C" void __cxa_call_unexpected (void *) __attribute__((noreturn)); -extern "C" void __cxa_call_terminate (void*) __attribute__((noreturn)); +extern "C" void __cxa_call_terminate (_Unwind_Exception*) __attribute__((noreturn)); #ifdef __ARM_EABI_UNWINDER__ // Arm EABI specified routines. Modified: soc2013/syuu/bhyve_usb/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h ============================================================================== --- soc2013/syuu/bhyve_usb/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h Sun Jun 30 13:10:38 2013 (r253731) @@ -36,7 +36,7 @@ #ifndef GSSAPI_KRB5_H_ #define GSSAPI_KRB5_H_ -#include <gssapi.h> +#include <gssapi/gssapi.h> GSSAPI_CPP_START Modified: soc2013/syuu/bhyve_usb/crypto/openssh/sshd_config ============================================================================== --- soc2013/syuu/bhyve_usb/crypto/openssh/sshd_config Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/crypto/openssh/sshd_config Sun Jun 30 13:10:38 2013 (r253731) @@ -105,7 +105,7 @@ #PrintLastLog yes #TCPKeepAlive yes #UseLogin no -#UsePrivilegeSeparation sandbox +#UsePrivilegeSeparation yes #PermitUserEnvironment no #Compression delayed #ClientAliveInterval 0 Modified: soc2013/syuu/bhyve_usb/crypto/openssh/sshd_config.5 ============================================================================== --- soc2013/syuu/bhyve_usb/crypto/openssh/sshd_config.5 Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/crypto/openssh/sshd_config.5 Sun Jun 30 13:10:38 2013 (r253731) @@ -1169,7 +1169,7 @@ The goal of privilege separation is to prevent privilege escalation by containing any corruption within the unprivileged processes. The default is -.Dq sandbox . +.Dq yes . If .Cm UsePrivilegeSeparation is set to Modified: soc2013/syuu/bhyve_usb/etc/defaults/rc.conf ============================================================================== --- soc2013/syuu/bhyve_usb/etc/defaults/rc.conf Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/etc/defaults/rc.conf Sun Jun 30 13:10:38 2013 (r253731) @@ -32,8 +32,6 @@ always_force_depends="NO" # Set to check that indicated dependencies are # running during boot (can increase boot time). -swapfile="NO" # Set to name of swapfile if aux swapfile desired. -swapfile_mdunit="99" # Swapfile md(4) unit number created by mdconfig(8). apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). @@ -85,15 +83,12 @@ #geli_da1_autodetach="NO" #geli_mirror_home_flags="-k /etc/geli/home.keys" -geli_swap_flags="-e aes -l 256 -s 4096 -d" # Options for GELI-encrypted - # swap partitions. - root_rw_mount="YES" # Set to NO to inhibit remounting root read-write. fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. fsck_y_flags="" # Additional flags for fsck -y background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. -netfs_types="nfs:NFS oldnfs:OLDNFS" # Net filesystems. +netfs_types="nfs:NFS oldnfs:OLDNFS smbfs:SMB" # Net filesystems. extra_netfs_types="NO" # List of network extra filesystem types for delayed # mount at startup (or NO). Modified: soc2013/syuu/bhyve_usb/etc/mtree/BSD.include.dist ============================================================================== --- soc2013/syuu/bhyve_usb/etc/mtree/BSD.include.dist Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/etc/mtree/BSD.include.dist Sun Jun 30 13:10:38 2013 (r253731) @@ -176,6 +176,8 @@ .. procfs .. + smbfs + .. udf .. unionfs Modified: soc2013/syuu/bhyve_usb/etc/mtree/BSD.usr.dist ============================================================================== --- soc2013/syuu/bhyve_usb/etc/mtree/BSD.usr.dist Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/etc/mtree/BSD.usr.dist Sun Jun 30 13:10:38 2013 (r253731) @@ -309,6 +309,10 @@ srcs .. .. + smbfs + print + .. + .. sunrpc dir .. Modified: soc2013/syuu/bhyve_usb/etc/network.subr ============================================================================== --- soc2013/syuu/bhyve_usb/etc/network.subr Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/etc/network.subr Sun Jun 30 13:10:38 2013 (r253731) @@ -318,6 +318,15 @@ local _tmpargs _arg _tmpargs=`_ifconfig_getargs $1` + case $1 in + lo[0-9]*|\ + stf[0-9]*|\ + faith[0-9]*|\ + lp[0-9]*|\ + sl[0-9]*) + return 1 + ;; + esac if noafif $1; then return 1 fi @@ -509,7 +518,7 @@ _if=$1 case $_if in - lo0|\ + lo[0-9]*|\ stf[0-9]*|\ faith[0-9]*|\ lp[0-9]*|\ Modified: soc2013/syuu/bhyve_usb/etc/rc.d/Makefile ============================================================================== --- soc2013/syuu/bhyve_usb/etc/rc.d/Makefile Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/etc/rc.d/Makefile Sun Jun 30 13:10:38 2013 (r253731) @@ -37,7 +37,6 @@ dhclient \ dmesg \ dumpon \ - encswap \ faith \ fsck \ ftp-proxy \ @@ -139,7 +138,8 @@ static_arp \ static_ndp \ stf \ - swap1 \ + swap \ + swaplate \ syscons \ sysctl \ syslogd \ Modified: soc2013/syuu/bhyve_usb/etc/rc.d/addswap ============================================================================== --- soc2013/syuu/bhyve_usb/etc/rc.d/addswap Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/etc/rc.d/addswap Sun Jun 30 13:10:38 2013 (r253731) @@ -13,57 +13,12 @@ . /etc/rc.subr name="addswap" -start_cmd="addswap_start" -stop_cmd="addswap_stop" +start_cmd=":" +stop_cmd=":" +rcvar= -addswap_start() -{ - case ${swapfile} in - [Nn][Oo] | '') - ;; - *) - if [ -w "${swapfile}" ]; then - check_startmsgs && echo "Adding ${swapfile} as additional swap" - - if [ -n "${swapfile_mdunit}" ]; then - mdev="/dev/md${swapfile_mdunit#md}" - mdconfig -a -t vnode -f "${swapfile}" -u ${swapfile_mdunit} - else - mdev="/dev/`mdconfig -a -t vnode -f "${swapfile}"`" - fi - - if [ $? -eq 0 ]; then - swapon ${mdev} - else - echo "error creating swapfile device" - fi - fi - ;; - esac -} - -addswap_stop() -{ - case ${swapfile} in - [Nn][Oo] | '') - ;; - *) - if [ -n "${swapfile_mdunit}" ]; then - mdev="/dev/md${swapfile_mdunit#md}" - else - mdev="/dev/`mdconfig -lv | grep "${swapfile}" | cut -f1`" - swapfile_mdunit=${mdev#md} - fi - if [ -n "${swapfile_mdunit}" ]; then - swapctl -l | grep -q ${mdev} - if [ $? -eq 0 ]; then - echo "Dismounting swapfile ${swapfile}" - swapoff ${mdev} && mdconfig -d -u ${swapfile_mdunit} - fi - fi - ;; - esac -} +set_rcvar_obsolete swapfile +set_rcvar_obsolete geli_swap_flags load_rc_config $name run_rc_command "$1" Modified: soc2013/syuu/bhyve_usb/etc/rc.d/fsck ============================================================================== --- soc2013/syuu/bhyve_usb/etc/rc.d/fsck Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/etc/rc.d/fsck Sun Jun 30 13:10:38 2013 (r253731) @@ -4,7 +4,7 @@ # # PROVIDE: fsck -# REQUIRE: localswap +# REQUIRE: swap # KEYWORD: nojail . /etc/rc.subr Modified: soc2013/syuu/bhyve_usb/etc/rc.d/mdconfig ============================================================================== --- soc2013/syuu/bhyve_usb/etc/rc.d/mdconfig Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/etc/rc.d/mdconfig Sun Jun 30 13:10:38 2013 (r253731) @@ -28,7 +28,7 @@ # # PROVIDE: mdconfig -# REQUIRE: localswap root +# REQUIRE: swap root . /etc/rc.subr Copied: soc2013/syuu/bhyve_usb/etc/rc.d/swap (from r253730, mirror/FreeBSD/head/etc/rc.d/swap) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/syuu/bhyve_usb/etc/rc.d/swap Sun Jun 30 13:10:38 2013 (r253731, copy of r253730, mirror/FreeBSD/head/etc/rc.d/swap) @@ -0,0 +1,17 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: swap +# REQUIRE: disks +# KEYWORD: nojail shutdown + +. /etc/rc.subr + +name="swap" +start_cmd='/sbin/swapon -aq' +stop_cmd=':' + +load_rc_config $name +run_rc_command "$1" Copied: soc2013/syuu/bhyve_usb/etc/rc.d/swaplate (from r253730, mirror/FreeBSD/head/etc/rc.d/swaplate) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/syuu/bhyve_usb/etc/rc.d/swaplate Sun Jun 30 13:10:38 2013 (r253731, copy of r253730, mirror/FreeBSD/head/etc/rc.d/swaplate) @@ -0,0 +1,17 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: swaplate +# REQUIRE: mountlate +# KEYWORD: nojail shutdown + +. /etc/rc.subr + +name="swaplate" +start_cmd='/sbin/swapon -aLq' +stop_cmd='/sbin/swapoff -aq' + +load_rc_config swap +run_rc_command "$1" Modified: soc2013/syuu/bhyve_usb/include/Makefile ============================================================================== --- soc2013/syuu/bhyve_usb/include/Makefile Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/include/Makefile Sun Jun 30 13:10:38 2013 (r253731) @@ -37,7 +37,7 @@ syslog.h ucontext.h LDIRS= bsm cam geom net net80211 netatalk netgraph netinet netinet6 \ - netipsec ${_netipx} netnatm \ + netipsec ${_netipx} netnatm netsmb \ nfs nfsclient nfsserver \ sys vm @@ -48,7 +48,7 @@ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \ - fs/procfs fs/udf fs/unionfs \ + fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/mountver geom/multipath geom/nop \ geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \ @@ -80,6 +80,7 @@ LSUBSUBDIRS+= netgraph/bluetooth/include .endif +# XXX unconditionally needed by <netsmb/netbios.h> #.if ${MK_IPX} != "no" _netipx= netipx #.endif Modified: soc2013/syuu/bhyve_usb/include/gssapi/gssapi.h ============================================================================== --- soc2013/syuu/bhyve_usb/include/gssapi/gssapi.h Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/include/gssapi/gssapi.h Sun Jun 30 13:10:38 2013 (r253731) @@ -44,6 +44,33 @@ #define _SSIZE_T_DECLARED #endif +/* Compatibility with Heimdal 1.5.1 */ +#ifndef GSSAPI_CPP_START +#ifdef __cplusplus +#define GSSAPI_CPP_START extern "C" { +#define GSSAPI_CPP_END } +#else +#define GSSAPI_CPP_START +#define GSSAPI_CPP_END +#endif +#endif + +/* Compatibility with Heimdal 1.5.1 */ +#ifndef BUILD_GSSAPI_LIB +#define GSSAPI_LIB_FUNCTION +#define GSSAPI_LIB_CALL +#define GSSAPI_LIB_VARIABLE +#endif + +/* Compatibility with Heimdal 1.5.1 */ +#ifndef GSSAPI_DEPRECATED_FUNCTION +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 ))) +#define GSSAPI_DEPRECATED_FUNCTION(X) __attribute__((deprecated)) +#else +#define GSSAPI_DEPRECATED_FUNCTION(X) +#endif +#endif + #if 0 /* * If the platform supports the xom.h header file, it should be Modified: soc2013/syuu/bhyve_usb/include/paths.h ============================================================================== --- soc2013/syuu/bhyve_usb/include/paths.h Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/include/paths.h Sun Jun 30 13:10:38 2013 (r253731) @@ -57,6 +57,8 @@ #define _PATH_ETC "/etc" #define _PATH_FTPUSERS "/etc/ftpusers" #define _PATH_FWMEM "/dev/fwmem" +#define _PATH_GBDE "/sbin/gbde" +#define _PATH_GELI "/sbin/geli" #define _PATH_HALT "/sbin/halt" #ifdef COMPAT_32BIT #define _PATH_I18NMODULE "/usr/lib32/i18n" Modified: soc2013/syuu/bhyve_usb/lib/Makefile ============================================================================== --- soc2013/syuu/bhyve_usb/lib/Makefile Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/lib/Makefile Sun Jun 30 13:10:38 2013 (r253731) @@ -102,6 +102,7 @@ ${_librtld_db} \ ${_libsdp} \ ${_libsm} \ + ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} \ libstand \ @@ -205,6 +206,7 @@ .endif .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +_libsmb= libsmb _libvgl= libvgl _libproc= libproc _librtld_db= librtld_db @@ -216,6 +218,7 @@ .if ${MACHINE_CPUARCH} == "ia64" _libefi= libefi +_libsmb= libsmb .endif .if ${MACHINE_CPUARCH} == "mips" @@ -226,6 +229,11 @@ .if ${MACHINE_CPUARCH} == "powerpc" _libproc= libproc _librtld_db= librtld_db +_libsmb= libsmb +.endif + +.if ${MACHINE_CPUARCH} == "sparc64" +_libsmb= libsmb .endif .if ${MK_OPENSSL} != "no" Modified: soc2013/syuu/bhyve_usb/lib/libfetch/fetch.c ============================================================================== --- soc2013/syuu/bhyve_usb/lib/libfetch/fetch.c Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/lib/libfetch/fetch.c Sun Jun 30 13:10:38 2013 (r253731) @@ -376,7 +376,7 @@ /* password */ if (*q == ':') - q = fetch_pctdecode(u->pwd, ++q, URL_PWDLEN); + q = fetch_pctdecode(u->pwd, q + 1, URL_PWDLEN); p++; } else { Modified: soc2013/syuu/bhyve_usb/lib/libprocstat/Makefile ============================================================================== --- soc2013/syuu/bhyve_usb/lib/libprocstat/Makefile Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/lib/libprocstat/Makefile Sun Jun 30 13:10:38 2013 (r253731) @@ -9,6 +9,7 @@ core.c \ libprocstat.c \ msdosfs.c \ + smbfs.c \ udf.c VERSION_DEF= ${.CURDIR}/Versions.def Modified: soc2013/syuu/bhyve_usb/lib/libprocstat/common_kvm.h ============================================================================== --- soc2013/syuu/bhyve_usb/lib/libprocstat/common_kvm.h Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/lib/libprocstat/common_kvm.h Sun Jun 30 13:10:38 2013 (r253731) @@ -41,6 +41,7 @@ int isofs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int msdosfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int nfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); +int smbfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int udf_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int ufs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int zfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); Modified: soc2013/syuu/bhyve_usb/lib/libprocstat/libprocstat.c ============================================================================== --- soc2013/syuu/bhyve_usb/lib/libprocstat/libprocstat.c Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/lib/libprocstat/libprocstat.c Sun Jun 30 13:10:38 2013 (r253731) @@ -1220,6 +1220,7 @@ FSTYPE(isofs), FSTYPE(msdosfs), FSTYPE(nfs), + FSTYPE(smbfs), FSTYPE(udf), FSTYPE(ufs), #ifdef LIBPROCSTAT_ZFS Modified: soc2013/syuu/bhyve_usb/lib/librt/sigev_thread.c ============================================================================== --- soc2013/syuu/bhyve_usb/lib/librt/sigev_thread.c Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/lib/librt/sigev_thread.c Sun Jun 30 13:10:38 2013 (r253731) @@ -28,13 +28,13 @@ */ #include <sys/types.h> -#include <machine/atomic.h> #include "namespace.h" #include <err.h> #include <errno.h> #include <ucontext.h> #include <sys/thr.h> +#include <stdatomic.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -51,7 +51,7 @@ static struct sigev_list_head sigev_hash[HASH_QUEUES]; static struct sigev_list_head sigev_all; static LIST_HEAD(,sigev_thread) sigev_threads; -static unsigned int sigev_generation; +static atomic_int sigev_generation; static pthread_mutex_t *sigev_list_mtx; static pthread_once_t sigev_once = PTHREAD_ONCE_INIT; static pthread_once_t sigev_once_default = PTHREAD_ONCE_INIT; @@ -196,7 +196,8 @@ if (sn != NULL) { sn->sn_value = evp->sigev_value; sn->sn_func = evp->sigev_notify_function; - sn->sn_gen = atomic_fetchadd_int(&sigev_generation, 1); + sn->sn_gen = atomic_fetch_add_explicit(&sigev_generation, 1, + memory_order_relaxed); sn->sn_type = type; _pthread_attr_init(&sn->sn_attr); _pthread_attr_setdetachstate(&sn->sn_attr, PTHREAD_CREATE_DETACHED); Modified: soc2013/syuu/bhyve_usb/lib/libutil/login_times.c ============================================================================== --- soc2013/syuu/bhyve_usb/lib/libutil/login_times.c Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/lib/libutil/login_times.c Sun Jun 30 13:10:38 2013 (r253731) @@ -96,7 +96,7 @@ else m.lt_start = 0; if (*p == '-') - p = parse_time(++p, &m.lt_end); + p = parse_time(p + 1, &m.lt_end); else m.lt_end = 1440; Modified: soc2013/syuu/bhyve_usb/rescue/rescue/Makefile ============================================================================== --- soc2013/syuu/bhyve_usb/rescue/rescue/Makefile Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/rescue/rescue/Makefile Sun Jun 30 13:10:38 2013 (r253731) @@ -130,6 +130,8 @@ .if ${MACHINE_CPUARCH} == "i386" CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk CRUNCH_ALIAS_bsdlabel= disklabel +#CRUNCH_PROGS+= mount_smbfs +#CRUNCH_LIBS+= -lsmb .endif .if ${MACHINE} == "pc98" Modified: soc2013/syuu/bhyve_usb/sbin/hastd/refcnt.h ============================================================================== --- soc2013/syuu/bhyve_usb/sbin/hastd/refcnt.h Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/sbin/hastd/refcnt.h Sun Jun 30 13:10:38 2013 (r253731) @@ -32,24 +32,24 @@ #ifndef __REFCNT_H__ #define __REFCNT_H__ -#include <stdatomic.h> +#include <machine/atomic.h> #include "pjdlog.h" -typedef atomic_uint refcnt_t; +typedef unsigned int refcnt_t; static __inline void refcnt_init(refcnt_t *count, unsigned int v) { - atomic_init(count, v); + *count = v; } static __inline void refcnt_acquire(refcnt_t *count) { - atomic_fetch_add_explicit(count, 1, memory_order_acquire); + atomic_add_acq_int(count, 1); } static __inline unsigned int @@ -58,7 +58,7 @@ unsigned int old; /* XXX: Should this have a rel membar? */ - old = atomic_fetch_sub(count, 1); + old = atomic_fetchadd_int(count, -1); PJDLOG_ASSERT(old > 0); return (old - 1); } Modified: soc2013/syuu/bhyve_usb/sbin/ifconfig/af_nd6.c ============================================================================== --- soc2013/syuu/bhyve_usb/sbin/ifconfig/af_nd6.c Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/sbin/ifconfig/af_nd6.c Sun Jun 30 13:10:38 2013 (r253731) @@ -148,7 +148,7 @@ memset(&nd, 0, sizeof(nd)); strncpy(nd.ifname, ifr.ifr_name, sizeof(nd.ifname)); if ((s6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { - if (errno != EAFNOSUPPORT) + if (errno != EAFNOSUPPORT && error != EPROTONOSUPPORT) warn("socket(AF_INET6, SOCK_DGRAM)"); return; } Modified: soc2013/syuu/bhyve_usb/sbin/mdconfig/mdconfig.8 ============================================================================== --- soc2013/syuu/bhyve_usb/sbin/mdconfig/mdconfig.8 Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/sbin/mdconfig/mdconfig.8 Sun Jun 30 13:10:38 2013 (r253731) @@ -144,7 +144,7 @@ and .Fl f options are specified, -display devices which match the two conditions. +display devices which match the two conditions. If the .Fl v option is specified, show all details. Modified: soc2013/syuu/bhyve_usb/sbin/mount/mount.8 ============================================================================== --- soc2013/syuu/bhyve_usb/sbin/mount/mount.8 Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/sbin/mount/mount.8 Sun Jun 30 13:10:38 2013 (r253731) @@ -450,6 +450,7 @@ .Cm nfs , .Cm nullfs , .Cm oldnfs , +.Cm smbfs , .Cm udf , and .Cm unionfs . @@ -544,6 +545,7 @@ .Xr mount_msdosfs 8 , .Xr mount_nfs 8 , .Xr mount_nullfs 8 , +.Xr mount_smbfs 8 , .Xr mount_udf 8 , .Xr mount_unionfs 8 , .Xr umount 8 , Modified: soc2013/syuu/bhyve_usb/sbin/mount/mount.c ============================================================================== --- soc2013/syuu/bhyve_usb/sbin/mount/mount.c Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/sbin/mount/mount.c Sun Jun 30 13:10:38 2013 (r253731) @@ -143,7 +143,7 @@ unsigned int i; const char *fs[] = { "cd9660", "mfs", "msdosfs", "nfs", - "nullfs", "oldnfs", "udf", "unionfs", + "nullfs", "oldnfs", "smbfs", "udf", "unionfs", NULL }; Modified: soc2013/syuu/bhyve_usb/sbin/nvmecontrol/Makefile ============================================================================== --- soc2013/syuu/bhyve_usb/sbin/nvmecontrol/Makefile Sun Jun 30 12:46:03 2013 (r253730) +++ soc2013/syuu/bhyve_usb/sbin/nvmecontrol/Makefile Sun Jun 30 13:10:38 2013 (r253731) @@ -1,6 +1,8 @@ # $FreeBSD$ PROG= nvmecontrol +SRCS= nvmecontrol.c devlist.c firmware.c identify.c logpage.c \ + perftest.c reset.c MAN= nvmecontrol.8 .include <bsd.prog.mk> Copied: soc2013/syuu/bhyve_usb/sbin/nvmecontrol/devlist.c (from r253730, mirror/FreeBSD/head/sbin/nvmecontrol/devlist.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/syuu/bhyve_usb/sbin/nvmecontrol/devlist.c Sun Jun 30 13:10:38 2013 (r253731, copy of r253730, mirror/FreeBSD/head/sbin/nvmecontrol/devlist.c) @@ -0,0 +1,115 @@ +/*- + * Copyright (C) 2012-2013 Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/param.h> + +#include <errno.h> +#include <fcntl.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sysexits.h> +#include <unistd.h> + +#include "nvmecontrol.h" + +static void +devlist_usage(void) +{ + fprintf(stderr, "usage:\n"); + fprintf(stderr, DEVLIST_USAGE); + exit(EX_USAGE); +} + +static inline uint32_t +ns_get_sector_size(struct nvme_namespace_data *nsdata) +{ + + return (1 << nsdata->lbaf[0].lbads); +} + +void +devlist(int argc, char *argv[]) +{ + struct nvme_controller_data cdata; + struct nvme_namespace_data nsdata; + char name[64]; + uint32_t i; + int ch, ctrlr, exit_code, fd, found; + + exit_code = EX_OK; + + while ((ch = getopt(argc, argv, "")) != -1) { + switch ((char)ch) { + default: + devlist_usage(); + } + } + + ctrlr = -1; + found = 0; + + while (1) { + ctrlr++; + sprintf(name, "%s%d", NVME_CTRLR_PREFIX, ctrlr); + + exit_code = open_dev(name, &fd, 0, 0); + + if (exit_code == EX_NOINPUT) + break; + else if (exit_code == EX_NOPERM) { + printf("Could not open /dev/%s, errno = %d (%s)\n", + name, errno, strerror(errno)); + continue; + } + + found++; + read_controller_data(fd, &cdata); + printf("%6s: %s\n", name, cdata.mn); + + for (i = 0; i < cdata.nn; i++) { + sprintf(name, "%s%d%s%d", NVME_CTRLR_PREFIX, ctrlr, + NVME_NS_PREFIX, i+1); + read_namespace_data(fd, i+1, &nsdata); + printf(" %10s (%lldGB)\n", + name, + nsdata.nsze * + (long long)ns_get_sector_size(&nsdata) / + 1024 / 1024 / 1024); + } + + close(fd); + } + + if (found == 0) + printf("No NVMe controllers found.\n"); + + exit(EX_OK); +} Copied: soc2013/syuu/bhyve_usb/sbin/nvmecontrol/firmware.c (from r253730, mirror/FreeBSD/head/sbin/nvmecontrol/firmware.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2013/syuu/bhyve_usb/sbin/nvmecontrol/firmware.c Sun Jun 30 13:10:38 2013 (r253731, copy of r253730, mirror/FreeBSD/head/sbin/nvmecontrol/firmware.c) @@ -0,0 +1,335 @@ +/*- + * Copyright (c) 2013 EMC Corp. + * All rights reserved. + * + * Copyright (C) 2012-2013 Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/param.h> +#include <sys/ioccom.h> +#include <sys/stat.h> +#include <sys/types.h> + +#include <ctype.h> +#include <errno.h> +#include <fcntl.h> +#include <stdbool.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sysexits.h> +#include <unistd.h> + +#include "nvmecontrol.h" + +static int +slot_has_valid_firmware(int fd, int slot) +{ + struct nvme_firmware_page fw; + int has_fw = false; + + read_logpage(fd, NVME_LOG_FIRMWARE_SLOT, + NVME_GLOBAL_NAMESPACE_TAG, &fw, sizeof(fw)); + + if (fw.revision[slot-1] != 0LLU) + has_fw = true; + + return (has_fw); +} + +static void +read_image_file(char *path, void **buf, ssize_t *size) +{ + struct stat sb; + int fd; + + *size = 0; + *buf = NULL; + + if ((fd = open(path, O_RDONLY)) < 0) { + fprintf(stderr, "Unable to open '%s'.\n", path); + exit(EX_IOERR); + } + if (fstat(fd, &sb) < 0) { + fprintf(stderr, "Unable to stat '%s'.\n", path); + close(fd); + exit(EX_IOERR); + } + if ((*buf = malloc(sb.st_size)) == NULL) { + fprintf(stderr, "Unable to malloc %zd bytes.\n", + sb.st_size); + close(fd); + exit(EX_IOERR); + } + if ((*size = read(fd, *buf, sb.st_size)) < 0) { + fprintf(stderr, "Error reading '%s', errno=%d (%s)\n", + path, errno, strerror(errno)); + close(fd); + exit(EX_IOERR); + } + if (*size != sb.st_size) { + fprintf(stderr, "Error reading '%s', " + "read %zd bytes, requested %zd bytes\n", + path, *size, sb.st_size); + close(fd); + exit(EX_IOERR); + } +} + +static void +update_firmware(int fd, uint8_t *payload, uint32_t payload_size) +{ + struct nvme_pt_command pt; + size_t size; + void *chunk; + uint32_t off, resid; + int exit_code = EX_OK; + + off = 0; + resid = payload_size; + + if ((chunk = malloc((size_t)NVME_MAX_XFER_SIZE)) == NULL) { + printf("Unable to malloc %d bytes.\n", NVME_MAX_XFER_SIZE); + exit(EX_IOERR); + } + + while (resid > 0) { + size = (resid >= NVME_MAX_XFER_SIZE) ? + NVME_MAX_XFER_SIZE : resid; + memcpy(chunk, payload + off, size); + + memset(&pt, 0, sizeof(pt)); + pt.cmd.opc = NVME_OPC_FIRMWARE_IMAGE_DOWNLOAD; + pt.cmd.cdw10 = (size / sizeof(uint32_t)) - 1; + pt.cmd.cdw11 = (off / sizeof(uint32_t)); + pt.buf = chunk; + pt.len = size; + pt.is_read = 0; + + if (ioctl(fd, NVME_PASSTHROUGH_CMD, &pt) < 0) { + printf("Firmware image download request failed. " + "errno=%d (%s)\n", + errno, strerror(errno)); + exit_code = EX_IOERR; + break; + } + + if (nvme_completion_is_error(&pt.cpl)) { + printf("Passthrough command returned error.\n"); + exit_code = EX_IOERR; + break; + } + + resid -= size; + off += size; + } + + if (exit_code != EX_OK) + exit(exit_code); +} + +static void +activate_firmware(int fd, int slot, int activate_action) +{ + struct nvme_pt_command pt; + + memset(&pt, 0, sizeof(pt)); + pt.cmd.opc = NVME_OPC_FIRMWARE_ACTIVATE; + pt.cmd.cdw10 = (activate_action << 3) | slot; + pt.is_read = 0; + + if (ioctl(fd, NVME_PASSTHROUGH_CMD, &pt) < 0) { + printf("Firmware activate request failed. errno=%d (%s)\n", + errno, strerror(errno)); + exit(EX_IOERR); + } + + if (nvme_completion_is_error(&pt.cpl)) { + printf("Passthrough command returned error.\n"); + exit(EX_IOERR); + } +} + +static void +firmware_usage(void) +{ + fprintf(stderr, "usage:\n"); + fprintf(stderr, FIRMWARE_USAGE); + exit(EX_USAGE); +} + +void +firmware(int argc, char *argv[]) +{ + int fd = -1, slot = 0; + int a_flag, s_flag, f_flag; + char ch, *p, *image = NULL; + char *controller = NULL, prompt[64]; + void *buf = NULL; + ssize_t size; + struct nvme_controller_data cdata; + + a_flag = s_flag = f_flag = false; + + while ((ch = getopt(argc, argv, "af:s:")) != -1) { + switch (ch) { + case 'a': + a_flag = true; + break; + case 's': + slot = strtol(optarg, &p, 0); + if (p != NULL && *p != '\0') { + fprintf(stderr, + "\"%s\" not valid slot.\n", + optarg); + firmware_usage(); + } else if (slot == 0) { + fprintf(stderr, + "0 is not a valid slot number. " + "Slot numbers start at 1.\n"); + firmware_usage(); + } else if (slot > 7) { + fprintf(stderr, + "Slot number %s specified which is " + "greater than max allowed slot number of " + "7.\n", optarg); + firmware_usage(); + } + s_flag = true; + break; + case 'f': + image = optarg; + f_flag = true; + break; + } + } + + /* Check that a controller (and not a namespace) was specified. */ + if (optind >= argc || strstr(argv[optind], NVME_NS_PREFIX) != NULL) + firmware_usage(); + + if (!f_flag && !a_flag) { + fprintf(stderr, + "Neither a replace ([-f path_to_firmware]) nor " + "activate ([-a]) firmware image action\n" + "was specified.\n"); + firmware_usage(); + } + + if (!f_flag && a_flag && slot == 0) { + fprintf(stderr, + "Slot number to activate not specified.\n"); + firmware_usage(); + } + + controller = argv[optind]; + open_dev(controller, &fd, 1, 1); + read_controller_data(fd, &cdata); + + if (cdata.oacs.firmware == 0) { + fprintf(stderr, + "Controller does not support firmware " + "activate/download.\n"); + exit(EX_IOERR); + } + + if (f_flag && slot == 1 && cdata.frmw.slot1_ro) { + fprintf(stderr, "Slot %d is marked as read only.\n", slot); + exit(EX_IOERR); + } + + if (slot > cdata.frmw.num_slots) { + fprintf(stderr, + "Slot %d was specified but controller only " + "supports %d firmware slots.\n", + slot, cdata.frmw.num_slots); + exit(EX_IOERR); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306301310.r5UDAcgb055407>