Re: CVS commit: src/usr.bin/elf2aout
> >> Modified Files: > >>src/usr.bin/elf2aout: elf2aout.c > >> > >> Log Message: > >> A couple of fixes so that NetBSD/cats builds (on linux), works, and > >> produces a symbol table that is readable (by 4.4BSD nm(1) at least) > >> > >> - Change from OMAGIC to ZMAGIC > > Is it necessary for cats? > Yes. The cyclone firmware requires ZMAGIC. > > (Maybe I should check if luna68k's firmware recognize ZMAGIC) > > > Please do. It turns out LUNA's firmware does not recognize ZMAGIC. (it complains "file not bootable" for ZMAGIC) Can we have options to specify OMAGIC/ZMAGIC as ld(1)? Thanks, --- Izumi Tsutsui
CVS commit: src/usr.sbin/cpuctl
Module Name:src Committed By: gutteridge Date: Fri May 17 23:51:35 UTC 2019 Modified Files: src/usr.sbin/cpuctl: cpuctl.8 Log Message: cpuctl.8: minor fixes To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/cpuctl/cpuctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/cpuctl
Module Name:src Committed By: gutteridge Date: Fri May 17 23:51:35 UTC 2019 Modified Files: src/usr.sbin/cpuctl: cpuctl.8 Log Message: cpuctl.8: minor fixes To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/cpuctl/cpuctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/cpuctl/cpuctl.8 diff -u src/usr.sbin/cpuctl/cpuctl.8:1.19 src/usr.sbin/cpuctl/cpuctl.8:1.20 --- src/usr.sbin/cpuctl/cpuctl.8:1.19 Mon Apr 15 22:37:13 2019 +++ src/usr.sbin/cpuctl/cpuctl.8 Fri May 17 23:51:35 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: cpuctl.8,v 1.19 2019/04/15 22:37:13 gutteridge Exp $ +.\" $NetBSD: cpuctl.8,v 1.20 2019/05/17 23:51:35 gutteridge Exp $ .\" .\" Copyright (c) 2007, 2008, 2012, 2015 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 15, 2019 +.Dd May 17, 2019 .Dt CPUCTL 8 .Os .Sh NAME @@ -47,7 +47,7 @@ The first argument, .Ar command , specifies the action to take. Valid commands are: -.Bl -tag -width offline +.Bl -tag -width identify .It identify Ar cpu Op Ar cpu ... Output information on the specified CPU's features and capabilities. Not available on all architectures. @@ -57,7 +57,7 @@ state change. .It offline Ar cpu Op Ar cpu ... Set the specified CPUs off line. .Pp -Unbound LWPs (lightweight processes) will not be executed on the CPUs +Unbound LWPs (lightweight processes) will not be executed on a CPU while it is off line. Bound LWPs will continue to be executed on the CPUs, and device interrupts routed to the CPUs will continue to be handled. @@ -66,7 +66,7 @@ away from individual CPUs. .Pp At least one CPU in the system must remain on line. .It online Ar cpu Op Ar cpu ... -Set the specified CPUs on line, making it available to run unbound LWPs. +Set the specified CPUs on line, making them available to run unbound LWPs. .It ucode Xo .Op Ar cpu .Op Ar file @@ -84,7 +84,7 @@ The command prints the installed version on the specified CPUs. On success the .Cm identify -command show different ucode versions before and after this command. +command shows different ucode versions before and after this command. The ucode updates are found in the default firmware path found in sysctl hw.firmware.path. .It intr Ar cpu Op Ar cpu ...
CVS commit: src/sys/external/bsd/acpica/dist
Module Name:src
Committed By: christos
Date: Fri May 17 20:27:48 UTC 2019
Modified Files:
src/sys/external/bsd/acpica/dist/events: evregion.c
src/sys/external/bsd/acpica/dist/include: actypes.h
Log Message:
use a union cast to assert alignment of string constant.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/events/evregion.c
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/acpica/dist/include/actypes.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/acpica/dist/events/evregion.c
diff -u src/sys/external/bsd/acpica/dist/events/evregion.c:1.8 src/sys/external/bsd/acpica/dist/events/evregion.c:1.9
--- src/sys/external/bsd/acpica/dist/events/evregion.c:1.8 Sun Apr 28 21:18:06 2019
+++ src/sys/external/bsd/acpica/dist/events/evregion.c Fri May 17 16:27:48 2019
@@ -581,7 +581,7 @@ AcpiEvExecuteRegMethod (
ACPI_EVALUATE_INFO *Info;
ACPI_OPERAND_OBJECT *Args[3];
ACPI_OPERAND_OBJECT *RegionObj2;
-const ACPI_NAME *RegNamePtr = ACPI_CAST_PTR (ACPI_NAME, METHOD_NAME__REG);
+const ACPI_NAME *RegNamePtr = ACPI_ALIGNED_STR_UNION (ACPI_NAME, METHOD_NAME__REG);
ACPI_NAMESPACE_NODE *MethodNode;
ACPI_NAMESPACE_NODE *Node;
ACPI_STATUS Status;
Index: src/sys/external/bsd/acpica/dist/include/actypes.h
diff -u src/sys/external/bsd/acpica/dist/include/actypes.h:1.18 src/sys/external/bsd/acpica/dist/include/actypes.h:1.19
--- src/sys/external/bsd/acpica/dist/include/actypes.h:1.18 Sun Apr 28 21:18:07 2019
+++ src/sys/external/bsd/acpica/dist/include/actypes.h Fri May 17 16:27:48 2019
@@ -540,6 +540,10 @@ typedef UINT64
#define ACPI_ARRAY_LENGTH(x)(sizeof(x) / sizeof((x)[0]))
+/* Use a union to align string s to type t */
+#define ACPI_ALIGNED_STR_UNION(t, s) \
+(&((const union { char _s[sizeof(t)]; t _t; }){ s }._t))
+
/* Pointer manipulation */
#define ACPI_CAST_PTR(t, p) ((t *) (ACPI_UINTPTR_T) (p))
CVS commit: src/sys/external/bsd/acpica/dist
Module Name:src Committed By: christos Date: Fri May 17 20:27:48 UTC 2019 Modified Files: src/sys/external/bsd/acpica/dist/events: evregion.c src/sys/external/bsd/acpica/dist/include: actypes.h Log Message: use a union cast to assert alignment of string constant. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/events/evregion.c cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/acpica/dist/include/actypes.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Fri May 17 18:50:40 UTC 2019
Modified Files:
src/sys/kern: subr_disk_mbr.c
Log Message:
Factor out the magic checking code for the label, and make it not depend
on alignment.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/kern/subr_disk_mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_disk_mbr.c
diff -u src/sys/kern/subr_disk_mbr.c:1.50 src/sys/kern/subr_disk_mbr.c:1.51
--- src/sys/kern/subr_disk_mbr.c:1.50 Wed Apr 3 18:10:52 2019
+++ src/sys/kern/subr_disk_mbr.c Fri May 17 14:50:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk_mbr.c,v 1.50 2019/04/03 22:10:52 christos Exp $ */
+/* $NetBSD: subr_disk_mbr.c,v 1.51 2019/05/17 18:50:40 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -54,7 +54,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_disk_mbr.c,v 1.50 2019/04/03 22:10:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk_mbr.c,v 1.51 2019/05/17 18:50:40 christos Exp $");
#include
#include
@@ -568,6 +568,12 @@ look_netbsd_part(mbr_args_t *a, mbr_part
return SCAN_CONTINUE;
}
+static bool
+check_label_magic(const struct disklabel *dlp, uint32_t diskmagic)
+{
+ return memcmp(&dlp->d_magic, &diskmagic, sizeof(diskmagic)) == 0 &&
+ memcmp(&dlp->d_magic2, &diskmagic, sizeof(diskmagic)) == 0;
+}
#ifdef DISKLABEL_EI
/*
@@ -617,11 +623,10 @@ validate_label(mbr_args_t *a, uint label
dlp = (void *)dlp_byte;
break;
}
- if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC)
+ if (!check_label_magic(dlp, DISKMAGIC))
#ifdef DISKLABEL_EI
{
- if (bswap32(dlp->d_magic) != DISKMAGIC ||
- bswap32(dlp->d_magic2) != DISKMAGIC)
+ if (!check_label_magic(dlp, bswap32(DISKMAGIC)))
continue;
/*
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Fri May 17 18:50:40 UTC 2019 Modified Files: src/sys/kern: subr_disk_mbr.c Log Message: Factor out the magic checking code for the label, and make it not depend on alignment. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/kern/subr_disk_mbr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: christos Date: Fri May 17 18:34:33 UTC 2019 Modified Files: src/sys/arch/x86/pci: pci_machdep.c Log Message: Factor out the fbinfo setting code, to make it more readable, and use memcpy to properly align the structure (although it does not matter on x86). To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/sys/arch/x86/pci/pci_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: christos
Date: Fri May 17 18:34:33 UTC 2019
Modified Files:
src/sys/arch/x86/pci: pci_machdep.c
Log Message:
Factor out the fbinfo setting code, to make it more readable, and use
memcpy to properly align the structure (although it does not matter on x86).
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/x86/pci/pci_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.84 src/sys/arch/x86/pci/pci_machdep.c:1.85
--- src/sys/arch/x86/pci/pci_machdep.c:1.84 Mon Feb 11 09:59:33 2019
+++ src/sys/arch/x86/pci/pci_machdep.c Fri May 17 14:34:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.84 2019/02/11 14:59:33 cherry Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.85 2019/05/17 18:34:33 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.84 2019/02/11 14:59:33 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.85 2019/05/17 18:34:33 christos Exp $");
#include
#include
@@ -1054,6 +1054,66 @@ x86_genfb_resume(device_t dev, const pmf
return true;
}
+static void
+populate_fbinfo(device_t dev, prop_dictionary_t dict)
+{
+#if NWSDISPLAY > 0 && NGENFB > 0
+ extern struct vcons_screen x86_genfb_console_screen;
+ struct rasops_info *ri = &x86_genfb_console_screen.scr_ri;
+#endif
+ const void *fbptr = lookup_bootinfo(BTINFO_FRAMEBUFFER);
+ struct btinfo_framebuffer fbinfo;
+
+ if (fbptr == NULL)
+ return;
+
+ memcpy(&fbinfo, fbptr, sizeof(fbinfo));
+
+ if (fbinfo.physaddr != 0) {
+ prop_dictionary_set_uint32(dict, "width", fbinfo.width);
+ prop_dictionary_set_uint32(dict, "height", fbinfo.height);
+ prop_dictionary_set_uint8(dict, "depth", fbinfo.depth);
+ prop_dictionary_set_uint16(dict, "linebytes", fbinfo.stride);
+
+ prop_dictionary_set_uint64(dict, "address", fbinfo.physaddr);
+#if NWSDISPLAY > 0 && NGENFB > 0
+ if (ri->ri_bits != NULL) {
+ prop_dictionary_set_uint64(dict, "virtual_address",
+ ri->ri_hwbits != NULL ?
+ (vaddr_t)ri->ri_hworigbits :
+ (vaddr_t)ri->ri_origbits);
+ }
+#endif
+ }
+#if notyet
+ prop_dictionary_set_bool(dict, "splash",
+ (fbinfo.flags & BI_FB_SPLASH) != 0);
+#endif
+ if (fbinfo.depth == 8) {
+ gfb_cb.gcc_cookie = NULL;
+ gfb_cb.gcc_set_mapreg = x86_genfb_set_mapreg;
+ prop_dictionary_set_uint64(dict, "cmap_callback",
+ (uint64_t)(uintptr_t)&gfb_cb);
+ }
+ if (fbinfo.physaddr != 0) {
+ mode_cb.gmc_setmode = x86_genfb_setmode;
+ prop_dictionary_set_uint64(dict, "mode_callback",
+ (uint64_t)(uintptr_t)&mode_cb);
+ }
+
+#if NWSDISPLAY > 0 && NGENFB > 0
+ if (device_is_a(dev, "genfb")) {
+ prop_dictionary_set_bool(dict, "enable_shadowfb",
+ ri->ri_hwbits != NULL);
+
+ x86_genfb_set_console_dev(dev);
+#ifdef DDB
+ db_trap_callback = x86_genfb_ddb_trap_callback;
+#endif
+ }
+#endif
+}
+
device_t
device_pci_register(device_t dev, void *aux)
{
@@ -1112,82 +1172,16 @@ device_pci_register(device_t dev, void *
}
if (parent && device_is_a(parent, "pci") &&
found_console == false) {
- struct btinfo_framebuffer *fbinfo;
struct pci_attach_args *pa = aux;
- prop_dictionary_t dict;
if (PCI_CLASS(pa->pa_class) == PCI_CLASS_DISPLAY) {
-#if NWSDISPLAY > 0 && NGENFB > 0
- extern struct vcons_screen x86_genfb_console_screen;
- struct rasops_info *ri;
-
- ri = &x86_genfb_console_screen.scr_ri;
-#endif
-
- fbinfo = lookup_bootinfo(BTINFO_FRAMEBUFFER);
- dict = device_properties(dev);
+ prop_dictionary_t dict = device_properties(dev);
/*
* framebuffer drivers other than genfb can work
* without the address property
*/
- if (fbinfo != NULL) {
-if (fbinfo->physaddr != 0) {
-prop_dictionary_set_uint32(dict, "width",
-fbinfo->width);
-prop_dictionary_set_uint32(dict, "height",
-fbinfo->height);
-prop_dictionary_set_uint8(dict, "depth",
-fbinfo->depth);
-prop_dictionary_set_uint16(dict, "linebytes",
-fbinfo->stride);
-
-prop_dictionary_set_uint64(dict, "address",
-fbinfo->physaddr);
-#if NWSDISPLAY > 0 && NGENFB > 0
-if (ri->ri_bits != NULL) {
- prop_dictionary_set_uint64(dict,
- "virtual_address",
- ri->ri_hwbits != NULL ?
- (vaddr_t)ri->ri_hworigbits :
- (vaddr_t)ri->ri_origbits);
-}
-#endif
-}
-#if notyet
-prop_dictionary_set_bool(dict, "splash",
-fbinfo->flags & BI_FB_SPLASH ?
- true : false);
-#endif
-if (fbinfo->depth == 8) {
- gfb_cb.gcc_cookie = NULL;
- gfb_cb.gcc_set_mapreg =
- x86_genfb_set_mapreg;
- prop_dictionary_set_uint64(dict,
- "cmap_callback",
- (uint64_t)(uintptr_t)&gfb_cb);
-}
-if (fbinfo->physaddr != 0) {
- mode_cb.gmc_setmode
CVS commit: src
Module Name:src
Committed By: nakayama
Date: Fri May 17 13:51:36 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
src/tools/disklabel: Makefile
src/tools/gpt: Makefile
src/tools/vgrind: Makefile
Log Message:
Use ${_TOOL_PREFIX} instead of hardcoding "nb" for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.1136 -r1.1137 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.7 -r1.8 src/tools/disklabel/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tools/gpt/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tools/vgrind/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1136 src/share/mk/bsd.own.mk:1.1137
--- src/share/mk/bsd.own.mk:1.1136 Fri May 17 13:44:55 2019
+++ src/share/mk/bsd.own.mk Fri May 17 13:51:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1136 2019/05/17 13:44:55 nakayama Exp $
+# $NetBSD: bsd.own.mk,v 1.1137 2019/05/17 13:51:36 nakayama Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -374,7 +374,7 @@ TOOL_CTFCONVERT= ${TOOLDIR}/bin/${_TOOL_
TOOL_CTFMERGE= ${TOOLDIR}/bin/${_TOOL_PREFIX}ctfmerge
TOOL_CVSLATEST= ${TOOLDIR}/bin/${_TOOL_PREFIX}cvslatest
TOOL_DB= ${TOOLDIR}/bin/${_TOOL_PREFIX}db
-TOOL_DISKLABEL= ${TOOLDIR}/bin/nbdisklabel
+TOOL_DISKLABEL= ${TOOLDIR}/bin/${_TOOL_PREFIX}disklabel
TOOL_DTC= ${TOOLDIR}/bin/${_TOOL_PREFIX}dtc
TOOL_EQN= ${TOOLDIR}/bin/${_TOOL_PREFIX}eqn
TOOL_FDISK= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-fdisk
Index: src/tools/disklabel/Makefile
diff -u src/tools/disklabel/Makefile:1.7 src/tools/disklabel/Makefile:1.8
--- src/tools/disklabel/Makefile:1.7 Tue May 1 12:38:39 2018
+++ src/tools/disklabel/Makefile Fri May 17 13:51:36 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2018/05/01 12:38:39 christos Exp $
+# $NetBSD: Makefile,v 1.8 2019/05/17 13:51:36 nakayama Exp $
-HOSTPROGNAME= nbdisklabel
+HOSTPROGNAME= ${_TOOL_PREFIX}disklabel
HOST_SRCDIR= sbin/disklabel
HOST_SRCS= disklabel.c
Index: src/tools/gpt/Makefile
diff -u src/tools/gpt/Makefile:1.4 src/tools/gpt/Makefile:1.5
--- src/tools/gpt/Makefile:1.4 Tue May 1 12:38:39 2018
+++ src/tools/gpt/Makefile Fri May 17 13:51:36 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/05/01 12:38:39 christos Exp $
+# $NetBSD: Makefile,v 1.5 2019/05/17 13:51:36 nakayama Exp $
-HOSTPROGNAME= nbgpt
+HOSTPROGNAME= ${_TOOL_PREFIX}gpt
HOST_SRCDIR= sbin/gpt
HOST_CPPFLAGS+= -I${.CURDIR}
Index: src/tools/vgrind/Makefile
diff -u src/tools/vgrind/Makefile:1.2 src/tools/vgrind/Makefile:1.3
--- src/tools/vgrind/Makefile:1.2 Tue Jul 15 16:04:35 2014
+++ src/tools/vgrind/Makefile Fri May 17 13:51:36 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2014/07/15 16:04:35 christos Exp $
+# $NetBSD: Makefile,v 1.3 2019/05/17 13:51:36 nakayama Exp $
-HOSTPROGNAME= nbvfontedpr
+HOSTPROGNAME= ${_TOOL_PREFIX}vfontedpr
HOST_BINDIR= ${TOOLDIR}/libexec
HOST_SRCDIR= usr.bin/vgrind
HOST_FILESDIR= ${TOOLDIR}/share/misc
CVS commit: src
Module Name:src
Committed By: nakayama
Date: Fri May 17 13:51:36 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
src/tools/disklabel: Makefile
src/tools/gpt: Makefile
src/tools/vgrind: Makefile
Log Message:
Use ${_TOOL_PREFIX} instead of hardcoding "nb" for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.1136 -r1.1137 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.7 -r1.8 src/tools/disklabel/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tools/gpt/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tools/vgrind/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: nakayama Date: Fri May 17 13:44:55 UTC 2019 Modified Files: src/share/mk: bsd.own.mk src/tools/llvm-clang-tblgen: Makefile src/tools/llvm-tblgen: Makefile Log Message: Revert previous. The binaries created are different, but according to joerg@ there is no difference in functionality. To generate a diff of this commit: cvs rdiff -u -r1.1135 -r1.1136 src/share/mk/bsd.own.mk cvs rdiff -u -r1.2 -r1.3 src/tools/llvm-clang-tblgen/Makefile cvs rdiff -u -r1.3 -r1.4 src/tools/llvm-tblgen/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
>>> Joerg Sonnenberger wrote
> On Fri, May 17, 2019 at 09:35:03AM +0900, Takeshi Nakayama wrote:
> > >>> Joerg Sonnenberger wrote
> >
> > > On Thu, May 16, 2019 at 08:00:49PM +, Takeshi Nakayama wrote:
> > > > Module Name:src
> > > > Committed By: nakayama
> > > > Date: Thu May 16 20:00:49 UTC 2019
> > > >
> > > > Modified Files:
> > > > src/share/mk: bsd.own.mk
> > > > src/tools/llvm-clang-tblgen: Makefile
> > > > src/tools/llvm-tblgen: Makefile
> > > >
> > > > Log Message:
> > > > Rename nb{clang,llvm}-tblgen to
> > > > ${MACHINE_GNU_PLATFORM}-{clang,llvm}-tblgen
> > > > since they contain the default target (e.g. x86_64--netbsd).
> > >
> > > This is wrong. Nothing in tblgen depends on the default target. Please
> > > revert.
> >
> > I thought that there is no functional difference, but different
> > binaries are created for each architecture because the binary
> > contains default target name.
> >
> > How can we avoid creating different binaries for each architecture?
>
> It doesn't matter that the binary is different. The functions that
> differ are never used by tblgen.
Anyway I just reverted.
-- Takeshi Nakayama
CVS commit: src
Module Name:src
Committed By: nakayama
Date: Fri May 17 13:44:55 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
src/tools/llvm-clang-tblgen: Makefile
src/tools/llvm-tblgen: Makefile
Log Message:
Revert previous.
The binaries created are different, but according to joerg@ there
is no difference in functionality.
To generate a diff of this commit:
cvs rdiff -u -r1.1135 -r1.1136 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.2 -r1.3 src/tools/llvm-clang-tblgen/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tools/llvm-tblgen/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1135 src/share/mk/bsd.own.mk:1.1136
--- src/share/mk/bsd.own.mk:1.1135 Thu May 16 20:00:49 2019
+++ src/share/mk/bsd.own.mk Fri May 17 13:44:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1135 2019/05/16 20:00:49 nakayama Exp $
+# $NetBSD: bsd.own.mk,v 1.1136 2019/05/17 13:44:55 nakayama Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -365,7 +365,7 @@ TOOL_AWK= ${TOOLDIR}/bin/${_TOOL_PREFIX
TOOL_CAP_MKDB= ${TOOLDIR}/bin/${_TOOL_PREFIX}cap_mkdb
TOOL_CAT= ${TOOLDIR}/bin/${_TOOL_PREFIX}cat
TOOL_CKSUM= ${TOOLDIR}/bin/${_TOOL_PREFIX}cksum
-TOOL_CLANG_TBLGEN= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-clang-tblgen
+TOOL_CLANG_TBLGEN= ${TOOLDIR}/bin/${_TOOL_PREFIX}clang-tblgen
TOOL_COMPILE_ET= ${TOOLDIR}/bin/${_TOOL_PREFIX}compile_et
TOOL_CONFIG= ${TOOLDIR}/bin/${_TOOL_PREFIX}config
TOOL_CRUNCHGEN= MAKE=${.MAKE:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}crunchgen
@@ -399,7 +399,7 @@ TOOL_INDXBIB= ${TOOLDIR}/bin/${_TOOL_PR
TOOL_INSTALLBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}installboot
TOOL_INSTALL_INFO= ${TOOLDIR}/bin/${_TOOL_PREFIX}install-info
TOOL_JOIN= ${TOOLDIR}/bin/${_TOOL_PREFIX}join
-TOOL_LLVM_TBLGEN= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-llvm-tblgen
+TOOL_LLVM_TBLGEN= ${TOOLDIR}/bin/${_TOOL_PREFIX}llvm-tblgen
TOOL_M4= ${TOOLDIR}/bin/${_TOOL_PREFIX}m4
TOOL_MACPPCFIXCOFF= ${TOOLDIR}/bin/${_TOOL_PREFIX}macppc-fixcoff
TOOL_MAKEFS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makefs
Index: src/tools/llvm-clang-tblgen/Makefile
diff -u src/tools/llvm-clang-tblgen/Makefile:1.2 src/tools/llvm-clang-tblgen/Makefile:1.3
--- src/tools/llvm-clang-tblgen/Makefile:1.2 Thu May 16 20:00:49 2019
+++ src/tools/llvm-clang-tblgen/Makefile Fri May 17 13:44:55 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2019/05/16 20:00:49 nakayama Exp $
+# $NetBSD: Makefile,v 1.3 2019/05/17 13:44:55 nakayama Exp $
-HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-clang-tblgen
-HOSTPROG_CXX= ${MACHINE_GNU_PLATFORM}-clang-tblgen
+HOSTPROGNAME= ${_TOOL_PREFIX}clang-tblgen
+HOSTPROG_CXX= ${_TOOL_PREFIX}clang-tblgen
HOST_SRCDIR= external/bsd/llvm/bin/clang-tblgen
.include "${.CURDIR}/../Makefile.host"
Index: src/tools/llvm-tblgen/Makefile
diff -u src/tools/llvm-tblgen/Makefile:1.3 src/tools/llvm-tblgen/Makefile:1.4
--- src/tools/llvm-tblgen/Makefile:1.3 Thu May 16 20:00:49 2019
+++ src/tools/llvm-tblgen/Makefile Fri May 17 13:44:55 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2019/05/16 20:00:49 nakayama Exp $
+# $NetBSD: Makefile,v 1.4 2019/05/17 13:44:55 nakayama Exp $
-HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-llvm-tblgen
-HOSTPROG_CXX= ${MACHINE_GNU_PLATFORM}-llvm-tblgen
+HOSTPROGNAME= ${_TOOL_PREFIX}llvm-tblgen
+HOSTPROG_CXX= ${_TOOL_PREFIX}llvm-tblgen
HOST_SRCDIR= external/bsd/llvm/bin/tblgen
.include "${.CURDIR}/../Makefile.host"
Re: CVS commit: src/distrib/amd64/cdroms/bootcd-com
In article <21082.1558083...@splode.eterna.com.au>, matthew green wrote: >> Module Name: src >> Committed By:christos >> Date:Wed May 15 13:47:41 UTC 2019 >> >> Modified Files: >> src/distrib/amd64/cdroms/bootcd-com: Makefile >> >> Log Message: >> Add a comment about iLO > >+# HP Proliant iLO serial console is on com1 > >actually, HP, and others, tend to have this configurable. >you really have no idea what it will be by default but >you can usually set it to something specific. All the ones I possess, and the ones at work I've connected to, have it there by default. I have not looked hard how to change it, but then again, if I started changing them then I would cause more harm than good christos
Re: CVS commit: src
On Fri, May 17, 2019 at 09:35:03AM +0900, Takeshi Nakayama wrote:
> >>> Joerg Sonnenberger wrote
>
> > On Thu, May 16, 2019 at 08:00:49PM +, Takeshi Nakayama wrote:
> > > Module Name: src
> > > Committed By: nakayama
> > > Date: Thu May 16 20:00:49 UTC 2019
> > >
> > > Modified Files:
> > > src/share/mk: bsd.own.mk
> > > src/tools/llvm-clang-tblgen: Makefile
> > > src/tools/llvm-tblgen: Makefile
> > >
> > > Log Message:
> > > Rename nb{clang,llvm}-tblgen to
> > > ${MACHINE_GNU_PLATFORM}-{clang,llvm}-tblgen
> > > since they contain the default target (e.g. x86_64--netbsd).
> >
> > This is wrong. Nothing in tblgen depends on the default target. Please
> > revert.
>
> I thought that there is no functional difference, but different
> binaries are created for each architecture because the binary
> contains default target name.
>
> How can we avoid creating different binaries for each architecture?
It doesn't matter that the binary is different. The functions that
differ are never used by tblgen.
Joerg
re: CVS commit: src/distrib/amd64/cdroms/bootcd-com
> Module Name: src > Committed By: christos > Date: Wed May 15 13:47:41 UTC 2019 > > Modified Files: > src/distrib/amd64/cdroms/bootcd-com: Makefile > > Log Message: > Add a comment about iLO +# HP Proliant iLO serial console is on com1 actually, HP, and others, tend to have this configurable. you really have no idea what it will be by default but you can usually set it to something specific. .mrg.
CVS commit: src/usr.sbin/puffs/mount_9p
Module Name:src Committed By: wiz Date: Fri May 17 08:56:12 UTC 2019 Modified Files: src/usr.sbin/puffs/mount_9p: mount_9p.8 Log Message: Merge single-letter options in SYNOPSIS. Add an article. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/puffs/mount_9p/mount_9p.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/puffs/mount_9p/mount_9p.8 diff -u src/usr.sbin/puffs/mount_9p/mount_9p.8:1.8 src/usr.sbin/puffs/mount_9p/mount_9p.8:1.9 --- src/usr.sbin/puffs/mount_9p/mount_9p.8:1.8 Fri May 17 08:48:04 2019 +++ src/usr.sbin/puffs/mount_9p/mount_9p.8 Fri May 17 08:56:12 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount_9p.8,v 1.8 2019/05/17 08:48:04 ozaki-r Exp $ +.\" $NetBSD: mount_9p.8,v 1.9 2019/05/17 08:56:12 wiz Exp $ .\" .\" Copyright (c) 2007 Antti Kantee. All rights reserved. .\" @@ -31,8 +31,7 @@ .Nd mount a file server using the 9P resource sharing protocol .Sh SYNOPSIS .Nm -.Op Fl s -.Op Fl u +.Op Fl su .Op Fl o Ar mntopts .Op Fl p Ar port .Ar [user@]host[:path] @@ -66,7 +65,7 @@ runs in the forground. By default .Nm follows the 9P2000 protocol. -With +With the .Fl u option .Nm
CVS commit: src/usr.sbin/puffs/mount_9p
Module Name:src Committed By: wiz Date: Fri May 17 08:56:12 UTC 2019 Modified Files: src/usr.sbin/puffs/mount_9p: mount_9p.8 Log Message: Merge single-letter options in SYNOPSIS. Add an article. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/puffs/mount_9p/mount_9p.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/puffs/mount_9p
Module Name:src Committed By: ozaki-r Date: Fri May 17 08:48:04 UTC 2019 Modified Files: src/usr.sbin/puffs/mount_9p: fs.c mount_9p.8 nineproto.c nineproto.h ninepuffs.c ninepuffs.h node.c Log Message: mount_9p: add initial support for 9P2000.u The implementation enables to work with a server talking 9P2000.u. However, it doesn't use the extended fields yet; it just ignores those of received messages and sets "please ignore" values to those of sending messages such as zero-length strings and maximum unsigned values. The feature is enabled by the -u option. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/mount_9p/fs.c \ src/usr.sbin/puffs/mount_9p/nineproto.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/puffs/mount_9p/mount_9p.8 cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/puffs/mount_9p/nineproto.h cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/puffs/mount_9p/ninepuffs.c cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/puffs/mount_9p/ninepuffs.h cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/puffs/mount_9p/node.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/puffs/mount_9p
Module Name:src
Committed By: ozaki-r
Date: Fri May 17 08:48:04 UTC 2019
Modified Files:
src/usr.sbin/puffs/mount_9p: fs.c mount_9p.8 nineproto.c nineproto.h
ninepuffs.c ninepuffs.h node.c
Log Message:
mount_9p: add initial support for 9P2000.u
The implementation enables to work with a server talking 9P2000.u. However, it
doesn't use the extended fields yet; it just ignores those of received messages
and sets "please ignore" values to those of sending messages such as zero-length
strings and maximum unsigned values.
The feature is enabled by the -u option.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/mount_9p/fs.c \
src/usr.sbin/puffs/mount_9p/nineproto.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/puffs/mount_9p/mount_9p.8
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/puffs/mount_9p/nineproto.h
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/puffs/mount_9p/ninepuffs.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/puffs/mount_9p/ninepuffs.h
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/puffs/mount_9p/node.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/puffs/mount_9p/fs.c
diff -u src/usr.sbin/puffs/mount_9p/fs.c:1.9 src/usr.sbin/puffs/mount_9p/fs.c:1.10
--- src/usr.sbin/puffs/mount_9p/fs.c:1.9 Wed Jun 22 04:03:23 2011
+++ src/usr.sbin/puffs/mount_9p/fs.c Fri May 17 08:48:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fs.c,v 1.9 2011/06/22 04:03:23 mrg Exp $ */
+/* $NetBSD: fs.c,v 1.10 2019/05/17 08:48:04 ozaki-r Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: fs.c,v 1.9 2011/06/22 04:03:23 mrg Exp $");
+__RCSID("$NetBSD: fs.c,v 1.10 2019/05/17 08:48:04 ozaki-r Exp $");
#endif /* !lint */
#include
@@ -48,6 +48,17 @@ __RCSID("$NetBSD: fs.c,v 1.9 2011/06/22
rv = fname(a1, a2, a3, a4); \
if (rv) errx(1, "p9p_handshake io failed %d, %d", rv, *a4)
+static const char *
+p9p_ver2str(int version)
+{
+
+ switch (version) {
+ case P9PROTO_VERSION: return P9PROTO_VERSTR;
+ case P9PROTO_VERSION_U: return P9PROTO_VERSTR_U;
+ }
+ return NULL;
+}
+
struct puffs_node *
p9p_handshake(struct puffs_usermount *pu,
const char *username, const char *path)
@@ -63,13 +74,15 @@ p9p_handshake(struct puffs_usermount *pu
const char *p;
uint8_t type;
int rv, done, x = 1, ncomp;
+ uint16_t strsize;
+ char *str;
/* send initial handshake */
pb = p9pbuf_makeout();
p9pbuf_put_1(pb, P9PROTO_T_VERSION);
p9pbuf_put_2(pb, P9PROTO_NOTAG);
p9pbuf_put_4(pb, p9p->maxreq);
- p9pbuf_put_str(pb, P9PROTO_VERSION);
+ p9pbuf_put_str(pb, p9p_ver2str(p9p->protover));
DO_IO(p9pbuf_write, pu, pb, p9p->servsock, &done, rv);
puffs_framebuf_recycle(pb);
@@ -89,6 +102,13 @@ p9p_handshake(struct puffs_usermount *pu
"%d vs. %d", P9P_MINREQLEN, maxreq);
p9p->maxreq = maxreq;
+ if (p9pbuf_get_str(pb, &str, &strsize))
+ errx(1, "server invalid response: no version");
+ if (strncmp(str, p9p_ver2str(p9p->protover), P9PROTO_VERSTR_MAXLEN) != 0) {
+ errx(1, "server doesn't support %s", p9p_ver2str(p9p->protover));
+ /* Should downgrade from 9P2000.u to 9P2000 if the server request? */
+ }
+
/* tell the server we don't support authentication */
p9pbuf_recycleout(pb);
tagid = NEXTTAG(p9p);
@@ -97,6 +117,8 @@ p9p_handshake(struct puffs_usermount *pu
p9pbuf_put_4(pb, P9PROTO_NOFID);
p9pbuf_put_str(pb, username);
p9pbuf_put_str(pb, "");
+ if (p9p->protover == P9PROTO_VERSION_U)
+ p9pbuf_put_4(pb, P9PROTO_NUNAME_UNSPECIFIED); /* n_uname[4] */
DO_IO(p9pbuf_write, pu, pb, p9p->servsock, &done, rv);
puffs_framebuf_recycle(pb);
@@ -117,6 +139,8 @@ p9p_handshake(struct puffs_usermount *pu
p9pbuf_put_4(pb, P9PROTO_NOFID);
p9pbuf_put_str(pb, username);
p9pbuf_put_str(pb, "");
+ if (p9p->protover == P9PROTO_VERSION_U)
+ p9pbuf_put_4(pb, P9PROTO_NUNAME_UNSPECIFIED); /* n_uname[4] */
DO_IO(p9pbuf_write, pu, pb, p9p->servsock, &done, rv);
puffs_framebuf_recycle(pb);
@@ -213,7 +237,7 @@ p9p_handshake(struct puffs_usermount *pu
errx(1, "server invalid tag: %d vs. %d", tagid, rtagid);
if (p9pbuf_get_2(pb, &dummy))
errx(1, "couldn't get stat len parameter");
- if (proto_getstat(pb, &rootva, NULL, NULL))
+ if (proto_getstat(pu, pb, &rootva, NULL, NULL))
errx(1, "could not parse root attributes");
puffs_framebuf_destroy(pb);
Index: src/usr.sbin/puffs/mount_9p/nineproto.c
diff -u src/usr.sbin/puffs/mount_9p/nineproto.c:1.9 src/usr.sbin/puffs/mount_9p/nineproto.c:1.10
--- src/usr.sbin/puffs/mount_9p/nineproto.c:1.9 Fri Nov 30 19:02:38 2007
+++ src/usr.sbin/puffs/mount_9p/nineproto.c Fri May 17 08:48:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nineproto.c,v 1.9 2007/11/30 19:02:38 pooka Exp $ */
+/* $NetBSD: nineproto.c,v 1.10 2019/05/17 08:48:04 ozaki-r Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include
#ifndef li
CVS commit: src/usr.sbin/puffs/mount_9p
Module Name:src Committed By: wiz Date: Fri May 17 08:26:20 UTC 2019 Modified Files: src/usr.sbin/puffs/mount_9p: mount_9p.8 Log Message: Add missing .Re. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/puffs/mount_9p/mount_9p.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/puffs/mount_9p/mount_9p.8 diff -u src/usr.sbin/puffs/mount_9p/mount_9p.8:1.6 src/usr.sbin/puffs/mount_9p/mount_9p.8:1.7 --- src/usr.sbin/puffs/mount_9p/mount_9p.8:1.6 Fri May 17 07:50:49 2019 +++ src/usr.sbin/puffs/mount_9p/mount_9p.8 Fri May 17 08:26:20 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount_9p.8,v 1.6 2019/05/17 07:50:49 ozaki-r Exp $ +.\" $NetBSD: mount_9p.8,v 1.7 2019/05/17 08:26:20 wiz Exp $ .\" .\" Copyright (c) 2007 Antti Kantee. All rights reserved. .\" @@ -68,6 +68,7 @@ runs in the forground. .Rs .%T RFC and standards documents relating the 9P protocol .%U http://ericvh.github.io/9p-rfc/ +.Re .Sh HISTORY The .Nm
CVS commit: src/usr.sbin/puffs/mount_9p
Module Name:src Committed By: wiz Date: Fri May 17 08:26:20 UTC 2019 Modified Files: src/usr.sbin/puffs/mount_9p: mount_9p.8 Log Message: Add missing .Re. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/puffs/mount_9p/mount_9p.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/puffs/mount_9p
Module Name:src Committed By: ozaki-r Date: Fri May 17 07:50:49 UTC 2019 Modified Files: src/usr.sbin/puffs/mount_9p: mount_9p.8 Log Message: Refer the current official page To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/puffs/mount_9p/mount_9p.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/puffs/mount_9p/mount_9p.8 diff -u src/usr.sbin/puffs/mount_9p/mount_9p.8:1.5 src/usr.sbin/puffs/mount_9p/mount_9p.8:1.6 --- src/usr.sbin/puffs/mount_9p/mount_9p.8:1.5 Fri May 17 07:50:09 2019 +++ src/usr.sbin/puffs/mount_9p/mount_9p.8 Fri May 17 07:50:49 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount_9p.8,v 1.5 2019/05/17 07:50:09 ozaki-r Exp $ +.\" $NetBSD: mount_9p.8,v 1.6 2019/05/17 07:50:49 ozaki-r Exp $ .\" .\" Copyright (c) 2007 Antti Kantee. All rights reserved. .\" @@ -65,6 +65,9 @@ runs in the forground. .Xr puffs 3 , .Xr puffs 4 , .Xr mount 8 +.Rs +.%T RFC and standards documents relating the 9P protocol +.%U http://ericvh.github.io/9p-rfc/ .Sh HISTORY The .Nm
CVS commit: src/usr.sbin/puffs/mount_9p
Module Name:src Committed By: ozaki-r Date: Fri May 17 07:50:09 UTC 2019 Modified Files: src/usr.sbin/puffs/mount_9p: mount_9p.8 Log Message: Document the -s option To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/puffs/mount_9p/mount_9p.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/puffs/mount_9p
Module Name:src Committed By: ozaki-r Date: Fri May 17 07:50:09 UTC 2019 Modified Files: src/usr.sbin/puffs/mount_9p: mount_9p.8 Log Message: Document the -s option To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/puffs/mount_9p/mount_9p.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/puffs/mount_9p/mount_9p.8 diff -u src/usr.sbin/puffs/mount_9p/mount_9p.8:1.4 src/usr.sbin/puffs/mount_9p/mount_9p.8:1.5 --- src/usr.sbin/puffs/mount_9p/mount_9p.8:1.4 Sun Dec 2 21:03:32 2007 +++ src/usr.sbin/puffs/mount_9p/mount_9p.8 Fri May 17 07:50:09 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount_9p.8,v 1.4 2007/12/02 21:03:32 wiz Exp $ +.\" $NetBSD: mount_9p.8,v 1.5 2019/05/17 07:50:09 ozaki-r Exp $ .\" .\" Copyright (c) 2007 Antti Kantee. All rights reserved. .\" @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 8, 2007 +.Dd May 15, 2019 .Dt MOUNT_9P 8 .Os .Sh NAME @@ -51,6 +51,16 @@ If is supplied, it is used as the mount rootpath on the remote host. .Ar path must be an absolute path. +.Pp +By default +.Nm +runs in the background with +.Xr daemon 3 . +With the +.Fl s +option +.Nm +runs in the forground. .Sh SEE ALSO .Xr puffs 3 , .Xr puffs 4 ,
CVS commit: src/usr.sbin/puffs/mount_9p
Module Name:src Committed By: ozaki-r Date: Fri May 17 07:50:49 UTC 2019 Modified Files: src/usr.sbin/puffs/mount_9p: mount_9p.8 Log Message: Refer the current official page To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/puffs/mount_9p/mount_9p.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: msaitoh Date: Fri May 17 07:42:30 UTC 2019 Modified Files: src/doc: CHANGES Log Message: ifmedia(4): Extend Ethernet's ifmedia word's subword up to 255. To generate a diff of this commit: cvs rdiff -u -r1.2536 -r1.2537 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: msaitoh Date: Fri May 17 07:42:30 UTC 2019 Modified Files: src/doc: CHANGES Log Message: ifmedia(4): Extend Ethernet's ifmedia word's subword up to 255. To generate a diff of this commit: cvs rdiff -u -r1.2536 -r1.2537 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2536 src/doc/CHANGES:1.2537 --- src/doc/CHANGES:1.2536 Tue May 7 05:06:42 2019 +++ src/doc/CHANGES Fri May 17 07:42:29 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2536 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2537 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -378,3 +378,5 @@ Changes from NetBSD 8.0 to NetBSD 9.0: SIGTRAP and si_code TRAP_SCE/TRAP_SCX. [kamil 20190506] installboot(8): Add support for NetBSD/evbarm boards that use u-boot for bootstrap. [thorpej 20190506] + ifmedia(4): Extend Ethernet's ifmedia word's subword up to 255. + [msaitoh 20190517]
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Fri May 17 07:39:33 UTC 2019
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
Use new media types.
To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 src/sys/dev/pci/ixgbe/ixgbe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.183 src/sys/dev/pci/ixgbe/ixgbe.c:1.184
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.183 Wed May 15 02:56:47 2019
+++ src/sys/dev/pci/ixgbe/ixgbe.c Fri May 17 07:39:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.183 2019/05/15 02:56:47 ozaki-r Exp $ */
+/* $NetBSD: ixgbe.c,v 1.184 2019/05/17 07:39:33 msaitoh Exp $ */
/**
@@ -1440,25 +1440,12 @@ ixgbe_add_media_types(struct adapter *ad
ADD(IFM_10G_CX4 | IFM_FDX, 0);
}
-#ifdef IFM_ETH_XTYPE
if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_KR) {
ADD(IFM_10G_KR | IFM_FDX, 0);
}
if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_KX4) {
ADD(IFM_10G_KX4 | IFM_FDX, 0);
}
-#else
- if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_KR) {
- device_printf(dev, "Media supported: 10GbaseKR\n");
- device_printf(dev, "10GbaseKR mapped to 10GbaseSR\n");
- ADD(IFM_10G_SR | IFM_FDX, 0);
- }
- if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_KX4) {
- device_printf(dev, "Media supported: 10GbaseKX4\n");
- device_printf(dev, "10GbaseKX4 mapped to 10GbaseCX4\n");
- ADD(IFM_10G_CX4 | IFM_FDX, 0);
- }
-#endif
if (layer & IXGBE_PHYSICAL_LAYER_1000BASE_KX) {
ADD(IFM_1000_KX | IFM_FDX, 0);
}
@@ -2840,11 +2827,7 @@ ixgbe_media_status(struct ifnet *ifp, st
if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_KR)
switch (adapter->link_speed) {
case IXGBE_LINK_SPEED_10GB_FULL:
-#ifndef IFM_ETH_XTYPE
- ifmr->ifm_active |= IFM_10G_SR | IFM_FDX;
-#else
ifmr->ifm_active |= IFM_10G_KR | IFM_FDX;
-#endif
break;
case IXGBE_LINK_SPEED_2_5GB_FULL:
ifmr->ifm_active |= IFM_2500_KX | IFM_FDX;
@@ -2858,11 +2841,7 @@ ixgbe_media_status(struct ifnet *ifp, st
layer & IXGBE_PHYSICAL_LAYER_1000BASE_KX)
switch (adapter->link_speed) {
case IXGBE_LINK_SPEED_10GB_FULL:
-#ifndef IFM_ETH_XTYPE
- ifmr->ifm_active |= IFM_10G_CX4 | IFM_FDX;
-#else
ifmr->ifm_active |= IFM_10G_KX4 | IFM_FDX;
-#endif
break;
case IXGBE_LINK_SPEED_2_5GB_FULL:
ifmr->ifm_active |= IFM_2500_KX | IFM_FDX;
@@ -2942,10 +2921,8 @@ ixgbe_media_change(struct ifnet *ifp)
case IFM_10G_TWINAX:
case IFM_10G_SR:
case IFM_10G_CX4:
-#ifdef IFM_ETH_XTYPE
case IFM_10G_KR:
case IFM_10G_KX4:
-#endif
speed |= IXGBE_LINK_SPEED_10GB_FULL;
break;
case IFM_5000_T:
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Fri May 17 07:39:33 UTC 2019 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: Use new media types. To generate a diff of this commit: cvs rdiff -u -r1.183 -r1.184 src/sys/dev/pci/ixgbe/ixgbe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: msaitoh Date: Fri May 17 07:38:48 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: New SIOC[GS]IFMEDIA. Welcome to 8.99.41. To generate a diff of this commit: cvs rdiff -u -r1.588 -r1.589 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.588 src/sys/sys/param.h:1.589 --- src/sys/sys/param.h:1.588 Mon May 13 07:54:52 2019 +++ src/sys/sys/param.h Fri May 17 07:38:48 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.588 2019/05/13 07:54:52 ozaki-r Exp $ */ +/* $NetBSD: param.h,v 1.589 2019/05/17 07:38:48 msaitoh Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 899004000 /* NetBSD 8.99.40 */ +#define __NetBSD_Version__ 899004100 /* NetBSD 8.99.41 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/sys/sys
Module Name:src Committed By: msaitoh Date: Fri May 17 07:38:48 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: New SIOC[GS]IFMEDIA. Welcome to 8.99.41. To generate a diff of this commit: cvs rdiff -u -r1.588 -r1.589 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: msaitoh
Date: Fri May 17 07:37:12 UTC 2019
Modified Files:
src/sys/compat/common: Makefile.sysio compat_80_mod.c compat_mod.h
files.common if_43.c
src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h
src/sys/compat/sys: sockio.h
src/sys/kern: compat_stub.c
src/sys/net: if.c if_media.c if_media.h
src/sys/sys: compat_stub.h sockio.h
Added Files:
src/sys/compat/common: if_media_80.c
Log Message:
The max subtype of the ifmedia word is 31. It's too small for Ethernet now.
We currently use use it up to 30. We should extend the limit to be able to use
more than 10Gbps speeds. Our ifmedia(4) is inconvenience and have some problem
so we should redesign the interface, but it's too late for netbsd-9 to do it.
So, we keep the data structure size and modify the structure a bit. The
strategy is almost the same as FreeBSD. Many bits of IFM_OMASK for Ethernet
have not used, so use some of them for Ethernet's subtype.
The differences against FreeBSD are:
- We use NetBSD style compat code (i.e. no SIOCGIFXMEDIA).
- FreeBSD's IFM_ETH_XTYPE's bit location is from 11 to "14" even though
IFM_OMASK is from 8 to "15". We use _IFM_ETH_XTMASK from bit 13 to "15".
- FreeBSD changed the meaning of IFM_TYPE_MATCH(). I think we should
not do it. We keep it not changing and added new IFM_TYPE_SUBTYPE_MATCH()
macro for matching both TYPE and SUBTYPE.
- Added up to 400GBASE-SR16.
New layout of the media word is as follows (from ifmedia_h):
* if_media Options word:
* BitsUse
* ---
* 0-4 Media subtype MAX SUBTYPE == 255 for ETH and 31 for others
* 5-7 Media type
* 8-15Type specific options
* 16-18 Mode (for multi-mode devices)
* 19 (Reserved for Future Use)
* 20-27 Shared (global) options
* 28-31 Instance
*
* 3 2 1
* 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
* +---+---+-+-+---+-+-+
* | | |R| | | | |
* | IMASK | GMASK |F|MMASK+-+ OMASK |NMASK| TMASK |
* | | |U| |XTMSK| | | |
* +---+---+-+-+-+-+-+-+
* <-> <---> <--->
* IFM_INST() IFM_MODE()IFM_TYPE()
*
* IFM_SUBTYPE(other than ETH)<--->
*
* <---> IFM_SUBTYPE(ETH)<--->
*
*
* <-> <->
*IFM_OPTIONS()
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/compat/common/Makefile.sysio
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/common/compat_80_mod.c \
src/sys/compat/common/files.common
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/common/compat_mod.h
cvs rdiff -u -r1.21 -r1.22 src/sys/compat/common/if_43.c
cvs rdiff -u -r0 -r1.1 src/sys/compat/common/if_media_80.c
cvs rdiff -u -r1.102 -r1.103 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.66 -r1.67 src/sys/compat/netbsd32/netbsd32_ioctl.h
cvs rdiff -u -r1.18 -r1.19 src/sys/compat/sys/sockio.h
cvs rdiff -u -r1.11 -r1.12 src/sys/kern/compat_stub.c
cvs rdiff -u -r1.453 -r1.454 src/sys/net/if.c
cvs rdiff -u -r1.44 -r1.45 src/sys/net/if_media.c
cvs rdiff -u -r1.64 -r1.65 src/sys/net/if_media.h
cvs rdiff -u -r1.15 -r1.16 src/sys/sys/compat_stub.h
cvs rdiff -u -r1.36 -r1.37 src/sys/sys/sockio.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/Makefile.sysio
diff -u src/sys/compat/common/Makefile.sysio:1.11 src/sys/compat/common/Makefile.sysio:1.12
--- src/sys/compat/common/Makefile.sysio:1.11 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/Makefile.sysio Fri May 17 07:37:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sysio,v 1.11 2019/01/27 02:08:39 pgoyette Exp $
+# $NetBSD: Makefile.sysio,v 1.12 2019/05/17 07:37:11 msaitoh Exp $
# Sources for syscall and ioctl compatibility across the versions.
@@ -47,7 +47,7 @@ SRCS+= kern_sa_60.c tty_60.c kern_time_6
SRCS+= rtsock_70.c uipc_usrreq_70.c
# Compatability code for NetBSD 8.0
-SRCS+= kern_mod_80.c
+SRCS+= kern_mod_80.c if_media_80.c
# More compatibility code for NetBSD 5.0
.PATH: ${S}/opencrypto
Index: src/sys/compat/common/compat_80_mod.c
diff -u src/sys/compat/common/compat_80_mod.c:1.3 src/sys/compat/common/compat_80_mod.c:1.4
--- src/sys/compat/common/compat_80_mod.c:1.3 Wed Apr 17 09:21:57 2019
+++ src/sys/compat/common/compat_80_mod.c Fri May 17 07:37:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_80_mod.c,v 1.3 2019/04/17 09:21:57 msaitoh Exp $ */
+/* $NetBSD: compat_80_mod.c,v 1.4 2019/05/17 07:37:11 msaitoh Exp $ */
/*-
* Copyright (c) 2018
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Fri May 17 07:37:12 UTC 2019 Modified Files: src/sys/compat/common: Makefile.sysio compat_80_mod.c compat_mod.h files.common if_43.c src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h src/sys/compat/sys: sockio.h src/sys/kern: compat_stub.c src/sys/net: if.c if_media.c if_media.h src/sys/sys: compat_stub.h sockio.h Added Files: src/sys/compat/common: if_media_80.c Log Message: The max subtype of the ifmedia word is 31. It's too small for Ethernet now. We currently use use it up to 30. We should extend the limit to be able to use more than 10Gbps speeds. Our ifmedia(4) is inconvenience and have some problem so we should redesign the interface, but it's too late for netbsd-9 to do it. So, we keep the data structure size and modify the structure a bit. The strategy is almost the same as FreeBSD. Many bits of IFM_OMASK for Ethernet have not used, so use some of them for Ethernet's subtype. The differences against FreeBSD are: - We use NetBSD style compat code (i.e. no SIOCGIFXMEDIA). - FreeBSD's IFM_ETH_XTYPE's bit location is from 11 to "14" even though IFM_OMASK is from 8 to "15". We use _IFM_ETH_XTMASK from bit 13 to "15". - FreeBSD changed the meaning of IFM_TYPE_MATCH(). I think we should not do it. We keep it not changing and added new IFM_TYPE_SUBTYPE_MATCH() macro for matching both TYPE and SUBTYPE. - Added up to 400GBASE-SR16. New layout of the media word is as follows (from ifmedia_h): * if_media Options word: * BitsUse * --- * 0-4 Media subtype MAX SUBTYPE == 255 for ETH and 31 for others * 5-7 Media type * 8-15Type specific options * 16-18 Mode (for multi-mode devices) * 19 (Reserved for Future Use) * 20-27 Shared (global) options * 28-31 Instance * * 3 2 1 * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 * +---+---+-+-+---+-+-+ * | | |R| | | | | * | IMASK | GMASK |F|MMASK+-+ OMASK |NMASK| TMASK | * | | |U| |XTMSK| | | | * +---+---+-+-+-+-+-+-+ * <-> <---> <---> * IFM_INST() IFM_MODE()IFM_TYPE() * * IFM_SUBTYPE(other than ETH)<---> * * <---> IFM_SUBTYPE(ETH)<---> * * * <-> <-> *IFM_OPTIONS() To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/compat/common/Makefile.sysio cvs rdiff -u -r1.3 -r1.4 src/sys/compat/common/compat_80_mod.c \ src/sys/compat/common/files.common cvs rdiff -u -r1.4 -r1.5 src/sys/compat/common/compat_mod.h cvs rdiff -u -r1.21 -r1.22 src/sys/compat/common/if_43.c cvs rdiff -u -r0 -r1.1 src/sys/compat/common/if_media_80.c cvs rdiff -u -r1.102 -r1.103 src/sys/compat/netbsd32/netbsd32_ioctl.c cvs rdiff -u -r1.66 -r1.67 src/sys/compat/netbsd32/netbsd32_ioctl.h cvs rdiff -u -r1.18 -r1.19 src/sys/compat/sys/sockio.h cvs rdiff -u -r1.11 -r1.12 src/sys/kern/compat_stub.c cvs rdiff -u -r1.453 -r1.454 src/sys/net/if.c cvs rdiff -u -r1.44 -r1.45 src/sys/net/if_media.c cvs rdiff -u -r1.64 -r1.65 src/sys/net/if_media.h cvs rdiff -u -r1.15 -r1.16 src/sys/sys/compat_stub.h cvs rdiff -u -r1.36 -r1.37 src/sys/sys/sockio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
