svn commit: r267264 - head/sys/kern
Author: kib Date: Mon Jun 9 09:10:31 2014 New Revision: 267264 URL: http://svnweb.freebsd.org/changeset/base/267264 Log: Devolatile as needed. Sponsored by: The FreeBSD Foundation MFC after:13 days Modified: head/sys/kern/vfs_bio.c Modified: head/sys/kern/vfs_bio.c == --- head/sys/kern/vfs_bio.c Mon Jun 9 07:21:42 2014(r267263) +++ head/sys/kern/vfs_bio.c Mon Jun 9 09:10:31 2014(r267264) @@ -476,7 +476,7 @@ bufspacewakeup(void) break; } if (need_wakeup) - wakeup((void *)&needsbuffer); + wakeup(__DEVOLATILE(void *, &needsbuffer)); rw_runlock(&nblock); } @@ -559,7 +559,7 @@ bufcountadd(struct buf *bp) break; } if (need_wakeup) - wakeup((void *)&needsbuffer); + wakeup(__DEVOLATILE(void *, &needsbuffer)); rw_runlock(&nblock); } @@ -2142,8 +2142,8 @@ getnewbuf_bufd_help(struct vnode *vp, in if ((needsbuffer & flags) == 0) break; } - error = rw_sleep((void *)&needsbuffer, &nblock, (PRIBIO + 4) | - slpflag, waitmsg, slptimeo); + error = rw_sleep(__DEVOLATILE(void *, &needsbuffer), &nblock, + (PRIBIO + 4) | slpflag, waitmsg, slptimeo); if (error != 0) break; } ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267265 - in head: etc/mtree usr.bin/truncate usr.bin/truncate/tests
Author: jilles
Date: Mon Jun 9 10:39:55 2014
New Revision: 267265
URL: http://svnweb.freebsd.org/changeset/base/267265
Log:
truncate: Detect integer overflow, fix relative sizes, add tests.
The change to expand_number (r204654) broke detection of too large sizes and
relative sizes ('+'/'-').
Also add some tests.
PR: 190735
Submitted by: Kirk Russell
MFC after:1 week
Added:
head/usr.bin/truncate/tests/
head/usr.bin/truncate/tests/Makefile (contents, props changed)
head/usr.bin/truncate/tests/truncate_test.sh (contents, props changed)
Modified:
head/etc/mtree/BSD.tests.dist
head/usr.bin/truncate/Makefile
head/usr.bin/truncate/truncate.c
Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist Mon Jun 9 09:10:31 2014
(r267264)
+++ head/etc/mtree/BSD.tests.dist Mon Jun 9 10:39:55 2014
(r267265)
@@ -251,6 +251,8 @@
..
tr
..
+truncate
+..
uudecode
..
uuencode
Modified: head/usr.bin/truncate/Makefile
==
--- head/usr.bin/truncate/Makefile Mon Jun 9 09:10:31 2014
(r267264)
+++ head/usr.bin/truncate/Makefile Mon Jun 9 10:39:55 2014
(r267265)
@@ -1,7 +1,13 @@
# $FreeBSD$
+.include
+
PROG= truncate
DPADD= ${LIBUTIL}
LDADD= -lutil
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include
Added: head/usr.bin/truncate/tests/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/truncate/tests/MakefileMon Jun 9 10:39:55 2014
(r267265)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+TESTSDIR= ${TESTSBASE}/usr.bin/truncate
+ATF_TESTS_SH= truncate_test
+
+.include
Added: head/usr.bin/truncate/tests/truncate_test.sh
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/truncate/tests/truncate_test.shMon Jun 9 10:39:55
2014(r267265)
@@ -0,0 +1,402 @@
+#
+# Copyright 2014, Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+# Helper function that is always used to create and fill stderr.txt for these
+# tests.
+_custom_create_file()
+{
+ # The first argument is a command.
+ # The second is just a string.
+ case "${1}" in
+ creat) > stderr.txt ;;
+ print) [ "${2}" ] && \
+ printf "%s\n" "${2}" >> stderr.txt ;;
+ esac
+}
+
+# Helper function that create the file stderr.txt that contains the string
+# passed in as the first argument.
+create_stderr_file()
+{
+ _custom_create_file creat
+ _custom_create_file print "${1}"
+}
+
+# Helper function that create the file stderr.txt that contains the expected
+# truncate utility usage message.
+create_stderr_usage_file()
+{
+ _custom_create_file creat
+ _custom_create_file print "${1}"
+ _custom_create_file print \
+ "usage: truncate [-c] -s [+|-]size[K|k|M|m|G|g|T|t] file ..."
+ _custom_create_file print " truncate [-c] -r rfile file ..."
+}
+
+atf_test_case illegal_option
+illegal_option_head()
+{
+ atf_set "descr" "Verifie
svn commit: r267267 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: smh Date: Mon Jun 9 13:04:58 2014 New Revision: 267267 URL: http://svnweb.freebsd.org/changeset/base/267267 Log: Removed stale comment about multi-vdev root pool config not working MFC after:1 week Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c == --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Mon Jun 9 11:07:50 2014(r267266) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Mon Jun 9 13:04:58 2014(r267267) @@ -3923,9 +3923,6 @@ spa_generate_rootconf(const char *name) } } - /* -* Multi-vdev root pool configuration discovery is not supported yet. -*/ nchildren = 1; nvlist_lookup_uint64(best_cfg, ZPOOL_CONFIG_VDEV_CHILDREN, &nchildren); holes = NULL; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267276 - head/share/mk
Author: jmmv
Date: Mon Jun 9 14:36:49 2014
New Revision: 267276
URL: http://svnweb.freebsd.org/changeset/base/267276
Log:
Ensure files are created during the build when using bsd.subdir.mk.
When FILES is defined in a Makefile that _also_ includes bsd.subdir.mk, the
build of the files (if any) was not properly triggered during the build
stage. This was because bsd.files.mk did not define the buildfiles target
if it was already defined... and bsd.subdir.mk defined this target on its
own, thus causing a conflict.
Fix this by unconditionally defining buildfiles from bsd.files.mk; this is
safe because nothing else in the tree needs to redefine this and because the
target itself contains no commands: all it does is define dependencies.
Also ensure that bsd.files.mk is always pulled in by bsd.test.mk regardless
of what bsd.prog.mk does.
These fixes allow "make installworld" to run cleanly on a system with
read-only src and obj trees.
This is "make tinderbox" clean.
Reviewed by: imp
Obtained from:jilles
Modified:
head/share/mk/bsd.files.mk
head/share/mk/bsd.test.mk
Modified: head/share/mk/bsd.files.mk
==
--- head/share/mk/bsd.files.mk Mon Jun 9 14:34:33 2014(r267275)
+++ head/share/mk/bsd.files.mk Mon Jun 9 14:36:49 2014(r267276)
@@ -4,13 +4,14 @@
.error bsd.files.mk cannot be included directly.
.endif
+.if !target()
+:
+
FILESGROUPS?= FILES
-.if !target(buildfiles)
.for group in ${FILESGROUPS}
buildfiles: ${${group}}
.endfor
-.endif
all: buildfiles
@@ -65,3 +66,5 @@ _${group}INS: ${_${group}FILES}
realinstall: installfiles
.ORDER: beforeinstall installfiles
+
+.endif # !target()
Modified: head/share/mk/bsd.test.mk
==
--- head/share/mk/bsd.test.mk Mon Jun 9 14:34:33 2014(r267275)
+++ head/share/mk/bsd.test.mk Mon Jun 9 14:36:49 2014(r267276)
@@ -82,8 +82,7 @@ test: aftertest
.if !empty(PROGS) || !empty(PROGS_CXX) || !empty(SCRIPTS)
.include
-.elif !empty(FILES)
-.include
.endif
+.include
.include
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267278 - head/sys/rpc
Author: mav
Date: Mon Jun 9 15:00:43 2014
New Revision: 267278
URL: http://svnweb.freebsd.org/changeset/base/267278
Log:
Fix race in r267221.
MFC after:2 weeks
Modified:
head/sys/rpc/svc.c
Modified: head/sys/rpc/svc.c
==
--- head/sys/rpc/svc.c Mon Jun 9 14:46:32 2014(r267277)
+++ head/sys/rpc/svc.c Mon Jun 9 15:00:43 2014(r267278)
@@ -1210,15 +1210,17 @@ svc_run_internal(SVCGROUP *grp, bool_t i
*/
if (pool->sp_assign) {
stpref = pool->sp_assign(st, rqstp);
+ rqstp->rq_thread = stpref;
STAILQ_INSERT_TAIL(&stpref->st_reqs,
rqstp, rq_link);
mtx_unlock(&stpref->st_lock);
- rqstp->rq_thread = stpref;
if (stpref != st)
rqstp = NULL;
- } else
+ } else {
+ rqstp->rq_thread = st;
STAILQ_INSERT_TAIL(&st->st_reqs,
rqstp, rq_link);
+ }
}
} while (rqstp == NULL && stat == XPRT_MOREREQS
&& grp->sg_state != SVCPOOL_CLOSING);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267283 - head/sys/dev/netmap
Author: luigi Date: Mon Jun 9 15:44:31 2014 New Revision: 267283 URL: http://svnweb.freebsd.org/changeset/base/267283 Log: sync the code with the one in stable/10 (wrap the if_t compatibilty function into a __FreeBSD_version conditional block) Modified: head/sys/dev/netmap/netmap_kern.h Modified: head/sys/dev/netmap/netmap_kern.h == --- head/sys/dev/netmap/netmap_kern.h Mon Jun 9 15:24:45 2014 (r267282) +++ head/sys/dev/netmap/netmap_kern.h Mon Jun 9 15:44:31 2014 (r267283) @@ -62,6 +62,9 @@ #define NM_ATOMIC_TEST_AND_SET(p) (!atomic_cmpset_acq_int((p), 0, 1)) #define NM_ATOMIC_CLEAR(p) atomic_store_rel_int((p), 0) +#if __FreeBSD_version >= 115 +struct netmap_adapter *netmap_getna(if_t ifp); +#endif MALLOC_DECLARE(M_NETMAP); @@ -1261,7 +1264,6 @@ void netmap_catch_tx(struct netmap_gener int generic_xmit_frame(struct ifnet *ifp, struct mbuf *m, void *addr, u_int len, u_int ring_nr); int generic_find_num_desc(struct ifnet *ifp, u_int *tx, u_int *rx); void generic_find_num_queues(struct ifnet *ifp, u_int *txq, u_int *rxq); -struct netmap_adapter *netmap_getna(if_t ifp); /* * netmap_mitigation API. This is used by the generic adapter ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267284 - head/sys/dev/netmap
Author: luigi
Date: Mon Jun 9 15:46:11 2014
New Revision: 267284
URL: http://svnweb.freebsd.org/changeset/base/267284
Log:
Fixes from Fanco Ficthner on transparent mode
* The way rings are updated changed with the last API bump.
Also sync ->head when moving slots in netmap_sw_to_nic().
* Remove a crashing selrecord() call.
* Unclog the logic surrounding netmap_rxsync_from_host().
* Add timestamping to RX host ring.
* Remove a couple of obsolete comments.
Submitted by: Franco Fichtner
MFC after:3 days
Sponsored by: Packetwerk
Modified:
head/sys/dev/netmap/netmap.c
Modified: head/sys/dev/netmap/netmap.c
==
--- head/sys/dev/netmap/netmap.cMon Jun 9 15:44:31 2014
(r267283)
+++ head/sys/dev/netmap/netmap.cMon Jun 9 15:46:11 2014
(r267284)
@@ -981,7 +981,7 @@ netmap_sw_to_nic(struct netmap_adapter *
dst->len = tmp.len;
dst->flags = NS_BUF_CHANGED;
- rdst->cur = nm_next(dst_cur, dst_lim);
+ rdst->head = rdst->cur = nm_next(dst_cur, dst_lim);
}
/* if (sent) XXX txsync ? */
}
@@ -1028,11 +1028,6 @@ netmap_txsync_to_host(struct netmap_adap
* They have been put in kring->rx_queue by netmap_transmit().
* We protect access to the kring using kring->rx_queue.lock
*
- * This routine also does the selrecord if called from the poll handler
- * (we know because td != NULL).
- *
- * NOTE: on linux, selrecord() is defined as a macro and uses pwait
- * as an additional hidden argument.
* returns the number of packets delivered to tx queues in
* transparent mode, or a negative value if error
*/
@@ -1088,10 +1083,6 @@ netmap_rxsync_from_host(struct netmap_ad
nm_rxsync_finalize(kring);
- /* access copies of cur,tail in the kring */
- if (kring->rcur == kring->rtail && td) /* no bufs available */
- selrecord(td, &kring->si);
-
mbq_unlock(q);
return ret;
}
@@ -2124,8 +2115,6 @@ do_retry_rx:
/*
* transparent mode support: collect packets
* from the rxring(s).
-* XXX NR_FORWARD should only be read on
-* physical or NIC ports
*/
if (netmap_fwd ||kring->ring->flags & NR_FORWARD) {
ND(10, "forwarding some buffers up %d to %d",
@@ -2152,13 +2141,12 @@ do_retry_rx:
/* transparent mode XXX only during first pass ? */
if (na->na_flags & NAF_HOST_RINGS) {
kring = &na->rx_rings[na->num_rx_rings];
- if (check_all_rx
- && (netmap_fwd || kring->ring->flags & NR_FORWARD))
{
- /* XXX fix to use kring fields */
- if (nm_ring_empty(kring->ring))
- send_down = netmap_rxsync_from_host(na,
td, dev);
- if (!nm_ring_empty(kring->ring))
- revents |= want_rx;
+ if (netmap_fwd || kring->ring->flags & NR_FORWARD) {
+ send_down = netmap_rxsync_from_host(na, td,
dev);
+ if (send_down && (netmap_no_timestamp == 0 ||
+ kring->ring->flags & NR_TIMESTAMP)) {
+ microtime(&kring->ring->ts);
+ }
}
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r267248 - head/usr.sbin/acpi/acpiconf
On Sunday, June 08, 2014 9:54:01 pm Eitan Adler wrote: > Author: eadler > Date: Mon Jun 9 01:54:00 2014 > New Revision: 267248 > URL: http://svnweb.freebsd.org/changeset/base/267248 > > Log: > acpiconf(8): document 'k' option > > Add missing documentation for the 'k' option based on reading the source > code. Might want some explicit language to say that users should probably never use this option directly. -- John Baldwin ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267290 - head/sys/dev/hpt27xx
Author: jhb
Date: Mon Jun 9 18:15:05 2014
New Revision: 267290
URL: http://svnweb.freebsd.org/changeset/base/267290
Log:
Make the hpt27xx(4) driver MPSAFE.
- Use the existing vbus locks instead of Giant for the CAM sim lock.
- Use callout(9) instead of timeout(9).
- Mark the interrupt handler as MPSAFE.
- Don't attempt to pass data in the softc from probe() to attach().
Reviewed by: Steve Chang
Assisted by: delphij
Modified:
head/sys/dev/hpt27xx/hpt27xx_os_bsd.c
head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
head/sys/dev/hpt27xx/os_bsd.h
Modified: head/sys/dev/hpt27xx/hpt27xx_os_bsd.c
==
--- head/sys/dev/hpt27xx/hpt27xx_os_bsd.c Mon Jun 9 17:55:23 2014
(r267289)
+++ head/sys/dev/hpt27xx/hpt27xx_os_bsd.c Mon Jun 9 18:15:05 2014
(r267290)
@@ -288,9 +288,9 @@ void os_request_timer(void * osext, HPT
PVBUS_EXT vbus_ext = osext;
HPT_ASSERT(vbus_ext->ext_type==EXT_TYPE_VBUS);
-
- untimeout(os_timer_for_ldm, vbus_ext, vbus_ext->timer);
- vbus_ext->timer = timeout(os_timer_for_ldm, vbus_ext, interval * hz /
100);
+
+ callout_reset(&vbus_ext->timer, interval * hz / 100,
+ os_timer_for_ldm, vbus_ext);
}
HPT_TIME os_query_time(void)
Modified: head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
==
--- head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Mon Jun 9 17:55:23 2014
(r267289)
+++ head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c Mon Jun 9 18:15:05 2014
(r267290)
@@ -31,12 +31,11 @@
#include
#include
-static int hpt_probe(device_t dev)
+static HIM *hpt_match(device_t dev)
{
PCI_ID pci_id;
HIM *him;
int i;
- PHBA hba;
for (him = him_list; him; him = him->next) {
for (i=0; him->get_supported_device_id(i, &pci_id); i++) {
@@ -44,18 +43,25 @@ static int hpt_probe(device_t dev)
him->get_controller_count(&pci_id,0,0);
if ((pci_get_vendor(dev) == pci_id.vid) &&
(pci_get_device(dev) == pci_id.did)){
- KdPrint(("hpt_probe: adapter at PCI %d:%d:%d,
IRQ %d",
- pci_get_bus(dev), pci_get_slot(dev),
pci_get_function(dev), pci_get_irq(dev)
- ));
- device_set_desc(dev, him->name);
- hba = (PHBA)device_get_softc(dev);
- memset(hba, 0, sizeof(HBA));
- hba->ext_type = EXT_TYPE_HBA;
- hba->ldm_adapter.him = him;
- return (BUS_PROBE_DEFAULT);
+ return (him);
}
}
}
+ return (NULL);
+}
+
+static int hpt_probe(device_t dev)
+{
+ HIM *him;
+
+ him = hpt_match(dev);
+ if (him != NULL) {
+ KdPrint(("hpt_probe: adapter at PCI %d:%d:%d, IRQ %d",
+ pci_get_bus(dev), pci_get_slot(dev),
pci_get_function(dev), pci_get_irq(dev)
+ ));
+ device_set_desc(dev, him->name);
+ return (BUS_PROBE_DEFAULT);
+ }
return (ENXIO);
}
@@ -63,14 +69,17 @@ static int hpt_probe(device_t dev)
static int hpt_attach(device_t dev)
{
PHBA hba = (PHBA)device_get_softc(dev);
- HIM *him = hba->ldm_adapter.him;
+ HIM *him;
PCI_ID pci_id;
HPT_UINT size;
PVBUS vbus;
PVBUS_EXT vbus_ext;
KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev),
pci_get_function(dev)));
-
+
+ him = hpt_match(dev);
+ hba->ext_type = EXT_TYPE_HBA;
+ hba->ldm_adapter.him = him;
#if __FreeBSD_version >=44
pci_enable_busmaster(dev);
#endif
@@ -93,7 +102,7 @@ static int hpt_attach(device_t dev)
if (!him->create_adapter(&pci_id, hba->pciaddr,
hba->ldm_adapter.him_handle, hba)) {
free(hba->ldm_adapter.him_handle, M_DEVBUF);
- return -1;
+ return ENXIO;
}
os_printk("adapter at PCI %d:%d:%d, IRQ %d",
@@ -104,7 +113,7 @@ static int hpt_attach(device_t dev)
vbus_ext = malloc(sizeof(VBUS_EXT) + size, M_DEVBUF, M_WAITOK);
if (!vbus_ext) {
free(hba->ldm_adapter.him_handle, M_DEVBUF);
- return -1;
+ return ENXIO;
}
memset(vbus_ext, 0, sizeof(VBUS_EXT));
vbus_ext->ext_type = EXT_TYPE_VBUS;
@@ -119,7 +128,7 @@ static int hpt_attach(device_t dev)
vbus_ext->hba_list = hba;
break;
}
- }
+ }
return 0;
}
Re: svn commit: r267248 - head/usr.sbin/acpi/acpiconf
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 2014-06-09 11:43:52 -0400, John Baldwin wrote: > On Sunday, June 08, 2014 9:54:01 pm Eitan Adler wrote: >> Author: eadler Date: Mon Jun 9 01:54:00 2014 New Revision: >> 267248 URL: http://svnweb.freebsd.org/changeset/base/267248 >> >> Log: acpiconf(8): document 'k' option >> >> Add missing documentation for the 'k' option based on reading the >> source code. > > Might want some explicit language to say that users should probably > never use this option directly. +1 Jung-uk Kim -BEGIN PGP SIGNATURE- Version: GnuPG v2 iQEcBAEBAgAGBQJTlfnrAAoJEHyflib82/FGrT4H/RNo67h4sh44hyAxX2I+k3J7 NMrk1/7sHA/MdvUZaIu3dgXwNaTt58DvzgUgV40VEu4WqdaJkGGS27bVp/S8R021 XCp28HEbe2jnNH9QNDmh+DxoBuZVXnPPu+Zhk7ESA135aoRuADpGtuhghQVNOhjQ MyxZQ/B+TbJzjMfFl/nKN/WAkj/8JCtRthMCmB5/eHVrjege/PG5FC/0e0TdwgSP DeyOYEyR/HJK0FLf0XR2H/j1BFOTf1XoFzNTt8hIQj4Xk8lJRmnxBD1SrXyvFtDo Riz8naMWhRs8idzqchDxU0xJR5PJEieOpOx6MCxkmBNEIX2aDIjDoqKJM8smRHI= =HAgt -END PGP SIGNATURE- ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267291 - head/sys/libkern
Author: jhb
Date: Mon Jun 9 19:27:47 2014
New Revision: 267291
URL: http://svnweb.freebsd.org/changeset/base/267291
Log:
Use strcasecmp() instead of strcmp() when checking user-supplied encoding
names so that encoding names are treated as case-insensitive. This allows
the use of 'utf-8' instead of 'UTF-8' for example and matches the behavior
of iconv(1).
PR: 167977
Submitted by: bugan...@gmail.com
MFC after:1 week
Modified:
head/sys/libkern/iconv.c
head/sys/libkern/iconv_ucs.c
Modified: head/sys/libkern/iconv.c
==
--- head/sys/libkern/iconv.cMon Jun 9 18:15:05 2014(r267290)
+++ head/sys/libkern/iconv.cMon Jun 9 19:27:47 2014(r267291)
@@ -168,8 +168,8 @@ iconv_lookupcs(const char *to, const cha
struct iconv_cspair *csp;
TAILQ_FOREACH(csp, &iconv_cslist, cp_link) {
- if (strcmp(csp->cp_to, to) == 0 &&
- strcmp(csp->cp_from, from) == 0) {
+ if (strcasecmp(csp->cp_to, to) == 0 &&
+ strcasecmp(csp->cp_from, from) == 0) {
if (cspp)
*cspp = csp;
return 0;
Modified: head/sys/libkern/iconv_ucs.c
==
--- head/sys/libkern/iconv_ucs.cMon Jun 9 18:15:05 2014
(r267290)
+++ head/sys/libkern/iconv_ucs.cMon Jun 9 19:27:47 2014
(r267291)
@@ -102,9 +102,9 @@ iconv_ucs_open(struct iconv_converter_cl
if (cspf)
dp->convtype |= KICONV_UCS_COMBINE;
for (i = 0; unicode_family[i].name; i++) {
- if (strcmp(from, unicode_family[i].name) == 0)
+ if (strcasecmp(from, unicode_family[i].name) == 0)
dp->convtype |= unicode_family[i].from_flag;
- if (strcmp(to, unicode_family[i].name) == 0)
+ if (strcasecmp(to, unicode_family[i].name) == 0)
dp->convtype |= unicode_family[i].to_flag;
}
if (strcmp(ENCODING_UNICODE, ENCODING_UTF16) == 0)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267292 - head/usr.sbin/bhyve
Author: joel (doc committer) Date: Mon Jun 9 19:29:10 2014 New Revision: 267292 URL: http://svnweb.freebsd.org/changeset/base/267292 Log: Remove blank lines. Modified: head/usr.sbin/bhyve/bhyve.8 Modified: head/usr.sbin/bhyve/bhyve.8 == --- head/usr.sbin/bhyve/bhyve.8 Mon Jun 9 19:27:47 2014(r267291) +++ head/usr.sbin/bhyve/bhyve.8 Mon Jun 9 19:29:10 2014(r267292) @@ -59,7 +59,6 @@ exit is detected. .Bl -tag -width 10n .It Fl a The guest's local APIC is configured in xAPIC mode. - The xAPIC mode is the default setting so this option is redundant. It will be deprecated in a future version. .It Fl A @@ -103,7 +102,6 @@ per slot. .Bl -tag -width 10n .It Ar slot .Ar pcislot[:function] - .Ar bus:pcislot:function .Pp The ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267293 - head/sys/boot/i386/gptboot
Author: joel (doc committer) Date: Mon Jun 9 19:36:08 2014 New Revision: 267293 URL: http://svnweb.freebsd.org/changeset/base/267293 Log: mdoc: fix AUTHORS section. Modified: head/sys/boot/i386/gptboot/gptboot.8 Modified: head/sys/boot/i386/gptboot/gptboot.8 == --- head/sys/boot/i386/gptboot/gptboot.8Mon Jun 9 19:29:10 2014 (r267292) +++ head/sys/boot/i386/gptboot/gptboot.8Mon Jun 9 19:36:08 2014 (r267293) @@ -241,5 +241,5 @@ gpart set -a bootonce -i 2 ada0 .Nm appeared in FreeBSD 7.1. .Sh AUTHORS -.An -This manual page written by Warren Block . +This manual page written by +.An Warren Block Aq wbl...@freebsd.org . ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267294 - head/usr.sbin/bhyve
Author: tychon
Date: Mon Jun 9 19:55:50 2014
New Revision: 267294
URL: http://svnweb.freebsd.org/changeset/base/267294
Log:
r267169 should apply to 64-bit BARs as well.
Reviewed by: neel
Modified:
head/usr.sbin/bhyve/pci_emul.c
Modified: head/usr.sbin/bhyve/pci_emul.c
==
--- head/usr.sbin/bhyve/pci_emul.c Mon Jun 9 19:36:08 2014
(r267293)
+++ head/usr.sbin/bhyve/pci_emul.c Mon Jun 9 19:55:50 2014
(r267294)
@@ -376,7 +376,7 @@ pci_emul_mem_handler(struct vmctx *ctx,
offset = addr - pdi->pi_bar[bidx].addr;
if (dir == MEM_F_WRITE) {
- if (pdi->pi_bar[bidx].type == PCIBAR_MEM32 && size == 8) {
+ if (size == 8) {
(*pe->pe_barwrite)(ctx, vcpu, pdi, bidx, offset,
4, *val & 0x);
(*pe->pe_barwrite)(ctx, vcpu, pdi, bidx, offset + 4,
@@ -386,7 +386,7 @@ pci_emul_mem_handler(struct vmctx *ctx,
size, *val);
}
} else {
- if (pdi->pi_bar[bidx].type == PCIBAR_MEM32 && size == 8) {
+ if (size == 8) {
*val = (*pe->pe_barread)(ctx, vcpu, pdi, bidx,
offset, 4);
*val |= (*pe->pe_barread)(ctx, vcpu, pdi, bidx,
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267298 - head/tools/tools/vt/fontcvt
Author: emaste
Date: Mon Jun 9 20:49:13 2014
New Revision: 267298
URL: http://svnweb.freebsd.org/changeset/base/267298
Log:
vt fontcvt: Hide stats by default and improve error handling
The font stats are interesting, but rather verbose.
Modified:
head/tools/tools/vt/fontcvt/fontcvt.c
Modified: head/tools/tools/vt/fontcvt/fontcvt.c
==
--- head/tools/tools/vt/fontcvt/fontcvt.c Mon Jun 9 20:48:38 2014
(r267297)
+++ head/tools/tools/vt/fontcvt/fontcvt.c Mon Jun 9 20:49:13 2014
(r267298)
@@ -88,8 +88,8 @@ static void
usage(void)
{
- fprintf(stderr,
-"usage: fontcvt [-w width] [-h height] normal.bdf [bold.bdf] out.fnt\n");
+ errx(1,
+"usage: fontcvt [-w width] [-h height] [-v] normal.bdf [bold.bdf] out.fnt\n");
exit(1);
}
@@ -137,7 +137,7 @@ add_mapping(struct glyph *gl, unsigned i
ml = &maps[map_idx];
if (TAILQ_LAST(ml, mapping_list) != NULL &&
TAILQ_LAST(ml, mapping_list)->m_char >= c) {
- fprintf(stderr, "Bad ordering at character %u\n", c);
+ errx(1, "Bad ordering at character %u\n", c);
return (1);
}
TAILQ_INSERT_TAIL(ml, mp, m_list);
@@ -210,8 +210,8 @@ parse_bitmap_line(uint8_t *left, uint8_t
unsigned int i, subline;
if (dwidth != width && dwidth != width * 2) {
- fprintf(stderr,
- "Unsupported width %u!\n", dwidth);
+ errx(1,
+ "Bitmap with unsupported width %u!\n", dwidth);
return (1);
}
@@ -230,7 +230,7 @@ parse_bitmap_line(uint8_t *left, uint8_t
*p++ = subline >> 8;
*p = subline;
} else {
- fprintf(stderr,
+ errx(1,
"Unsupported wbytes %u!\n", wbytes);
return (1);
}
@@ -264,7 +264,7 @@ parse_bdf(FILE *fp, unsigned int map_idx
(ln[6] == ' ' || ln[6] == '\0')) {
for (i = 0; i < height; i++) {
if ((ln = fgetln(fp, &length)) == NULL) {
- fprintf(stderr, "Unexpected EOF!\n");
+ errx(1, "Unexpected EOF!\n");
return (1);
}
ln[length - 1] = '\0';
@@ -450,10 +450,47 @@ write_fnt(const char *filename)
return (0);
}
+static void
+print_font_info(void)
+{
+ printf(
+"Statistics:\n"
+"- glyph_total: %5u\n"
+"- glyph_normal:%5u\n"
+"- glyph_normal_right: %5u\n"
+"- glyph_bold: %5u\n"
+"- glyph_bold_right:%5u\n"
+"- glyph_unique:%5u\n"
+"- glyph_dupe: %5u\n"
+"- mapping_total: %5u\n"
+"- mapping_normal: %5u\n"
+"- mapping_normal_folded: %5u\n"
+"- mapping_normal_right:%5u\n"
+"- mapping_normal_right_folded: %5u\n"
+"- mapping_bold:%5u\n"
+"- mapping_bold_folded: %5u\n"
+"- mapping_bold_right: %5u\n"
+"- mapping_bold_right_folded: %5u\n"
+"- mapping_unique: %5u\n"
+"- mapping_dupe:%5u\n",
+ glyph_total,
+ glyph_count[0],
+ glyph_count[1],
+ glyph_count[2],
+ glyph_count[3],
+ glyph_unique, glyph_dupe,
+ mapping_total,
+ map_count[0], map_folded_count[0],
+ map_count[1], map_folded_count[1],
+ map_count[2], map_folded_count[2],
+ map_count[3], map_folded_count[3],
+ mapping_unique, mapping_dupe);
+}
+
int
main(int argc, char *argv[])
{
- int ch;
+ int ch, val, verbose = 0;
assert(sizeof(struct file_header) == 32);
assert(sizeof(struct file_mapping) == 8);
@@ -461,10 +498,23 @@ main(int argc, char *argv[])
while ((ch = getopt(argc, argv, "h:w:")) != -1) {
switch (ch) {
case 'h':
- height = atoi(optarg);
+ val = atoi(optarg);
+ if (val <= 0 || val > 128) {
+ errx(1, "Invalid height %d", val);
+ return (1);
+ }
+ height = val;
+ break;
+ case 'v':
+ verbose = 1;
break;
case 'w':
- width = atoi(optarg);
+ val = atoi(optarg);
+ if (val <= 0 || val > 128) {
+ errx(1, "Invalid width %d", val);
+ return (1);
+ }
+ width = val;
svn commit: r267299 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Mon Jun 9 20:50:49 2014 New Revision: 267299 URL: http://svnweb.freebsd.org/changeset/base/267299 Log: Move the Sendmail update to keep revision numbers incremental. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Jun 9 20:49:13 2014(r267298) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Jun 9 20:50:49 2014(r267299) @@ -352,9 +352,6 @@ &man.jemalloc.3; has been updated to version 3.5.0. -Sendmail - has been updated from 8.14.7 to 8.14.9. - bmake has been updated to version 20140101. @@ -370,6 +367,9 @@ LLVM and Clang have been updated to version 3.4. + +Sendmail + has been updated from 8.14.7 to 8.14.9. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267300 - in head/sys/amd64/vmm: intel io
Author: neel
Date: Mon Jun 9 20:51:08 2014
New Revision: 267300
URL: http://svnweb.freebsd.org/changeset/base/267300
Log:
Add reserved bit checking when doing %CR8 emulation and inject #GP if
required.
Pointed out by: grehan
Reviewed by: tychon
Modified:
head/sys/amd64/vmm/intel/vmx.c
head/sys/amd64/vmm/io/vlapic.c
head/sys/amd64/vmm/io/vlapic.h
Modified: head/sys/amd64/vmm/intel/vmx.c
==
--- head/sys/amd64/vmm/intel/vmx.c Mon Jun 9 20:50:49 2014
(r267299)
+++ head/sys/amd64/vmm/intel/vmx.c Mon Jun 9 20:51:08 2014
(r267300)
@@ -1602,20 +1602,23 @@ vmx_emulate_cr4_access(struct vmx *vmx,
static int
vmx_emulate_cr8_access(struct vmx *vmx, int vcpu, uint64_t exitqual)
{
- uint64_t regval;
+ struct vlapic *vlapic;
+ uint64_t cr8;
+ int regnum;
/* We only handle mov %cr8 to/from a register at this time. */
if ((exitqual & 0xe0) != 0x00) {
return (UNHANDLED);
}
+ vlapic = vm_lapic(vmx->vm, vcpu);
+ regnum = (exitqual >> 8) & 0xf;
if (exitqual & 0x10) {
- regval = vlapic_get_tpr(vm_lapic(vmx->vm, vcpu));
- vmx_set_guest_reg(vmx, vcpu, (exitqual >> 8) & 0xf,
- regval >> 4);
+ cr8 = vlapic_get_cr8(vlapic);
+ vmx_set_guest_reg(vmx, vcpu, regnum, cr8);
} else {
- regval = vmx_get_guest_reg(vmx, vcpu, (exitqual >> 8) & 0xf);
- vlapic_set_tpr(vm_lapic(vmx->vm, vcpu), regval << 4);
+ cr8 = vmx_get_guest_reg(vmx, vcpu, regnum);
+ vlapic_set_cr8(vlapic, cr8);
}
return (HANDLED);
Modified: head/sys/amd64/vmm/io/vlapic.c
==
--- head/sys/amd64/vmm/io/vlapic.c Mon Jun 9 20:50:49 2014
(r267299)
+++ head/sys/amd64/vmm/io/vlapic.c Mon Jun 9 20:51:08 2014
(r267300)
@@ -906,6 +906,46 @@ vlapic_calcdest(struct vm *vm, cpuset_t
static VMM_STAT_ARRAY(IPIS_SENT, VM_MAXCPU, "ipis sent to vcpu");
+static void
+vlapic_set_tpr(struct vlapic *vlapic, uint8_t val)
+{
+ struct LAPIC *lapic = vlapic->apic_page;
+
+ lapic->tpr = val;
+ vlapic_update_ppr(vlapic);
+}
+
+static uint8_t
+vlapic_get_tpr(struct vlapic *vlapic)
+{
+ struct LAPIC *lapic = vlapic->apic_page;
+
+ return (lapic->tpr);
+}
+
+void
+vlapic_set_cr8(struct vlapic *vlapic, uint64_t val)
+{
+ uint8_t tpr;
+
+ if (val & ~0xf) {
+ vm_inject_gp(vlapic->vm, vlapic->vcpuid);
+ return;
+ }
+
+ tpr = val << 4;
+ vlapic_set_tpr(vlapic, tpr);
+}
+
+uint64_t
+vlapic_get_cr8(struct vlapic *vlapic)
+{
+ uint8_t tpr;
+
+ tpr = vlapic_get_tpr(vlapic);
+ return (tpr >> 4);
+}
+
int
vlapic_icrlo_write_handler(struct vlapic *vlapic, bool *retu)
{
@@ -1610,20 +1650,3 @@ vlapic_set_tmr_level(struct vlapic *vlap
VLAPIC_CTR1(vlapic, "vector %d set to level-triggered", vector);
vlapic_set_tmr(vlapic, vector, true);
}
-
-void
-vlapic_set_tpr(struct vlapic *vlapic, uint8_t val)
-{
- struct LAPIC*lapic = vlapic->apic_page;
-
- lapic->tpr = val;
- vlapic_update_ppr(vlapic);
-}
-
-uint8_t
-vlapic_get_tpr(struct vlapic *vlapic)
-{
- struct LAPIC*lapic = vlapic->apic_page;
-
- return (lapic->tpr);
-}
Modified: head/sys/amd64/vmm/io/vlapic.h
==
--- head/sys/amd64/vmm/io/vlapic.h Mon Jun 9 20:50:49 2014
(r267299)
+++ head/sys/amd64/vmm/io/vlapic.h Mon Jun 9 20:51:08 2014
(r267300)
@@ -92,8 +92,8 @@ void vlapic_reset_tmr(struct vlapic *vla
void vlapic_set_tmr_level(struct vlapic *vlapic, uint32_t dest, bool phys,
int delmode, int vector);
-void vlapic_set_tpr(struct vlapic *vlapic, uint8_t val);
-uint8_t vlapic_get_tpr(struct vlapic *vlapic);
+void vlapic_set_cr8(struct vlapic *vlapic, uint64_t val);
+uint64_t vlapic_get_cr8(struct vlapic *vlapic);
/* APIC write handlers */
void vlapic_id_write_handler(struct vlapic *vlapic);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267301 - head/tools/tools/vt/fontcvt
Author: emaste
Date: Mon Jun 9 20:52:35 2014
New Revision: 267301
URL: http://svnweb.freebsd.org/changeset/base/267301
Log:
vt fontcvt: Speed up bold glyph map deduplication
Perform an O(n) deduplication pass over the bold maps at the end, rather
than walking the normal map list to look for a duplicate glyph each time
a bold mapping entry is added.
Sponsored by: The FreeBSD Foundation
Modified:
head/tools/tools/vt/fontcvt/fontcvt.c
Modified: head/tools/tools/vt/fontcvt/fontcvt.c
==
--- head/tools/tools/vt/fontcvt/fontcvt.c Mon Jun 9 20:51:08 2014
(r267300)
+++ head/tools/tools/vt/fontcvt/fontcvt.c Mon Jun 9 20:52:35 2014
(r267301)
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include
#include
@@ -45,7 +46,9 @@ __FBSDID("$FreeBSD$");
#define VFNT_MAPS 4
#define VFNT_MAP_NORMAL 0
+#define VFNT_MAP_NORMAL_RH 1
#define VFNT_MAP_BOLD 2
+#define VFNT_MAP_BOLD_RH 3
static unsigned int width = 8, wbytes, height = 16;
@@ -101,34 +104,6 @@ add_mapping(struct glyph *gl, unsigned i
mapping_total++;
- if (map_idx >= VFNT_MAP_BOLD) {
- int found = 0;
- unsigned normal_map_idx = map_idx - VFNT_MAP_BOLD;
-
- TAILQ_FOREACH(mp, &maps[normal_map_idx], m_list) {
- if (mp->m_char < c)
- continue;
- else if (mp->m_char > c)
- break;
- found = 1;
-
- /*
-* No mapping is needed if it's equal to the
-* normal mapping.
-*/
- if (mp->m_glyph == gl) {
- mapping_dupe++;
- return (0);
- }
- }
-
- if (!found) {
- fprintf(stderr,
- "Character %u not in normal font!\n", c);
- return (1);
- }
- }
-
mp = malloc(sizeof *mp);
mp->m_char = c;
mp->m_glyph = gl;
@@ -148,6 +123,33 @@ add_mapping(struct glyph *gl, unsigned i
return (0);
}
+static int
+dedup_mapping(unsigned int map_idx)
+{
+ struct mapping *mp_bold, *mp_normal, *mp_temp;
+ unsigned normal_map_idx = map_idx - VFNT_MAP_BOLD;
+
+ assert(map_idx == VFNT_MAP_BOLD || map_idx == VFNT_MAP_BOLD_RH);
+ mp_normal = TAILQ_FIRST(&maps[normal_map_idx]);
+ TAILQ_FOREACH_SAFE(mp_bold, &maps[map_idx], m_list, mp_temp) {
+ while (mp_normal->m_char < mp_bold->m_char)
+ mp_normal = TAILQ_NEXT(mp_normal, m_list);
+ if (mp_bold->m_char != mp_normal->m_char) {
+ errx(1, "Character %u not in normal font!\n",
+ mp_bold->m_char);
+ return (1);
+ }
+ if (mp_bold->m_glyph != mp_normal->m_glyph)
+ continue;
+
+ /* No mapping is needed if it's equal to the normal mapping. */
+ TAILQ_REMOVE(&maps[map_idx], mp_bold, m_list);
+ free(mp_bold);
+ mapping_dupe++;
+ }
+ return (0);
+}
+
static struct glyph *
add_glyph(const uint8_t *bytes, unsigned int map_idx, int fallback)
{
@@ -540,6 +542,8 @@ main(int argc, char *argv[])
argv++;
}
number_glyphs();
+ dedup_mapping(VFNT_MAP_BOLD);
+ dedup_mapping(VFNT_MAP_BOLD_RH);
fold_mappings(0);
fold_mappings(1);
fold_mappings(2);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267302 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Mon Jun 9 20:52:42 2014 New Revision: 267302 URL: http://svnweb.freebsd.org/changeset/base/267302 Log: Document r267256, OpenSSL 1.0.1h update. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Jun 9 20:52:35 2014(r267301) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Jun 9 20:52:42 2014(r267302) @@ -370,6 +370,9 @@ Sendmail has been updated from 8.14.7 to 8.14.9. + +OpenSSL has + been updated to version 1.0.1h. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267297 - in head/sys/modules: agp aic7xxx/ahd bios/smapi sound/driver/maestro
Author: jhb
Date: Mon Jun 9 20:48:38 2014
New Revision: 267297
URL: http://svnweb.freebsd.org/changeset/base/267297
Log:
Re-enable -Werror for these modules. It is already enabled for the same
files when built as part of a kernel.
Modified:
head/sys/modules/agp/Makefile
head/sys/modules/aic7xxx/ahd/Makefile
head/sys/modules/bios/smapi/Makefile
head/sys/modules/sound/driver/maestro/Makefile
Modified: head/sys/modules/agp/Makefile
==
--- head/sys/modules/agp/Makefile Mon Jun 9 20:42:52 2014
(r267296)
+++ head/sys/modules/agp/Makefile Mon Jun 9 20:48:38 2014
(r267297)
@@ -20,7 +20,6 @@ SRCS+= agp_apple.c
SRCS+= device_if.h bus_if.h agp_if.h pci_if.h
SRCS+= opt_agp.h
MFILES=kern/device_if.m kern/bus_if.m dev/agp/agp_if.m dev/pci/pci_if.m
-WERROR=
EXPORT_SYMS= agp_find_device \
agp_state \
Modified: head/sys/modules/aic7xxx/ahd/Makefile
==
--- head/sys/modules/aic7xxx/ahd/Makefile Mon Jun 9 20:42:52 2014
(r267296)
+++ head/sys/modules/aic7xxx/ahd/Makefile Mon Jun 9 20:48:38 2014
(r267297)
@@ -4,7 +4,6 @@
.PATH: ${.CURDIR}/../../../dev/aic7xxx
KMOD= ahd
-WERROR=
GENSRCS= aic79xx_seq.h aic79xx_reg.h
REG_PRINT_OPT=
AHD_REG_PRETTY_PRINT=1
Modified: head/sys/modules/bios/smapi/Makefile
==
--- head/sys/modules/bios/smapi/MakefileMon Jun 9 20:42:52 2014
(r267296)
+++ head/sys/modules/bios/smapi/MakefileMon Jun 9 20:48:38 2014
(r267297)
@@ -6,7 +6,6 @@
KMOD= smapi
SRCS= smapi.c smapi_bios.S \
bus_if.h device_if.h
-WERROR=
.include
Modified: head/sys/modules/sound/driver/maestro/Makefile
==
--- head/sys/modules/sound/driver/maestro/Makefile Mon Jun 9 20:42:52
2014(r267296)
+++ head/sys/modules/sound/driver/maestro/Makefile Mon Jun 9 20:48:38
2014(r267297)
@@ -5,6 +5,5 @@
KMOD= snd_maestro
SRCS= device_if.h bus_if.h pci_if.h
SRCS+= maestro.c
-WERROR=
.include
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267306 - head/share/vt/fonts
Author: emaste Date: Mon Jun 9 21:06:46 2014 New Revision: 267306 URL: http://svnweb.freebsd.org/changeset/base/267306 Log: Add vgarom font source These are in 'GNU Unifont' format, and are converted from syscons(4) cp437 fonts. Added: head/share/vt/fonts/vgarom-8x14.hex (contents, props changed) head/share/vt/fonts/vgarom-8x16.hex (contents, props changed) head/share/vt/fonts/vgarom-8x8.hex (contents, props changed) Added: head/share/vt/fonts/vgarom-8x14.hex == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/vt/fonts/vgarom-8x14.hex Mon Jun 9 21:06:46 2014 (r267306) @@ -0,0 +1,259 @@ +# $FreeBSD$ +# Height: 14 +# Width: 8 +: +0020: +0021:183C3C3C181800181800 +0022:00662400 +0023:6C6CFE6C6C6CFE6C6C00 +0024:18187CC6C2C07C0686C67C181800 +0025:C2C60C183066C600 +0026:386C6C3876DC7600 +0027:003030306000 +0028:0C183030303030180C00 +0029:30180C0C0C0C0C183000 +002A:663CFF3C6600 +002B:18187E181800 +002C:18181830 +002D:FE00 +002E:00181800 +002F:02060C183060C080 +0030:7CC6CEDEF6E6C6C67C00 +0031:18387818181818187E00 +0032:7CC6060C183060C6FE00 +0033:7CC606063C0606C67C00 +0034:0C1C3C6CCCFE0C0C1E00 +0035:FEC0C0C0FC0606C67C00 +0036:3860C0C0FCC6C6C67C00 +0037:FEC6060C183030303000 +0038:7CC6C6C67CC6C6C67C00 +0039:7CC6C6C67E06060C7800 +003A:001818001818 +003B:0018180018183000 +003C:060C18306030180C0600 +003D:007E7E00 +003E:6030180C060C18306000 +003F:7CC6C60C181800181800 +0040:7CC6C6DEDEDEDCC07C00 +0041:10386CC6C6FEC6C6C600 +0042:FC667C66FC00 +0043:3C66C2C0C0C0C2663C00 +0044:F86C666CF800 +0045:FE66626878686266FE00 +0046:FE66626878686060F000 +0047:3C66C2C0C0DEC6663A00 +0048:C6C6C6C6FEC6C6C6C600 +0049:3C181818181818183C00 +004A:1E0C0C0C0C0C7800 +004B:EC6C786C6C66E600 +004C:F060606060606266FE00 +004D:C6EEFEFED6C6C6C6C600 +004E:C6E6F6FEDECEC6C6C600 +004F:386CC6C6C6C6C66C3800 +0050:FC667C606060F000 +0051:7CC6C6C6C6D6DE7C0C0E +0052:FC667C6CE600 +0053:7CC6C660380CC6C67C00 +0054:7E7E5A18181818183C00 +0055:C6C6C6C6C6C6C6C67C00 +0056:C6C6C6C6C6C66C381000 +0057:C6C6C6C6D6D6FE7C6C00 +0058:C6C66C3838386CC6C600 +0059:3C1818183C00 +005A:FEC68C183060C2C6FE00 +005B:3C303030303030303C00 +005C:80C0E070381C0E060200 +005D:3C0C0C0C0C0C0C0C3C00 +005E:10386CC6 +005F:FF00 +0060:30301800 +0061:00780C7C7600 +0062:E06060786C667C00 +0063:007CC6C0C0C67C00 +0064:1C0C0C3C6CCC7600 +0065:007CC6FEC0C67C00 +0066:386C6460F0606060F000 +0067:0076CC7C0CCC7800 +0068:E060606C7666E600 +0069:18180038181818183C00 +006A:0606000E060606063C00 +006B:E06060666C786C66E600 +006C:38181818181818183C00 +006D:00ECFED6D6D6C600 +006E:00DC6600 +006F:007CC6C6C6C67C00 +0070:00DC667C6060F000 +0071:0076CC7C0C0C1E00 +0072:00DC7060F000 +0073:007CC6701CC67C00 +0074:103030FC303030361C00 +0075:00CC7600 +0076:003C1800 +0077:00C6C6D6D6FE6C00 +0078:00C66C38386CC600 +0079:00C6C6C6C67E060CF800 +007A:00FECC183066FE00 +007B:0E181818701818180E00 +007C:18181818001818181800 +007D:701818180E1818187000 +007E:76DC +00A0: +00A1:18180018183C3C3C1800 +00A2:0018183C666060663C181800 +00A3:00386C6460F0606060E6FC00 +00A5:3C187E187E181800 +00A7:007CC660386CC6C66C380CC67C00 +00AA:003C6C6C3E007E00 +00AB:366CD86C3600 +00AC:FE060606 +00B0:00386C6C3800 +00B1:0018187E1818FF00 +00B2:0070D83060C8F800 +00B5:7C6060C0 +00B6:7FDBDBDB7B1B1B1B1B00 +00B7:0018 +00BA:00386C6C38007C00 +00BB:D86C366CD800 +00BC:00C0C0C6CCD83066CE9E3E060600 +00BD:00C0C0C6CCD83060DC860C183E00 +00BF:303000303060C6C67C00 +00C4:00C6C610386CC6C6FEC6C600 +00C5:386C3800386CC6C6FEC6C600 +00C6:3E6CFECCCE00 +00C7:3C66C2C0C0C2663C0C067C00 +00C9:18306000FE66607C
svn commit: r267307 - in head/lib/libc: amd64/gen i386/gen
Author: jilles Date: Mon Jun 9 21:35:36 2014 New Revision: 267307 URL: http://svnweb.freebsd.org/changeset/base/267307 Log: siglongjmp(): Preserve floating point exception flags on i386 and amd64. Per POSIX, siglongjmp() shall be equivalent to longjmp() except that it must match sigsetjmp() instead of setjmp() and except for the effect on the signal mask. Therefore, it should preserve the floating point exception flags. This was fixed for longjmp() and _longjmp() in r180080 and r180081 for amd64 and i386 respectively. Modified: head/lib/libc/amd64/gen/sigsetjmp.S head/lib/libc/i386/gen/sigsetjmp.S Modified: head/lib/libc/amd64/gen/sigsetjmp.S == --- head/lib/libc/amd64/gen/sigsetjmp.S Mon Jun 9 21:06:46 2014 (r267306) +++ head/lib/libc/amd64/gen/sigsetjmp.S Mon Jun 9 21:35:36 2014 (r267307) @@ -105,7 +105,6 @@ ENTRY(__siglongjmp) movq40(%rdx),%r13 movq48(%rdx),%r14 movq56(%rdx),%r15 - fninit fldcw 64(%rdx) testq %rax,%rax jnz 1f Modified: head/lib/libc/i386/gen/sigsetjmp.S == --- head/lib/libc/i386/gen/sigsetjmp.S Mon Jun 9 21:06:46 2014 (r267306) +++ head/lib/libc/i386/gen/sigsetjmp.S Mon Jun 9 21:35:36 2014 (r267307) @@ -115,7 +115,6 @@ ENTRY(__siglongjmp) movl12(%edx),%ebp movl16(%edx),%esi movl20(%edx),%edi - fninit fldcw 24(%edx) testl %eax,%eax jnz 1f ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267310 - head/sys/dev/vt/hw/vga
Author: emaste
Date: Tue Jun 10 01:19:48 2014
New Revision: 267310
URL: http://svnweb.freebsd.org/changeset/base/267310
Log:
Correct unicode map for VGA ROM character 0x0e
The character is a beamed pair of sixteenth notes, so should be U+266C
not U+266B (beamed eighth notes).
Modified:
head/sys/dev/vt/hw/vga/vga.c
Modified: head/sys/dev/vt/hw/vga/vga.c
==
--- head/sys/dev/vt/hw/vga/vga.cMon Jun 9 23:11:50 2014
(r267309)
+++ head/sys/dev/vt/hw/vga/vga.cTue Jun 10 01:19:48 2014
(r267310)
@@ -351,7 +351,8 @@ static const struct unicp437 cp437table[
{ 0x263a, 0x01, 0x01 }, { 0x263c, 0x0f, 0x00 },
{ 0x2640, 0x0c, 0x00 }, { 0x2642, 0x0b, 0x00 },
{ 0x2660, 0x06, 0x00 }, { 0x2663, 0x05, 0x00 },
- { 0x2665, 0x03, 0x01 }, { 0x266a, 0x0d, 0x01 },
+ { 0x2665, 0x03, 0x01 }, { 0x266a, 0x0d, 0x00 },
+ { 0x266c, 0x0e, 0x00 },
};
static uint8_t
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267311 - head/sys/amd64/vmm/intel
Author: neel Date: Tue Jun 10 01:38:02 2014 New Revision: 267311 URL: http://svnweb.freebsd.org/changeset/base/267311 Log: Turn on interrupt window exiting unconditionally when an ExtINT is being injected into the guest. This allows the hypervisor to inject another ExtINT or APIC vector as soon as the guest is able to process interrupts. This change is not to address any correctness issue but to guarantee that any pending APIC vector that was preempted by the ExtINT will be injected as soon as possible. Prior to this change such pending interrupts could be delayed until the next VM exit. Modified: head/sys/amd64/vmm/intel/vmx.c Modified: head/sys/amd64/vmm/intel/vmx.c == --- head/sys/amd64/vmm/intel/vmx.c Tue Jun 10 01:19:48 2014 (r267310) +++ head/sys/amd64/vmm/intel/vmx.c Tue Jun 10 01:38:02 2014 (r267311) @@ -1311,9 +1311,13 @@ vmx_inject_interrupts(struct vmx *vmx, i * have posted another one. If that is the case, set * the Interrupt Window Exiting execution control so * we can inject that one too. +* +* Also, interrupt window exiting allows us to inject any +* pending APIC vector that was preempted by the ExtINT +* as soon as possible. This applies both for the software +* emulated vlapic and the hardware assisted virtual APIC. */ - if (vm_extint_pending(vmx->vm, vcpu)) - vmx_set_int_window_exiting(vmx, vcpu); + vmx_set_int_window_exiting(vmx, vcpu); } VCPU_CTR1(vmx->vm, vcpu, "Injecting hwintr at vector %d", vector); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267313 - head/sys/dev/virtio/block
Author: bryanv
Date: Tue Jun 10 03:29:15 2014
New Revision: 267313
URL: http://svnweb.freebsd.org/changeset/base/267313
Log:
Always append new bios to the tail of the queue, instead of sorting them
MFC after:1 week
Modified:
head/sys/dev/virtio/block/virtio_blk.c
Modified: head/sys/dev/virtio/block/virtio_blk.c
==
--- head/sys/dev/virtio/block/virtio_blk.c Tue Jun 10 03:23:35 2014
(r267312)
+++ head/sys/dev/virtio/block/virtio_blk.c Tue Jun 10 03:29:15 2014
(r267313)
@@ -577,7 +577,7 @@ vtblk_strategy(struct bio *bp)
if (sc->vtblk_flags & VTBLK_FLAG_DETACH)
vtblk_finish_bio(bp, ENXIO);
else {
- bioq_disksort(&sc->vtblk_bioq, bp);
+ bioq_insert_tail(&sc->vtblk_bioq, bp);
if ((sc->vtblk_flags & VTBLK_FLAG_SUSPEND) == 0)
vtblk_startio(sc);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267316 - head/usr.bin/dtc
Author: rpaulo Date: Tue Jun 10 05:58:46 2014 New Revision: 267316 URL: http://svnweb.freebsd.org/changeset/base/267316 Log: The, currently undocumented, -i option takes an argument. Modified: head/usr.bin/dtc/dtc.cc Modified: head/usr.bin/dtc/dtc.cc == --- head/usr.bin/dtc/dtc.cc Tue Jun 10 04:44:28 2014(r267315) +++ head/usr.bin/dtc/dtc.cc Tue Jun 10 05:58:46 2014(r267316) @@ -100,7 +100,7 @@ main(int argc, char **argv) clock_t c0 = clock(); class device_tree tree; fdt::checking::check_manager checks; - const char *options = "hqI:O:o:V:d:R:S:p:b:fisvH:W:E:DP:"; + const char *options = "hqI:O:o:V:d:R:S:p:b:fi:svH:W:E:DP:"; // Don't forget to update the man page if any more options are added. while ((ch = getopt(argc, argv, options)) != -1) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267317 - head/usr.bin/dtc
Author: rpaulo
Date: Tue Jun 10 06:04:25 2014
New Revision: 267317
URL: http://svnweb.freebsd.org/changeset/base/267317
Log:
dtc: don't crash if the argument is a directory.
Modified:
head/usr.bin/dtc/fdt.cc
Modified: head/usr.bin/dtc/fdt.cc
==
--- head/usr.bin/dtc/fdt.cc Tue Jun 10 05:58:46 2014(r267316)
+++ head/usr.bin/dtc/fdt.cc Tue Jun 10 06:04:25 2014(r267317)
@@ -42,6 +42,8 @@
#include
#include
#include
+#include
+#include
#include "dtb.hh"
namespace dtc
@@ -1078,6 +1080,13 @@ device_tree::buffer_for_file(const char
fprintf(stderr, "Unable to open file %s\n", path);
return 0;
}
+ struct stat st;
+ if (fstat(source, &st) == 0 && S_ISDIR(st.st_mode))
+ {
+ fprintf(stderr, "File %s is a directory\n", path);
+ close(source);
+ return 0;
+ }
input_buffer *b = new mmap_input_buffer(source);
// Keep the buffer that owns the memory around for the lifetime
// of this FDT. Ones simply referring to it may have shorter
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267318 - head/usr.bin/dtc
Author: rpaulo
Date: Tue Jun 10 06:16:34 2014
New Revision: 267318
URL: http://svnweb.freebsd.org/changeset/base/267318
Log:
dtc: ignore lines starting with #.
This is necessary because we use the C pre-processor to parse #include lines
and cpp adds line markings that start with #.
Modified:
head/usr.bin/dtc/input_buffer.cc
Modified: head/usr.bin/dtc/input_buffer.cc
==
--- head/usr.bin/dtc/input_buffer.ccTue Jun 10 06:04:25 2014
(r267317)
+++ head/usr.bin/dtc/input_buffer.ccTue Jun 10 06:16:34 2014
(r267318)
@@ -151,7 +151,7 @@ input_buffer::next_token()
start = cursor;
skip_spaces();
// Parse /* comments
- if (((*this)[0] == '/') && ((*this)[1] == '*'))
+ if ((*this)[0] == '/' && (*this)[1] == '*')
{
// eat the start of the comment
++(*this);
@@ -168,13 +168,14 @@ input_buffer::next_token()
// Eat the /
++(*this);
}
- // Parse // comments
- if (((*this)[0] == '/') && ((*this)[1] == '/'))
+ // Parse // comments and # comments
+ if (((*this)[0] == '/' && (*this)[1] == '/') ||
+(*this)[0] == '#')
{
// eat the start of the comment
++(*this);
++(*this);
- // Find the ending * of */
+ // Find the ending of the line
while (**this != '\n')
{
++(*this);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r267319 - head/sys/tools/fdt
Author: rpaulo
Date: Tue Jun 10 06:24:01 2014
New Revision: 267319
URL: http://svnweb.freebsd.org/changeset/base/267319
Log:
Call cpp with -P to avoid printing line markings.
Modified:
head/sys/tools/fdt/make_dtb.sh
Modified: head/sys/tools/fdt/make_dtb.sh
==
--- head/sys/tools/fdt/make_dtb.sh Tue Jun 10 06:16:34 2014
(r267318)
+++ head/sys/tools/fdt/make_dtb.sh Tue Jun 10 06:24:01 2014
(r267319)
@@ -15,6 +15,6 @@ fi
for d in ${dts}; do
dtb=${dtb_path}/`basename $d .dts`.dtb
echo "converting $d -> $dtb"
-cpp -x assembler-with-cpp -I $S/gnu/dts/include -I
$S/boot/fdt/dts/${MACHINE} -I $S/gnu/dts/${MACHINE} -include $d /dev/null |
+cpp -P -x assembler-with-cpp -I $S/gnu/dts/include -I
$S/boot/fdt/dts/${MACHINE} -I $S/gnu/dts/${MACHINE} -include $d /dev/null |
dtc -O dtb -o $dtb -b 0 -p 1024 -i $S/boot/fdt/dts/${MACHINE} -i
$S/gnu/dts/${MACHINE}
done
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r267291 - head/sys/libkern
On Mon, Jun 09, 2014 at 07:27:47PM +, John Baldwin wrote: > New Revision: 267291 > URL: http://svnweb.freebsd.org/changeset/base/267291 > > Log: > Use strcasecmp() instead of strcmp() when checking user-supplied encoding > names so that encoding names are treated as case-insensitive. This allows > the use of 'utf-8' instead of 'UTF-8' for example and matches the behavior > of iconv(1). Thanks! Thas had bitten me before; caused me some nasty debugging minutes. > MFC after: 1 week Please MFC to stable/8 as well, thank you. ./danfe ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
