svn commit: r236705 - head/cddl/contrib/opensolaris/lib/libzfs/common
Author: mm
Date: Thu Jun 7 08:32:53 2012
New Revision: 236705
URL: http://svn.freebsd.org/changeset/base/236705
Log:
Import Illumos revision 13715:351036203e4b
2803 zfs get guid pretty-prints the output
References:
https://www.illumos.org/issues/2803
Obtained from:illumos (issue #2803)
MFC after:3 days
Modified:
head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.cThu Jun
7 06:41:09 2012(r236704)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.cThu Jun
7 08:32:53 2012(r236705)
@@ -23,6 +23,7 @@
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright (c) 2012 DEY Storage Systems, Inc. All rights reserved.
* Copyright (c) 2011-2012 Pawel Jakub Dawidek .
* All rights reserved.
* Copyright (c) 2012 Martin Matuska . All rights reserved.
@@ -2321,6 +2322,17 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop
}
break;
+ case ZFS_PROP_GUID:
+ /*
+* GUIDs are stored as numbers, but they are identifiers.
+* We don't want them to be pretty printed, because pretty
+* printing mangles the ID into a truncated and useless value.
+*/
+ if (get_numeric_property(zhp, prop, src, &source, &val) != 0)
+ return (-1);
+ (void) snprintf(propbuf, proplen, "%llu", (u_longlong_t)val);
+ break;
+
default:
switch (zfs_prop_get_type(prop)) {
case PROP_TYPE_NUMBER:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236707 - head/tools/tools/tinybsd
Author: bz Date: Thu Jun 7 09:14:28 2012 New Revision: 236707 URL: http://svn.freebsd.org/changeset/base/236707 Log: TinyBSD now seems to be hosted elsewhere. Modified: head/tools/tools/tinybsd/README Modified: head/tools/tools/tinybsd/README == --- head/tools/tools/tinybsd/README Thu Jun 7 08:38:40 2012 (r236706) +++ head/tools/tools/tinybsd/README Thu Jun 7 09:14:28 2012 (r236707) @@ -256,4 +256,4 @@ TinyBSD is still a project under heavy d its documentation. In case you'd like to try or use the BETA version of the script, feel free to -download it from the project's official site at http://www.tinybsd.org. +download it from the project's official site at http://code.google.com/p/tinybsd/. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236712 - in head: share/man/man4 sys/cam sys/cam/scsi sys/conf
Author: mav Date: Thu Jun 7 10:05:51 2012 New Revision: 236712 URL: http://svn.freebsd.org/changeset/base/236712 Log: To make CAM debugging easier, compile in some debug flags (CAM_DEBUG_INFO, CAM_DEBUG_CDB, CAM_DEBUG_PERIPH and CAM_DEBUG_PROBE) by default. List of these flags can be modified with CAM_DEBUG_COMPILE kernel option. CAMDEBUG kernel option still enables all possible debug, if not overriden. Additional 50KB of kernel size is a good price for the ability to debug problems without rebuilding the kernel. In case where size is important, debugging can be compiled out by setting CAM_DEBUG_COMPILE option to 0. Modified: head/share/man/man4/scsi.4 head/sys/cam/cam_debug.h head/sys/cam/cam_xpt.c head/sys/cam/cam_xpt.h head/sys/cam/scsi/scsi_sa.c head/sys/cam/scsi/scsi_target.c head/sys/conf/NOTES head/sys/conf/options Modified: head/share/man/man4/scsi.4 == --- head/share/man/man4/scsi.4 Thu Jun 7 09:52:48 2012(r236711) +++ head/share/man/man4/scsi.4 Thu Jun 7 10:05:51 2012(r236712) @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd March 4, 2010 +.Dd June 7, 2012 .Dt CAM 4 .Os .Sh NAME @@ -43,6 +43,7 @@ .Cd "options CAM_DEBUG_BUS=-1" .Cd "options CAM_DEBUG_TARGET=-1" .Cd "options CAM_DEBUG_LUN=-1" +.Cd "options CAM_DEBUG_COMPILE=CAM_DEBUG_INFO|CAM_DEBUG_CDB|CAM_DEBUG_PROBE" .Cd "options CAM_DEBUG_FLAGS=CAM_DEBUG_INFO|CAM_DEBUG_CDB" .Cd "options CAM_MAX_HIGHPOWER=4" .Cd "options SCSI_NO_SENSE_STRINGS" @@ -72,12 +73,11 @@ There are a number of generic kernel con subsystem: .Bl -tag -width SCSI_NO_SENSE_STRINGS .It Dv CAMDEBUG -This option enables the +This option compiles in all the .Nm debugging printf code. This will not actually cause any debugging information to be printed out when included by itself. -Enabling printouts requires additional configuration. See below for details. .It Dv "CAM_MAX_HIGHPOWER=4" This sets the maximum allowable number of concurrent "high power" commands. @@ -248,54 +248,53 @@ see other .Nm device entries. .Sh DIAGNOSTICS -When the kernel is compiled with options CAMDEBUG, an XPT_DEBUG CCB can be -used to enable various amounts of tracing information on any -specific device. -Devices not being traced will not produce trace information. -There are currently four debugging flags that may be turned on: +An XPT_DEBUG CCB can be used to enable various amounts of tracing information +on any specific bus/device from the list of options compiled into the kernel. +There are currently seven debugging flags that may be compiled in and used: .Bl -tag -width CAM_DEBUG_SUBTRACE .It Dv CAM_DEBUG_INFO -This debugging flag enables general informational printfs for the device +This flag enables general informational printfs for the device or devices in question. .It Dv CAM_DEBUG_TRACE -This debugging flag enables function-level command flow tracing. +This flag enables function-level command flow tracing. i.e.\& kernel printfs will happen at the entrance and exit of various functions. .It Dv CAM_DEBUG_SUBTRACE -This debugging flag enables debugging output internal to various functions. +This flag enables debugging output internal to various functions. .It Dv CAM_DEBUG_CDB -This debugging flag will cause the kernel to print out all +This flag will cause the kernel to print out all +.Tn ATA +and .Tn SCSI commands sent to a particular device or devices. +.It Dv CAM_DEBUG_XPT +This flag will enable command scheduler tracing. +.It Dv CAM_DEBUG_PERIPH +This flag will enable peripheral drivers messages. +.It Dv CAM_DEBUG_PROBE +This flag will enable devices probe process tracing. .El .Pp Some of these flags, most notably .Dv CAM_DEBUG_TRACE and -.Dv CAM_DEBUG_SUBTRACE -will produce kernel printfs in EXTREME numbers, -and because of that, they are not especially useful. -There are not many things logged at the -.Dv CAM_DEBUG_INFO -level, so it is not especially useful. -The most useful debugging flag is the -.Dv CAM_DEBUG_CDB -flag. +.Dv CAM_DEBUG_SUBTRACE , +will produce kernel printfs in EXTREME numbers. +.Pp Users can enable debugging from their kernel config file, by using the following kernel config options: -.Bl -tag -width CAM_DEBUG_TARGET +.Bl -tag -width CAM_DEBUG_COMPILE .It Dv CAMDEBUG -This enables +This builds into the kernel all possible .Nm debugging. -Without this option, users will not even be able -to turn on debugging from userland via -.Xr camcontrol 8 . -.It Dv CAM_DEBUG_FLAGS -This allows the user to set the various debugging flags described above -in a kernel config file. +.It Dv CAM_DEBUG_COMPILE +This allows to specify support for which debugging flags described above +should be built into the kernel. Flags may be ORed together if the user wishes to see printfs for multiple debugging levels. +.It Dv CAM_DEBUG_FLAGS +This allows to set the various debugging flags from a kernel config file. .I
svn commit: r236713 - head/sys/cam
Author: mav
Date: Thu Jun 7 10:53:42 2012
New Revision: 236713
URL: http://svn.freebsd.org/changeset/base/236713
Log:
Add CAM_DEBUG_INFO debug messages for periph created/invalidated/destroyed
and for asyncs sent.
Modified:
head/sys/cam/cam_periph.c
head/sys/cam/cam_xpt.c
Modified: head/sys/cam/cam_periph.c
==
--- head/sys/cam/cam_periph.c Thu Jun 7 10:05:51 2012(r236712)
+++ head/sys/cam/cam_periph.c Thu Jun 7 10:53:42 2012(r236713)
@@ -240,6 +240,7 @@ cam_periph_alloc(periph_ctor_t *periph_c
goto failure;
init_level++;
+ CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph created\n"));
status = periph_ctor(periph, arg);
@@ -252,6 +253,7 @@ failure:
/* Initialized successfully */
break;
case 3:
+ CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph destroyed\n"));
xpt_remove_periph(periph);
/* FALLTHROUGH */
case 2:
@@ -572,6 +574,7 @@ void
cam_periph_invalidate(struct cam_periph *periph)
{
+ CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph invalidated\n"));
/*
* We only call this routine the first time a peripheral is
* invalidated.
@@ -610,6 +613,7 @@ camperiphfree(struct cam_periph *periph)
if (periph->periph_dtor != NULL)
periph->periph_dtor(periph);
xpt_remove_periph(periph);
+ CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph destroyed\n"));
if (periph->flags & CAM_PERIPH_NEW_DEV_FOUND) {
union ccb ccb;
Modified: head/sys/cam/cam_xpt.c
==
--- head/sys/cam/cam_xpt.c Thu Jun 7 10:05:51 2012(r236712)
+++ head/sys/cam/cam_xpt.c Thu Jun 7 10:53:42 2012(r236713)
@@ -2973,7 +2973,7 @@ xpt_action_default(union ccb *start_ccb)
}
case XPT_DEBUG: {
/* Check that all request bits are supported. */
- if (start_ccb->cdbg.flags & ~CAM_DEBUG_COMPILE) {
+ if (start_ccb->cdbg.flags & ~(CAM_DEBUG_COMPILE)) {
start_ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
break;
}
@@ -4033,6 +4033,28 @@ xptpathid(const char *sim_name, int sim_
return (pathid);
}
+static const char *
+xpt_async_string(u_int32_t async_code)
+{
+
+ switch (async_code) {
+ case AC_BUS_RESET: return ("AC_BUS_RESET");
+ case AC_UNSOL_RESEL: return ("AC_UNSOL_RESEL");
+ case AC_SCSI_AEN: return ("AC_SCSI_AEN");
+ case AC_SENT_BDR: return ("AC_SENT_BDR");
+ case AC_PATH_REGISTERED: return ("AC_PATH_REGISTERED");
+ case AC_PATH_DEREGISTERED: return ("AC_PATH_DEREGISTERED");
+ case AC_FOUND_DEVICE: return ("AC_FOUND_DEVICE");
+ case AC_LOST_DEVICE: return ("AC_LOST_DEVICE");
+ case AC_TRANSFER_NEG: return ("AC_TRANSFER_NEG");
+ case AC_INQ_CHANGED: return ("AC_INQ_CHANGED");
+ case AC_GETDEV_CHANGED: return ("AC_GETDEV_CHANGED");
+ case AC_CONTRACT: return ("AC_CONTRACT");
+ case AC_ADVINFO_CHANGED: return ("AC_ADVINFO_CHANGED");
+ }
+ return ("AC_UNKNOWN");
+}
+
void
xpt_async(u_int32_t async_code, struct cam_path *path, void *async_arg)
{
@@ -4041,8 +4063,8 @@ xpt_async(u_int32_t async_code, struct c
struct cam_ed *device, *next_device;
mtx_assert(path->bus->sim->mtx, MA_OWNED);
-
- CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_async\n"));
+ CAM_DEBUG(path, CAM_DEBUG_TRACE | CAM_DEBUG_INFO,
+ ("xpt_async(%s)\n", xpt_async_string(async_code)));
/*
* Most async events come from a CAM interrupt context. In
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r236712 - in head: share/man/man4 sys/cam sys/cam/scsi sys/conf
On Thu, 7 Jun 2012, Alexander Motin wrote: Author: mav Date: Thu Jun 7 10:05:51 2012 New Revision: 236712 URL: http://svn.freebsd.org/changeset/base/236712 Log: To make CAM debugging easier, compile in some debug flags (CAM_DEBUG_INFO, CAM_DEBUG_CDB, CAM_DEBUG_PERIPH and CAM_DEBUG_PROBE) by default. List of these flags can be modified with CAM_DEBUG_COMPILE kernel option. CAMDEBUG kernel option still enables all possible debug, if not overriden. Additional 50KB of kernel size is a good price for the ability to debug problems without rebuilding the kernel. In case where size is important, debugging can be compiled out by setting CAM_DEBUG_COMPILE option to 0. Hmm, it looks like re@ will want to add this to the list of things to remove from GENERIC for building release kernels. Is that true? -Ben ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r236712 - in head: share/man/man4 sys/cam sys/cam/scsi sys/conf
On 06/07/12 16:26, Benjamin Kaduk wrote: On Thu, 7 Jun 2012, Alexander Motin wrote: Author: mav Date: Thu Jun 7 10:05:51 2012 New Revision: 236712 URL: http://svn.freebsd.org/changeset/base/236712 Log: To make CAM debugging easier, compile in some debug flags (CAM_DEBUG_INFO, CAM_DEBUG_CDB, CAM_DEBUG_PERIPH and CAM_DEBUG_PROBE) by default. List of these flags can be modified with CAM_DEBUG_COMPILE kernel option. CAMDEBUG kernel option still enables all possible debug, if not overriden. Additional 50KB of kernel size is a good price for the ability to debug problems without rebuilding the kernel. In case where size is important, debugging can be compiled out by setting CAM_DEBUG_COMPILE option to 0. Hmm, it looks like re@ will want to add this to the list of things to remove from GENERIC for building release kernels. Is that true? I don't think so. That only enables compilation of some debugging printf. It changes nothing in CAM behavior until user explicitly enable some of that through the loader tunables, sysctl or `camcontrol debug` command. It it like bootverbose, not like INVARIANTS. We are not blocking bootverbose on releases. -- Alexander Motin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236714 - stable/8/usr.bin/fstat
Author: jhb
Date: Thu Jun 7 14:02:07 2012
New Revision: 236714
URL: http://svn.freebsd.org/changeset/base/236714
Log:
Correct the format specifier for shm_size. shm_size is a size_t unlike
the uint64_t size field in libprocstat's shmstat structure in 9.x and
later.
Pointy hat to:jhb
Modified:
stable/8/usr.bin/fstat/fstat.c
Modified: stable/8/usr.bin/fstat/fstat.c
==
--- stable/8/usr.bin/fstat/fstat.c Thu Jun 7 10:53:42 2012
(r236713)
+++ stable/8/usr.bin/fstat/fstat.c Thu Jun 7 14:02:07 2012
(r236714)
@@ -988,7 +988,7 @@ shmtrans(struct shmfd *shmp, int i, int
printf(" %-15s", name[0] != '\0' ? name : "-");
strmode(shm.shm_mode, mode);
}
- printf(" %10s %6ju", mode, shm.shm_size);
+ printf(" %10s %6zu", mode, shm.shm_size);
printf(" %2s\n", rw);
return;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236716 - head/share/man/man4
Author: wblock (doc committer) Date: Thu Jun 7 14:38:43 2012 New Revision: 236716 URL: http://svn.freebsd.org/changeset/base/236716 Log: Add specific supported revision of ASUS USB-N13 ver. A1. http://lists.freebsd.org/pipermail/freebsd-doc/2012-June/019960.html Submitted by: PseudoCylon (AK) Approved by: bcr (mentor) MFC after:3 days Modified: head/share/man/man4/run.4 Modified: head/share/man/man4/run.4 == --- head/share/man/man4/run.4 Thu Jun 7 14:03:20 2012(r236715) +++ head/share/man/man4/run.4 Thu Jun 7 14:38:43 2012(r236716) @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 12, 2011 +.Dd June 7, 2012 .Dt RUN 4 .Os .Sh NAME @@ -112,7 +112,7 @@ driver supports the following wireless a .Bl -tag -width Ds -offset indent -compact .It Airlink101 AWLL6090 .It ASUS USB-N11 -.It ASUS USB-N13 +.It ASUS USB-N13 ver. A1 .It ASUS WL-160N .It Belkin F5D8051 ver 3000 .It Belkin F5D8053 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236717 - head/lib/libprocstat
Author: jhb
Date: Thu Jun 7 15:54:52 2012
New Revision: 236717
URL: http://svn.freebsd.org/changeset/base/236717
Log:
Teach procstat_get_shm_info_kvm() how to fetch the pathname of a SHM file
descriptor from a core and set it in fts->fs_path.
MFC after:1 week
Modified:
head/lib/libprocstat/libprocstat.c
Modified: head/lib/libprocstat/libprocstat.c
==
--- head/lib/libprocstat/libprocstat.c Thu Jun 7 14:38:43 2012
(r236716)
+++ head/lib/libprocstat/libprocstat.c Thu Jun 7 15:54:52 2012
(r236717)
@@ -881,6 +881,8 @@ procstat_get_shm_info_kvm(kvm_t *kd, str
{
struct shmfd shmfd;
void *shmfdp;
+ char *path;
+ int i;
assert(kd);
assert(shm);
@@ -896,6 +898,21 @@ procstat_get_shm_info_kvm(kvm_t *kd, str
}
shm->mode = S_IFREG | shmfd.shm_mode;
shm->size = shmfd.shm_size;
+ if (fst->fs_path == NULL && shmfd.shm_path != NULL) {
+ path = malloc(MAXPATHLEN);
+ for (i = 0; i < MAXPATHLEN - 1; i++) {
+ if (!kvm_read_all(kd, (unsigned long)shmfd.shm_path + i,
+ path + i, 1))
+ break;
+ if (path[i] == '\0')
+ break;
+ }
+ path[i] = '\0';
+ if (i == 0)
+ free(path);
+ else
+ fst->fs_path = path;
+ }
return (0);
fail:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236719 - stable/9/sys/dev/mfi
Author: sbruno
Date: Thu Jun 7 18:44:06 2012
New Revision: 236719
URL: http://svn.freebsd.org/changeset/base/236719
Log:
MFC r236323
Cosmetic nit. If a configured volume has no label, don't emit an empty
string for the name during probe. Simply indicate that it has no label.
Modified:
stable/9/sys/dev/mfi/mfi_disk.c
Modified: stable/9/sys/dev/mfi/mfi_disk.c
==
--- stable/9/sys/dev/mfi/mfi_disk.c Thu Jun 7 15:57:30 2012
(r236718)
+++ stable/9/sys/dev/mfi/mfi_disk.c Thu Jun 7 18:44:06 2012
(r236719)
@@ -130,10 +130,17 @@ mfi_disk_attach(device_t dev)
state = "unknown";
break;
}
- device_printf(dev, "%juMB (%ju sectors) RAID volume '%s' is %s\n",
- sectors / (1024 * 1024 / secsize), sectors,
- ld_info->ld_config.properties.name,
- state);
+
+if ( strlen(ld_info->ld_config.properties.name) == 0 ) {
+device_printf(dev,
+ "%juMB (%ju sectors) RAID volume (no label) is %s\n",
+ sectors / (1024 * 1024 / secsize), sectors, state);
+} else {
+device_printf(dev,
+ "%juMB (%ju sectors) RAID volume '%s' is %s\n",
+ sectors / (1024 * 1024 / secsize), sectors,
+ ld_info->ld_config.properties.name, state);
+}
sc->ld_disk = disk_alloc();
sc->ld_disk->d_drv1 = sc;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236720 - stable/8/sys/dev/mfi
Author: sbruno
Date: Thu Jun 7 18:54:42 2012
New Revision: 236720
URL: http://svn.freebsd.org/changeset/base/236720
Log:
MFC r236323
Cosmetic nit. If a configured volume has no label, don't emit an empty
string for the name during probe. Simply indicate that it has no label.
Modified:
stable/8/sys/dev/mfi/mfi_disk.c
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/dev/mfi/mfi_disk.c
==
--- stable/8/sys/dev/mfi/mfi_disk.c Thu Jun 7 18:44:06 2012
(r236719)
+++ stable/8/sys/dev/mfi/mfi_disk.c Thu Jun 7 18:54:42 2012
(r236720)
@@ -130,10 +130,17 @@ mfi_disk_attach(device_t dev)
state = "unknown";
break;
}
- device_printf(dev, "%juMB (%ju sectors) RAID volume '%s' is %s\n",
- sectors / (1024 * 1024 / secsize), sectors,
- ld_info->ld_config.properties.name,
- state);
+
+if ( strlen(ld_info->ld_config.properties.name) == 0 ) {
+device_printf(dev,
+ "%juMB (%ju sectors) RAID volume (no label) is %s\n",
+ sectors / (1024 * 1024 / secsize), sectors, state);
+} else {
+device_printf(dev,
+ "%juMB (%ju sectors) RAID volume '%s' is %s\n",
+ sectors / (1024 * 1024 / secsize), sectors,
+ ld_info->ld_config.properties.name, state);
+}
sc->ld_disk = disk_alloc();
sc->ld_disk->d_drv1 = sc;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236721 - in stable/9/sys: . dev
Author: sbruno Date: Thu Jun 7 18:58:59 2012 New Revision: 236721 URL: http://svn.freebsd.org/changeset/base/236721 Log: Update mergeinfo from r236323 that was missed in the code MFC commit at r236323 doh! Modified: Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236722 - stable/9/share/man/man4
Author: sbruno Date: Thu Jun 7 19:12:49 2012 New Revision: 236722 URL: http://svn.freebsd.org/changeset/base/236722 Log: MFC r236412,236418,236420,236591,236624 Doc updates for bce(4) tuneables Note that for 7/8/9 the strict_rx_mtu variable is named loose_rx_mtu. Modified: stable/9/share/man/man4/bce.4 Directory Properties: stable/9/share/man/man4/ (props changed) Modified: stable/9/share/man/man4/bce.4 == --- stable/9/share/man/man4/bce.4 Thu Jun 7 18:58:59 2012 (r236721) +++ stable/9/share/man/man4/bce.4 Thu Jun 7 19:12:49 2012 (r236722) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 7, 2009 +.Dd June 4, 2012 .Dt BCE 4 .Os .Sh NAME @@ -200,9 +200,73 @@ variables and .Xr loader 8 tunables: .Bl -tag -width indent +.It Va hw.bce.verbose +Enable/Disable verbose logging and output to the console. +Useful for debugging (default 0). .It Va hw.bce.msi_enable -Whether or not MSI support is enabled in the driver. -The default value is 1. +Enable/Disable MSI support (default 1). +.It Va hw.bce.tso_enable +Enable/Disable TSO support (default 1). +.It Va hw.bce.strict_rx_mtu +Enable/Disable strict RX frame size checking (default 0). +.It Va hw.bce.hdr_split +Enable/Disable frame header/payload splitting (default 1). +.It Va hw.bce.rx_pages +Set the number of memory pages assigned to recieve packets by the driver. +Due to alignment issues, this value can only be of the set +1, 2, 4 or 8 (default 2). +.It Va hw.bce.tx_pages +Set the number of memory pages assigned to transmit packets +by the driver. +Due to alignment issues, this value can only be of the set +1, 2, 4 or 8 (default 2). +.It Va hw.bce.rx_ticks +Time in microsecond ticks to wait before generating a status +block updates due to RX processing activity. +Values from 0-100 are valid. +A value of 0 disables this status block update. +Cannot be set to 0 if hw.bce.rx_quick_cons_trip is also 0 +(default 18). +.It Va hw.bce.rx_ticks_int +Time in microsecond ticks to wait during RX interrupt +processing before generating a status block update. +Values from 0-100 are valid. +Valid values are in the range from 0-100. +A value of 0 disables this status block update (default 18). +.It Va hw.bce.rx_quick_cons_trip +Number of RX Quick BD Chain entries that must be completed +before a status block is generated. +Values from 0-256 are valid. +A value of 0 disables this status block update. +Cannot be set to 0 if hw.bce.rx_ticks is also 0 (default 6). +.It Va hw.bce.rx_quick_cons_trip_int +Number of RX quick BD entries that must be completed before +a status block is generated duing interrupt processing. +Values from 0-256 are valid. +A value of 0 disables this status block update (default 6). +.It Va hw.bce.tx_ticks +Time in microsecond ticks to wait before a status block +update is generated due to TX activitiy. +Values from 0-100 are valid. +A value of 0 disables this status block update. +Cannot be set to 0 if hw.bce.tx_quick_cons_trip is also 0 +(default 80). +.It Va hw.bce.tx_ticks_int +Time in microsecond ticks to wait in interrupt processing +before a status block update is generated due to TX activity +Values from 0-100 are valid. +A value of 0 disables this status block update (default 80). +.It Va hw.bce.tx_cons_trip +How many TX Quick BD Chain entries that must be completed +before a status block is generated. +Values from 0-100 are valid. +A value of 0 disables this status block update. +Cannot be set to 0 if hw.bce.tx_ticks is also 0 (default 20). +.It Va hw.bce.tx_cons_trip_int +How many TX Quick BD Chain entries that must be completed +before a status block is generated during an interrupt. +Values from 0-100 are valid. +A value of 0 disables this status block update (default 20). .El .Sh DIAGNOSTICS .Bl -diag @@ -266,7 +330,7 @@ address space. .It "bce%d: Could not allocate TX descriptor chain DMA tag!" The driver could not allocate a DMA tag for the controller's TX chain. -.It "bce%d: Could not allocate TX descriptor chain DMA memory! +.It "bce%d: Could not allocate TX descriptor chain DMA memory!" The driver could not allocate DMA addressable memory for the controller's TX chain. .It "bce%d: Could not map TX descriptor chain DMA memory!" @@ -346,6 +410,10 @@ with the cable connection, or a driver l A controller hardware failure has occurred. If the problem continues replace the controller. .El +.Sh SUPPORT +For general information and support, +go to the Broadcom NIC Open Source Developer Resource Site: +.Pa http://www.broadcom.com/support/ethernet_nic/open_source.php . .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236723 - stable/8/share/man/man4
Author: sbruno Date: Thu Jun 7 19:19:12 2012 New Revision: 236723 URL: http://svn.freebsd.org/changeset/base/236723 Log: MFC r236412,236418,236420,236591,236624 Doc updates for bce(4) tuneables Note that for 7/8/9 the strict_rx_mtu variable is named loose_rx_mtu. Modified: stable/8/share/man/man4/bce.4 Directory Properties: stable/8/share/man/man4/ (props changed) Modified: stable/8/share/man/man4/bce.4 == --- stable/8/share/man/man4/bce.4 Thu Jun 7 19:12:49 2012 (r236722) +++ stable/8/share/man/man4/bce.4 Thu Jun 7 19:19:12 2012 (r236723) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 7, 2009 +.Dd June 4, 2012 .Dt BCE 4 .Os .Sh NAME @@ -200,9 +200,73 @@ variables and .Xr loader 8 tunables: .Bl -tag -width indent +.It Va hw.bce.verbose +Enable/Disable verbose logging and output to the console. +Useful for debugging (default 0). .It Va hw.bce.msi_enable -Whether or not MSI support is enabled in the driver. -The default value is 1. +Enable/Disable MSI support (default 1). +.It Va hw.bce.tso_enable +Enable/Disable TSO support (default 1). +.It Va hw.bce.loose_rx_mtu +Enable/Disable strict RX frame size checking (default 0). +.It Va hw.bce.hdr_split +Enable/Disable frame header/payload splitting (default 1). +.It Va hw.bce.rx_pages +Set the number of memory pages assigned to recieve packets by the driver. +Due to alignment issues, this value can only be of the set +1, 2, 4 or 8 (default 2). +.It Va hw.bce.tx_pages +Set the number of memory pages assigned to transmit packets +by the driver. +Due to alignment issues, this value can only be of the set +1, 2, 4 or 8 (default 2). +.It Va hw.bce.rx_ticks +Time in microsecond ticks to wait before generating a status +block updates due to RX processing activity. +Values from 0-100 are valid. +A value of 0 disables this status block update. +Cannot be set to 0 if hw.bce.rx_quick_cons_trip is also 0 +(default 18). +.It Va hw.bce.rx_ticks_int +Time in microsecond ticks to wait during RX interrupt +processing before generating a status block update. +Values from 0-100 are valid. +Valid values are in the range from 0-100. +A value of 0 disables this status block update (default 18). +.It Va hw.bce.rx_quick_cons_trip +Number of RX Quick BD Chain entries that must be completed +before a status block is generated. +Values from 0-256 are valid. +A value of 0 disables this status block update. +Cannot be set to 0 if hw.bce.rx_ticks is also 0 (default 6). +.It Va hw.bce.rx_quick_cons_trip_int +Number of RX quick BD entries that must be completed before +a status block is generated duing interrupt processing. +Values from 0-256 are valid. +A value of 0 disables this status block update (default 6). +.It Va hw.bce.tx_ticks +Time in microsecond ticks to wait before a status block +update is generated due to TX activitiy. +Values from 0-100 are valid. +A value of 0 disables this status block update. +Cannot be set to 0 if hw.bce.tx_quick_cons_trip is also 0 +(default 80). +.It Va hw.bce.tx_ticks_int +Time in microsecond ticks to wait in interrupt processing +before a status block update is generated due to TX activity +Values from 0-100 are valid. +A value of 0 disables this status block update (default 80). +.It Va hw.bce.tx_cons_trip +How many TX Quick BD Chain entries that must be completed +before a status block is generated. +Values from 0-100 are valid. +A value of 0 disables this status block update. +Cannot be set to 0 if hw.bce.tx_ticks is also 0 (default 20). +.It Va hw.bce.tx_cons_trip_int +How many TX Quick BD Chain entries that must be completed +before a status block is generated during an interrupt. +Values from 0-100 are valid. +A value of 0 disables this status block update (default 20). .El .Sh DIAGNOSTICS .Bl -diag @@ -266,7 +330,7 @@ address space. .It "bce%d: Could not allocate TX descriptor chain DMA tag!" The driver could not allocate a DMA tag for the controller's TX chain. -.It "bce%d: Could not allocate TX descriptor chain DMA memory! +.It "bce%d: Could not allocate TX descriptor chain DMA memory!" The driver could not allocate DMA addressable memory for the controller's TX chain. .It "bce%d: Could not map TX descriptor chain DMA memory!" @@ -346,6 +410,10 @@ with the cable connection, or a driver l A controller hardware failure has occurred. If the problem continues replace the controller. .El +.Sh SUPPORT +For general information and support, +go to the Broadcom NIC Open Source Developer Resource Site: +.Pa http://www.broadcom.com/support/ethernet_nic/open_source.php . .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236724 - head/sys/net
Author: trociny
Date: Thu Jun 7 19:46:46 2012
New Revision: 236724
URL: http://svn.freebsd.org/changeset/base/236724
Log:
Add VIMAGE support to if_tap.
PR: kern/152047, kern/158686
Submitted by: Daan Vreeken
MFC after:1 week
Modified:
head/sys/net/if_tap.c
Modified: head/sys/net/if_tap.c
==
--- head/sys/net/if_tap.c Thu Jun 7 19:19:12 2012(r236723)
+++ head/sys/net/if_tap.c Thu Jun 7 19:46:46 2012(r236724)
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -66,6 +67,7 @@
#include
#include
#include
+#include
#include
@@ -214,6 +216,7 @@ tap_destroy(struct tap_softc *tp)
KASSERT(!(tp->tap_flags & TAP_OPEN),
("%s flags is out of sync", ifp->if_xname));
+ CURVNET_SET(ifp->if_vnet);
seldrain(&tp->tap_rsel);
knlist_destroy(&tp->tap_rsel.si_note);
destroy_dev(tp->tap_dev);
@@ -222,6 +225,7 @@ tap_destroy(struct tap_softc *tp)
mtx_destroy(&tp->tap_mtx);
free(tp, M_TAP);
+ CURVNET_RESTORE();
}
static void
@@ -363,6 +367,7 @@ tapclone(void *arg, struct ucred *cred,
if (unit == -1)
append_unit = 1;
+ CURVNET_SET(CRED_TO_VNET(cred));
/* find any existing device, or allocate new unit number */
i = clone_create(&tapclones, &tap_cdevsw, &unit, dev, extra);
if (i) {
@@ -381,6 +386,7 @@ tapclone(void *arg, struct ucred *cred,
}
if_clone_create(name, namelen, NULL);
+ CURVNET_RESTORE();
} /* tapclone */
@@ -521,6 +527,7 @@ tapclose(struct cdev *dev, int foo, int
/* junk all pending output */
mtx_lock(&tp->tap_mtx);
+ CURVNET_SET(ifp->if_vnet);
IF_DRAIN(&ifp->if_snd);
/*
@@ -544,6 +551,8 @@ tapclose(struct cdev *dev, int foo, int
}
if_link_state_change(ifp, LINK_STATE_DOWN);
+ CURVNET_RESTORE();
+
funsetown(&tp->tap_sigio);
selwakeuppri(&tp->tap_rsel, PZERO+1);
KNOTE_LOCKED(&tp->tap_rsel.si_note, 0);
@@ -945,7 +954,9 @@ tapwrite(struct cdev *dev, struct uio *u
}
/* Pass packet up to parent. */
+ CURVNET_SET(ifp->if_vnet);
(*ifp->if_input)(ifp, m);
+ CURVNET_RESTORE();
ifp->if_ipackets ++; /* ibytes are counted in parent */
return (0);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236725 - head/sys/net
Author: trociny Date: Thu Jun 7 19:48:45 2012 New Revision: 236725 URL: http://svn.freebsd.org/changeset/base/236725 Log: Sort includes. Submitted by: Daan Vreeken MFC after:3 days Modified: head/sys/net/if_tap.c Modified: head/sys/net/if_tap.c == --- head/sys/net/if_tap.c Thu Jun 7 19:46:46 2012(r236724) +++ head/sys/net/if_tap.c Thu Jun 7 19:48:45 2012(r236725) @@ -65,8 +65,8 @@ #include #include #include -#include #include +#include #include #include ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236727 - head/sys/kern
Author: pjd Date: Thu Jun 7 22:49:09 2012 New Revision: 236727 URL: http://svn.freebsd.org/changeset/base/236727 Log: Plug file reference leak in capability failure case. Sponsored by: FreeBSD Foundation MFC after:3 days Modified: head/sys/kern/tty.c Modified: head/sys/kern/tty.c == --- head/sys/kern/tty.c Thu Jun 7 22:47:53 2012(r236726) +++ head/sys/kern/tty.c Thu Jun 7 22:49:09 2012(r236727) @@ -1841,7 +1841,7 @@ ttyhook_register(struct tty **rtp, struc fp_cap = fp; error = cap_funwrap(fp_cap, CAP_TTYHOOK, &fp); if (error) - return (error); + goto done1; #endif /* ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236729 - head/sys/dev/ixgbe
Author: emax Date: Thu Jun 7 22:57:26 2012 New Revision: 236729 URL: http://svn.freebsd.org/changeset/base/236729 Log: Correct typo(?) and actually set PTHRESH to 32 and not 16 as per Intel Linux driver 3.8.21. MFC after:1 week Modified: head/sys/dev/ixgbe/ixgbe.c Modified: head/sys/dev/ixgbe/ixgbe.c == --- head/sys/dev/ixgbe/ixgbe.c Thu Jun 7 22:49:50 2012(r236728) +++ head/sys/dev/ixgbe/ixgbe.c Thu Jun 7 22:57:26 2012(r236729) @@ -1152,7 +1152,7 @@ ixgbe_init_locked(struct adapter *adapte * from the Intel linux driver 3.8.21. * Prefetching enables tx line rate even with 1 queue. */ - txdctl |= (16 << 0) | (1 << 8); + txdctl |= (32 << 0) | (1 << 8); IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(i), txdctl); } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236730 - head/sys/kern
Author: pjd
Date: Thu Jun 7 23:08:18 2012
New Revision: 236730
URL: http://svn.freebsd.org/changeset/base/236730
Log:
Eliminate redundant variable.
Sponsored by: FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/kern/tty.c
Modified: head/sys/kern/tty.c
==
--- head/sys/kern/tty.c Thu Jun 7 22:57:26 2012(r236729)
+++ head/sys/kern/tty.c Thu Jun 7 23:08:18 2012(r236730)
@@ -1817,9 +1817,6 @@ ttyhook_register(struct tty **rtp, struc
{
struct tty *tp;
struct file *fp;
-#ifdef CAPABILITIES
- struct file *fp_cap;
-#endif
struct cdev *dev;
struct cdevsw *cdp;
struct filedesc *fdp;
@@ -1838,8 +1835,7 @@ ttyhook_register(struct tty **rtp, struc
}
#ifdef CAPABILITIES
- fp_cap = fp;
- error = cap_funwrap(fp_cap, CAP_TTYHOOK, &fp);
+ error = cap_funwrap(fp, CAP_TTYHOOK, &fp);
if (error)
goto done1;
#endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236731 - head/sys/kern
Author: pjd
Date: Thu Jun 7 23:33:10 2012
New Revision: 236731
URL: http://svn.freebsd.org/changeset/base/236731
Log:
In fdalloc() f_ofileflags for the newly allocated descriptor has to be 0.
Assert that instead of setting it to 0.
Sponsored by: FreeBSD Foundation
MFC after:1 month
Modified:
head/sys/kern/kern_descrip.c
Modified: head/sys/kern/kern_descrip.c
==
--- head/sys/kern/kern_descrip.cThu Jun 7 23:08:18 2012
(r236730)
+++ head/sys/kern/kern_descrip.cThu Jun 7 23:33:10 2012
(r236731)
@@ -1554,9 +1554,8 @@ fdalloc(struct thread *td, int minfd, in
*/
KASSERT(!fdisused(fdp, fd),
("fd_first_free() returned non-free descriptor"));
- KASSERT(fdp->fd_ofiles[fd] == NULL,
- ("free descriptor isn't"));
- fdp->fd_ofileflags[fd] = 0; /* XXX needed? */
+ KASSERT(fdp->fd_ofiles[fd] == NULL, ("free descriptor isn't"));
+ KASSERT(fdp->fd_ofileflags[fd] == 0, ("file flags are set"));
fdused(fdp, fd);
*result = fd;
return (0);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r236729 - head/sys/dev/ixgbe
Just because the Linux driver does something does not mean that FreeBSD should, this may be OK, but it isn't something automatic, and with a thing like this you should at least have asked me first... please next time? Jack On Thu, Jun 7, 2012 at 3:57 PM, Maksim Yevmenkin wrote: > Author: emax > Date: Thu Jun 7 22:57:26 2012 > New Revision: 236729 > URL: http://svn.freebsd.org/changeset/base/236729 > > Log: > Correct typo(?) and actually set PTHRESH to 32 and not 16 as per Intel > Linux driver 3.8.21. > > MFC after:1 week > > Modified: > head/sys/dev/ixgbe/ixgbe.c > > Modified: head/sys/dev/ixgbe/ixgbe.c > > == > --- head/sys/dev/ixgbe/ixgbe.c Thu Jun 7 22:49:50 2012(r236728) > +++ head/sys/dev/ixgbe/ixgbe.c Thu Jun 7 22:57:26 2012(r236729) > @@ -1152,7 +1152,7 @@ ixgbe_init_locked(struct adapter *adapte > * from the Intel linux driver 3.8.21. > * Prefetching enables tx line rate even with 1 queue. > */ > - txdctl |= (16 << 0) | (1 << 8); > + txdctl |= (32 << 0) | (1 << 8); >IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(i), txdctl); >} > > ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236733 - head/usr.bin/calendar/calendars
Author: ashish (ports committer) Date: Fri Jun 8 01:51:49 2012 New Revision: 236733 URL: http://svn.freebsd.org/changeset/base/236733 Log: Add myself to the calendar. Modified: head/usr.bin/calendar/calendars/calendar.freebsd Modified: head/usr.bin/calendar/calendars/calendar.freebsd == --- head/usr.bin/calendar/calendars/calendar.freebsdFri Jun 8 00:00:37 2012(r236732) +++ head/usr.bin/calendar/calendars/calendar.freebsdFri Jun 8 01:51:49 2012(r236733) @@ -310,6 +310,7 @@ 10/23 Mario Sergio Fujikawa Ferreira born in Brasilia, Distrito Federal, Brazil, 1976 10/25 Eric Melville born in Los Gatos, California, United States, 1980 10/25 Julien Laffaye born in Toulouse, France, 1988 +10/25 Ashish SHUKLA born in Kanpur, India, 1985 10/26 Philip M. Gollucci born in Silver Spring, Maryland, United States, 1979 10/27 Takanori Watanabe born in Numazu, Shizuoka, Japan, 1972 11/05 M. Warner Losh born in Kansas City, Kansas, United States, 1966 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r236729 - head/sys/dev/ixgbe
Jack, On Thu, Jun 7, 2012 at 5:36 PM, Jack Vogel wrote: > Just because the Linux driver does something does not mean that FreeBSD > should, > this may be OK, but it isn't something automatic, and with a thing like this > you should > at least have asked me first... please next time? oh... i'm sorry. i just went by the comment in the code that clearly states where values were taken from and what they should be. naturally, i assumed it was a typo. again, sorry about that. i will double check next time. thanks, max ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236734 - stable/9/sys/geom/multipath
Author: mav
Date: Fri Jun 8 05:53:25 2012
New Revision: 236734
URL: http://svn.freebsd.org/changeset/base/236734
Log:
MFC r236619:
Add missing newlines into XML output.
Modified:
stable/9/sys/geom/multipath/g_multipath.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/geom/multipath/g_multipath.c
==
--- stable/9/sys/geom/multipath/g_multipath.c Fri Jun 8 01:51:49 2012
(r236733)
+++ stable/9/sys/geom/multipath/g_multipath.c Fri Jun 8 05:53:25 2012
(r236734)
@@ -1314,7 +1314,7 @@ g_multipath_dumpconf(struct sbuf *sb, co
if (sc == NULL)
return;
if (cp != NULL) {
- sbuf_printf(sb, "%s%s", indent,
+ sbuf_printf(sb, "%s%s\n", indent,
(cp->index & MP_NEW) ? "NEW" :
(cp->index & MP_LOST) ? "LOST" :
(cp->index & MP_FAIL) ? "FAIL" :
@@ -1323,17 +1323,17 @@ g_multipath_dumpconf(struct sbuf *sb, co
sc->sc_active_active == 2 ? "READ" : "PASSIVE");
} else {
good = g_multipath_good(gp);
- sbuf_printf(sb, "%s%s", indent,
+ sbuf_printf(sb, "%s%s\n", indent,
good == 0 ? "BROKEN" :
(good != sc->sc_ndisks || sc->sc_ndisks == 1) ?
"DEGRADED" : "OPTIMAL");
}
if (cp == NULL && pp == NULL) {
- sbuf_printf(sb, "%s%s", indent, sc->sc_uuid);
- sbuf_printf(sb, "%sActive/%s", indent,
+ sbuf_printf(sb, "%s%s\n", indent, sc->sc_uuid);
+ sbuf_printf(sb, "%sActive/%s\n", indent,
sc->sc_active_active == 2 ? "Read" :
sc->sc_active_active == 1 ? "Active" : "Passive");
- sbuf_printf(sb, "%s%s", indent,
+ sbuf_printf(sb, "%s%s\n", indent,
sc->sc_uuid[0] == 0 ? "MANUAL" : "AUTOMATIC");
}
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236735 - stable/8/sys/geom/multipath
Author: mav
Date: Fri Jun 8 05:54:36 2012
New Revision: 236735
URL: http://svn.freebsd.org/changeset/base/236735
Log:
MFC r236619:
Add missing newlines into XML output.
Modified:
stable/8/sys/geom/multipath/g_multipath.c
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/geom/multipath/g_multipath.c
==
--- stable/8/sys/geom/multipath/g_multipath.c Fri Jun 8 05:53:25 2012
(r236734)
+++ stable/8/sys/geom/multipath/g_multipath.c Fri Jun 8 05:54:36 2012
(r236735)
@@ -1312,7 +1312,7 @@ g_multipath_dumpconf(struct sbuf *sb, co
if (sc == NULL)
return;
if (cp != NULL) {
- sbuf_printf(sb, "%s%s", indent,
+ sbuf_printf(sb, "%s%s\n", indent,
(cp->index & MP_NEW) ? "NEW" :
(cp->index & MP_LOST) ? "LOST" :
(cp->index & MP_FAIL) ? "FAIL" :
@@ -1321,17 +1321,17 @@ g_multipath_dumpconf(struct sbuf *sb, co
sc->sc_active_active == 2 ? "READ" : "PASSIVE");
} else {
good = g_multipath_good(gp);
- sbuf_printf(sb, "%s%s", indent,
+ sbuf_printf(sb, "%s%s\n", indent,
good == 0 ? "BROKEN" :
(good != sc->sc_ndisks || sc->sc_ndisks == 1) ?
"DEGRADED" : "OPTIMAL");
}
if (cp == NULL && pp == NULL) {
- sbuf_printf(sb, "%s%s", indent, sc->sc_uuid);
- sbuf_printf(sb, "%sActive/%s", indent,
+ sbuf_printf(sb, "%s%s\n", indent, sc->sc_uuid);
+ sbuf_printf(sb, "%sActive/%s\n", indent,
sc->sc_active_active == 2 ? "Read" :
sc->sc_active_active == 1 ? "Active" : "Passive");
- sbuf_printf(sb, "%s%s", indent,
+ sbuf_printf(sb, "%s%s\n", indent,
sc->sc_uuid[0] == 0 ? "MANUAL" : "AUTOMATIC");
}
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236736 - head/sys/dev/puc
Author: jhay
Date: Fri Jun 8 06:07:23 2012
New Revision: 236736
URL: http://svn.freebsd.org/changeset/base/236736
Log:
Add support for the Sunix SER5437A dual serial PCI Express card.
Modified:
head/sys/dev/puc/pucdata.c
Modified: head/sys/dev/puc/pucdata.c
==
--- head/sys/dev/puc/pucdata.c Fri Jun 8 05:54:36 2012(r236735)
+++ head/sys/dev/puc/pucdata.c Fri Jun 8 06:07:23 2012(r236736)
@@ -901,6 +901,12 @@ const struct puc_cfg puc_pci_devices[] =
.config_function = puc_config_syba
},
+ { 0x1fd4, 0x1999, 0x, 0,
+ "Sunix SER5437A",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_2S, 0x10, 0, 8,
+ },
+
{0x5372, 0x6873, 0x, 0,
"Sun 1040 PCI Quad Serial",
DEFAULT_RCLK,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
