From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 01:15:42 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81E651F4 for ; Sun, 21 Jun 2015 01:15:42 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm28.bullet.mail.bf1.yahoo.com (nm28.bullet.mail.bf1.yahoo.com [98.139.212.187]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2D198F66 for ; Sun, 21 Jun 2015 01:15:42 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1434849339; bh=BrK1jYP+5GzzVJIiEw3NvM879S/6YQvRYXOCi/lonWU=; h=Date:From:To:CC:Subject:References:In-Reply-To:From:Subject; b=LQZTEyZ+Ln1/3Vai5cgcI5XynprUmCWDZCt05fVsTZUILMh01hObsYBEdjr+LH88JNM0NMKwvMBiXCw7W3rF73GQwFEsAT82c8GN2jIQZiL/ZO3cwFoK5D5CiMQ91lzK8iYwwGU4sDXXXn2dxSdGZEO/k6CR8qQp/Pxx8BnP6w7QM1ZsGTLocryjzizcCV2NzDxlLQB2CdBHmn50cRfF3rzAqSj6E4xKzF5sTQ0ECxHJcgmzxfYlje5/ugm4NskiGRj8bU2LlPHWAv6GnaHjuGbzWJAcK1AIV/WvICRfGdfTMJh34k+l217sjSCHkFOxKpBgncM620HOIC2yR9aQlQ== Received: from [98.139.170.180] by nm28.bullet.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 01:15:39 -0000 Received: from [68.142.230.71] by tm23.bullet.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 01:15:39 -0000 Received: from [127.0.0.1] by smtp228.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 01:15:39 -0000 X-Yahoo-Newman-Id: 504158.16384.bm@smtp228.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 4oLYOaAVM1lrqAUAz8jvDVEn.HbHGDGzsdkK5.6JT.xrcWy OGJA_divAvpjtSkmhTiwchouZucStaIMG0V_PR0ON8lel0Ey4TbJ01U3LRJl OGqNqWg2swW6Lm3remiHAxieDSietwRtduFsyHUXP82ZMdXge6hakgVFfyAr tp.SYzrmeqZFbbpTwqiGcSaQksFQm0JQp1j2E2zZdwPb20HoFqs5OtSFT9dx NoGJ36YCAteBoVtP7HOt4OlLPLUk7Hna5Fo9MwarX5JoFRZOe1kagO75RpZk ouVxXvnHNH1KYPDKs.aBj1y8urkNh1EFv31cy_G8hJwGei435q3WTqzVEHJr rU96wnwzuBPcs_fRXH8Xkvv7IQ3vTHroyp8dkLi0td3g.uY2Gktn.XqWw518 Slssk_a6EtfbqMbaSsXf7OPsA92MZkMUuictgqP3tD1He7wsaIpsKTjUEaYj ljkx56139uKrAArXGdLFQ6a.ewN.rjcwhbeKOoz6lvIMddfrlhp2aXdwOz98 0.s04tVHI87VHMLFDVeH4.B7hK5wzQ044 X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Message-ID: <55861046.4050501@FreeBSD.org> Date: Sat, 20 Jun 2015 20:15:50 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Bruce Evans , Dimitry Andric CC: David Chisnall , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> In-Reply-To: <20150620023835.N2562@besplex.bde.org> Content-Type: multipart/mixed; boundary="------------010609030301090209060008" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 01:15:42 -0000 This is a multi-part message in MIME format. --------------010609030301090209060008 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit On 06/19/15 12:23, Bruce Evans wrote: > On Fri, 19 Jun 2015, Dimitry Andric wrote: > >> On 19 Jun 2015, at 17:02, Pedro Giffuni wrote: >>> >>>> On 19/06/2015 05:16 a.m., David Chisnall wrote: >>>>> I only just caught this (having seen the fallout from NetBSD doing >>>>> the same thing in a shipping release and the pain that it’s caused): >>>>> >>>>> __weak is a reserved keyword in Objective-C, please pick another >>>>> name for this. This in cdefs.h makes it impossible to include any >>>>> FreeBSD standard headers in Objective-C programs (of which we have >>>>> a couple of hundred in ports) if they use any of the modern >>>>> Objective-C language modes. >> ... >>> Closely related to this, we are redefining _Noreturn, which is a >>> reserved keyword in C11. >> >> No, sys/cdefs.h has: >> >> 254 /* >> 255 * Keywords added in C11. >> 256 */ >> 257 >> 258 #if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L >> || defined(lint) >> [...] >> 284 #if defined(__cplusplus) && __cplusplus >= 201103L >> 285 #define _Noreturn [[noreturn]] >> 286 #else >> 287 #define _Noreturn __dead2 >> 288 #endif >> [...] >> 320 #endif /* __STDC_VERSION__ || __STDC_VERSION__ < 201112L */ >> >> So the whole block redefining all the _Xxx identifiers is skipped for >> C11 and higher. > > I probably pointed this out incorrectly to Pedro. > > All uses of _Noreturn are still broken, and also ugly. __dead2 is the > gcc-2 compatible version of the gcc-1 compatible macro __dead. It is > syntactically different from __dead and _Noreturn. It must be placed > after the function parameter list instead of in the function type > declarator because old versions of gcc only accept attributes there. > __dead and presumably _Noreturn must be placed in the function type > declarator. This is incompatible, and also uglier. > I was thinking that _Noreturn can be fixed for older compilers less disruptively. I haven't tested the attached patch the idea is to resurrect __dead and use it for _Noreturn. > Correct version with ugly declarations: > > __dead void > foo(void) __dead2; > With the patch we would use: __Noreturn void foo(void) _dead2; Which is still ugly but C11-ish. Pedro. --------------010609030301090209060008 Content-Type: text/x-patch; name="dead.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="dead.diff" Index: sys/sys/cdefs.h =================================================================== --- sys/sys/cdefs.h (revision 284643) +++ sys/sys/cdefs.h (working copy) @@ -207,6 +207,7 @@ * a feature that we cannot live without. */ #ifdef lint +#define __dead #define __dead2 #define __pure2 #define __unused @@ -217,11 +218,13 @@ #else #define __weak __attribute__((__weak__)) #if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER) +#define __dead __volatile #define __dead2 #define __pure2 #define __unused #endif #if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7 && !defined(__INTEL_COMPILER) +#define __dead __attribute__((__noreturn__)) #define __dead2 __attribute__((__noreturn__)) #define __pure2 __attribute__((__const__)) #define __unused @@ -284,7 +287,7 @@ #if defined(__cplusplus) && __cplusplus >= 201103L #define _Noreturn [[noreturn]] #else -#define _Noreturn __dead2 +#define _Noreturn __dead #endif #if !__has_extension(c_static_assert) --------------010609030301090209060008-- From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 01:22:35 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E999E38E; Sun, 21 Jun 2015 01:22:35 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D8576182; Sun, 21 Jun 2015 01:22:35 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L1MZdv096590; Sun, 21 Jun 2015 01:22:35 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L1MZQb096589; Sun, 21 Jun 2015 01:22:35 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201506210122.t5L1MZQb096589@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Sun, 21 Jun 2015 01:22:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284654 - head/sys/vm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 01:22:36 -0000 Author: alc Date: Sun Jun 21 01:22:35 2015 New Revision: 284654 URL: https://svnweb.freebsd.org/changeset/base/284654 Log: Avoid pmap_is_modified() on pages that can't be mapped. MFC after: 1 week Sponsored by: EMC / Isilon Storage Division Modified: head/sys/vm/vm_pageout.c Modified: head/sys/vm/vm_pageout.c ============================================================================== --- head/sys/vm/vm_pageout.c Sun Jun 21 00:36:02 2015 (r284653) +++ head/sys/vm/vm_pageout.c Sun Jun 21 01:22:35 2015 (r284654) @@ -1226,9 +1226,11 @@ vm_pageout_scan(struct vm_domain *vmd, i * then the page may still be modified until the last of those * mappings are removed. */ - vm_page_test_dirty(m); - if (m->dirty == 0 && object->ref_count != 0) - pmap_remove_all(m); + if (object->ref_count != 0) { + vm_page_test_dirty(m); + if (m->dirty == 0) + pmap_remove_all(m); + } if (m->dirty == 0) { /* From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 01:35:33 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE72E70E; Sun, 21 Jun 2015 01:35:33 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ACAF63C6; Sun, 21 Jun 2015 01:35:33 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L1ZXva001935; Sun, 21 Jun 2015 01:35:33 GMT (envelope-from marcel@FreeBSD.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L1ZXuV001933; Sun, 21 Jun 2015 01:35:33 GMT (envelope-from marcel@FreeBSD.org) Message-Id: <201506210135.t5L1ZXuV001933@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcel set sender to marcel@FreeBSD.org using -f From: Marcel Moolenaar Date: Sun, 21 Jun 2015 01:35:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284655 - head/usr.bin/mkimg X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 01:35:33 -0000 Author: marcel Date: Sun Jun 21 01:35:32 2015 New Revision: 284655 URL: https://svnweb.freebsd.org/changeset/base/284655 Log: Don't resize again prior to writing. Resizing may not be idempotent and no scheme adjusts the size after the format resized the image the first time. Modified: head/usr.bin/mkimg/format.c Modified: head/usr.bin/mkimg/format.c ============================================================================== --- head/usr.bin/mkimg/format.c Sun Jun 21 01:22:35 2015 (r284654) +++ head/usr.bin/mkimg/format.c Sun Jun 21 01:35:32 2015 (r284655) @@ -78,14 +78,10 @@ format_selected(void) int format_write(int fd) { - lba_t size; int error; if (format == NULL) return (ENOSYS); - size = image_get_size(); - error = format->resize(size); - if (!error) - error = format->write(fd); + error = format->write(fd); return (error); } From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 01:44:28 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 62D9E895; Sun, 21 Jun 2015 01:44:28 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FAC57F0; Sun, 21 Jun 2015 01:44:28 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L1iSbZ006619; Sun, 21 Jun 2015 01:44:28 GMT (envelope-from marcel@FreeBSD.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L1iSah006618; Sun, 21 Jun 2015 01:44:28 GMT (envelope-from marcel@FreeBSD.org) Message-Id: <201506210144.t5L1iSah006618@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcel set sender to marcel@FreeBSD.org using -f From: Marcel Moolenaar Date: Sun, 21 Jun 2015 01:44:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284656 - head/usr.bin/mkimg X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 01:44:28 -0000 Author: marcel Date: Sun Jun 21 01:44:27 2015 New Revision: 284656 URL: https://svnweb.freebsd.org/changeset/base/284656 Log: Microsoft Azure demands that fixed VHD images are a whole number of megabytes. This is on top of having the image rounded to the matching geometry of the image size. By rounding up to the next MB after rounding to the geometry, we lost idempotency. Subsequent calls to resize the image will keep increasing the image size. Tested by: gjb@ Modified: head/usr.bin/mkimg/vhd.c Modified: head/usr.bin/mkimg/vhd.c ============================================================================== --- head/usr.bin/mkimg/vhd.c Sun Jun 21 01:35:32 2015 (r284655) +++ head/usr.bin/mkimg/vhd.c Sun Jun 21 01:44:27 2015 (r284656) @@ -365,6 +365,11 @@ vhd_fix_resize(lba_t imgsz) struct vhd_geom geom; int64_t imagesz; + /* + * Round the image size to the pre-determined geometry that + * matches the image size. This circular dependency implies + * that we need to loop to handle boundary conditions. + */ imgsz *= secsz; imagesz = imgsz; while (1) { @@ -375,6 +380,10 @@ vhd_fix_resize(lba_t imgsz) break; imagesz += geom.heads * geom.sectors * VHD_SECTOR_SIZE; } + /* + * Azure demands that images are a whole number of megabytes. + */ + imagesz = (imagesz + 0xfffffULL) & ~0xfffffULL; return (image_set_size(imagesz / secsz)); } From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 01:45:47 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from hub.FreeBSD.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D29C9DE; Sun, 21 Jun 2015 01:45:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Date: Sun, 21 Jun 2015 01:45:43 +0000 From: Glen Barber To: Marcel Moolenaar Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284656 - head/usr.bin/mkimg Message-ID: <20150621014543.GJ62182@hub.FreeBSD.org> References: <201506210144.t5L1iSah006618@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="451BZW+OUuJBCAYj" Content-Disposition: inline In-Reply-To: <201506210144.t5L1iSah006618@svn.freebsd.org> X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event X-PEKBAC-Definition: Problem Exists, Keyboard Between Admin/Computer User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 01:45:47 -0000 --451BZW+OUuJBCAYj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jun 21, 2015 at 01:44:28AM +0000, Marcel Moolenaar wrote: > Author: marcel > Date: Sun Jun 21 01:44:27 2015 > New Revision: 284656 > URL: https://svnweb.freebsd.org/changeset/base/284656 >=20 > Log: > Microsoft Azure demands that fixed VHD images are a whole number > of megabytes. This is on top of having the image rounded to the > matching geometry of the image size. > By rounding up to the next MB after rounding to the geometry, we > lost idempotency. Subsequent calls to resize the image will keep > increasing the image size. > =20 > Tested by: gjb@ >=20 > Modified: > head/usr.bin/mkimg/vhd.c >=20 Thank you! Glen --451BZW+OUuJBCAYj Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVhhdHAAoJEAMUWKVHj+KT7yUP/2HsQgZINmmLFHnAnwdqYEZP 3/Kon6qhvVS5BNEqnJpD7n6WAqQklLJrj2C8v+RNKVC8oTnaByO7xCBsUFgWn0pv AkZmL+ohB9PjvfQ6jieNHa5q49ujeUg0ez1KOHUahJc9VFOPvj1VdgjZ0o3DoVHp 5zbYy3Sw3gubr1Ex5fhQlVWSNpcfFBCT3GEVMILW16euBLUbi1qRT0PF9IAjecQX XbcCvpWCq80FbTaaA5n7TdKy37yFNh0kgGUdFI3RuK7skkrm2Iu+ZiNWwOpsB0gh oJWx0CnX6S4cXfo+Bfe1E33Gz8WGM0xc7+zeADljccPDnp/YlUbGK+cJrFbtX0Hp d+ispACZQxIYzl4D3IH9EgxQ4KdVsQuRQxvUD0/iwCPI0R5uyfCs6whvugUhQ7yW wNpLQ9pkg+krH2RveK1IXDsGd5Ci6Z9VpsyhYiFvk8Auu1DgX5yqf9Uue+sqJTuy c+QNJppHIBHe7x2xrnPFICJKTcfaRRRuPNdDo+E86A/6ZY1CePRVdquCv03N/XYL 77OZLBmmbQSFRra2VRqwjAd+kAEZf0LyMFkIPZmE8PTvYMkFMiS+wKiMKoUMNDC2 uhDOk+fX9gZEPl+JNVMXy7EXmFCVaY1QMou0GXHHSl+dE7XfJbfwUQmxImu6MGYL bedIZiHJ3Rvm826s3Wq2 =nthH -----END PGP SIGNATURE----- --451BZW+OUuJBCAYj-- From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 01:55:10 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E130FB63; Sun, 21 Jun 2015 01:55:09 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CD9829FB; Sun, 21 Jun 2015 01:55:09 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L1t9sK011610; Sun, 21 Jun 2015 01:55:09 GMT (envelope-from marcel@FreeBSD.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L1t1qF011558; Sun, 21 Jun 2015 01:55:01 GMT (envelope-from marcel@FreeBSD.org) Message-Id: <201506210155.t5L1t1qF011558@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcel set sender to marcel@FreeBSD.org using -f From: Marcel Moolenaar Date: Sun, 21 Jun 2015 01:55:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284657 - head/usr.bin/mkimg/tests X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 01:55:10 -0000 Author: marcel Date: Sun Jun 21 01:55:01 2015 New Revision: 284657 URL: https://svnweb.freebsd.org/changeset/base/284657 Log: Rebase the fixed VHD images after the rounding fix. Modified: head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu Modified: head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,15 +1,15 @@ # $FreeBSD$ begin 644 img-1x1-4096-apm.vhdf.gz -M'XL("+F;>54``VEM9RTQ>#$M-#`Y-BUA<&TN=FAD9BYO=70`K57+:L,P$+SG -M*[;T%JC18R6YQX8FMT)H*/163&RGAB8Q::`]N/]>R9)B^9&0%LL;8['6>'9F -MI1!B!P`*$`R(#N*"4>`(S;P34,V?(SUN,'*CFE@P2BZL.@\7=48UF5I`9M*" -M`*:]=3P$I.U$M7SJ`EHXPP\I*&)"KD&*J_@]E.5'-@#'QBK7PO$^.Y'7SQ1` -M,5`(\M[=90XR,VG'[JU,#L?B6.QW;QX.-9Q,S6+U%W;;I!QD)T;V%J_T-O9- -MZ0#;WH+GAV/W'M9V2".\-D(',A`<$(&EFK@P.3WO`2X.639;/=Z]+%:A?H@C -M\Y-7Z,<"_>PF"?6#D)\<6S]Y43_%0:F!WFST^_RRC>CYC:P?)4X_D@SJ -M9=2^+"`ZP-$8(I.Q24ON]KH1D?LS(`X!66-O#;C>[[+UL?@.=["!,P[G^7"8 -M]8R;_P*I@"7U$9.:YX#?[7PS+;8;#^=//_]A[?7)XFZ5.B'CIMR%-KB&G+V? -MV/&^2,TJ_5.ZSQ$H;17NV&F8Z*==+)Z*S7(0<4W31VO22ABXU[89%JX^_<*7 -4_^NMA9,CMTI"R.076*/W'M('```` +M'XL(""X7AE4``VEM9RTQ>#$M-#`Y-BUA<&TN=FAD9BYO=70`K55=:\(P%'WW +M5US8RQ!6TN0FJ8\;T[=!F>Q9BFVE,+4X87OHCU_2)#;]4-Q(O(2&VQQ/SKFY +M)<0,`.3`*1`5Q`9-]-RM!P'-\CU2XS%RHYD9L/C6KNMPT6`TL[D!I#K-"6`^ +MVL=\P+B?:-*W(:"!T_PP!DETB"T(?A>_Y[K^+";@:*CC&C@V9L?+]CD&D!0D +M@EC8690@"IVV[#9U=CI7Y^IXV#@X5'`BUYOE7]CMLWJ2'0_L+=[I;>**T@+V +MO07'#T/7'K9V""V\,D(%4N`,$('FBCC7.;4>`:Y.1?&R?GWZ6*U]_1`#\Q-W +MZ$<]_UO`[?%0;,_5CW^#N>W.93D=>C]E^EL@ +M)-"L;3&Y?O;X/2QW\VJ_DO>/NU(&MY!IQXZ-1>*^>@L! +M!"&.>P>W[%)?/0.'E\,6:F8M31>]12\QV9LU7-O]_)?_ZZV!$X%+17TH9[]& +'6*@@T@<````` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,14 +1,13 @@ # $FreeBSD$ begin 644 img-1x1-4096-bsd.vhdf.gz -M'XL("+R;>54``VEM9RTQ>#$M-#`Y-BUB6A74/ZL6#!WQW.T"A`PN[&DJ!DNE\_#/35HBV -M`2@$D9]YSAOJ+.97'6VBAH8$U"DH#=J`==/%T-D',]0ON^\[AX -MU#P.+^%ZP?(:7$)>P-V=H<.JF1=';X]22.I<)4?XI6+U6[GQM[<@O -MK#/@'D0!PG8VY$"J[QT-8-"WG^O5)=,D#5[N -M3@\@%$C)`N_4.4S\PX-5?;!E!=HV,GUG'\Q`N-?Q444X+49>_ZUMBS,K+Y5< -+B.@7"Y_:'#`'```` +M'XL("#$7AE4``VEM9RTQ>#$M-#`Y-BUB` +M$L"JA75]PYY2^MC#\=#1!`)U!DJ#-I"[XVR:Y(-LV-?S2QH..^#XEM4Z+IT- +MCQ.W<*-@?@].HA4G%)&/N+6-'I<,K&3"J2UU+A*L^9.S>J_8^=SF,[LPS\!; +M8!J8]U)0X)A?F/05L0Q!W-W0![&[%>(R>IX'.''#7:"XM\W<;JM+8G7USLF0 +M\YMQY\U%"+VY/4[LVPA$UUEZ;`%)#E(5#02K+UUV=3?U]_P@PC#A/2MLL3[87$VV(R$!7^Q+SC>Z#OX7PY +M7C\N'N=;E?^Q,AAT[2`J88`IX)PX/J@K:3DC +H3HW.-FZ5G4P_R0?96&Q5B--L9O7?W/8XLW.IN.([_`(4]_T8,`<````` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,15 +1,14 @@ # $FreeBSD$ begin 644 img-1x1-4096-ebr.vhdf.gz -M'XL("+^;>54``VEM9RTQ>#$M-#`Y-BUE8G(N=FAD9BYO=70`K94]6;!BS -M!X"Y)MN\H4Y&1[W:K!H:/]P,K*I)H,45QLL,,"V7;<I?X9Z]/$%!F("1(!1JO#?AU_S*5#L%C -MS9_%X25<+YA?@TO)RQGI5L:\H1[*Q#X[G%A29Q"LO"E8&;GVA![YN7D&9E9) -M`4RW-O2!?7YAT+<-9:`7[H(^",/-"9?YX[F#PPOA@H\[+.9V6=TZ5%=$3H8< -MKXPK5RY!_)5K<1AW(\!F9S$5:$:%]WE#_9CXIP6*%AAM!@4J36:5@JI`E:`D -M]3,!:@N9=H'H5U)=?'V6Q??YQ\TPX7C_YP@;^6-*JT5E@#E]1!VI[^B[VY\V -MYX]3A^NVJN[#0M&D2P,10;C&H/00[L/NZ;Y![MY[=6DX28.7N;(C,`&<>X&W -MZ@PF^?6#%7VP9052-S*[YKUX!L*]C;#$M-#`Y-BUE8G(N=FAD9BYO=70`K96Q;H,P$(;W +M/,5%W3(@V_@,K%'3.5+5=B8$H@QMEPX=>/C:&(,/`TDJ@^,8G>_C/]_9,&8O +M`/V;;SC.0/!E?5L?=XX= +M;O,8$!'*,@"^.7W">$D!K)SIEPWM/J'WH$\:(&8@$5!!+NX-^./P/I<.R6.M +MG\6)6[A!,+\'EQHO;Z9?&&&T%L?\4J114`ZH&A6:< +M25`%9+D/%+22VNK[JZY^KK]^A@V.#U^.L!E_D9K=HC(0I7F).INQI^_I<-E= +M/R\.YXXJ]V*IS**CAL@@7*3AONQ?GSOD<527AHN$_NH5"I@$SDG@O;HC+6?L +HSGD7;*W[M)/I&GD@AMFCRN"03;S^FUN+4Y%+1=?>Y@]G9,(54``VEM9RTQ>#$M-#`Y-BUG<'0N=FAD9BYO=70`K98[;]M`#,=W -M?PH:78H4%>ZMTQ(@1F.@6_K:NDBRE&2(@P`=.JC?O>2=7B?KA+HX^2S(H/@3 -M_SQ2-&/^`%`"6+ERCANZ0Q9^NMW-SM%X=1T0GT\A+(`9`CVN1B,3=$_30-OV -MBW'GY9VE`L'[ZP&7C8?:9S/<:?2Z7''##.>/26Y['5!K*,L+X(\A/N&V0X,R -MH`H0>#\#Q4$+T&K$.:VZGL=W?_P,#W=?OQ/LYR17<#36`NH<"@&\6$3'_UVN -MQV%`(.4RVP-.QG!ROXZ3A.,;N+4%'8_@U):7KZ%KQ&H6>MFYEVR@DM"64)XB -MN-L%SB2N/$7FRD!>@VE`]C' -M[.U#'Y_B?46LK;@AECU%I<)L3&Y.M;TI%T*<3)T]2]G3R;)7],6RMN*&:/9* -MG[WU)%'V5ENF&[*6[4-XX;N(0L_'JAZ8+((E3`INX-P -M";N#<`F[@W!)NX.`";N#<`F[@W`)NX-P2;L#@8:E&^*$(K=$?'^*1S3`)ASCA-H>X%!MBW2$68A,.<<(E'>((M&0V$HSK -M+Z/I.E=@L*7L'"BFFG'`^O7?R^R9ZE4QC_)BT7^0E)A&FR1DAYB3G0] -MB^_=_>/-\\OC@!.]JN'!5-%8Q0A1%W+18.PD]WCX]LDA#T]C="NOJ#$M-#`Y-BUG<'0N=FAD9BYO=70`K9=-;]0P$(;O +M^RL&<2@J(K(=V\E>D*AH$;>EA1N7?-A5#RQ"0HA#?CPS=M+863M2D1,KRFKB +M)_-.9CQ>QOP!(`6P+G'-&Z:;*CZGP_7!T7C_,B"^GUS8`"L$>MR`1B;H&6/` +MVGDP[F;YR3A$N]X[7+4>;ZH`-X:S-B-O"'&5QRUR[?8;3A_NO!/N^RA4$`($N'J'A('H"3N/ZLM'CKFM@?>#Z?7G-&Z93%9\>*&=@,0^E +MM4/!ZB!

H@7,'J(%S1ZB!@P>H@7,'J(%S!ZB!I`H&'EFCCA*/<,@T:# +M;6@#$;F1;<=3]0?W%71<17*-V&O].TT\_3%,P29.N-TF;DU6[')LQ!9LXH0K +MVL35O/W6-6A77UK1?2-!8TFU(5"L.>.`P\^S&7X__0VCI]S*#.LF>3-HOJ@I +M,3662$54``VEM9RTQ>#$M-#`Y-BUM8G(N=FAD9BYO=70`K94]<\,@#(;W -M_`KUNF7P`09,UES3N7>]?JS$L=,,;9<.'=S_7LGX`TSM)#UBV2$G]/@5$H0Q -M]P&0`IC]XSGO:+99>#6K]:JE\?UU0,.@KB-@AD"'*Q&'$]"LZ@9HC`,)QQN- -M,Q"\&SN#)AL_-YF'.PQ1LX]:29Q?IV!X2XI@9G.)T+@4%\8]6UB&2)(=T$?Q.E:PA7A?.[AQ)ET(<3M -M%VN[K.XF5EZX/KT?>UQ_5/4OEIH672%$1NFB0YLQW?OMXUV+W+X-ZO)X -MD<8HO(L#,`FIT<5X12;1/VWM@ZG -/$[>*96SU"XRD3B>_"``` +M'XL("#T7AE4``VEM9RTQ>#$M-#`Y-BUM8G(N=FAD9BYO=70`K96Q;H,P$(9W +MGN*B;AF0;7R&K%'3&:EJ.Q,"48:V2X<./'S/&(.-`TDJP\4Q.OOC/]_9,&8N +M`"F`55?:94>W3_V[2[9)3^/'QX`%@[8-@"D!#:XF'`T@JW#HD#$.6CC]R#@# +MP8>^,>C2Z=JD#NXTS@IMV>'B4H.SX;:/`1&AJ@+@F]4G8J=#:B#F(!%002'N +M#?CC\#X+V.!XK/4S.'$+-PKF]^`R/1DX'QGW+ES-<3?N08GXAX$HC]9J`)I5-@N.[HR]6\#E`,PV@KB +M\"E2&:@65`,*=3^7H':0%RY0^)74U=]?3?US^74SK'%\_'*$IN>+3.\6E8.H +M]$O42?<=?4^'\_;R>;8X>U39%TNE%QT)(H-PT0_W9?_ZW"/+25T6+A*ZJ[=3 +MP"1P[@4^J"O]54``VEM9RTQ>#$M-#`Y-BUP8SDX+G9H9&8N;W5T`*V4/4_#,!"& -M]_Z*J]@Z1/;E[+AK19F1$!]K"$GI`"P,#.&_X\NG'3=IBYRXD:O+/7E?GWU" -MM!<`(8C\Q',^4.\2_ZY7FU5#D]5U0*4@#X&/%MC@D/5M"0H".YL,J*IQ>($Z -MF5P]3MI@".JR9@,G<)U=BKQ^V!A6&9`"I<'@I0J?]T\G#&,\PRT.S^$&P?(2 -M7,I9SIM6+N.M1YQM*3.(D1YE5D5=[,@FDF>6V<0=@\7($P70Q\X -MU!=&?=M0!GIV%_1!:#=G7.:_+QT/Z#>>._IN]H?-\>/0X_I6 -MU7^8-"^ZLA`*[-J`-J/=N]W#;8/_464SRZYNE -IP6Q9@3*-S'YX?[P`XUZFK8IQ2DRR_EO;%J#$M-#`Y-BUP8SDX+G9H9&8N;W5T`*V5L6Z#,!"& +M=Y[BHFX9D'W8!M:HZ8Q4M9TIA2A#VZ5#!QZ^MC'!AX$DE<&RC`Y__+_//A@; +M+@"!P.J%?CW0'U)Z]\D^L33>W0>4$NH0^**!%H=&7RF@$:!'LP9=-S42Z-/9 +M->*X#H8@-VLUL(!S=D7D]4-K6.8@)$@%!=ZJ\.WXNF`8XQD><'@-=Q',;\%E +M9I;WIE:+_();"PRXG6/M)IS84J<1K+W+K(R[61"+V3P_S\#T'FZ`%2Z&%'C) +M+TSZRE`&$KL;^B"T6QM<3M_G'@ZOV`6*>]_,[;:Z7:BNB9R,;'XR;CRY!D)/ +M[H##N(5`V,JL=Z"ID4&_'NBKE-X#4#A@M!64[M^A,E`=J!:4-.-<@"HA+WP@ +MTIW4-]]?;?-S_O4S;'!\5M']9N9C9DZ+R@%K\Q'U8<:>OH?C:7_^/(VXL52- +M'Q;*++K4$!'8E=3NT^'YT2*K25T6+I+T5Z]4P`1P3HP[=17=SM+F=S3;ZCZS +A,L=&'DA@L509G&2S6?_-[8!3D;>*_JLE?_.D>A9P"``` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,14 +1,14 @@ # $FreeBSD$ begin 644 img-1x1-4096-vtoc8.vhdf.gz -M'XL(",R;>54``VEM9RTQ>#$M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME$]/A#`0 -MQ>_[*9YZVP-IAU+@NM&]F9AX\2@+9=V#FA@/'O"[.Z6PT,+^B:$4`GG,K_/: -MR0CA!J`T4H).[%2$)(92B!4+%5B?3C3;+V,VS_?J,7*C63F89'$V1)P3FB@8 -MS6K=`3,O3IX'9A`Y!,T"'2X?HO*+N'/Y.5RQE%V'VUV+T_RL4!D8$^!>1[AR -MX<.0$[L&?.`DVV*Y!+Q1@5UI[;K@\(3E*1P+S0#R<8-=&H60AY-SV2%RMX^K -M!ER0XX7=\_/K<6;14I'UM;BJP,Z`""*>X&Y['-FHA/\O9IZGA>8I\B]7*JH# -M+E9[BG1F91U#U]"F[54Q4@6=(\W&0/*.&4WY^6'*[\//>/\LSC:JNIZ?-IZX -M"?(B*:BPB^C*OH_RNWO8KP_O^QY'G:M^86ZIQTX:NF1!9X/=+??1%KEY.V87 -M3S=IB.([Y<:L(*5GO,N.,=&O;U8=S9H:2=:FV4_OPQ,L[B6L/8M+1!#U_U*V -1.+UPJ11"K/X`5,-&%]T&```` +M'XL("$47AE4``VEM9RTQ>#$M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME$UJPS`0 +MA?WS#_#4W8IK&^PMQ![23'#W)N*$5VGZOLFLOP?SHV*B-A.AA[[E42I8*I459#H$BN&>[P\6X/7Z?OX?GIV*BZ+C^]7E`3I$U* +MB,9O8EK_/,CO[NFX.;T=+S@175TVII9Z[:1CESJUNZ4^>D;N^NSD])#T\/1J +M`Z;`>6(\9K=+B\7CU-6LI56>T[S,Y"4)9&O/XS0;J?Y?RAYG%BX5JKW5#QL[ +&&6_=!@`` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,15 +1,15 @@ # $FreeBSD$ begin 644 img-1x1-512-apm.vhdf.gz -M'XL("*2;>54``VEM9RTQ>#$M-3$R+6%P;2YV:&1F+F]U=`"ME5UKPC`4AN_] -M%6?L3EA)DY.DNYQ,[P8R&>QN%-NZPM3BA.VB^^_+ITT_%#<:CZ7E-(]OWG,2 -M";$#`#EP"D0%<4%C8`C-@GC]':MQ@Y$8]L;"87)AU'A=U1CV96B#5:4X` -ML]X\%@+C=J)>/G6!%J?U80R2Z!!K$/PJ?0]5]9$/X.A8R[4XUE?'"W,?`T@* -M$D'GA6![+_>[-XU#A1*8GR[^HVZ;5H#H^`USO=_GZ6'Z'.UCC=(6+8CCT?,KT -M?X&00%-SQ&3Z/M!W.]],R^W&X_SIYW]8U?I4XNXJ54(DS7(7JL`&.7L_J6-] -MDYI9ZBLSWV -1%B=&;I64D,DOU%=49]('```` +M'XL("!,7AE4``VEM9RTQ>#$M-3$R+6%P;2YV:&1F+F]U=`"M55UKPC`4??=7 +M7-C+$%;2Y":ICQO3MT&9[%F*;:4PM3AA>^B/7](D-OU0W$B\A(;;'$_.N;DE +MQ`P`Y,`I$!7$!DWTW*T'`I(=#^PMWNDMNJ*T@'UO +MP?'#T+6'K1U""Z^,4($4.`-$H+DBSG5.K4>`JU-1O*Q?GSY6:U\_Q,#\Q!WZ +M44\_JQ__!G/;GE#&XATXX=&XO$??460M=R +M'/<.;MFEOGH&#B^'+=3,6IHN>HM>8K(W:[BV^_DO_]=;`R<"EXKZ4,Y^`;>54``VEM9RTQ>#$M-3$R+6)S9"YV:&1F+F]U=`"ME,%.A#`0AN\\ -MQ1AO:T+:H2W=*W$]FYBH5Y:%=0_JQ8,'?'<[0*$#"[L:2H&2Z7S\,]-6B+8! -M*`21GWG.&^HLYE<=;:*&A@34*2@-VH!UT\70V032U[SN'C4 -M/`XOX7K!\AI<0E[!S$0!RAXW9VAPZJ9%T=OCU)(ZEPE1_BE8O5;N?&WMR"^L -M,^`>1`'"=C;D0*KO'0U@T+>=RD`6[H(^F(:;$R[E\V6`PPOA`L?M%VN[J,[7 -M-L05*Q^,*W#$M-3$R+6)S9"YV:&1F+F]U=`"ME#UO@S`0AO?\ +MBI.ZH`S(W\`:-9V1*K4SI1!E:+MTZ.`?7Q]@\&$@:86Q+)!]#^]]^!CK!X`2 +MP*J%=7W#GE+ZV,/QT-$$`G4&2H,VD+OC;)KD@VS8U_-+&@X[X/B6U3HNG0V/ +M$[=PHV!^#TZB%2<4D8^XM8T>EPRL9,*I+74N$JSYD[-ZK]CYW.8SNS#/P%M@ +M&ICW4E#@F%^8]!6Q#$'9R28%DP#1N-[ +MIL`4D.4A4-!*LO779U-_7W_"#",.$]*VRQ/MA<3;8C(0%?[$O.-[H._A?#E> +M/RX>YUN5_[$R&'3M("IR5U-WGT[/CQVRG-3).$@ZC%YA@"G@G#@^J"MI.2-. +GC54``VEM9RTQ>#$M-3$R+65B!L81MGS36=>]?KQTH(I!G:+ATZT/]>"_-A8R!)SV#`G*R'5Y9L&+,' -M@+DFV[RA3D9'O=JL&AH_W`RLJDF@Q17&RPPP+9=MQS3&'1QG@'Q>W]K%'6.' -M6]T&E!+R/``^=_J0O`0"RR?N\X9ZE_AGKT\04&8@)$@%&J\-^'7_,I4.P6/- -MG\7A)5POF%^#2\G+&>E6QKRA'LK$/CN<6%)G$*R\*5@9N?:$'OFY>09F5DD! -M3+4/]F/BG!8H6&&T&!2I-9I6"JD"5H"3U -M,P%J"YEV@>A74EU\?9;%]_G'S3#A>/_G"!OY8TJK166`.7U$':GOZ+O;GS;G -MCU.'Z[:J[L-"T:1+`Q%!N,:@]!#NP^[IOD'NWGMU:3A)@Y>YLB,P`9Q[@;?J -M#";Y]8,5?;!E!5(W,KOFO7@&PKV-MRK"23;R^F]N+4Y%+I6#$M-3$R+65BT^H?>@3QH@9B`14$$N[@WXX_`^EP[)8ZV? +MQ8E;N$$POP>7&B]OIE\9RX9V+!/[[W!R39U&L/JA8#%R[)16P +MO+<)"ASR"Z.^(I0A2+@K^B`,MS2XC,[G'D[<"!+KD`]*^R7#>TQH;<%RAX8;06Q_Q2I%%0#J@:%9IQ) +M4`5DN0\4M)+:ZONKKGZNOWZX/7XZP&7^1FMVB,A"E>8DZF[&G[^EPV5T_ +M+P[GCBKW8JG,HJ.&R"!&BX3^ZA4*F`3.2>"]NB,M9^S. +G>1=LK?NTD^D:>2"&V:/*X)!-O/Z;6XM3D4M%U][F#V=DPAR_"``` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,19 +1,19 @@ # $FreeBSD$ begin 644 img-1x1-512-gpt.vhdf.gz -M'XL("*V;>54``VEM9RTQ>#$M-3$R+6=P="YV:&1F+F]U=`"ME4N/U#`,@._S -M*SS:"UI$E3B/9FXP8E=P6V"Y<>ES60D&(7'@4/X[<9(^TFD&=I4T4V7D^*OM -MV#%C?@!(!%9MO-."X5C$S["[WCD:KY\&M-\G$U;`P@(]KK%"AK2GZZ#OPV3< -M:7EE(0%Y6(^X8AIR7RQP[:1U/M."!$^P+[.[R*VP;T$:$`B\7UG'D^Z^PY6[ -M'F<-`B'6T1YQ(H43^W7T/$X0CE_`;4T8>`(G+VGY'/J_L_4XQ6(ML]0R"@R" -M;J"MDKAO$4YGSCQ)XEI#V8#N0'%H>EJT&CBW]MDR,0Z"@"VP`Y0VT#4!A].' -MXN1AKXJ?+X-]DH>,V)II02IZ$B]E!!GU#WH>0+%LS+4A& -MK_+1VPX2&;59,L,8M6(?X^K,T=,DMO5A[^_S=UHPW!7QXX$R`+-9*%'GK`[" -M9:P.PF6L#L)EK0X"9JP.PF6L#L)EK`["9:T."W3)G*F)$\XU\9[B7`N0*S.2 -M[9CL>TTH$;NK\5+K3S?QQ&'HC$V<;N$B?;1BX>:N%6@SNWM[_/36(8]?)^LVKJE9R_Y*>YE( -MNF*6C@?K+*;X$SLK)V>['M"0[C2C/Y&`<"\V,L^X5%EN?N[9>ESN5*D8V_T% -(**T"\+,-```` +M'XL("!X7AE4``VEM9RTQ>#$M-3$R+6=P="YV:&1F+F]U=`"ME\%NVS`,0._Y +M"@X[=&A10Z(EV3ZN6`OLEJTM=MG%D>6BP)9AP`X[Y.,G2G(C)9*W#K()0P'- +M9Y(B38)(,4+SL4N=>S?[=U'V+[__$"PK\=PD5OEK&&8P'2$2+WC*^$^ +MI.%Z'!)N!NRRP;9%W,5I]CRN)=RT@LM)&2?6K'P-_=O>>IQDJ54?6_42>@2E +M81J+N&\)3E6N/$'JG8).@S(@.>B9%I,"SJU_MDU\3R#@!&R`C@/N"'C8?VKV +M'G;=_+P*_@D>*B(G944I>P+7*H*<^DNXD.+:VMGK*7NR6O:&4"PY*2N*V1M] +M]O))(J=RK6MQ(6O-FQ2WJYP]16K;'_;]?7XM*P[;)CT]4`1@-0_%/.N*W4&X +MBMU!N(K=0;BJW4'`BMU!N(K=0;B*W4&XJMUA@8;5&^*$H]J;;,X'D':(IU53 +M'L?6OR_WSK&+)%R#:Z-_98CG-\-4'.*$6QWBLRD'&XZ38"L.<<)5'>(R?'ZK +M%I3K+R5IW0E0MJ7Z&(C'FG%`_6-O]*_GWW'V",=]162%[+&EPE0=X$@/41.M +M(__>WCY=/G]_6G`8HEH>3!6-5()"G(4KTW#O;NX_..3VZ%WF-27C[`T*F*!7 +M3!QX\&Z;EHIT7T!+L&8&W9+MBR0_$D6VD`GG2B6^^7_WUN-JEXK]:[#Y`[$* +&K32S#0`` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,15 +1,15 @@ # $FreeBSD$ begin 644 img-1x1-512-mbr.vhdf.gz -M'XL("+";>54``VEM9RTQ>#$M-3$R+6UBR?@#3.TD/6+9(2?T^!42A#'W -M`9`"F/WC.>]HMEEX-:OUJJ7Q_75`PZ"N(V"&0(*KU]HQC9QWSU.+JE#!*NN2E8E -M[CUI)G%^G8'A+BF!F%\[N'$F70AQ.T7 -M:[NL[B965R8NAIKNC`MW+D'"G>MP(NU!(-J3!3L09\7/>4?SD(67`\H.F&P% -MI="&W#H'78.N0"L:%Q+T!@KC`T7824WY^5&57Z=OO\*$X\,_1VP4+W+:+;H` -M8>DE^D!C3]_M[K@^O1][7']4]2^6FA9=(41&Z:)#FS'=^^WC78OV#J<3 -.MXIE;/4+C*1.)[\(```` +M'XL(""(7AE4``VEM9RTQ>#$M-3$R+6UB> +MXJ)N&9!M?(:L4=,9J6H[$P)1AK9+APX\?,\8@XT#22K#Q3$Z^^,_W]DP9BX` +M*8!55]IE1[=/_;M+MDE/X\?'@`6#M@V`*0$-KB8<#2"K<.B0,0Y:./W(.`/! +MA[XQZ-+IVJ0.[C3."FW9X>)2@[/AMH\!$:&J`N";U2=BIT-J(.8@$5!!(>X- +M^./P/@O8X'BL]3,X<0LW"N;WX#(]RQGI5L:RHYO*Q/Q;G%Q31PC6/!0L1JX] +M6N"OZ(`RWTKC<'\\=G+@1+OBXXVIN +MU]5M0G5UY&3@?&?@=I`7+E#XE=35WU]-_7/Y=3.L<7S\@^>X>E1I'++9K/_FUN!4Y%*AVDO^`""! +&+FB_"``` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,14 +1,14 @@ # $FreeBSD$ begin 644 img-1x1-512-pc98.vhdf.gz -M'XL("+2;>54``VEM9RTQ>#$M-3$R+7!C.3@N=FAD9BYO=70`K90]3\,P$(;W -M_HJKV#I$]N7LN&M%F9$0'VL(2>D`+`P,X;_CRZ<=-VF+G+B1J\L]>5^??4*T -M%P`AB/S$;54.3U75`I2`/@8\6V."0]6T)"@([FPRHJG%X@3J9 -M7#U.VF`(ZK)F`R=PG5V*O'[8&%89D`*EP>"E"I_W3R<,8SS#+0[/X0;!\A)< -MREG.FU8MR@$W%VAQZXZU'G&TI,XB1'F5615WLR":29Y;9Q!V#Q<@3!=#'SC4 -M%T9]VU`&>G87]$%H-V=L0L^[G6QMLOJUJ&Z(G(QTNG)N/#D,L0_ -MN2T.XS8":CJSW8'<(X/G?*"^3_R[!5('C+:"A-IP6*>@*]`E:,7SC$!O(3,N -M$/V=5!=?GV7Q??QQ*\PX.>GH[N!\3/FTZ`PPYX_H-YX[^F[VA\WQX]#C^E;5 -M?Y@T+[JR$`KLVH`VH]V[W<-M@]R]#^K2<)'&+/O+WD`02.D9[]193/+KFZ7! -H;%F!,HW,?GA_O`#C7J:MBG%*3++^6]L6IR-OE5R(U1]?@1I9<`@````` +M'XL(""<7AE4``VEM9RTQ>#$M-3$R+7!C.3@N=FAD9BYO=70`K96Q;H,P$(9W +MGN*B;AF0?=@&UJCIC%2UG2F%*$/;I4,''KZV,<&'@225P;*,#G_\O\\^&!LN +M`('`ZH5^/=`?4GKWR3ZQ--[=!Y02ZA#XHH$6AT9?*:`1H$>S!ETW-1+HT]DU +MXK@.AB`W:S6P@'-V1>3U0VM8YB`D2`4%WJKP[?BZ8!CC&1YP>`UW$F5HO\@EL+#+B=8^TFG-A2IQ&LO;H`5+H84>,DO +M3/K*4`82NQOZ(+1;&UQ.W^<>#J_8!8I[W\SMMKI=J*Z)G(QL?C)N/+D&0D_N +M@,.XA4#8RJQWH*F10;\>Z*N4W@-0.&"T%93NWZ$R4!VH%I0TXUR`*B$O?"#2 +MG=0WWU]M\W/^]3-L<'Q6T?UFYF-F3HO*`6OS$?5AQIZ^A^-I?_X\C;BQ5(T? +M%LHLNM00$=B5U.[3X?G1(JM)718NDO17KU3`!'!.C#MU%=W.TN9W--OJ/K,R +@QT8>2&"Q5!F<9+-9_\WM@%.1MXK^JR5_\Z1Z%G`(```` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,14 +1,14 @@ # $FreeBSD$ begin 644 img-1x1-512-vtoc8.vhdf.gz -M'XL("+>;>54``VEM9RTQ>#$M-3$R+79T;V,X+G9H9&8N;W5T`*V43T^$,!#% -M[_LIGGK;`VF'4N"ZT;V9F'CQ*`MEW8.:&`\>\+L[I;#0POZ)H10">%YBGR+U]BO#^_['D>=JWYA;JG'3AJZ9$%G@]TM]]$6N7D[9A=/ -M-VF(XCOEQJP@I6>\RXXQT:]O5AW-FAI)UJ;93^_#$RSN):P]BTM$$/7_4K8X -0O7"I%$*L_@!4PT87W08````` +M'XL(""H7AE4``VEM9RTQ>#$M-3$R+79T;V,X+G9H9&8N;W5T`*V436K#,!"% +M]SG%@VY""D;_MK>ES:X0Z`7JQ'+(HBV4+KK0X3N*E-BR53<4*XJP&;]/\Z1A +M&`L#4`:E@-%^*@$MH12DID`+BD\GW/;3VH>71_UXP\*7 +MP2=V+>C"1743<#VVR[W=(![?,/\-1P&WGN07<+U=,9"(!,=SV:$(_Q37]KAJ +MHIHSN\YF9QG8J+HN/[U>4!.D34J( +MQF]B6O\\R._NZ;@YO1TO.!%=73:FEGKMI&.7.K6[I3YZ1N[Z[.3TD/3P]&H# +MIL!Y8CQFMTN+Q>/4U:RE59[3O,SD)0ED:\_C-!NI_E_*'F<6+A6JO=4/&SL9 +%;]T&```` ` end Modified: head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,15 +1,15 @@ # $FreeBSD$ begin 644 img-63x255-4096-apm.vhdf.gz -M'XL("&NF>54``VEM9RTV,W@R-34M-#`Y-BUA<&TN=FAD9BYO=70`K55=:\(P -M%'WW5US8F["2YM.];&Q,WP8RV;.4-I7"U.*$[:'^]^73IA^*&XF7D'*;TW// -M2:X(V0%`&3`,2`5R023D*;3/O8!F_IZH\9CXT4PL6(JN[+H,E_1&,YE:0*S3 -M#`$M!OM(")AV$\WRK0]HX30_FH)`.G@.G-W$[[FN/^4('(Y5KH4C0W:L-&ME -MAL`@*/`'-_,2N-1IQVY=9X=C=:SVN[6'HPJ.%WJS^`N[;5:/LF.1O:4W>CMS -M"^P`N]Z"YT=CGSUJ[.!:>&6$"HJ!$:`4<*&(,YU3SP/`Q4'*E]7K_<=B%>I' -M:61^_`;]<*"?O22A?A#RX['UXU?U$P2$&#F;K7Y?W_8@>GZ1]4N1TP]E(_/E -M1+-,NC\+2!U@-(:BF)GNQXF[ZUI$XGO`+`3$K;T&,-_O9'ZL?L(;K.&TPV4Y -M'GH_)OJ_@`O`F6DQA5X'_.[FFVFUW7@XW_W\AY779XO[58H"9K@M=Z$,-I"G -MEAT9BM3NLM]1/$G9*=RQ.YGY*2R6GHN5TG`,HO_<)D9[LX8SW2]\^;_>6C@> -/^:BH9CKY!5KF!832!P`` +M'XL("&87AE4``VEM9RTV,W@R-34M-#`Y-BUA<&TN=FAD9BYO=70`K57+:L,P +M$+SG*Q9Z"]3(>KJG/FAR*X2&GH.)[6!H$I,&VH,_OEI+2B3;"6F1O`B)M<:C +M&6E-B&D`7("@0'00&[SKS_->0#M[3W1[2EQK)P8LO;;J,ES2:^UD:@`IIH4F +M5`S6,1\P#1/MXJT/:."0'T]!$0RY!BENXO?<-)_E"!R-M5T#QX;L1-6-4P!% +M07&0#[:7%<@2TY;=JLD/Q_I8[W[^R0*+PV0@>G(!AP#K30Q`7F]'P`.#^4YSO`]7Y7KH_UCW^#,UN=JVH\<#UE +M^"^0"FC>E9@"QQZ_N]EF6F\W#LY5/_=A[?7)XOXNLW"[54``VEM9RTV,W@R-34M-#`Y-BUB.,LB10UG2M5:F?7QE&&MDN'#LY_+Q@3'\:/JC+&"'3?RUV2[K:,P!I08A02HH['8R]&@1"=JW\VN.6]OCZ)+6 -M/"X?M8!C:[A@,&_F<$>$XU;8H)V$(JV*`C?]`L\1[N#_@!-+UME($#,EF'56 -M;A6[D-MBI(?S#-0`Y4"*7L9BX#V_,-BW3\U@D;L+]D'J;NEP.MY/$8ZMN`LQ -M[MWA4#ZC%*Y$[Y!:5VV<##Y^&7]\N0X2OUR/8]L6`M95%GL#[:YTG!>TSWG\ -M>:#H@9M%4-=%5ZH4!]6`,J"DFVL!:@^ZP$`6WZ2V^OHTU??U!V?8X:@O!I/= -MZ3/N7HO2P$IWB*K='-GW<+[LKA^7@`NE*APLE`NZM!"1N*OKOM1ZW-/IY;%# -MW@;K>!JD03I\A^-+5O.X +M?#`B3JSAHL.RGL,=$IP,PCK19#RQJCA(U^_5!.X^/,<>IY:\"YE@;DHP&ZS> +M*G>QMG9@E]89N`,N@=E.)BCP5E_H_=N/W1`DW`7_8!QNB;B"ZO,$)U;"!8I[ +M0QPGRGT)5[)W''M7;5P,.;P9?[RY"*$WM\6);1N!:#I+.(%!:_R>%_BGG,X6 +MJ#K@9AFT7>\S$DP-QH'1^%TH,'LH;`H4]"3YZNO35=_7G[3"B.-M,YA<:"\D +MWA93@"CQ)^8=OQ/_[LZ7W?7C$G&Q5<4?*X-)UP&B1N%:&N[CZ?EAZ)T<)\F2 +M[''T,VU[(7"2O4.*4[=@G6M:(.\7V1#!9*M"G&8#J__6ML69C8]*.'S9+_P) +&SWLP!P`` ` end Modified: head/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,15 +1,15 @@ # $FreeBSD$ begin 644 img-63x255-4096-ebr.vhdf.gz -M'XL("'&F>54``VEM9RTV,W@R-34M-#`Y-BUE8G(N=FAD9BYO=70`K90];\,@ -M$(;W_(J3NF6(``-VED2*FLZ5JK:S[>`H0]JE0P?_^-Z%X(#!^:@`&]D^>/P> -M=QQCM@'@G;RF#?UBU/K9?':B\>9Q($\"+:ZE59RFU8K&HJ-7&@=0U -M=;@3S*0,D\ZJO,E280_7^7$&;H`7P*JS383`(;YPT;>,98C`W2OZ(':W)EP9 -MSN<>3MQP%T)<,U261`AO[-XJ5M=F#@8?GXP[3RY!PI-K<2)O(5B>*@MF(,Z* -MQVE#_[H(NP7*,S#;#G8-,M&L"]`=:`-:T7,I02^AK'R@"#.I;[^_3/MS^/4C -M3#ANBT'RHO6BH-.B2Q`U_43OZ-G3][3=SP_'O<.Y4N5^+#5MND*(C-SM&F#R -MXN[+YNUYK*Z(-^FRRKJ).OVRAU^"W5O[.#DX:XR3Z:[@)3`D2Q7A%!NM^F]L -1+4YG3A7-V.P/(8K+DQ`)```` +M'XL("&X7AE4``VEM9RTV,W@R-34M-#`Y-BUE8G(N=FAD9BYO=70`K94[;\,@ +M$(#W_(J3NF6(``-V%D>*FLZ5JK:SX^`H0]NE0P?_^-Z9X`+&>52`C;`//M^+ +M,V.V`>"=O.8%_2IJ_6*Y&&A\?S^0)X$6U](N3LL:16/1T2.-(Z[%9Y/0;X,= +M6^WC#KG-[>X#*@5-,P&^.OU$YG"4AL12`&L2X[R@WZ["[H#5D#"J!*E`::C$ +MK1J^[]X2\:T8SV6PQ8EK.*>PS:`4;N/A"A1VWDJ;B>==?M[Y& +MZ[F'$U?,A1"W'RM+(H17O%=/M6LS!X/')^/&DTN0\.1:G,A;"-9#9<$,Q%73 +M<5[0/Z_";H'R#,SE0>[^;;H`W8$VH!7-2PEZ#67E`T6827W[]6G:[]./%^$! +MQVTQ2%ZT7Q1T6G0)HJ&/Z`/-/?T>=L?EZ>/H<*Y4N0]+34Y7")&1N3PV]VG[ +M\AAK5\1.XI'W!.GIESU\$WAOX^/D:*S!L1UP[@H>`D&J5`TXQ:)=_XVMQ>G, +.J8+_W<4O_(N/54``VEM9RTV,W@R-34M-#`Y-BUG<'0N=FAD9BYO=70`K99-;]P@ -M$(;O^RNFZBU5$6#`[&6K1$VDWM*O6R^VL:,37FX9UAQ@/GX0>@)/!FY9XWG.Y8>IUV-SM/$^UU0%R?)"R`#($!UZ&12WJG -M[V$8QL&%GQ4F=P*J?GR><&S^'5B$<^=9ER-OB'$LX"9WA^N`6D/37`"_3_JD -MWPX-RH#:@\3W.2@!6H)69YSW77>QOON'3_!X^^4;P7[,[DI!(AS8!CH#M5NH -M$QONOJ;N!AP*`MR01;0G7)7%'9;1"[@*C6V_@5L;>9S:FA5RZ-_V-N`T3V?9 -M>!9J;BL8&FAH@$B1+W4`N0 -M+0%/Q\_L&&#OV:]WHSXEQHQ8&WE#+GJ*4H7;G+LUY?:FNY#BJM+1LQ0]72QZ -M^S%9UD;>D(U>$Z*W'B2*WEKI(FZ,&GN3XMJRT1.^:V!]X/?[\IXWG!Y9>@6@ -M&H'%%-:N[@M6!^$*5@?A"E8'X8I6!P$+5@?A"E8'X0I6!^&*5D?M;#A3E6GB -MA*/<$WL0"H::6GDB(]N.9WV'V%W+Y5;KWVCBJYMA><$F3KC-)MX.USI;L(D3 -MKF@31Z`_[YD*C*\OH^FY5F"PI&P,E'/.>&#W\]AWOY__+*+GSWOG0_)BT'Q9 -M46(:+)&&%C&.GB-];^^?;IY?GB:<'+V:%J:,QBQ&B+IP%T^75L[N/MQ]_>B1 -MK[.ZE<_4/"NL@SJK(7%\5!?.HQ]B9]79V=Z!0XUJ'LF?Q)!+Y'#>BU_^W[T- -0N-*I@N>]W5^),'7#A9X7).!1?KCV.+;^W+,(-\:S5*!MB'`NX<[C3=4"MH>LN@%_/_DF_ +M'!J4`;4'B?=C;`*T!*V><3YV[6+_[NX_P,.[3U\(]FT)5PHT]@)Z`YV&MEEY +M)S;"_96&&W#H$&6_F;+!-D7<89V]@&L(-VS@XJDPFTIW):TO1DNI+BF=O8L94]7R]Y^ +M%DMNE`W%['4A>_DD4?9RI8NX.6OL18KKZV9/^*Z!]8'[]^6Y;#@]L/0(0#4# +MJWG83I.K6!V$JU@=A*M8'82K6AT$K%@=A*M8'82K6!V$JUH="!QYO29..-*> +MVX/#G/?0IZHIM^/%OT,2[BBW6O]&$\\OQEBQB1-NLXE/X[7!5FSBA*O:Q.W\ +M^FT:,+Z^C*;K5H'!DK(Q4"Z:\4#WXSBZWT]_XNQ9OS/#\I*\&C1?-B1,@R72 +MT4/,0->1?R_O'F^>OC^><7*.ZOQ@4C2J&"'J(ER;AGM_^_G]VKO,-F63[(D+ +M.:^V@4.,4\_!XJ54``VEM9RTV,W@R-34M-#`Y-BUM8G(N=FAD9BYO=70`K90];\,@ -M$(;W_(J3NF6P``-VED2*FLZ5JK:S[>`H0]JE0P?_^-X98X.Q\U'9$(1S\/@] -M[CC&[`,@!;!B8IPW-/LD;,UJO6IIO'P,F#-@/`(F"+2X"G&X`&46BL:TIE<: -MR<"H5_ANNKGMT"`AV6'#9YMXN&._*^[SAA;G/X.[]6-`I:`H(N"[TR>NRGA< -M7V86CF_>)HS*0"I0&G)QK\+/P\=(H<7QI1RV.'$+YP3;#)K"[3Q4T=G@0S4X999]6RR9)C"_?Y<09N@*?`\LXF0F`?7QCT -M;6(9(G#WBCZ(W2T(EX7KN8<3-]R%$%?VE64BA#=.;QNKJQ8.!A_?C#MO+D'" -MFVMQ8ME"L&DK"V8@KHK'>4/SFH3-`F4'7.P$ZQ*9:-8IZ!JT`:UHGDG0&\AR -M'RC"3&JJ[R]3_9Q__0@3CMMB,-EIOTCIMN@,1$$?T4>:>_J>#J?U^7)R.%>J -MW(>EID-7")&1NW4)3`[NONS?GL?JTOB0AEW63=3IESW\)SB]G8^3O;/&.)FN -?!R^!8;)4$4ZQT:[_QM;B],*IHAE;_0'0:Q,V$`D````` +M'XL("'<7AE4``VEM9RTV,W@R-34M-#`Y-BUM8G(N=FAD9BYO=70`K94];\,@ +M$(;W_(J3NF6P``-VED2*FLZ5JK:SX^`H0]JE0P?_^!Y@'#[L?%0`03@'C]_C +M#DR(+0"<`6DF^GE#ORW"VB^6"T.C^\>`-0%"$V"!0(MK$8<34&8C=%]V^E'W +MVD!T:_%9#6/;H$="L<&*95UXN,.X*FWS!H/SR\7=[C&@$-`T"?#=Z6-793RN +MKU*9XUN;A!$5<`%"0LWN5?BY^X@46AS-Y;#%L5LX)]AFT!1NX^%*-';>3)N) +MPRH_[_RQAUO;G\/Q:^IP)XB:,LPZ*_(F2XTU7.?'&:@"6@*I!QL+@6-\X:)O +MECAVPUT(+L,%1>QE,-KV>E?JTR`I8HU\B#WKLZ7O:'9>G\]'AW%7E +M7LREWG2!$!ZY2V-W7[9OS[&Z,MXD&NT>TSK]:P__"79OX^/XZ*S"OC4XUX*' +=P#!U51F<(-&J_\;6XF3F5,'O[N(/#6I7UQ`)```` ` end Modified: head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,15 +1,15 @@ # $FreeBSD$ begin 644 img-63x255-4096-pc98.vhdf.gz -M'XL("'RF>54``VEM9RTV,W@R-34M-#`Y-BUP8SDX+G9H9&8N;W5T`*V4.V^# -M,!#']WR*D[IE0'X#2R)%3>=*5=N94!-E:+MTZ,"'KP_;Q,:01V5,B.'PC_\] -M?(38`T`P(,W,==G0[XIX]*OU:J#1[CZ@E-"DP%<#''`,]=4"6@%F-CF!=\., -M)H:^<,?6_7L<-<84Y%8M&D9<,>*\&18;M!2X=C?A/,!M[,_CQ"5U -M)A)$SQD6G95YBZ4R(UX7YAFH!LJ!5,[&8N"87SCKJU,9+'+W@CY(W6T05\;O -MTP#'KK@+,>Z`N""?40JO1&^3JFLS)X-.=\:-.Q:#O87]>1)%;QOBQ.BLUEZF/Z.;R##;JA`GR635?W-K -0<2ISJ2A"5G]F`B/D$@D````` +M'XL("'T7AE4``VEM9RTV,W@R-34M-#`Y-BUP8SDX+G9H9&8N;W5T`*V5.V^# +M,!#']WR*D[IE0'X#2Y"BIG.EJNU,J8DRM%TZ=.##UT_J!^11&1/'QQ6QASD9JT:9EPUXYR[K'#\"#HKY':%M2RLL#$*>0V,`Q?0D&L5 +MOAY>$H465RPE%D-"_(9I?!"]':YNJ%P,G"Z,Z[JSB9H',`4M%$/NOFZ`@1A`2!-?CFH%HH6Y"((E7TC1\?>3ZC>+:(&TNN7B'<]#O3='8[;T\?1XWRI\B]F0@>=*PA+W,6INP_[ +MI_M4'4V#A)/H$:TS+'OJ3A2]+L2QV5FI^L'@_!E=1(:E4F5P'"6S_IM;BQ.% +/EXKZ\&Y^`;L#9P42"0`` ` end Modified: head/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,14 +1,14 @@ # $FreeBSD$ begin 644 img-63x255-4096-vtoc8.vhdf.gz -M'XL("'^F>54``VEM9RTV,W@R-34M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME,EN -MPR`0AN]YBI%ZRR%B,\:G2EURJU2I+U#;0)1#6ZGJ(0<>OBQV,`2[:62,$-8P -M'__8,X-0&`",0TV`5VXR`A4%QH`2`&IW$NR1;(+9?ROU\/9$Z,O.#[,),&R- -ME^<'KUF#V67#;+8#4"1^>!DH`#6`2!$8<$WT:O[$+>D+N':M<`.NNQ;'[2I! -M*E`JP[U/9UESX!V`W`M13B6@CNS)P"U\"5;WX4:@:\@5I,@23)&S#]UZ?J?XZGR1?T -M.-?Y;/86I_,GMI?:2VH@K;N$2[>?Z+M[/FR/'X<11X:HQHMMCSZWYKPDK&#! -M8[A[VY@]\A35T?PC3;U"#5J=5*=%8T;,6&XCCIV#5=+7+(XS>4D,I>SSN`IE -57C?7AL?QE5-%(+3Y!5F3,44N!P`` +M'XL("($7AE4``VEM9RTV,W@R-34M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME+UN +MPR`4A?<\Q9&Z98C,C[$]1>I/MDJ5^@*U#409VDI5APY^^&*P8R#832-CA(C@ +M?)Q++C?+7`.X0$$A\KYSBIR!#%M=7 +M/I.]R=[KJ:FEYI`"M.X/$;*?>_[NGH[;T_MQQ-$AJO%@4Z//I3E^$F48[L$4 +MYM@=BR_)5[DW:'PR'3X:__;V/HZ?@S4%2#?6YMB#'\%"*OLL+L\BUE>54``VEM9RTV,W@R-34M-3$R+6%P;2YV:&1F+F]U=`"M55UKPC`4 -M??=77-B;L)+FT[UL;$S?!C+9LY0VE<+4XH3MH?[WY=.F'XH;B9>0`ZC"HX7>K/X"[MM5H^R8Y&]I3=Z2]T" -M.\"NM^#YT=AGCQH[N!9>&:&"8F`$*`5<*.),Y]3S`'!QD/)E]7K_L5B%^E$: -MF1^_03\W/8B>7VS]9DX_E(W,EQ/- -M,NG^+"!U@-$8BF)FNA\G[JYK$8GO`;,0$+?V&L!\OY/YL?H);["&TPZ7Y7CH -M_9CH_P(N`&>FQ11Z'?"[FV^FU7;CX7SW\Q]67I\M[EP6'HN5DK#,8C^FOA>.2C --HH[?Y!?6$J;]T@<````` +M'XL("$@7AE4``VEM9RTV,W@R-34M-3$R+6%P;2YV:&1F+F]U=`"M55UKPR`4 +M?>^ON+"WPD*B5\V>]L':MT%9V7,)C2F!M0U=87O(CY]&;35)2S +MHS=I:AH`,F`$4A6I#>SZ\[P7T,[>$]6>$M?:B0'+KJVZ#)?T6CN9&D"BTTP1 +M*@?KJ`^8A8EV\=8'-'":'V8@4AU\#9S=Q.^Y:3[E"!R)M5T#1X?L6-6-,P!! +M0"#P!]OS"KC4:V.E?5>.CUA.I_ +M`1=`BJ[$E'KL\;N;;:;U=N/@7/5S'U9>GRSN[S(/MSM7!O?9T:%(>:!>IGG2 +M*MAXH-ZC#X>GS4JI>TW313`)$J.U6<-UU<]_^;_>&C@>^:BH'^7D%W>2WK;2 +#!P`` ` end Modified: head/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,14 +1,14 @@ # $FreeBSD$ begin 644 img-63x255-512-bsd.vhdf.gz -M'XL("%JE>54``VEM9RTV,W@R-34M-3$R+6)S9"YV:&1F+F]U=`"ME#MOPR`0 -M@'?_BI.Z9;!XXRR)%#6=*U5J9]?&48:V2X<.SG\O&!,?QH^J,L8(=-S'/>`( -M\0U`,"#EQ#@O:$]Y_+79+NMHS`&E!B%!*BCL=C+T:!$)VK?S:XY;V^/HDM8\ -M+A^U@&-KN&`P;^9P1X3C5MB@G80BK8H"-_T"SQ'NX/^`$TO6V4@0,R68=59N -M%;N0VV*DA_,,U`#E0(I>QF+@/;\PV+=/S6"1NPOV0>INZ7`ZWD\1CJVX"S'N -MW>%0/J,4KD3OD%I7;9P,/GX9?WRY#A*_7(]CVQ8"UE46>P/MKG2<%[3/>?QY -MH.B!FT50UT57JA0'U8`RH*2;:P%J#[K`0!;?I+;Z^C35]_4'9]CAJ"\&D]WI -M,^Y>B]+`2G>(JMT`"Z4J'"R4"[JT$)&XJ^N^U'K -M!NMX&J1!RY]C[<1ESSK>6W?KQB-V5MR=-::S$?7Q>A!,EBJ'DV2D]=_<>IS: -.^*H(0K)?SG[[SC`'```` +M'XL("$L7AE4``VEM9RTV,W@R-34M-3$R+6)S9"YV:&1F+F]U=`"ME#M/PS`0 +M@/?\BI/8.D1^QUUH55%F)"280W"J#L#"P.`?CR^)&U^>",5VHEAW]^4>]C'6 +M#@`E@)43[WF!/^5T^FR7-32!0%V`TJ`-V*#.^D4V1.!?SR]Y.GR'XTM6\[A\ +M,").K.&BP[*>PQT2G`S".M%D/+&J.$C7[]4$[CX\QQZGEKP+F6!N2C`;K-XJ +M=[&V=F"7UAFX`RZ!V4XF*/!67^C]VX_=$"3U=M7`PYO!E_O+D(H3>WQ8EM&X%H.DLX@4%K_)X7^*>RAL"A3T)/GJZ]-5W]>?M,*(XVTSF%QH+R3> +M%E.`*/$GYAV_$__NSI?=]>,2<;%5Q1\K@TG7`:)&X5H:[N/I^6'HG1PGR9+L +MS`'```` ` end Modified: head/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,15 +1,15 @@ # $FreeBSD$ begin 644 img-63x255-512-ebr.vhdf.gz -M'XL("%JF>54``VEM9RTV,W@R-34M-3$R+65B"=O*8-_6+4^ME\=J+QYG$@3P(MKJ55G*;5BL:BHU<:!UR+[R:A;XT= -MV\K'[7*[VST&5`KJ.@*^.WTB]P[E2Y7XL-6VZ0HB,W.T:8/+B -M[LOF[7FLKH@WZ;+*NHDZ_;*'7X+=6_LX.3AKC)/IKN`E,"1+%>$4&ZWZ;VPM -03F=.%,.N2IN)YUU^WOES#U?;V^'D)>W0 +M$\RD!+/&JKS)4F$/]_EQ!FZ`%\"JLTR$P#&^\*??>JJ&",R]H!],S6T(5X;K +MN8<35\R%$+\5T^U:S,'@\4#19A)??OU:=KOTX\7X0'' +M;3%(7K1?%'1:=`FBH8_H`\T]_1YVQ^7IX^APKE2Y#TM-3E<(D9&Y/#;W:?OR +M&&M7Q$[BD?<$Z>F7/7P3>&_CX^1HK,&Q'7#N"AX"0:I4#3C%HEW_C:W%Z54``VEM9RTV,W@R-34M-3$R+6=P="YV:&1F+F]U=`"MEDUOU#`0 -MAN_[*P8A<2BJ93NVX[TLHJ*5N!4HXL(EB9.J$BQ"XH#$]K\S8^?+V3C0RALK -MRFKBQ^^,9S+F//P`E`1>K=S3AM,5BZ_3[F+G::)^&A#7)PD+($-@P#5HY)+> -M:5OHNGYPX6>%R8V`HNV?!QR;?@R[D_L;L"A(,`-641[P!7)Z!V6T0NX`HUUNX%;&VFOL^6=9&VI",7A6BMQXD$K56NHCKH\9>Q+@Z<_0,F;$^\/M]?D\;3K] -M\9"\?%I28I@19T2+&T?-,W\OK^XN'[_<#3O9>#0M31F,6(T2=N5LZ"N;H -M[LW5IW<>^3BI6_E,3;/".JBSZ"+'>W6/_OYF[JP:G6T=.-2HIA']B0RI1`[G -7O?G+S]W;@,N=*M@E=W\!E(LU`;,-```` +M'XL("%07AE4``VEM9RTV,W@R-34M-3$R+6=P="YV:&1F+F]U=`"METN/U#`, +M@._S*XRX+2)*TB1-3P,K=A&WY77CTD>Z6@D&(8'$H3\>NVEWDDY26)36JC)R +M\M5V['C*N;\`E`3>)IYYQ73-XGLZ7!UFFNB>!L3WDPD;($.@Q_6HY)+F.`?C +MN`@7\RJ_&$7Q\WC&L?/UB@6X(5RUD;PBQ#&/6]T=GP;4&MKV`OAYM4_.VZ%! +M&5`-2)R/O@G0$K1ZQ,V^ZSZT[^;V'=R]_O")8%_.[DJ!2NN@:H!KJ/7&.I%U +MMV&_8G<]#@VBZ%=CTMDJBSMNH^=Q%>&&'5Q*\CBUM\KGT+_MK<=I'J^RX2JK +MP4HP/0QM%OS`.M(!^I,%@0`BT#\O$SA`)<@#>0"U`=@2< +M3N_9R<->LA\O%ON46#(B)7E%+GI*[F4$&?47=R'&5:6C9REZNECTFB594I)7 +M9*/7^NBE@T1&I4H7<4O4V+,8UQ6.GB$UU@>>WY?/O&*Z8_'M@6H!%K.P'L>^ +M8'40KF!U$*Y@=1"N:'40L&!U$*Y@=1"N8'40KFAU(-#Q+6^F#(:LQ@AZL)=&[M[>_WQS=:ZQ#%EH^B)BW3> +M'`/'$*<>G<5/`SRAN#I+]"-2)!.9<'.JA)/_=V\]KG2JX*?!X0]G0CO.LPT` +!```` ` end Modified: head/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,15 +1,15 @@ # $FreeBSD$ begin 644 img-63x255-512-mbr.vhdf.gz -M'XL("&&F>54``VEM9RTV,W@R-34M-3$R+6UBW0("'98<-GFWBX8[\K[O.&%N<_@[OU8T"EH"@BX+O3)Z[*>%Q? -M9A:.;]XFC,I`*E`:!#-3AEEGU;+)DF,+]_EQ!FZ`I\#RSB9"8!]?&/1M -M8ADB*/HC=+0B7A>NYAQ,WW(405_:592*$-TYO&ZNK%@X&']^,.V\N0<*; -M:W%BV4*P:2L+9B"NBL=Y0_.:A,T"90=<[`3K$IEHUBGH&K0!K6B>2=`;R'(? -M*,),:JKO+U/]G'_]"!..VV(PV6F_2.FVZ`Q$01_11YI[^IX.I_7YQ^K2^)"&7=9-U.F7/?PG.+V=CY.]L\8XF:X' ->+X%ALE013K'1KO_&UN+TPJFB&5O]`=!K$S80"0`` +M'XL("%D7AE4``VEM9RTV,W@R-34M-3$R+6UB/W^,. +M3(@M`)P!:2;Z>4._+<+:+Y8+0Z/[QX`U`4(38(%`BVL1AQ-09B-T7W;Z4??: +M0'1K\5D-8]N@1T*QP8IE77BXP[@J;?,&@_/+Q=WN,:`0T#0)\-WI8U=E/*ZO +M4IGC6YN$$15P`4)"S>Y5^+G[B!1:',WEL,6Q6S@GV&;0%&[CX4HT=MY,FXG# +M*C_O_+&'6]N?P_%KZG`GB)HRS#HK\B9+C35INHW%5.)]Z.';#70AQ^_%FF0CAC=U;I^K:S,&@\NSI>]H=EZ?ST>'<5>5> +MS*7>=($0'KE+8W=?MF_/L;HRWB0:[1[3.OUK#_\)=F_CX_CHK,*^-3C7@H?` +<,'55&9P@T:K_QM;B9.94P>_NX@\-:E?7$`D````` ` end Modified: head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,15 +1,15 @@ # $FreeBSD$ begin 644 img-63x255-512-pc98.vhdf.gz -M'XL("&6F>54``VEM9RTV,W@R-34M-3$R+7!C.3@N=FAD9BYO=70`K90[;X,P -M$,?W?(J3NF5`?@-+(D5-YTI5VYE0$V5HNW3HP(>O#]O$QI!'94R(X?"/_SU\ -MA-@#0#`@SQPUQA3D5BT:1EPQXIR[(G/\&+DHY'Z%I"/DC=;1!7QN_3 -M`,>NN`LQ[H"X()]1"J]$;Y.J:S,G@TYWQHT[%R'QSK4XEK<1U$-G,16(73RY -M+AOZYR(>%B@<,%L$NX/MSHJ#ZD!I4!+GI0!50UF%0!974M]^?^GVY_0;9AAQ -MU#:#V1/7,XZ[197`&OR(^L!YH.]A?UR?/H\>YUN5_[!0&'1I(")QMSL`$6=W -MGW8OCU-U/`W2>95UT^@,VYYY$D5O&^+$Z*S67J8_HYO(,-NJ$"?)9-5_!9P78"CRC@&3X:+#08,5+J+R<.A4) +M))<,J\[RLHNE42V>%^89L`1,`37.1F+@G%_XT]?F,DCD[AE]D+O;:UP=/X\# +M'+G@+L2X-XT+\AFE\$+T=KFZH7`R<+HSKMRY&A+O7(LC90M!:RJ+6H&ZBF?] +MNF%ZK.)F@(=ST.]-T=CMO3Q]'C?*GR+V9"!YTK"$O^I.%+TNQ+'96:GZP>#\&5U$AJ5297`<);/^FUN+$X67 +.BOKP;GX!NP-G!1()```` ` end Modified: head/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu Sun Jun 21 01:44:27 2015 (r284656) +++ head/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu Sun Jun 21 01:55:01 2015 (r284657) @@ -1,14 +1,14 @@ # $FreeBSD$ begin 644 img-63x255-512-vtoc8.vhdf.gz -M'XL("&BF>54``VEM9RTV,W@R-34M-3$R+79T;V,X+G9H9&8N;W5T`*V4R6[# -M(!"&[WF*D7K+(6(SQJ=*77*K5*DO4-M`E$-;J>HA!QZ^+'8P!+MI9(P0UC`? -M_]@S@U`8`(Q#38!7;C("%07&@!(`:G<2[)%L@ME_*_7P]D3HR\X/LPDP;(V7 -MYP>O68/99<-LM@-0)'YX&2@`-8!($1AP3?1J_L0MZ0NX=JUP`ZZ[%L?M*D$J -M4"K#O4]P_VE]I+:B"MNX1+MY_HNWL^;(\?AQ%'AJC&BVV//K?FO"2L8,%C -MN'O;F#WR%-71_"--O4(-6IU4IT5C1LQ8;B..G8-5TM -4-]>&Q_&54T4@M/D%69,Q12X'```` +M'XL("&,7AE4``VEM9RTV,W@R-34M-3$R+79T;V,X+G9H9&8N;W5T`*V4O6[# +M(!2%]SS%D;IEB,R/L3U%ZD^V2I7Z`K4-1!G:2E6'#G[X8K!C(-A-(V.$B.!\ +MG$LN-\M<`[A`02'ROG.*G(%S,`HP,Y,P6Z*.[O"EU/WK(V7/.]NZC8,1LWBY +M?U#-+G2[J'6;[0`L`QU9!I;(*F0T"72X:E)5?^*6_#ECMO3^W'$T2&J\6!3H\^E.7X291CNP13F +MV!V++\E7N3=H?#(=/AK_]O8^CI^#-05(-];FV(,?P4(J^RPNSR+5S6_#XL3* +.J6)R;_,+FZ-::BX'```` ` end From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 02:45:32 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 840DD1BF; Sun, 21 Jun 2015 02:45:32 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 724776D5; Sun, 21 Jun 2015 02:45:32 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L2jWLG036018; Sun, 21 Jun 2015 02:45:32 GMT (envelope-from marcel@FreeBSD.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L2jWmN036016; Sun, 21 Jun 2015 02:45:32 GMT (envelope-from marcel@FreeBSD.org) Message-Id: <201506210245.t5L2jWmN036016@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcel set sender to marcel@FreeBSD.org using -f From: Marcel Moolenaar Date: Sun, 21 Jun 2015 02:45:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284658 - head/usr.bin/mkimg X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 02:45:32 -0000 Author: marcel Date: Sun Jun 21 02:45:31 2015 New Revision: 284658 URL: https://svnweb.freebsd.org/changeset/base/284658 Log: Microsoft Azure expects the creator OS to be "Wi2k" and not "FBSD". The image is not accepted for provisioning otherwise. Bump the VHD creator tool version and the version of mkimg to signify our success in provisioning. Note that this also imapcts the dynamic VHD images. Tested by: gjb@ Modified: head/usr.bin/mkimg/Makefile head/usr.bin/mkimg/vhd.c Modified: head/usr.bin/mkimg/Makefile ============================================================================== --- head/usr.bin/mkimg/Makefile Sun Jun 21 01:55:01 2015 (r284657) +++ head/usr.bin/mkimg/Makefile Sun Jun 21 02:45:31 2015 (r284658) @@ -6,7 +6,7 @@ PROG= mkimg SRCS= format.c image.c mkimg.c scheme.c MAN= mkimg.1 -MKIMG_VERSION=20150222 +MKIMG_VERSION=20150620 mkimg.o: Makefile CFLAGS+=-DMKIMG_VERSION=${MKIMG_VERSION} Modified: head/usr.bin/mkimg/vhd.c ============================================================================== --- head/usr.bin/mkimg/vhd.c Sun Jun 21 01:55:01 2015 (r284657) +++ head/usr.bin/mkimg/vhd.c Sun Jun 21 02:45:31 2015 (r284658) @@ -81,9 +81,9 @@ struct vhd_footer { uint32_t creator_tool; #define VHD_CREATOR_TOOL 0x2a696d67 /* FreeBSD mkimg */ uint32_t creator_version; -#define VHD_CREATOR_VERSION 0x00010000 +#define VHD_CREATOR_VERSION 0x00020000 uint32_t creator_os; -#define VHD_CREATOR_OS 0x46425344 +#define VHD_CREATOR_OS 0x5769326b /* Wi2k */ uint64_t original_size; uint64_t current_size; struct vhd_geom geometry; From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 02:47:08 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from hub.FreeBSD.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 95D61319; Sun, 21 Jun 2015 02:47:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Date: Sun, 21 Jun 2015 02:47:04 +0000 From: Glen Barber To: Marcel Moolenaar Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284658 - head/usr.bin/mkimg Message-ID: <20150621024704.GM62182@hub.FreeBSD.org> References: <201506210245.t5L2jWmN036016@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="jB+02Y6wHc2pEa2x" Content-Disposition: inline In-Reply-To: <201506210245.t5L2jWmN036016@svn.freebsd.org> X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event X-PEKBAC-Definition: Problem Exists, Keyboard Between Admin/Computer User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 02:47:08 -0000 --jB+02Y6wHc2pEa2x Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jun 21, 2015 at 02:45:32AM +0000, Marcel Moolenaar wrote: > Author: marcel > Date: Sun Jun 21 02:45:31 2015 > New Revision: 284658 > URL: https://svnweb.freebsd.org/changeset/base/284658 >=20 > Log: > Microsoft Azure expects the creator OS to be "Wi2k" and not "FBSD". > The image is not accepted for provisioning otherwise. Bump the > VHD creator tool version and the version of mkimg to signify our > success in provisioning. > =20 > Note that this also imapcts the dynamic VHD images. > =20 > Tested by: gjb@ >=20 > Modified: > head/usr.bin/mkimg/Makefile > head/usr.bin/mkimg/vhd.c >=20 Thank you (again)! Sorry for not catching this sooner. Glen --jB+02Y6wHc2pEa2x Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVhiWoAAoJEAMUWKVHj+KTLIYP/iBHnTsEjv9tBGJ0U76us2nc V+VirNuzyMH7mS86HO0NPFcyV2ZjN8ghx6GSRGRvyK3xigYyoVrErv7vA1DF7We1 uGHbF05srIn0vkVgQN4jviDWNoA2IY/8RSgDuIzclpUH22lxmCaJcwh6UTFWlwKw kxlg4R0x+BhjMCnYClgxCGiG7wbxf4rlEuRrRBwGM20vM3HI3WqzcmBl9KzBfUyW 9HyTcvbRZ88sIpkjf7EjloHm81O3qKCub1M9pmzhQX8pKMrXvFANz1PekgR1kzZ0 ev4xlVi7tSN69N0ILRNrmNvjcIQAPxXDqUmd+fCgzDkd350r/VObcUmGHVinOWBS Z1ocQkqgLdUYC4zxoDY7OpSiE5+R+fwTYJ0nfrdODfRkBLO+KHIKF19Oe6DXCLAR 9BFRH5gUkFe4PZ1PrC8iaRgpZC5BrYsc+sppPeZf63w1yGVrKzrwWn/V98bR3gXn IojhDd9vxREgfDJqg2vkIRFXpOxMWtDbJGsVmVifHFv6PSL7EGxEr9JPChr1CCyG b7Rpv4aMzYE5FCWnNdxvSkWkZv47DWqLtuxzzeskchogMXhKwCVs39fUTjRTlOxi jZQAxM6mOU5WDRly8gM1EzSzZN19mboddr3ht7pC27jUBowwtZVXf/GUfigstQf/ NdtgdZ2T14sCUSmJyKyT =c2xZ -----END PGP SIGNATURE----- --jB+02Y6wHc2pEa2x-- From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 02:49:54 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81842485; Sun, 21 Jun 2015 02:49:54 +0000 (UTC) (envelope-from marcel@xcllnt.net) Received: from mail.xcllnt.net (mail.xcllnt.net [50.0.150.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 387A6756; Sun, 21 Jun 2015 02:49:53 +0000 (UTC) (envelope-from marcel@xcllnt.net) Received: from [192.168.2.22] (atc.xcllnt.net [50.0.150.213]) (authenticated bits=0) by mail.xcllnt.net (8.14.9/8.14.9) with ESMTP id t5L2nqt0067284 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 20 Jun 2015 19:49:53 -0700 (PDT) (envelope-from marcel@xcllnt.net) Subject: Re: svn commit: r284658 - head/usr.bin/mkimg Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_83384FF8-92AD-47CF-BC3A-5A9E24F346D7"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5b6 From: Marcel Moolenaar In-Reply-To: <20150621024704.GM62182@hub.FreeBSD.org> Date: Sat, 20 Jun 2015 19:49:52 -0700 Cc: Marcel Moolenaar , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <4ADAC0A3-C3E9-411E-A49D-0BD376ABB36D@xcllnt.net> References: <201506210245.t5L2jWmN036016@svn.freebsd.org> <20150621024704.GM62182@hub.FreeBSD.org> To: Glen Barber X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 02:49:54 -0000 --Apple-Mail=_83384FF8-92AD-47CF-BC3A-5A9E24F346D7 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii > On Jun 20, 2015, at 7:47 PM, Glen Barber wrote: > > On Sun, Jun 21, 2015 at 02:45:32AM +0000, Marcel Moolenaar wrote: >> Author: marcel >> Date: Sun Jun 21 02:45:31 2015 >> New Revision: 284658 >> URL: https://svnweb.freebsd.org/changeset/base/284658 >> >> Log: >> Microsoft Azure expects the creator OS to be "Wi2k" and not "FBSD". >> The image is not accepted for provisioning otherwise. Bump the >> VHD creator tool version and the version of mkimg to signify our >> success in provisioning. >> >> Note that this also imapcts the dynamic VHD images. >> >> Tested by: gjb@ >> >> Modified: >> head/usr.bin/mkimg/Makefile >> head/usr.bin/mkimg/vhd.c >> > > Thank you (again)! > > Sorry for not catching this sooner. No worries! -- Marcel Moolenaar marcel@xcllnt.net --Apple-Mail=_83384FF8-92AD-47CF-BC3A-5A9E24F346D7 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJVhiZQAAoJEIda8t8f0tjjklUQAKhh5mos3F/t/S4DWRv+hktN j40Nv/Ucj2B8eggYRuDAGqpbtd19xFB1+NkVhxO2TIBl9UCRtwois2TCEay8LOWL V4ybC7u405N/eIrmpOmW3CFNZXRdsLNSTiDEH5GEDr5ph56E+XTZboFNywFEfCWy T3rWDM6xOwCBtJ4EM01JgRk8HWl+w9KqBXDcVgvhOiLqCr+/cRG5Ao9FitpXPSoI k9Cr37/s7+FM4Nh5afdmIB0hYo7ocRShcGTozitXKSFZAbFbwiXjfoZZqA6CEkDy KKlk5VWjtlRhCngbpCzARyiuqpJZk8DOzFYf8/4xZ7CbkNwxUeCA/y2te+nw2K10 lXCHZR3+4VyuZnN/U3/fwEuUb3+Yw9E7saFGHRohJPXVO/1zZAJd612MuxvrKAKU EGEZ5lH14QeoExUO7ZSIKC+zenuGd5VbaFXGoYGh4Y6vPuRHQ5009Y13N34TIS1p OJMkabgufYzYQsDHaeO8pedMrgr3fz68G9ua0ZUEdPXxmhXyjyfplSKDSdU1b77I 0hOTMJhuuoHG7mgbU/B/DNo5pIvYgIPItir2ai5pl2cBSvGFm/opOJdx/Ed0tcWw jktsGOVK9I/0C+6Mph9YT62hPdTzMS669xM8yCetcrzTAFtsZu/oyXLAEDrRza1u /ZVOjX3CeMOdoYq25/yl =80gj -----END PGP SIGNATURE----- --Apple-Mail=_83384FF8-92AD-47CF-BC3A-5A9E24F346D7-- From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 02:55:35 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 283447AC; Sun, 21 Jun 2015 02:55:35 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 146D194F; Sun, 21 Jun 2015 02:55:35 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L2tZ3L041027; Sun, 21 Jun 2015 02:55:35 GMT (envelope-from marcel@FreeBSD.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L2tPLJ040970; Sun, 21 Jun 2015 02:55:25 GMT (envelope-from marcel@FreeBSD.org) Message-Id: <201506210255.t5L2tPLJ040970@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcel set sender to marcel@FreeBSD.org using -f From: Marcel Moolenaar Date: Sun, 21 Jun 2015 02:55:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284659 - head/usr.bin/mkimg/tests X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 02:55:35 -0000 Author: marcel Date: Sun Jun 21 02:55:25 2015 New Revision: 284659 URL: https://svnweb.freebsd.org/changeset/base/284659 Log: Rebase after r284658: 1. Change creator OS to "wi2k" 2. Bump tool version to 2.0 Modified: head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-ebr.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-apm.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-bsd.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.gz.uu head/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu Modified: head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,18 +1,18 @@ # $FreeBSD$ begin 644 img-1x1-4096-apm.vhd.gz -M'XL(".W%'50``VEM9RTQ>#$M-#`Y-BUA<&TN=FAD+F]U=`"M5EUOVR`4?<^O -MN-+>*BT"#+A[7-7F;5*U:L\M#N=^ -M`"'N`9`-R!ZD!BEPW'*0WZ"]!C"3OC';4_\*A^[M57?[S%`Z,DM1J: -MHSUK@)M%6F`*%Y%K',,AP"R_W#U?;5Z>`QSS<&%A+H$S$`:$3]:1Y,@.D58W -M#[<6\BFR:Z;LHI7Y_^9`.%":?-$$=D]'CD\[ -M/>+'"J$BC_SH9*XI;Y?Y4&'A8\^`8SC/;1'P,<%BHLM1;Q='8O:IME)RK[5I_HV^LD3\C$ -MMQ#XZ=JQIZT[)`J/)Z2(9Q!;&^("Y\S[!'#UKK4YA;[^6CVD^FE>EQ\E)^C' -M$OU'29N)S:C?[J\+Q,"OMG[*ZT=4IB]/'.Z7PY\# -M9+Z85JO.+%:_.@RY!ZS&D,<NJ*WW)JG351;B*5UV$JWK5E;:@+OX!7ZN]MA\-```` +M'XL("'`EAE4``VEM9RTQ>#$M-#`Y-BUA<&TN=FAD+F]U=`"M5EUOVR`4?<^O +MN-+>*LV":\#=XZ:U;Y.J5=,>6]?!E=6UC9I(ZT-^_+A\Q-C&;I+A$`3"]_AP +M[@R;UQ?=[+KWPC_[E0/C++8: +MFI,]EB#,1RK`FCZBUC2&?8`I/ET]7G3/CP$./1QZ(%F158F@'B;?4>S`CI!^ +M=_AD(>][=N6476]E_@\"F`#.HS?*P.[^P/$`)XQ5V]I6$2/2)[3!9+!`<$]% +M,863;&05T4R)&FTV!:>6K$Z!NUAY7[A0,8%1F=Y(QZ%"&INP"3I,F@F5]^VF +M?MOJ$3^<"15UX,:/3L!AKNTZN'+*3K8^ +MYVS2N1)M>U>Z91O8W9ELVW6[[O7E+L!1H:)2:Q&/9_=<;Y+L9&;?ZB-]>QGE +M"9OX%@(_G3OVM'6'(N'IA)0@$*0YR`3@VA"7M&;F$\#K-ZV_W7[__.OZ-M9/ +MB[S\.#M"/XST'H?"`V1B*/H=S,>1ZT9FG>EEYAIFNNFJ^RIQS +KU26XC%==Y4O6K!4[Z:JK?,G*=-4EN(Q778++>M55MJ"N_@%!NLDU'PT````` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,15 +1,15 @@ # $FreeBSD$ begin 644 img-1x1-4096-apm.vhdf.gz -M'XL(""X7AE4``VEM9RTQ>#$M-#`Y-BUA<&TN=FAD9BYO=70`K55=:\(P%'WW -M5US8RQ!6TN0FJ8\;T[=!F>Q9BFVE,+4X87OHCU_2)#;]4-Q(O(2&VQQ/SKFY -M)<0,`.3`*1`5Q`9-]-RM!P'-\CU2XS%RHYD9L/C6KNMPT6`TL[D!I#K-"6`^ -MVL=\P+B?:-*W(:"!T_PP!DETB"T(?A>_Y[K^+";@:*CC&C@V9L?+]CD&D!0D -M@EC8690@"IVV[#9U=CI7Y^IXV#@X5'`BUYOE7]CMLWJ2'0_L+=[I;>**T@+V -MO07'#T/7'K9V""V\,D(%4N`,$('FBCC7.;4>`:Y.1?&R?GWZ6*U]_1`#\Q-W -MZ$<]_UO`[?%0;,_5CW^#N>W.93D=>C]E^EL@ -M)-"L;3&Y?O;X/2QW\VJ_DO>/NU(&MY!IQXZ-1>*^>@L! -M!"&.>P>W[%)?/0.'E\,6:F8M31>]12\QV9LU7-O]_)?_ZZV!$X%+17TH9[]& -'6*@@T@<````` +M'XL("'`EAE4``VEM9RTQ>#$M-#`Y-BUA<&TN=FAD9BYO=70`K551:\(P$'[W +M5QSL90@K:7))]'%C^C8HD[%'J;:5LJG%"=M#?_R2)EE36T5'XA$:SOOX[KO+ +MA1"S`)`#IT"4$6MTHO?V?&)0SUXCM>XCM^J1`8LO19V'BTY6/1H;0*K=G`!F +MO3CF`\9=1YV\G`(:.,T/8Y!$FUB#X%?Q>ZRJSWP`CH9*U\"Q/CM>--\Q@*0@ +M$<34[J(`D6NW9;>LTL.Q/);[W=+!H8(3F0Z6M[#;IM4@.QZXMGAE;2>N*2U@ +MM[;@^&'HWL.F'$(+KPJA#"EP!HA`,T6<:Y\Z]P#GASQ_6CP_O,T7OGZ(@?F) +M*_2CGG[FDOCZ@<]/A-9/7-1/,I!RH#=;_;Z^32,Z?H'UBXG5CZ0#^WE'G43= +MGP%$"QB,(;?363![U[6(S,V`B0](V_(V@.O]+E\?RQ__!G,[G8MBV'0\9?HM +M$!)HVHR83'][_.YFFW&YW3@X-_WNKR;[GM)/QK(I&7'^B)Q +M7[VI`((0QYW$+;O$5\_`X5^R>0$K;/1QUCET'(.S6<,UT\__\W]K:^!$X%91 +,#^7H%Z>,MH[2!P`` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,17 +1,17 @@ # $FreeBSD$ begin 644 img-1x1-4096-bsd.vhd.gz -M'XL(".[%'50``VEM9RTQ>#$M-#`Y-BUB?T)1?GU5Y/EY6^FD6'8PSV\HU)WM, -M0*A),L"")I%[:D-C,*N'S6%Y_#@8'&J1X:P3?-V]3ZUL& -MTN6/NZ/$:[A>,+\%E^B]:U&2`1?JZ'!,L]B`$W/J*&>JNYQ-(R=SF8_L['4& -M7@/?`\NMK+:`_?K"H._1EX&.NS/ZP'>W(%SFCN<6#J^X"RYN-[NV\^J8KZZ, -MO!C[\<2Q-VY'0[C'@38GBPJ`]4HOPYW-"\K]^V`J(^J:&)`D7\2))N*@7 -02:G^(C"V^`74/'YQ?0P````` +M'XL("',EAE4``VEM9RTQ>#$M-#`Y-BUB9LCS$H +M^D@*F/-'])[[4+68Z&5]7)X^CBT.#0X-*$G9*D;0.^\[6G3JF+0YX;E&;GMU +ML:^NMZ+?3H%0(*4U(V[5;3N-'4Z1U>%0/RDKXOBTC_/B###N'$4^+A$#*TOF +M6%`M9\=P>L[J&=QR8=:B215*C)1:"IV$%+E/:=/&P7LH56Z7[_SG4@[TX42J +MZ$Z?],;B:7?1I`JVDXT"Q>D\YR[4E.L0-Y(J_XJ>=NV4Z5`01-(.8.V^&[T> +M!;8^+<5,S*<78U)?SOH4U5D^TDX/5*^1>W?`@H%4KU3NB88,'XW@9OT^MK[% +M1+K\L3H*O(?K!,M'<+&I78L2][BI@08G#$OT.#6GCG.F?,K9)'`R%]G`SEYG +MD`>0>Q"9E=46L%M?Z/6M?!GHN#NC#WQW<\:E[GQIX?".N^#B=K-K.Z].^.J* +MP(NQ'U;&@Y7+$+=R&QR&W0BPWEDH`VF6WTX/5&^1>S=`-%M5L+T/VZTJE$)E +M@,$4$K`,K!#+V61[-@NU41CH(,FX@`=)Q@4\2#(NX$&2<0$/DHP+>)!D7-"# +0I*:_"$(L?@%=YQ4O?0P````` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,13 +1,13 @@ # $FreeBSD$ begin 644 img-1x1-4096-bsd.vhdf.gz -M'XL("#$7AE4``VEM9RTQ>#$M-#`Y-BUB` -M$L"JA75]PYY2^MC#\=#1!`)U!DJ#-I"[XVR:Y(-LV-?S2QH..^#XEM4Z+IT- -MCQ.W<*-@?@].HA4G%)&/N+6-'I<,K&3"J2UU+A*L^9.S>J_8^=SF,[LPS\!; -M8!J8]U)0X)A?F/05L0Q!W-W0![&[%>(R>IX'.''#7:"XM\W<;JM+8G7USLF0 -M\YMQY\U%"+VY/4[LVPA$UUEZ;`%)#E(5#02K+UUV=3?U]_P@PC#A/2MLL3[87$VV(R$!7^Q+SC>Z#OX7PY -M7C\N'N=;E?^Q,AAT[2`J88`IX)PX/J@K:3DC -H3HW.-FZ5G4P_R0?96&Q5B--L9O7?W/8XLW.IN.([_`(4]_T8,`<````` +M'XL("',EAE4``VEM9RTQ>#$M-#`Y-BUBA@34"2@-VD!JKXMYLP\FZ%ZO+Y&_NA$GC[3V<=%B.1S> +MPTT&RT=P,6E)1L%TPNT)!EPXLL(9IXZLLY$0]9^CY>0;9@-`@ +MG)?(@5-^8;8O6YN!S-T#^V#M;D&XA-^7'@[ON`L<5Q[F]MBZ<&U==7(RXF5G +M/-BY!.&=.^#PW$&`_62Q%6AOK<]]09='_!F`:@2>%D$]SCX3@VG`U&`TO2<* +M3`9)Z@.15U)7?7W6U7?[XV>8<)20IMG>I(\Q=8M)``OZB7FC=\^^I^OMTG[< +M',Z-*C>1;+-9K1C!E"MW]:+96GSOD?EL7;P.DO:CEQD0"J1DCH_6Y;R<":#$M-#`Y-BUE8G(N=FAD+F]U=`"METU3PR`0AN_] -M%>MX\]"!#6S:JZ.>G7'4JVE,'`]^C'KPD!\O!$@@"=@H34J3@7WR[K)L*&/F -M`T`%4`O4`$E]70J@/90[`-5I3^Q;;F^AJ]]>F_KK^7MK/]W&P#CSK4)S;8\% -M"/60$K#2#Z%'?0V=PVQ/+Y_.GE^>'`XMSCU8$`@$J2!B]AQB@SI-NCJ_N>B1 -M#Z.Z8JYNM%+?@P`F@'-O1.'4/0P:!YQ05FW;GR5452_3G<%-T#$Z.\%)-K'R -M9"X%U7-V"4>SC\Q5T(<8?DW*;5G#$M-#`Y-BUE8G(N=FAD+F]U=`"METUSI"`0AN_S +M*SJUMQPL:*&=7+D@#V.J'T).^ALEAJB_WS[>7G\\.AQ:'%B0;;54C4!<]A]BB3I,>+O@R +M(Q]7=76L;K52WTX`$\"Y-Z)VZAX7C0M.**MQG,]&*]+Q<6=P$W1HW$M5Q3C) +M-E:>S+V@>L[NX2AG=01W>[)S85)%)4:C6A4Z#@WJ:Y4V+@[1J5+E_?5/^_=U +MV.C#1*K0HH]'?77:7;2I@FZP52!T.N?CY_!X4>X13"_!E?;4NI&^IF1[IC6-#&_#B=RZO02'@XY*POGWG#> +MV/GS#$RMDA[8V?9A"%SF%U9]=[$,#-S-Z(/8W5;CFG`\]W#X@;L0XKKLW.;5 +MW<3J^L*3,6Y7QI4K5T/"E6MP6+80X%Q95`:J47&;[IB^5>%A@&C?',5>16AK +M7S&%P@*+*12NF)936+-LLAW-0K(*"^WK*5WN/[.O)Z_<%]C7DROW*2MV:%]/ +>MMP7VM>3*_=E]O4:5W1?3^H?&V.G?Q5QFYT,#@`` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,14 +1,14 @@ # $FreeBSD$ begin 644 img-1x1-4096-ebr.vhdf.gz -M'XL("#47AE4``VEM9RTQ>#$M-#`Y-BUE8G(N=FAD9BYO=70`K96Q;H,P$(;W -M/,5%W3(@V_@,K%'3.5+5=B8$H@QMEPX=>/C:&(,/`TDJ@^,8G>_C/]_9,&8O -M`/V;;SC.0/!E?5L?=XX= -M;O,8$!'*,@"^.7W">$D!K)SIEPWM/J'WH$\:(&8@$5!!+NX-^./P/I<.R6.M -MG\6)6[A!,+\'EQHO;Z9?&&&T%L?\4J114`ZH&A6:< -M25`%9+D/%+22VNK[JZY^KK]^A@V.#U^.L!E_D9K=HC(0I7F).INQI^_I<-E= -M/R\.YXXJ]V*IS**CAL@@7*3AONQ?GSOD<527AHN$_NH5"I@$SDG@O;HC+6?L -HSGD7;*W[M)/I&GD@AMFCRN"03;S^FUN+4Y%+1=?>Y@]G9,(#$M-#`Y-BUE8G(N=FAD9BYO=70`K96Q3J=H==3^/5T\"VG04:7*V\U`(U2AHF:C#NX#@#Y,OZ]B[N'#O< +M]CD@$91E`'RS^E!["016SCR7#=UKXM^C/J&!E($@(`DY;@WXX_@^EP[!8^V? +MP>$CW"B8;\&EVLM9Z5;&LJ&[EXGYMCBQIDXA6/-4L!2Y]D0^\7/S#$QU20TL +M'VSH`\?\PEU?$5?9$4LVFO%($607ATJ39KOC9(T]W=6FX2>3N7B&!">#<"WQ0=_++F?IS +HW@;;M%")?G_L\'YXAMFC2N.(3;S^FUN#DY%+1=7>[@^&L-RROP@````` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,22 +1,22 @@ # $FreeBSD$ begin 644 img-1x1-4096-gpt.vhd.gz -M'XL("/'%'50``VEM9RTQ>#$M-#`Y-BUG<'0N=FAD+F]U=`"MF$MOVS`,Q^_Y -M%!QVZS#7DB79N0Q8L1;8K7O==JCER$4/RQ[IH1C\X2?*\D.VY"$M$]5(H/#G -M/RF*8IWG_0M`%:!:4`:4Q,^E`+6'L@*PDWYP=V7^*W3-SZ-I'A^>,O_J=CV, -MY7.KT!SM>0'"WJ0$7N--U`$_0S=@LM?7]QXX<9"@>`@+42L[J/R -M41V2;JZ^?'#(NTE=L58W6=D_+2`7P-CL%\6@[F[4..*$M6I;-THH:[0=1_`E -MF$#LK@U"+H<)[MP/HS>A8*Y/L7PCYNG%2.JK49_=6WD=N:8GNJLL?(]`K<\# -M#A$,<:/#NL'XN3IBS.11GR138(N-!`1+ADT[BP_*#S(H++;I'(0#MQ*M`>[/84U`KOCI^S8 -MP]YFO]]X?8;YC(B-]$0J>L;5Y2KE;CD5[(2[$.*HZ[*I,'J2+'I[GRRQD9Y( -M1J_NHQR#WQQ#9N<9] -M(253*#R03*'P^Y=0(3.;BWGN*BN_*$05!G&$%09QA!4&<:05!H&$%09QA!4& -M<805!G&D%4;1-D+*-T)%!8;A/RXZS)IT2]-5V:D7=AFXZQJA9/NTT0C%%X.R -M$5+_:X1:DW)VY"R<)6R$%'4CI'PA)7J6H89&:*WA.<\RU-`(S6[\@F<9*MX( ->/?=9!N((GV4@CO!9!N*(4X79WF7W#]HOQ!D`$P`` +M'XL("'LEAE4``VEM9RTQ>#$M-#`Y-BUG<'0N=FAD+F]U=`"MF$UOU#`0AN_] +M%8.X%9'&CNUDA80$4I&X%03JA4/CK%.M$,O']M!#?CP>Q_EP8@>VG5TWVI5W +MGKPS'H^GR?/^!:`*4"TH`TKBYU*`VD%9`=A)/[B[,O\5NN;GT30/A\?,O[J+ +M'L;RN55HCO:\`&%O4@*O\29JCY^A&S#9R^O[R\./^P''/8Y[D"S1JN"@].H^ +M*A_5(>GVP+\[Y-VDKEBKFZSLGQ:0"V!L]HMB4';-D,< +M5L.FRN/I5_WG9!;Z>")5U*B/K>:*M+OY]%KY'H-;G +M`8<(AKC18=U@_%P=,&;RJ$^2*;#%QH+DL_CI/?'ZZO8\H)10URO@UT%?XY9# +M@E`@=I@8MC@(!I*#G-+9^2Z;N;[K#Q_AYMWG+PC[-KG;8+KL.50--#MH]4+= +M>J=MUY:&]]G'VZBS11)W%/.\KW"@PPJNTTJ!^'`K41[L-M36".P.W[* +MCCWL=?;[E==GF,^(V$A/I*)G7%VN4NZ64\%.N`LACKHNFPJC)\FBM_/)$AOI +MB63TZCYZ\2!A]&);=SS5LNQ%B-.TT6/NU+#[P];O]34]T=UDX;L'F%7@;NN$4JV3QN-4'PQ +M*!LA]:]&J#4I9T?.PEG"1DA1-T+*%U*B9QEJ:(36&I[R+$,-C5`^!?`9SS)4 +@O!%ZZK,,Q!$^RT`#$M-#`Y-BUG<'0N=FAD9BYO=70`K9=-;]0P$(;O -M^RL&<2@J(K(=V\E>D*AH$;>EA1N7?-A5#RQ"0HA#?CPS=M+863M2D1,KRFKB -M)_-.9CQ>QOP!(`6P+G'-&Z:;*CZGP_7!T7C_,B"^GUS8`"L$>MR`1B;H&6/` -MVGDP[F;YR3A$N]X[7+4>;ZH`-X:S-B-O"'&5QRUR[?8;3A_NO!/N^RA4$`($N'J'A('H"3N/ZLM'CKFM@?>#Z?7G-&Z93%9\>*&=@,0^E -MM4/!ZB!

H@7,'J(%S1ZB!@P>H@7,'J(%S!ZB!I`H&'EFCCA*/<,@T:# -M;6@#$;F1;<=3]0?W%71<17*-V&O].TT\_3%,P29.N-TF;DU6[')LQ!9LXH0K -MVL35O/W6-6A77UK1?2-!8TFU(5"L.>.`P\^S&7X__0VCI]S*#.LF>3-HOJ@I -M,3662$#$M-#`Y-BUG<'0N=FAD9BYO=70`K9??B]0P$,?? +M]Z\8\>'DQ)#?[;X("J?XMAX>OOC2'\FQB"N"B`_]X\TD[37I)H63=$/I,IW/ +MSGKM<>1];C%8EP8^RU665#C",!M\BUSP,J!5UW!7Q8XN/^<2B0 +M&N01N+N?@F2@."CYA//:U1#'=_?A$YS>W7]!V+=5+F?..`A@'&2#E#0Z5I;[ +M\3Z5&W`N(,P^;[)B11%WL\U>P`G$C3NXW"KCY)X7Y66Q>9RBJ5<;>PD#O0#; +M03<6<&\W.%VY\B2:>PW-`-J`8C!8O!@U,`;0NC8)/<&!NQ"/T##@/0*GRV=R +M";`WY-?K.3[)YHK(K;*AE#V)I4+;DMP&:WM7+J0X43M[+69/5<2Z6W"H; +MBMGK0O;R2<+LY5K7X>:LD1:GANL/]_Z^/I<-TXFDGP"4,[!:A-+: +MH6)W(*YB=R"N8G<@KFIW(+!B=R"N8G<@KF)W(*YJ=SB@H?6&..*P]@R%1H-M +M<`.1A%$-PD<@W?&_T[0SS_,$S%(8ZXW2%N35'L[P]_WA<<'Q6M210->@E..C^2JY*Y7X]\^\>>5JCR[RF +M5)R]HP8J\143"Y^C.Z6EHOP.:!%K++02?9]6\B4Q9`L9<;Y4XIO_]]D&7.U2 +.<7\-#O\`_#?S";,-```` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,18 +1,18 @@ # $FreeBSD$ begin 644 img-1x1-4096-mbr.vhd.gz -M'XL("/+%'50``VEM9RTQ>#$M-#`Y-BUM8G(N=FAD+F]U=`"METU3@S`0AN_] -M%>MX\]!)EF2A5T<].^.H5P'!\>#'J` -M`)0!M4`-D-37N0`Z0%X`J$%S8'_FYA:Z^NVUJ;^>O_?FU>T&&&>^56BN[3$# -MH1Z2`Y;Z(?2HKZ&SF/WIY=/9\\N3Q:'!V0<+`H$@%43,GD/,J=.DJ_.;BQ[Y -M,*K+YNI&*_6I!#`!G'LS,JONP6ET.*&LVK8_?GPV$WT8 -M*15R^OAL+(N[BZ94T$XV"H0NYS5WH:=\37$+I?*OZ%%H)\R%"@*3=@![]\/H -MC2CP]1%G*S&/)R.JK]3ZU-IBY<(Y/M"=[\.W`U;5-F#!!H4ASCE -M#44R!A-Y/"$G7ORJQ\3YK=IM0"EUQY@";ZV^.G4Z&@V4N>Z^DJ#`8QV^O[Q; -M6FY-9/7^L5DU^!O.">;'X#+32NU,OS+B`]U8)L.WQ8DU=7H)-YN@:E54@,KO";C`5U^8=1WF,O`P-T5?3!WM]2X/)S//1S^XBZ$N&HUM^OJ -M3N;JZL3):*#$M-#`Y-BUM8G(N=FAD+F]U=`"MESUOI#`0AOO] +M%1-=EP+9@SV0]J3TUUS2!@A$JRBYTR5%"G[\V6`;&V.R)-YE69`]#^]\>-;+ +MV/P"H!)H`.J!I+ZN!-`-5#6`&C0'3F=N;F'L_KSVW?OYHS"O\33#./.M0G-M +MCR4(]9`*L-$/H4=]#:/%%#]NGZ[/+T\6AP:'!B0K;54B4!L]AYA3ITGW9WR> +MD`^+NC)6MUBI3RN`">#RZ*&"?9 +MRLJ3N154S]DM'.U9'<%=GTPNYE)1A5&ILPH=APKUM2H;&X?H4*7R\?:W^??6 +MK_1AHE3(Z>/16)EV%TVIH)UL%`A=SGONPD1Y7^,V2N5;T:/03I@+%00F[0!. +M[H?16U#@ZR/.=F*>3D927Z/U";7.FHUS>F#\681O!VS;8\":S0I#G'.X[9S# +MC5P\FHMD"2;R=$*NO/BUCYGSVP['@%)"TT3`WU9?ESL=O0:J]JFZKR2H\5*' +M[V_OMI9;GUB]7VQ6/7Z&POTA9V7F +MVNOKE9V?9V!JE73`:J_)>$"77UCTW<0R,'!W1Q_$[C8:5X7SN8?#3]R%$-?N +MYG9?W56LKLNL +CV*%]/9EVGVE?3[;=Y]G7:US6?3VI?VR,G?X#`*JO#$M-#`Y-BUM8G(N=FAD9BYO=70`K96Q;H,P$(9W -MGN*B;AF0;7R&K%'3&:EJ.Q,"48:V2X<./'S/&(.-`TDJP\4Q.OOC/]_9,&8N -M`"F`55?:94>W3_V[2[9)3^/'QX`%@[8-@"D!#:XF'`T@JW#HD#$.6CC]R#@# -MP8>^,>C2Z=JD#NXTS@IMV>'B4H.SX;:/`1&AJ@+@F]4G8J=#:B#F(!%002'N -M#?CC\#X+V.!XK/4S.'$+-PKF]^`R/1DX'QGW+ES-<3?N08GXAX$HC]9J`)I5-@N.[HR]6\#E`,PV@KB -M\"E2&:@65`,*=3^7H':0%RY0^)74U=]?3?US^74SK'%\_'*$IN>+3.\6E8.H -M]$O42?<=?4^'\_;R>;8X>U39%TNE%QT)(H-PT0_W9?_ZW"/+25T6+A*ZJ[=3 -MP"1P[@4^J"O]#$M-#`Y-BUM8G(N=FAD9BYO=70`K96][V6TZFBR?`^8"FB8")@RTN(IQO(&EH'[!(B08Q_G#(@6@ +M[-=6H$W&:YMXN--@%#IIWQ8.<:2-BY%H?K#@+L)@M7(.^*G_.*]IB$MP6J'KC:"5+_ +M*M(IZ`9T#9K,.E.@]Y#E/A##2FJK[Z^Z^KG\^ADV.#F\.6(Q]IB:;M$98&'^ +M1)_,VO/OY7#>7:YGAW.CRDTD;C:V2A%T&85+DV:[X&>'/([>I?$AD7]Z>PU" +M@91!X+UWQ["#$M-#`Y-BUP8SDX+G9H9"YO=70`K9=-;X,P#(;O -M_16N=NNA2HP3VNNT[CQIVG8M9;3:81]:>^B!'[\8$DCX6KL%*`H*?O+:<4PJ -M1'T`Z`3T'G0!6G$[)=!K2%<`IM->6-VE?80R__PH\M/;>6F/GK*[!+69V+NI4,8F1FKL)G804N6W2QL6A=YE4.1^_LN]CT=&' -M(ZFB&WVRUY>,NXLV5="];!40I_.4NU!13EW<0*K\*WHZM"/;,$$0RG5@Y7X8 -MO18%OCXMQ43,QR=C5%_&^LS:$MG`?;RCO%V&9P/<[:\#*L5+J`M\<@[GK&]- -MD--0W'TG+UH=^4CV_7E^B\CQP\IAE7*Y5!I6>*G"E\WS@,,8S^$:A[_A&L'R -M$EQB:Y][TZC%YFLSVE'CYI8U;W$TI8[77'&5LRINLF"^ZMCY\PS"Y'`.8N55 -M!0_8S"^T^M9]&1BX.Z$/^NYFC$O#]Z6'PU_'*K7$8MQ!059E-!G*-[-W'.\J'97C60+2E/MJW`VUMCJ:0+#":0K+5 -M.:)"*B:3[=HLU%9AI(TXXR)NQ!D7<2/.N(@;<<9%W(@S+N)&G'%1-^+:_,42 -+8O8#/[LV_KT-```` +M'XL("(,EAE4``VEM9RTQ>#$M-#`Y-BUP8SDX+G9H9"YO=70`K9=-;X,P#(;O +M_16N=NL!)2:$]CII]UVV74@]Z`ITQOU<@=Y`O@:@0=.PN4IS"W7Y]5F5I\,Y,4>]:&%2N%:^.=MC +M"HI>D@,6_!*]XS[4%I/CG@>X-\ +M[=6EH;K>BGY;!4*!E,X3J57WVFGL<(JL]ONFY:R(XV.;=^,-,.X]24)<)@96 +MCLRQH#K.CN'TG-4MN-7"S$6;*I08.5TI=!)RY#ZEC8U#T"A5SL?OXN=8#?3A +M1*KH3I\,QM)I=]&D"MJ'C0+%Z3SG+C24TQ`WDBK_BI[V[93I4!!$9@>P<=^/ +M7H\"5Y^68B;FTY,QJ:]@?8K663%RG1ZH[Q/_[(#;_6W`+(,B!#Y9ATO6MU%0 +MJK&XNTY>M3K*B>S[\_Q6D>.'C<-4[ZA<9AK6>*W"EX?G$8>G@\(*[X..VLW,[KVX9JBLC3\9NN#*N +M7+D,\5=NB\.XA4`UE9DRD&MD<)T>J!\3_VR!:$I]M&\'FMH<3:$RP&@*E:G. +M$16J:C;9;LU";11&VH@S+N)&G'$1-^*,B[@19US$C3CC(F[$&1=U(Z[I+Y80 +*BU\\?ZUPO0T````` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,14 +1,14 @@ # $FreeBSD$ begin 644 img-1x1-4096-pc98.vhdf.gz -M'XL("$$7AE4``VEM9RTQ>#$M-#`Y-BUP8SDX+G9H9&8N;W5T`*V5L6Z#,!"& -M=Y[BHFX9D'W8!M:HZ8Q4M9TIA2A#VZ5#!QZ^MC'!AX$DE<&RC`Y__+_//A@; -M+@"!P.J%?CW0'U)Z]\D^L33>W0>4$NH0^**!%H=&7RF@$:!'LP9=-S42Z-/9 -M->*X#H8@-VLUL(!S=D7D]4-K6.8@)$@%!=ZJ\.WXNF`8XQD><'@-=Q',;\%E -M9I;WIE:+_();"PRXG6/M)IS84J<1K+W+K(R[61"+V3P_S\#T'FZ`%2Z&%'C) -M+TSZRE`&$KL;^B"T6QM<3M_G'@ZOV`6*>]_,[;:Z7:BNB9R,;'XR;CRY!D)/ -M[H##N(5`V,JL=Z"ID4&_'NBKE-X#4#A@M!64[M^A,E`=J!:4-.-<@"HA+WP@ -MTIW4-]]?;?-S_O4S;'!\5M']9N9C9DZ+R@%K\Q'U8<:>OH?C:7_^/(VXL52- -M'Q;*++K4$!'8E=3NT^'YT2*K25T6+I+T5Z]4P`1P3HP[=17=SM+F=S3;ZCZS -A,L=&'DA@L509G&2S6?_-[8!3D;>*_JLE?_.D>A9P"``` +M'XL("(0EAE4``VEM9RTQ>#$M-#`Y-BUP8SDX+G9H9&8N;W5T`*V5/6^#,!"& +M]_R*B[IEB.S#-K!6RIZE[0P4HJAJNW3HP(^O;4SPV4!(9;"0H^.>O.?[@+'A +M`A`(K)IY+AOZYR.]^]UA9VF\>PPH)50Q\$4#+0Z-OE)`(T#O@@5=-RUBZ(_! +M->*X-L8@Y[5HF,&Y<$7B\T,;L,Q!2)`*"MRJ\.WT.A,PI@MXP.$]W$TPWX++ +MC)?WIE:+_(9;,@RXO6/M)YQ84Z<1K'TH6)FV6!"+P,_/,S!=PPVPPMF0`F_Y +MA4E?&I`M:"DV><"5`EYX0.1 +M5E+??'^US<_UU\^PP?%@HOO+^&-FND7E@)7Y$_5N]IZ^I]/E;]LH05!V%*X-FN^*'19XG=5E\2-(_O5(!$\`Y"=RI.]-REC:_8[!M![6P +BYS,N\H,89D>5P4D6>/TWMP-.)2X5_57;_0$2<&2X<`@````` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,17 +1,17 @@ # $FreeBSD$ begin 644 img-1x1-4096-vtoc8.vhd.gz -M'XL("/3%'50``VEM9RTQ>#$M-#`Y-BUV=&]C."YV:&0N;W5T`*V6R6[",!"& -M[SS%2+UQ0-[BP+5JN56JU!?`21S40Q.0"AICVC1Q,E?/QUQR.=J!/ -M!%)%M_KX:$Z&W14N543SLE.@*)WGW(6*AIWTZY`0:!)AH*]/4;H&D.V=2XT01C6"::+V716F\K@\\F9D -M(W\ZN=PDA5'^$B5GV$BUCU$2YBU4>XB%4?X2)6 -2?82+6O7I*O<6?^^O%OLJ#``` +M'XL("(#$M-#`Y-BUV=&]C."YV:&0N;W5T`*V636_C(!"& +M[_D5(_76@P4#'B?7JMW;2BOUT&MP3*JHVFW5Y-!#?OPR-O[`F#1M<3#"PO/X +MG6&8($1W`9`"V@-9H)+'E0;:0+4&<).^8=M+_PCGW>L_NSL=/@I_G5<=3(JI +M56C.]JA`NX]4@(8_0@V/X=QCBIN'Y]O#W^<>AQZ''E16;*40J(Z^0V)0QZ2G +M`[ZTR.VH3L7J1BMWUQJ$!BDG;ZA>W7;0.."TL]KOVU:Q(HY/WX*'8()Q+T41 +MXTHQLYK(7`KJQ-DE'%VR^@KN=N77HDL5EQB5ZUWH)%3(8Y]`LWI?,E=:"FG.6XA57X4/0KMM!^X((BR +MG\#6_3!Z(PJF^DB*"S%/+T92GV%]FGA%N0J4H!%*MUDU*'(33 +MT^\P?B:QNM^.GUD'=I_LCC6(#5>-9+J8S6BU^?EF,R:7NQVNOA;'Y:N!QH*U +M,]QV@MME7HPZGK<*.[.#'!`!<5%U8' +MPS:;XIH!-]?XB;-B49W-FBKU_EI<8Z"VH!2H,L*ITN-V;.7^B(19Z-,3YS]% +M^.M2!7U=R5:H,+="[8'9%#J@S:Q0BHN9\=7]2UYAIE,?XS*>^AB7\=3'N(RG +;/L9E//4Q+N.ICW%93WW4YM[J/Q`EJ(,J#``` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,14 +1,14 @@ # $FreeBSD$ begin 644 img-1x1-4096-vtoc8.vhdf.gz -M'XL("$47AE4``VEM9RTQ>#$M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME$UJPS`0 -MA?WS#_#4W8IK&^PMQ![23'#W)N*$5VGZOLFLOP?SHV*B-A.AA[[E42I8*I459#H$BN&>[P\6X/7Z?OX?GIV*BZ+C^]7E`3I$U* -MB,9O8EK_/,CO[NFX.;T=+S@175TVII9Z[:1CESJUNZ4^>D;N^NSD])#T\/1J -M`Z;`>6(\9K=+B\7CU-6LI56>T[S,Y"4)9&O/XS0;J?Y?RAYG%BX5JKW5#QL[ -&&6_=!@`` +M'XL("(@EAE4``VEM9RTQ>#$M-#`Y-BUV=&]C."YV:&1F+F]U=`"ME$]+PS`8 +MQN_[%`]X&1-*_K>]BGH3!AZ\VJ[I&$,%\>`A']YDR6S39'5(T[2TO'U^>9_D +MY27$#T`HE`Q*NBD8)(<0X-(&.MAX.F$>/[6^>[Z73X4?9N5AU`:S$C(7,,5D +MF-4F`*M(1^>!%4@-PK)`CZL'5?TG;BX_CVN6LNMQ[;4X99\=.@VM)[C7$6ZW +M\&'0Q*Z&/7!6705<3^U29]>+IR=,+^%LP*R3_#QNL,M&$A;A:"X[%/Z.<=V` +MJQ+5G-EU-CN]:*G0_EIS(T*L6A>BA]ZE4;I(< +M[UZM0`0HC8R'[+9QL3B<^#6K>[3BM#_G&7U$@6SM.9PD$]7_2]GAU,*E8FMO +*]0/Z[P?!W08````` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,18 +1,18 @@ # $FreeBSD$ begin 644 img-1x1-512-apm.vhd.gz -M'XL(".7%'50``VEM9RTQ>#$M-3$R+6%P;2YV:&0N;W5T`*U6RVX;(13=^RNN -ME%VD6L#`G739JO&N4I2HZV0Z9B)+36+%EIJ%/SY<'H9Y,+5=QA@Q8N[A<.X# -M&',/`%:`':`&5#2N)>!7J&\`S*1OPO;'`.$NM^N9D -M+RJ09I$:1$.+X)K&<`@PRZO;Y^O-RW.`$QXN+"P1I`!E0.1H'61'=H2T^O[P -MPT(^17;5F%VT,O_?$I@$SI,OJL#NZ-5=?95D/36)JA]5YZ$W&S`SC% -M!E8)S2E1D\U.P>&%CST!2.,]M%RS*?@@W$2K_I1[V[:0?&!&8"A/" -M;K^O7H2"E!]R-J-YWAE9?@WQ,ZFI1$AVVZI_;?CVGF#8T!U-QKL7Z]?2M,D0 -MN9Z*BO@RS-V[GY/ATA(_R2F,*9);BN%3^'W;;O_H"3A1:KL.KAJS4YW/.9MT -MKD3;WI5NU05VCR;;]IO]YNWU,3D@5SR"Q-L05S9GW$>#J76MS"GWYM7I(]=.R+#_.3M!/ -M)/JY)$GU2VL+SQWBE_.;U8\.DWHB-J-^N[\N$`._TOH)KQ]K)OK\Q.%NV?\Y -M0.&+:;'J+&+U*\-0>L!B#&7,X5(,.==&7 -BK*P5.^NJB[YD%;KJ$ES!JR[!%;WJHBVHBT^(Z?)+'PT````` +M'XL("%4EAE4``VEM9RTQ>#$M-3$R+6%P;2YV:&0N;W5T`*U6R6[;,!"]^RL& +MZ"U`!7)$CMIC@R:W`D&#HL=$D:E`R&;$!IJ#/[XNEG\*^>GLUU:[YR/RS7[5@4O2MAN9L +MCSDH^Y$"L.2/T)K'L`\PV:>KQXOFY3'`H8=##Z0+MLH1Z&'R'1('=HSTN\$G +M!WG?L495,X +M+496/9ISHO8V.P='2U:GP%VLO"_:4+&!4=C>2B>A0![;L`DZ3)H-E8_MIGS? +MFA$_C(0*'?C)R5H>WR[Z4,'PLF>@.)R7M@L.93>&FPF5_U*/AG;*#ZP(0H<% +M=-L?JM=!09\?2;&@>=P947XE\[.IJ;'+-MOR?VWXZB?#B+$[RHAWS]:OXF6; +M(6H]%Q7=9)R[-S]FPZ5B?DIR&',D5QS#Q_#[MMD\FQDX3+7=%BZ?LM.USSF7 +M=&V)=GU;NG4=V-W9;-LUN^;M]2[`<:'B4NL0CV?W4FYFV>G$OC5'^C8D#7K` +MH6\A\#.I8\\X=Q`+SR>D!H6@[4&F`->6N.8U.Y\`7K\;)L\PT567XE7FG*LN +IPR6\ZI(O65$K<=)5EWS)2G359;B$5UV&2WK5)5=05W\!EOB&R!\-```` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,15 +1,15 @@ # $FreeBSD$ begin 644 img-1x1-512-apm.vhdf.gz -M'XL("!,7AE4``VEM9RTQ>#$M-3$R+6%P;2YV:&1F+F]U=`"M55UKPC`4??=7 -M7-C+$%;2Y":ICQO3MT&9[%F*;:4PM3AA>^B/7](D-OU0W$B\A(;;'$_.N;DE -MQ`P`Y,`I$!7$!DWTW*T'`I(=#^PMWNDMNJ*T@'UO -MP?'#T+6'K1U""Z^,4($4.`-$H+DBSG5.K4>`JU-1O*Q?GSY6:U\_Q,#\Q!WZ -M44\_JQ__!G/;GE#&XATXX=&XO$??460M=R -M'/<.;MFEOGH&#B^'+=3,6IHN>HM>8K(W:[BV^_DO_]=;`R<"EXKZ4,Y^`#$M-3$R+6%P;2YV:&1F+F]U=`"M55%KPC`0?O=7 +M'.QE""MM3PSJV7.DUVWD5CTR8,FEJ/-PT%T(;,A`<$(%EFK@@GS[W`.>'/']8/-Z]S!>^?HB!^?N:2^/J!ST^&UD]>U$]Q4&J@-UO]/K],(SI^H?6;6/WBU0*8M.]X72?CJ +M327U_R>8%O&&CC[/.H>,8G,T$UTP__\__K:V!DX%;13^4 +*HQ\K>!7WT@<````` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,17 +1,17 @@ # $FreeBSD$ begin 644 img-1x1-512-bsd.vhd.gz -M'XL(".;%'50``VEM9RTQ>#$M-3$R+6)S9"YV:&0N;W5T`*V7/6_#(!"&]_R* -MD[IEB.",L;M&3>=*E=HUCF-'&?JA)D,&__AR-MA@C).TV`1AP3V\=QR(,-8] -M`#(!68.L0*;4S@3(1\AR`-6I"[8UUY_0E%^?57D^7E;Z:18=C#/;RC4G>TQ` -MJ$DRP((FD7MJ0V,PJX?-87G\.!@<:IR96$@0"*F""&\>R7IU1'I>OSZUR.V@ -M+O'5#5;JMQ/`!'!NC4B,NFVOL<<)9577;8R;2)5_14^Z=D(W5!!8:CJP==^-WH`" -M6Y_D;";FX<4(ZBM(G]I;K)BHPQW->N6^/;`D8)K1=D\EY'AK!-\W;U/K6P;2 -MY8^[H\1KN%XPOP67Z+UK49(!%^KH<$RSV(`3<^HH9ZJ[G$TC)W.9C^SL=09> -M`]\#RZVLMH#]^L*@[]&7@8Z[,_K`=[<@7.:.YQ8.K[@++FXWN[;SZIBOKHR\ -M&/OQSKAQYQ+$W;D=#N,>!-B>+"H#U2B_#G#$M-3$R+6)S9"YV:&0N;W5T`*V738^",!"&[_Z* +M2?;F@;1#*7C=Q/N>UJN(:(S9CZP>//#C=P8*M!10=PO8E+3S\,YTIJE"-!>` +MCD$?0)>@$^ZG"O0*T@R`!LV#=2O-*U3%UV=97$^WR%S5HH%)85NYYFR/,2CZ +M2`J8\T?TGOM0M9CH97UW6Q +MKZZWHM].@5`@I34C;M5M.XT=3I'5X5`_*2OB^+2/\^(,,.X<13XN$0,K2^98 +M4"UGQW!ZSNH9W')AUJ))%4J,E%H*G804N4]IT\;!>RA5;I?O_.=2#O3A1*KH +M3I_TQN)I=]&D"K:3C0+%Z3SG+M24ZQ`WDBK_BIYV[93I4!!$T@Y@[;X;O1X% +MMCXMQ4S,IQ=C4E_.^A3563[23@]4KY%[=\""@52O5.Z)A@P?C>!F_3ZVOL5$ +MNORQ.@J\A^L$RT=PL:E=BQ+WN*F!!B<,2_0X-:>.0 +M!Y![$)F5U1:P6U_H]:U\&>BX.Z,/?'=SQJ7N?&GA\(Z[X.)VLVL[KT[XZHK` +MB[$?5L:#E62@#:9;?3@]4;Y%[-T`T6U6PO0_;K2J40F6` +MP102L`RL$,O99'LV"[51&.@@R;B`!TG&!3Q(,B[@09)Q`0^2C`MXD&1#$M-3$R+6)S9"YV:&1F+F]U=`"ME#UO@S`0AO?\ -MBI.ZH`S(W\`:-9V1*K4SI1!E:+MTZ.`?7Q]@\&$@:86Q+)!]#^]]^!CK!X`2 -MP*J%=7W#GE+ZV,/QT-$$`G4&2H,VD+OC;)KD@VS8U_-+&@X[X/B6U3HNG0V/ -M$[=PHV!^#TZB%2<4D8^XM8T>EPRL9,*I+74N$JSYD[-ZK]CYW.8SNS#/P%M@ -M&ICW4E#@F%^8]!6Q#$'9R28%DP#1N-[ -MIL`4D.4A4-!*LO779U-_7W_"#",.$]*VRQ/MA<3;8C(0%?[$O.-[H._A?#E> -M/RX>YUN5_[$R&'3M("IR5U-WGT[/CQVRG-3).$@ZC%YA@"G@G#@^J"MI.2-. -GC#$M-3$R+6)S9"YV:&1F+F]U=`"ME#MOA#`,@'=^ +MA:4NZ`:4F"3`6NEVIG8&"B=4M5TZ=.#'-P8",:^[5H0H`CG^\%N(80$H!%%L +MG/N"[CGB3Q=<@IZ&!-0)*`W:0&JOBWFS#R;H7J\OD;^Z$2>/M/9QT6(Y'-[# +M30;+1W`Q:4E&P73"[0D&7#BRPAFGCJRSD1#UGYS59\7.Y39=Z/EY!MF`T""< +ME\B!4WYAMB];FX',W0/[8.UN0;B$WY<>#N^X"QQ7'N;VV+IP;5UU:-WS[ZGZ^W2?MP< +MSHTJ-Y%LLUFM&,&4*W?UHME:?.^1^6Q=O`Z2]J.7&1`*I&2.C];EO)P)IR9G +EZP9*U#$M-3$R+65BO"0'R\$2"`)V"A-2I.!??+NLFPH8^8# -M0`50"]0`27U="J`]E#L`U6E/[%MN;Z&KWUZ;^NOY>VL_W<;`./.M0G-MCP4( -M]9`2L-(/H4=]#9W#;$\OG\Z>7YX<#BW./5@0"`2I(&+V'&*#.DVZ.K^YZ)$/ -MH[IBKFZT4M^#`":`4N])2O*6XA5?X5/0KMA+U006#2=6#O?AB] -M$06^/N(L$?/X9$3U54F__N#PX;`:&%%H<[O; -MK@-*J2O&%'CK]-7:2I4Z5BVT\8[N?!L>@[Y&`V6IJZ\DV.&Q#M]?WBU-1Q-9 -MO>OC9W#X&VX0S(_!%;:4NI%^9L0[NC%-S*_#B90ZO82;5<[*S+G7["9V_CP# -M4ZND!K:S?1@"A_F%4=]^+@,#=Q/Z8.YNI7%E.)Y[./S%70AQA^3CG:Z,(U>NAH0KU^`P;R'`OK*H#%2CYFV\H[O>AH+G_R[Z>O'*?85]/KMS'K-BJ?3W9#$M-3$R+65BSF&C6:FDKM1VURR,$?OR"@($+&+*/#:$$_OMTT+<.8 +M^0!0#30"#4!27S<"Z`Z:,X#JM"?.+;>W,/6_?PW]V^6]LI_I9&"<^5:AN;;' +M&H1Z2`/8ZH?0D[Z&R6&J+_?/MY>?SPZ'%H<6)!MM52-0%SV'V*).DQXN^#(C +M'U=U=:QNM5+?3@`3P+DWHG;J'A>-"TXHJW&IKE38N#M&I4N7]]4_[]W78 +MZ,-$JM"BCT=]==I=M*F";K!5('0ZY]R%F?*VQ>VDRG]%CT([82]4$)AT'3B[ +M'T9O18&OCSC+Q#P]&4E];=:O3SC<=8>!"84&UR\.MW+UR"3)&DSD:7TW/NZI +MM+OC,:"4T+81\+O3UVLKHN].F.Z:O57@L^@8-5.5355])<,9K'7ZX_[$W +M'4-B]1Z/G\'A1[A%,+\&5]M2ZD;ZF9'NF-8T,;\.)W+J]!(>#CDK"^?><-[8 +M^?,,3*V2'MC9]F$(7.875GUWL0P,W,WH@]C=5N.:<#SWLI7>X_LZ\GK]P7V->3*_#$M-3$R+65BT^H?>@3QH@9B`14$$N[@WXX_`^EP[)8ZV? -MQ8E;N$$POP>7&B]OIE\9RX9V+!/[[W!R39U&L/JA8#%R[)16P -MO+<)"ASR"Z.^(I0A2+@K^B`,MS2XC,[G'D[<"!+KD`]*^R7#>TQH;<%RAX8;06Q_Q2I%%0#J@:%9IQ) -M4`5DN0\4M)+:ZONKKGZNOWZX/7XZP&7^1FMVB,A"E>8DZF[&G[^EPV5T_ -M+P[GCBKW8JG,HJ.&R"!&BX3^ZA4*F`3.2>"]NB,M9^S. -G>1=LK?NTD^D:>2"&V:/*X)!-O/Z;6XM3D4M%U][F#V=DPAR_"``` +M'XL("%TEAE4``VEM9RTQ>#$M-3$R+65BI>T,!'*Y7MJE0P<>OC;&Q,9`2,_@$.=D??EE288Q!-B?+*H"U:KPN6SH3HE_&Z`8@-%VD(97D4Q!MB`;D*3GF0!9 +M0):[0/0KJ:N_OYKZY_KK9ECC^/CF"(?VQU1WB\P`2_TG\JSGCKZ7X^5PO5TL +MSAY5]D12S::\4@19!>'2I-FN^-DC3W=U:;A)Y.Y>(8$)X-P+?%!W\LN9^G/> +G!MNT4(E^?^SP?GB&V:-*XXA-O/Z;6X.3D4M%U=[N#X:PW+*_"``` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,22 +1,22 @@ # $FreeBSD$ begin 644 img-1x1-512-gpt.vhd.gz -M'XL(".C%'50``VEM9RTQ>#$M-3$R+6=P="YV:&0N;W5T`*V82V^<,!"`[_D5 -M4_66JA0;V[#'1DVDWM+7+8>`@6BE=OM(#E'%CZ_'V(`7FW238;V(E7<^YN7Q -MR'D^7@"J`-6#ZD!)?"X%J!V4%8"9=(/;.W,_8=`_#YU^V#]F[AK.1AC+EU*A -M.,KS`H1Y20F\QI>H%I]A\)CL]>7=^?['G<=QA_,O%@H$!VD@8O4>E4_:(>GJ -MXLL'B[R=M2O6VLU2YML(R`4PMOA'X;6[G72<<,)(];T=)90URDXC^!%,(.YO -MEJUQ,C^26J@9<^K"V!A.;4F=@CL_<[$84\4D1FGNQG4,2H[/)FV\'U;#I,KC -M_:_ZSWUWI!]/I(J:]&.KN2)M+G>IPOV?G08"TWG+7+"4AV-<)%5>Y#T5ROGH -M&B?DTD]P:W[HO1D%2_T4RS=\G@Y&4K\:]3-K*Z\C]_3$<)&%GPG8-*[<(/`X?`I -M.XRPM]GO-TZ_CKF,B(WT1,I['=_*"%3J"7,AQ%'7Y:Y"[TDR[^UB+I -MO7KT7MQ)J%1LZ4Z[6I:]"G$-K?>8;1_-^C#U>WU/3PS76?@9@=QM0V3[&G>% -ME$Q#X8!D&@JW?@DU9&(SF*=&6;F@$%48Q!%6&,015AC$D588!!)6&,015AC$ -M$588Q)%6&$7;""G7".6E#4`!31>JD6QI!A\(WW)X'-]JGS8:H7@P*!LA]50C -MU'=)8_UU9"QA(Z2H&R'E"BG168;RC=!:A^><92C?""U>_(*S#!5OA)Y[EH$X -8PK,,Q!&>92"..%6P;SG[!W#$M-3$R+6=P="YV:&0N;W5T`*V82V_4,!"`[_LK +M!G$K(CB.[63%":0B<2L(Q*6'YN%4*V!YM(<>\N/Q.'82;^R4;2?KC;+RSI=Y +M>3PR8^,%H`I0/2@-2N)S*4#MH:P`S*0;W-YS]Q.&]M=1M_>'A\Q=PVZ$Y6PI +M%8JC/"]`F)>4P&M\B>KP&0:/R5Y>WEXS-H5:^UF*?-M!#`!>;[X1^&UNYETG'#"2/6]'244#YW_?=.G^C'$ZFB)OWRU5R1-I>[5.'^STX#@>F\92Y8ROTI+I(JS_*>"N5\ +M=(T3F/03W)H?>F]&P5(_E;,-GZ>#D=2O1OV$66=UY)Z>&-YGX6<"-LUY0._! +M$#<9W+3H/UL'M)XM&I-D=FRQ$1"V\%_3$<>WZ<\#2@EUO0)^]?JU-AP2A`*Q +MQ\0PQ4'D(#G(.9VM[;)=ZG?YX2-A+B&UGNY;1_-^C#U>WU/3PQ76?@9@=QM0V3[ +M&G>%E$Q#X8!D&@JW?@DUS,5F,,^-LG)!(:HPB".L,(@CK#"((ZTP""2L,(@C +MK#"((ZPPB".M,(JV$5*N$6*E#4`!C0[52+8T@P^$;SD\CF^U3QN-4#P8E(V0 +M>JP1ZG726'^=&$O8""GJ1DBY0DITEJ%\([36X2EG&#$M-3$R+6=P="YV:&1F+F]U=`"ME\%NVS`,0._Y -M"@X[=&A10Z(EV3ZN6`OLEJTM=MG%D>6BP)9AP`X[Y.,G2G(C)9*W#K()0P'- -M9Y(B38)(,4+SL4N=>S?[=U'V+[__$"PK\=PD5OEK&&8P'2$2+WC*^$^ -MI.%Z'!)N!NRRP;9%W,5I]CRN)=RT@LM)&2?6K'P-_=O>>IQDJ54?6_42>@2E -M81J+N&\)3E6N/$'JG8).@S(@.>B9%I,"SJU_MDU\3R#@!&R`C@/N"'C8?VKV -M'G;=_+P*_@D>*B(G944I>P+7*H*<^DNXD.+:VMGK*7NR6O:&4"PY*2N*V1M] -M]O))(J=RK6MQ(6O-FQ2WJYP]16K;'_;]?7XM*P[;)CT]4`1@-0_%/.N*W4&X -MBMU!N(K=0;BJW4'`BMU!N(K=0;B*W4&XJMUA@8;5&^*$H]J;;,X'D':(IU53 -M'L?6OR_WSK&+)%R#:Z-_98CG-\-4'.*$6QWBLRD'&XZ38"L.<<)5'>(R?'ZK -M%I3K+R5IW0E0MJ7Z&(C'FG%`_6-O]*_GWW'V",=]162%[+&EPE0=X$@/41.M -M(__>WCY=/G]_6G`8HEH>3!6-5()"G(4KTW#O;NX_..3VZ%WF-27C[`T*F*!7 -M3!QX\&Z;EHIT7T!+L&8&W9+MBR0_$D6VD`GG2B6^^7_WUN-JEXK]:[#Y`[$* -&K32S#0`` +M'XL("&$EAE4``VEM9RTQ>#$M-3$R+6=P="YV:&1F+F]U=`"ME\V.U#`,@._S +M%$9[6+1HJR9-TO8(TB)Q&V#17KCT)UF-@$%('#C,PV,GZ3:92;HL2FM5&;G^ +M:CMVW:EK=P`(#O60N.85IW=5?)YV-SM+8^/+@/A\B!X_TU"`:2@Q1/.!N[G$+_[MY_@/W;3_<$^[J&RQDJS03]#+HE1.P=VPCW +M/@[7X3CA#/`V&6R3Q5V?9\_A&L+-&[B4Y'%BR\K5T+_MK^OR^O><5I7\6G`PH/+.:A,&8JV!V$ +M*]@=A"O8'80KVAT$+-@=A"O8'80KV!V$*]H="-1UN2%..*J]&7/>@\0A'E=- +M?ARC?P^?K6/74;B:;XW^C2&>W@Q=<(@3;G.(&YT/UA]GP18=13[\/?\+L$8ZYBD@*V?.&"E.UP`=ZB)II +M'?AW=?=X<_CQN."XCVI)(-8?6C68L_$B7!F'^W#@WRQROWJ7>$W),'N]@EK0 +M*R8,W'NWCTM%VB^@)5AMH!-D^R31CTB1+&3"V5();_[?O76XTJ6"?PUV?P'7 +':/,?LPT````` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,18 +1,18 @@ # $FreeBSD$ begin 644 img-1x1-512-mbr.vhd.gz -M'XL(".K%'50``VEM9RTQ>#$M-3$R+6UBH!P_\>!-(0@($BZ:E%";9AW<_LDT9&UX` -ME`&U0`V0U->Y`#I`7@"H07-@?^;F%KKZ[;6IOYZ_]^;5[0889[Y5:*[M,0.A -M'I(#EOHA]*BOH;.8_>GET]GSRY/%H<'9!PL"@2`51,R>0\RITZ2K\YN+'ODP -MJLOFZD8K]:D$,`&<>S,RJ^[!:70XH:S:MC]R*,M>ICV"FV!@=':"DVQBYAIWQ-<0NE\J_H46@GS(4*`I-V`'OWP^B- -M*/#U$6_*K'Q/FMVFU`*77'F`)OK;XZ=3H:#92Y[KZ2H,!C';Z_O%M: -M;DUD]?ZQ637X&\X)YL?@,M-*[4R_,N(#W5@FP[?%B35U>@DWFYR5B6NO*29V -M?IZ!J552`RN\)N,!77YAU'>8R\#`W15],'>WU+@\G,\]'/[B+H2X:C6WZ^I. -MYNKJQ,EHIROCR)6K(>'*'7"8MA%@WUE4!:I9\W-\H+O>A^\!B.:7(]E/$9K> -METRA,,!D"H5MIND49FRUV+96(1F%B?;U%&_W?]G7D]?N$^SKR;;[F!7;M*\G ->T^X3[>O)MOLT^WJ-2[JO)_6/C;'=#W^X!V4,#@`` +M'XL("&0EAE4``VEM9RTQ>#$M-3$R+6UBS^O/;=^_FC,*_Q-,,X\ZU"^["1'E?XS9*Y5O1H]!.F`L5!";M`$[N +MA]%;4.#K(\YV8IY.1E)?H_4)M`4D+31,#?5E^7.QV]!JKVJ;JO)*CQ4H?O +M;^^VEEN?6+U?;%8]?H9S@ODEN-*T4CO3KXSTP+B4R?QM<6)/G5["_2%G9>;: +MZ^N5G9]G8&J5=,!JK\EX0)=?6/3=Q#(P<'=''\3N-AI7A?.YA\-/W(40U^[F +M=E_=5:RNRYR,8;TR+ERY&A*NW!F'>1L!3IU%5:":%9_3`^.O(GS/0#2_'-E^ +MBM#TOFP*A0%F4RAL,\VGL&2[Q7:T"LDHS+2OIW2[_\J^GKQVGV%?3[;=IZS8 +BH7T]F7:?:5]/MMWGV==K7-9]/:E_;(R=_@,`JJ]S#`X````` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,15 +1,15 @@ # $FreeBSD$ begin 644 img-1x1-512-mbr.vhdf.gz -M'XL(""(7AE4``VEM9RTQ>#$M-3$R+6UB> -MXJ)N&9!M?(:L4=,9J6H[$P)1AK9+APX\?,\8@XT#22K#Q3$Z^^,_W]DP9BX` -M*8!55]IE1[=/_;M+MDE/X\?'@`6#M@V`*0$-KB8<#2"K<.B0,0Y:./W(.`/! -MA[XQZ-+IVJ0.[C3."FW9X>)2@[/AMH\!$:&J`N";U2=BIT-J(.8@$5!!(>X- -M^./P/@O8X'BL]3,X<0LW"N;WX#(]RQGI5L:RHYO*Q/Q;G%Q31PC6/!0L1JX] -M6N"OZ(`RWTKC<'\\=G+@1+OBXXVIN -MU]5M0G5UY&3@?&?@=I`7+E#XE=35WU]-_7/Y=3.L<7S\@^>X>E1I'++9K/_FUN!4Y%*AVDO^`""! -&+FB_"``` +M'XL("&4EAE4``VEM9RTQ>#$M-3$R+6UBY<]2]L9".1RO;1+APX\?&6,P<:!)#U`(<[)^B)9/PAA+P"% +M((H;SWE%^YJ$=[O9;3J:+)\#Y@*:)@(F#+2XBG&\@:6@?L$B)!C'^<,B!:#L +MUU:@3<9KFWBXTV`5R[S"QR46Y\)MG@,205%$P#?G'ZZ=#F6`E($B(`TY/AKP +MQ^%]$K#%R;7.S^+P'FYP6#Z"2XV5M].OC'E%.Y:)_78XM>0=(T3]5+"T"=<"''E8FZ7 +MO=O&WE4K)X.FG?%@YQI(V+D6A^L.`NPF"U<@[XJ?\XKVF(2W!:H>N-H)4O\J +MTBGH!G0-FLPZ4Z#WD.4^$,-*:JOOK[KZN?SZ&38X.;PY8C'VF)INT1E@8?Y$ +MG\S:\^_E<-Y=KF>'YL_P54P +%QK\(```` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,18 +1,18 @@ # $FreeBSD$ begin 644 img-1x1-512-pc98.vhd.gz -M'XL(".O%'50``VEM9RTQ>#$M-3$R+7!C.3@N=FAD+F]U=`"METUO@S`,AN_] -M%:YVZZ%*C!/:Z[3N/&G:=BUEM-IA'UI[Z($?OQ@22/A:NP4H"@I^\MIQ3"I$ -M?0#H!/0>=`%:<3LET&M(5P"FTUY8W:5]A#+__"CRT]MY:8]R5L.D\*U"<[;' -M!,@,D@)F/(A^Y3:4#K.\V1P6;^\'AT.+LKL$M9G8NZE0QB9&:NPF=A!2Y;=+&Q:%WF50Y'[^R[V/1T8CJT(]LP01#*=6#E?AB] -M%@6^/BW%1,S')V-47\;ZS-H2VL;TV0 -MTU#7Z+R/'#RF&5/FEC5O<32ECM=<<96S*FZR8+[JV/GS#,+D<`YBY54% -M#]C,+[3ZUGT9&+@[H0_Z[F:,2\/WI8?#7]R%$+>;G-MI=?.^NCSR9+QV5\:% -M*Y-9`M*4^VK<#;6V.II`L,)I"LM4Y -MHD(J)I/MVBS45F&DC3CC(F[$&1=Q(\ZXB!MQQD7#$M-3$R+7!C.3@N=FAD+F]U=`"METUO@S`,AN_] +M%:YVZP$E)H3V.FGW7;9=1RF=JFD?6GOH@1\_&Q)("-!V"Z0H*/CAM>.85(CV +M`-`IZ#WH"G3&_5R!WD"^!J!!T["Y2G,+=?GU696GPSDQ1[UH85*X5KXYVV,* +MBEZ2`Q;\$KWC/M06D]P]O*T.'V\6AP:'!I3E;)4BZ&WP'BTZ=4QZ.>![@WSM +MU:6ANMZ*?EL%0H&4SA.I5??::>QPBJSV^Z;EK(CC8YMWXPTP[CU)0EPF!E:. +MS+&@.LZ.X?2-`L7I/.2*O^*GO;ME.E0$$1F![!QWX]> +MCP)7GY9B)N;3DS&IKV!]BM99,7*='JCO$__L@-O];<`L@R($/EF'2]:W45"J +ML;B[3EZU.LJ)[/OS_%:1XX>-PU3OJ%QF&M9XK<*7A^<1AS&>PRT.+^$ZP?(: +M7&IJGWV2U&+WM9D<:'%+PUKV.#6GCM=<=9.S6=QDP7(]L'/G&03E<`EB[50% +M!]C-+_3Z-J$,]-R=T0>ANP7C#P@KO@X[:S:VAQ-H3+`:`J5J#$M-3$R+7!C.3@N=FAD9BYO=70`K96Q;H,P$(9W -MGN*B;AF0?=@&UJCIC%2UG2F%*$/;I4,''KZV,<&'@225P;*,#G_\O\\^&!LN -M`('`ZH5^/=`?4GKWR3ZQ--[=!Y02ZA#XHH$6AT9?*:`1H$>S!ETW-1+HT]DU -MXK@.AB`W:S6P@'-V1>3U0VM8YB`D2`4%WJKP[?BZ8!CC&1YP>`UW$F5HO\@EL+#+B=8^TFG-A2IQ&LO;H`5+H84>,DO -M3/K*4`82NQOZ(+1;&UQ.W^<>#J_8!8I[W\SMMKI=J*Z)G(QL?C)N/+D&0D_N -M@,.XA4#8RJQWH*F10;\>Z*N4W@-0.&"T%93NWZ$R4!VH%I0TXUR`*B$O?"#2 -MG=0WWU]M\W/^]3-L<'Q6T?UFYF-F3HO*`6OS$?5AQIZ^A^-I?_X\C;BQ5(T? -M%LHLNM00$=B5U.[3X?G1(JM)718NDO17KU3`!'!.C#MU%=W.TN9W--OJ/K,R -@QT8>2&"Q5!F<9+-9_\WM@%.1MXK^JR5_\Z1Z%G`(```` +M'XL("&HEAE4``VEM9RTQ>#$M-3$R+7!C.3@N=FAD9BYO=70`K94];X,P$(;W +M_(J+NF6([,,VL%;*GJ7M#!2BJ&J[=.C`CZ]M3/#90$AEL)"CXYZ\Y_N`L>$" +M$`BLFGDN&_KG([W[W6%G:;Q[#"@E5#'P10,M#HV^4D`C0.^"!5TW+6+HC\$U +MXK@VQB#GM6B8P;EP1>+S0QNPS$%(D`H*W*KP[?0Z$S"F"WC`X3W<33#?@LN, +ME_>F5HO\AELR#+B]8^TGG%A3IQ&L?2A8F;98$(O`S\\S,%W##;#"V9`";_F% +M25\9RT`2[HH^B,.M#"ZG[W,/AW?"!8JK5W.[KFX?JVL2)R,+.V-CYQH([=P! +MAVD'@;"365>@F9'1<]G0GX_T'H#"`9.=H'3?#I6!ZD"UH*39YP)4"7GA`Y%6 +M4M]\?[7-S_77S[#!\6"B^\OX8V:Z1>6`E?D3]6[VGKZGT^5P_;R,N'%4C1-) +M-YOVRA!4'84K@V:[XH=%GB=U67Q(TC^]4@$3P#D)W*D[TW*6-K]CL&T'M;#G +A,R[R@QAF1Y7!219X_3>W`TXE+A7]5=O]`1)P9+AP"``` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,17 +1,17 @@ # $FreeBSD$ begin 644 img-1x1-512-vtoc8.vhd.gz -M'XL(".S%'50``VEM9RTQ>#$M-3$R+79T;V,X+G9H9"YO=70`K9;);L(P$(;O -M/,5(O7%`WN+`M6JY5:K4%\!)'-1#%P$'#CQ\9Q)G<1('*`[&,G+F\S_CL1G& -MZ@=`2]`E:`LZH7&J0&\@70/@I&NBZKG["9?\Y]OFI\_SRCV710WCK&_EFY.] -MD*!PD12$H45T06.X-)C5T^M^^?FU;W#"X9J%E08E($&(&JVC6:N.2-OGCY<* -MN>O4R;&ZS@J_F0*F@//>&[)1MVLUMCB%5F59M12,J60VS?OA373.#G`)&UCU -M9$X%M>?L%$[/6=V#6R[<7M2I@HF18H^AXY`*&F/:-'$8-4R5\_'7'(YVH$\$ -M4D6W^OAH3H;=%2Y51/.R4Z`HG>?C -MUZ&@KT]S-A/S\&8$]1G2A\<+=Y1N@:0[9U+C1!%R>'NP%D^:?O/C9P*[^^_X -MF;5G=^5TK(%MZ-8)IHO9=%:;QP^;,;'NZ)D(#S>Z7$@=M,>LCRM:W%#C -M%6?9I#H;-56R\E9<82"S("7(9(23B,IA"!-K)"SF8SX][SJYW"2%4?X2)6?82+6/41+F+51[B(51_A(E9] -1A(M:]>DJ]Q9_[Z\6^RH,```` +M'XL("&PEAE4``VEM9RTQ>#$M-3$R+79T;V,X+G9H9"YO=70`K99-;^,@$(;O +M^14C]=:#!0,>)]>JW=M**_70:W!,JJC:;=7DT$-^_#(V_L"8-&UQ,,+"\_B= +M89@@1'5!MI`M09PD[YAVTO_".?=ZS^[.QT^"G^=5QU,BJE5 +M:,[VJ$"[CU2`AC]"#8_AW&.*FX?GV\/?YQZ''H<>5%9LI1"HCKY#8E#'I*<# +MOK3([:A.Q>I&*W?7&H0&*2=OJ%[==M`XX+2SVN_;5K$BCD_?@H=@@G$O11'C +M2C&SFLA<"NK$V24<7;+Z"NYVY=>B2Q67&)7K7>@D5,ACES9]'*+F4N7C^&;> +MCW:F#Q.I0H,^&E\R5UH*:$6Y"I2@$4JW634H/=[3 +M[S!^)K&ZWXZ?60=VG^R.-8@-5XUDNIC-:+7Y^68S)I>[':Z^%L?EJX'&@K4S +MW':"VV5>C#IRUW(FJ^N`8NYNS>ZJV?O2]PD<%U(1Z>MPH[LX,<$`%Q475@?# +M-IOBF@$WU_B)LV)1GXC*<^ +:QF4\]3$NXZF/<5E/?=3FWNH_$"6H@RH,```` ` end Modified: head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,14 +1,14 @@ # $FreeBSD$ begin 644 img-1x1-512-vtoc8.vhdf.gz -M'XL(""H7AE4``VEM9RTQ>#$M-3$R+79T;V,X+G9H9&8N;W5T`*V436K#,!"% -M]SG%@VY""D;_MK>ES:X0Z`7JQ'+(HBV4+KK0X3N*E-BR53<4*XJP&;]/\Z1A -M&`L#4`:E@-%^*@$MH12DID`+BD\GW/;3VH>71_UXP\*7 -MP2=V+>C"1743<#VVR[W=(![?,/\-1P&WGN07<+U=,9"(!,=SV:$(_Q37]KAJ -MHIHSN\YF9QG8J+HN/[U>4!.D34J( -MQF]B6O\\R._NZ;@YO1TO.!%=73:FEGKMI&.7.K6[I3YZ1N[Z[.3TD/3P]&H# -MIL!Y8CQFMTN+Q>/4U:RE59[3O,SD)0ED:\_C-!NI_E_*'F<6+A6JO=4/&SL9 -%;]T&```` +M'XL("&TEAE4``VEM9RTQ>#$M-3$R+79T;V,X+G9H9&8N;W5T`*V43TO#,!C& +M[_L4#W@9$TK^M[V*>A,&'KS:KND80P7QX"$?WF3);--D=4C3M+2\?7YYG^3E +M)<0/0"B4#$JZ*1@DAQ#@T@8ZV'@Z81X_M;Y[OI=/A1]FY6'4!K,2,A#IAM$5^^5$0`+E9[ +M,C0JQ:%Z*'WJ51RE@*I15F,@BXX99O?QKG=?A^_Q_LG0J/H^/YV>V29H%RG! +M&K>(ZMS[*+^;A_WF\+8_XUAPQ<+"LG0J;KMJF]B5L=V7`SN>D-LA.YYNDASO +M7JU`!"B-C(?LMG&Q.)SX-:M[M.*T/^<9?42!;.TYG"03U?]+V>'4PJ5B:V_U +)`_KO!\'=!@`` ` end Modified: head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,18 +1,18 @@ # $FreeBSD$ begin 644 img-63x255-4096-apm.vhd.gz -M'XL("/_%'50``VEM9RTV,W@R-34M-#`Y-BUA<&TN=FAD+F]U=`"M5EUOVR`4 -M?<^ON-+>*BT"#-?=T]1JS=ND:M6>6\O!5:2UC9I(ZX-__+A\U#@&U\UP$,'" -M]W`X]P,8H+P',I&_"]MR_0M^^/.OVN'M;^Z=?.3#. -M8JNQ.=F+"J19I`;1T"*XI3'T`6;]Y>;Q8O?T&."$APL+2P0I0!D0.5D'V3L[ -M0MIW/9+BTQ$]R"F.*Y)9B>`F_J_W^CT[`B5+;=7#5 -ME)WJ?,[9I',EVO:N=*LNL+LWV7;<'7SSORLE]$S+'35Q7R5.>>J -J2W`%K[KH2U;6ROTMO>JB+UF%KKH$5_"J2W!%K[IH"^KJ'[J1;&,?#0`` +M'XL("*@EAE4``VEM9RTV,W@R-34M-#`Y-BUA<&TN=FAD+F]U=`"M5LMNW"`4 +MW<]77*F[2!W!->!T535JLJL4-:JZ3%P/CJPTR2@S4K/PQY?+(\8/7&?*#,(@ +M?(\/YSZ`,?<#4`6H!I0&)6E<"E"?H#P',(N^H>VYGT)7/S_I^MB^;OVOVS@P +MSF*KH3G98P'"?*0$K.@C:D=CZ`+,]L/E_5G[>!_@T,.A!Y(E614(ZM?D.XJ] +ML2.DGRT^6,B[GETQ9==;N4?30-%$;Q2!W9WM/\>;%<;*O$]-42-]0AM,!@O] +M9D?:23:RBFC.B1IM=@Y.+5F]!^YLXWWA0L4$1FEZ(QV'$FELPB;H,&DF5%X/ +M^^KEH$?\,!$JZHT?GZP5Z>VB#Q4,+WL&@L)Y:;M@48YCN)E0^2_UU-!.^($1 +M@>@<-F$E"`0I#G(!.#.$)>T9N83P*L7K2]NOG[\<743 +MZZ=%7GZ'23D3F[U^AS\N$`._W/I57C]6 +MS?3IA>YZ._P[0/3%-%MUQK[ZY6$H/&`VAJ+/X5P,N5YTYGN]K#S#3%==E:XR +MIUQU"2[C55?YDI6TKJG/FAR*X2&GH.)[6!H$I,&VH,_OEI+2B3;"6F1O`B)M<:C -M&6E-B&D`7("@0'00&[SKS_->0#M[3W1[2EQK)P8LO;;J,ES2:^UD:@`IIH4F -M5`S6,1\P#1/MXJT/:."0'T]!$0RY!BENXO?<-)_E"!R-M5T#QX;L1-6-4P!% -M07&0#[:7%<@2TY;=JLD/Q_I8[W[^R0*+PV0@>G(!AP#K30Q`7F]'P`.#^4YSO`]7Y7KH_UCW^#,UN=JVH\<#UE -M^"^0"FC>E9@"QQZ_N]EF6F\W#LY5/_=A[?7)XOXNLW"[KJG/FAR*X2&TF-P;3F8-HE)`^W!'U_)DAK)=D):)"]"8KW# +M[*RT0L@,`,J`84#*D#7:S<=]SZ"=/2=JW"5NM!,#EIZ+.@V7]$8[F1I`K-U, +M$2H'<<0'3$-'NWCJ`QHXS8^F()`V7@!G%_&[;YH/.0*'8Z5KX,B0':NZ=0H@ +M,`@*_,;.O`(NM=NR6S7Y_E`?ZMUVY>!4%8&7.EC\A=TF;T;9LRD?EH_7+_.EKQ^E +MD?GQ"_3#GG[FDOCZ@<^/Q]:/G]5/$!!BY&P>]?O\,@?1\8NL7XJL?B@?F4\[ +MVD42?@:06L!H##/;G3FQ=UV+2%P/R'Q`?"QO!UCLMK(XU-_^#==B2KWV^%W-UM-ZLW9PKONYAX,)'454N=\&Z69ANJ\U?N^S(T.1 +MLD"]5/,D59!XH-ZM#T=_DY42"J./LV`3.$9[LX;KNI__\W]K:^!XY*.B'LK) +)#UU>%[W2!P`` ` end Modified: head/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu ============================================================================== --- head/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu Sun Jun 21 02:45:31 2015 (r284658) +++ head/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu Sun Jun 21 02:55:25 2015 (r284659) @@ -1,17 +1,17 @@ # $FreeBSD$ begin 644 img-63x255-4096-bsd.vhd.gz -M'XL("`#&'50``VEM9RTV,W@R-34M-#`Y-BUB5LB`]_)6VQ"<*">WB/ -M.Q`1HGT`5`*J`E6"2JF=25"WD.4`IM,6;.K8?D*M/]Y+_7TX1?:I%RTL%MS* -M-R=[3$":23+`@B91.VI#[3#1S7:_/+SM'0XMSDTL%4B$U$#D8)Y!C?O^ZG4H -MX/I4+&;6?#H8D_H*TF?VEBA&ZNF.>A/Y[QFH"9AFM-U3!3E>NX(OV^>Q^.J) -M=/GC[M!X"><$\]/`QZT8+FG#T5%8\H*.(2F[;SF"NS._=8>3<^HH9\JQCDEG -MT\#)K/.>'8\SQ"7$"8B<934#GN,+G;[;H0STW)W1!T-W"\)E_OB8X?""N^#C -M7NVYS`9W(;RP>NNA.ATX&+O^SKARYQ+$W[DM#L,>!-B<+"8#S:AA/=U1/T;^ -MVP+1'E7!SCYT1U4HA=("@RDTP#*P0BQGD^VW6:BLPD`72<(%O$@2+N!%DG`! ->+Y*$"WB1)%S`BR3A@EXDE?F+(,3B!S97<DEP.^ +M#M7IL;K>JG6PJD!78H:6ZJ)H+7&&K&@^/Q:V21.?[O%>O`&)\]0E:F`E9$X% +M53@[A;-+5M?@;E4XQ$V4RK^B9WT[XSH4!)5T`]BX[T>O1X'4 +M9V.U$//Y9,SJRUF?H7663[3S`_5#Y-\G8,%`6J^TW!,+&5X:P9?'YZG\%C/E +M\L?54>`Y7"=8[@8^;BUPNDU'3Q'%"T4,NNS?S03NGGZ;'F>6U''-E%,#L\XF +M@8NYR`9V,L\0EQ!K4)FH:@$\Y1=Z?7=C&>BYNZ`/QN[FC$O]^;'`X1EWP<=M +MW;XL)O Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3777CFB0 for ; Sun, 21 Jun 2015 03:32:33 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DBF2D360 for ; Sun, 21 Jun 2015 03:32:32 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: by wibdq8 with SMTP id dq8so47600403wib.1 for ; Sat, 20 Jun 2015 20:32:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=kP+ldy45FCkrlRyS2pDcgld/3u/DT6I3u4wZobmYk2c=; b=UUMnYPcwMIS+KyR0hr/pjnzQ+VqcGZnLFFLLH73kwVWD18hGLuXHQwK05T4zm67USK azTNZDFR7oveykDcYIRTS5POARBO5rjxGc8FY98Kc7zHiZSmqxuEtvGzLHQzbj7Vf0Z8 0qV1kNN6Kcp1eqdPVHvdriGavqQH964DpP98aZz8rzdS9x5N5sTYi2bso/waijW9AfSm sEhiXITnb+0J7/4PkIcjjT4uhKHZtq219bFLHTkj+o00ShHqsUkttC1yfhPRMbGotlt2 cQpQAJkeRDMZnZT6vCXeAAznEtbkGAsT/3cbDj2Bm6O5GlGRGyWAhQjHNjE3n26mIyTM pgug== X-Gm-Message-State: ALoCoQkDafYbrb+BuIceW4bfkcf4VcSveM6QbbQMiO0h1fjdxzqz0IWFwaOnhYrkbAo8NUhx/Ip/ MIME-Version: 1.0 X-Received: by 10.180.109.136 with SMTP id hs8mr19678110wib.73.1434857545246; Sat, 20 Jun 2015 20:32:25 -0700 (PDT) Sender: sobomax@sippysoft.com Received: by 10.27.205.66 with HTTP; Sat, 20 Jun 2015 20:32:25 -0700 (PDT) In-Reply-To: References: <201506192224.t5JMOxpC097306@svn.freebsd.org> <1434755385.1415.114.camel@freebsd.org> <1434818987.1415.120.camel@freebsd.org> Date: Sat, 20 Jun 2015 20:32:25 -0700 X-Google-Sender-Auth: VEuB31i4xAbKZ1dFjeAynBuuTYU Message-ID: Subject: Re: svn commit: r284614 - head/sys/boot/uboot/lib From: Maxim Sobolev To: Luiz Otavio O Souza Cc: Ian Lepore , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 03:32:33 -0000 Kewl, have you bothered to report it back to u-boot guys by any chance? -Max On Sat, Jun 20, 2015 at 1:11 PM, Luiz Otavio O Souza wrote: > On Sat, Jun 20, 2015 at 4:42 PM, Maxim Sobolev wrote: > > No, what I am saying is that it sets "fdtaddr=4096" for the value of > 0x1000 > > and that drives btloader nuts. Dumb, yeah! On the positive note got > > redpitaya fully working (except lack of the I2C support and actual fpga > > support being unknown). But at least I can try to dual-boot it now. > > > > -Max > > Yeah, I'd to fix that for RPi 2 too: > > > https://svnweb.freebsd.org/ports/head/sysutils/u-boot-rpi2/files/patch-common_cmd__fdt.c?view=markup > > Luiz > From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 04:34:58 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B6C5C785; Sun, 21 Jun 2015 04:34:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8CE642B2; Sun, 21 Jun 2015 04:34:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L4Yw1a090414; Sun, 21 Jun 2015 04:34:58 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L4YwRm090413; Sun, 21 Jun 2015 04:34:58 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506210434.t5L4YwRm090413@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 21 Jun 2015 04:34:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284660 - head/release/tools X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 04:34:58 -0000 Author: gjb Date: Sun Jun 21 04:34:57 2015 New Revision: 284660 URL: https://svnweb.freebsd.org/changeset/base/284660 Log: Chase r284656 and r284658: Remove the Azure-local vm_extra_create_disk(), since we no longer need qemu-img to convert the final VHD image to an Azure-compatible format. Although the waagent utility is installed from ports, create the symlink to /usr/sbin, pending investigation on where this is hard-coded, so it can be reported upstream. In the meantime, this is good enough. MFC after: 3 days X-MFC-Needs: r284269, r284270, r284271, r284655, r284656, r284657, r284658, r284659 X-MFC-Note: Required for 10.2-RELEASE, marcel@ has implicit approval for the required changes Sponsored by: The FreeBSD Foundation Modified: head/release/tools/azure.conf Modified: head/release/tools/azure.conf ============================================================================== --- head/release/tools/azure.conf Sun Jun 21 02:55:25 2015 (r284659) +++ head/release/tools/azure.conf Sun Jun 21 04:34:57 2015 (r284660) @@ -14,6 +14,7 @@ export VM_EXTRA_PACKAGES="sysutils/azure export VM_RC_LIST= vm_extra_pre_umount() { + chroot ${DESTDIR} ln -s /usr/local/sbin/waagent /usr/sbin/waagent chroot ${DESTDIR} /usr/local/sbin/waagent -verbose -install yes | chroot ${DESTDIR} /usr/local/sbin/waagent -deprovision echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf @@ -26,17 +27,3 @@ vm_extra_pre_umount() { return 0 } - -vm_extra_create_disk() { - if [ ! -x "/usr/local/bin/qemu-img" ]; then - env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-devel - fi - - mv ${VMIMAGE} ${VMIMAGE}.raw - size=$(qemu-img info -f raw --output json ${VMIMAGE}.raw | awk '/virtual-size/ {print $2}' | tr -d ',') - size=$(( ( ${size} / ( 1024 * 1024 ) + 1 ) * ( 1024 * 1024 ) )) - qemu-img resize ${VMIMAGE}.raw ${size} - qemu-img convert -f raw -o subformat=fixed -O vpc ${VMIMAGE}.raw ${VMIMAGE} - - return 0 -} From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 05:32:57 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D361F27; Sun, 21 Jun 2015 05:32:57 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B6D029C; Sun, 21 Jun 2015 05:32:57 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L5Wuth019480; Sun, 21 Jun 2015 05:32:56 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L5WuRS019479; Sun, 21 Jun 2015 05:32:56 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201506210532.t5L5WuRS019479@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Sun, 21 Jun 2015 05:32:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284662 - head/sys/dev/xen/blkfront X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 05:32:57 -0000 Author: cperciva Date: Sun Jun 21 05:32:56 2015 New Revision: 284662 URL: https://svnweb.freebsd.org/changeset/base/284662 Log: If we fail to allocate memory, pass ENOMEM as the error code, not the "error" variable (which is always zero at this point). Modified: head/sys/dev/xen/blkfront/blkfront.c Modified: head/sys/dev/xen/blkfront/blkfront.c ============================================================================== --- head/sys/dev/xen/blkfront/blkfront.c Sun Jun 21 04:39:34 2015 (r284661) +++ head/sys/dev/xen/blkfront/blkfront.c Sun Jun 21 05:32:56 2015 (r284662) @@ -1135,7 +1135,7 @@ xbd_initialize(struct xbd_softc *sc) M_XENBLOCKFRONT, M_NOWAIT|M_ZERO); if (sc->xbd_shadow == NULL) { bus_dma_tag_destroy(sc->xbd_io_dmat); - xenbus_dev_fatal(sc->xbd_dev, error, + xenbus_dev_fatal(sc->xbd_dev, ENOMEM, "Cannot allocate request structures\n"); return; } From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 05:36:59 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 523B223A; Sun, 21 Jun 2015 05:36:59 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 339072E1; Sun, 21 Jun 2015 05:36:59 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L5ax4q020255; Sun, 21 Jun 2015 05:36:59 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L5axaL020254; Sun, 21 Jun 2015 05:36:59 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201506210536.t5L5axaL020254@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Sun, 21 Jun 2015 05:36:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284663 - head/sys/dev/xen/blkfront X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 05:36:59 -0000 Author: cperciva Date: Sun Jun 21 05:36:58 2015 New Revision: 284663 URL: https://svnweb.freebsd.org/changeset/base/284663 Log: Move the bus_dma_tag creation and per-transaction data allocation from xbd_initialize to xbd_connect. Both of these initialization steps need to know what the maximum possible I/O size will be, and when we gain support for indirect segment I/Os we won't know that value until we reach xbd_connect. Since none of this data is used before xbd_connect completes, moving the initialization is harmless. This commit should not result in any functional changes. Modified: head/sys/dev/xen/blkfront/blkfront.c Modified: head/sys/dev/xen/blkfront/blkfront.c ============================================================================== --- head/sys/dev/xen/blkfront/blkfront.c Sun Jun 21 05:32:56 2015 (r284662) +++ head/sys/dev/xen/blkfront/blkfront.c Sun Jun 21 05:36:58 2015 (r284663) @@ -1039,7 +1039,6 @@ xbd_initialize(struct xbd_softc *sc) const char *node_path; uint32_t max_ring_page_order; int error; - int i; if (xenbus_get_state(sc->xbd_dev) != XenbusStateInitialising) { /* Initialization has already been performed. */ @@ -1110,53 +1109,6 @@ xbd_initialize(struct xbd_softc *sc) sc->xbd_max_requests = XBD_MAX_REQUESTS; } - /* Allocate datastructures based on negotiated values. */ - error = bus_dma_tag_create( - bus_get_dma_tag(sc->xbd_dev), /* parent */ - 512, PAGE_SIZE, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - sc->xbd_max_request_size, - sc->xbd_max_request_segments, - PAGE_SIZE, /* maxsegsize */ - BUS_DMA_ALLOCNOW, /* flags */ - busdma_lock_mutex, /* lockfunc */ - &sc->xbd_io_lock, /* lockarg */ - &sc->xbd_io_dmat); - if (error != 0) { - xenbus_dev_fatal(sc->xbd_dev, error, - "Cannot allocate parent DMA tag\n"); - return; - } - - /* Per-transaction data allocation. */ - sc->xbd_shadow = malloc(sizeof(*sc->xbd_shadow) * sc->xbd_max_requests, - M_XENBLOCKFRONT, M_NOWAIT|M_ZERO); - if (sc->xbd_shadow == NULL) { - bus_dma_tag_destroy(sc->xbd_io_dmat); - xenbus_dev_fatal(sc->xbd_dev, ENOMEM, - "Cannot allocate request structures\n"); - return; - } - - for (i = 0; i < sc->xbd_max_requests; i++) { - struct xbd_command *cm; - - cm = &sc->xbd_shadow[i]; - cm->cm_sg_refs = malloc( - sizeof(grant_ref_t) * sc->xbd_max_request_segments, - M_XENBLOCKFRONT, M_NOWAIT); - if (cm->cm_sg_refs == NULL) - break; - cm->cm_id = i; - cm->cm_flags = XBDCF_INITIALIZER; - cm->cm_sc = sc; - if (bus_dmamap_create(sc->xbd_io_dmat, 0, &cm->cm_map) != 0) - break; - xbd_free_command(cm); - } - if (xbd_alloc_ring(sc) != 0) return; @@ -1215,6 +1167,7 @@ xbd_connect(struct xbd_softc *sc) unsigned long sectors, sector_size; unsigned int binfo; int err, feature_barrier, feature_flush; + int i; if (sc->xbd_state == XBD_STATE_CONNECTED || sc->xbd_state == XBD_STATE_SUSPENDED) @@ -1245,6 +1198,53 @@ xbd_connect(struct xbd_softc *sc) if (err == 0 && feature_flush != 0) sc->xbd_flags |= XBDF_FLUSH; + /* Allocate datastructures based on negotiated values. */ + err = bus_dma_tag_create( + bus_get_dma_tag(sc->xbd_dev), /* parent */ + 512, PAGE_SIZE, /* algnmnt, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + sc->xbd_max_request_size, + sc->xbd_max_request_segments, + PAGE_SIZE, /* maxsegsize */ + BUS_DMA_ALLOCNOW, /* flags */ + busdma_lock_mutex, /* lockfunc */ + &sc->xbd_io_lock, /* lockarg */ + &sc->xbd_io_dmat); + if (err != 0) { + xenbus_dev_fatal(sc->xbd_dev, err, + "Cannot allocate parent DMA tag\n"); + return; + } + + /* Per-transaction data allocation. */ + sc->xbd_shadow = malloc(sizeof(*sc->xbd_shadow) * sc->xbd_max_requests, + M_XENBLOCKFRONT, M_NOWAIT|M_ZERO); + if (sc->xbd_shadow == NULL) { + bus_dma_tag_destroy(sc->xbd_io_dmat); + xenbus_dev_fatal(sc->xbd_dev, ENOMEM, + "Cannot allocate request structures\n"); + return; + } + + for (i = 0; i < sc->xbd_max_requests; i++) { + struct xbd_command *cm; + + cm = &sc->xbd_shadow[i]; + cm->cm_sg_refs = malloc( + sizeof(grant_ref_t) * sc->xbd_max_request_segments, + M_XENBLOCKFRONT, M_NOWAIT); + if (cm->cm_sg_refs == NULL) + break; + cm->cm_id = i; + cm->cm_flags = XBDCF_INITIALIZER; + cm->cm_sc = sc; + if (bus_dmamap_create(sc->xbd_io_dmat, 0, &cm->cm_map) != 0) + break; + xbd_free_command(cm); + } + if (sc->xbd_disk == NULL) { device_printf(dev, "%juMB <%s> at %s", (uintmax_t) sectors / (1048576 / sector_size), From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 06:05:34 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3843B617; Sun, 21 Jun 2015 06:05:34 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 25E9DB40; Sun, 21 Jun 2015 06:05:34 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L65YhQ034485; Sun, 21 Jun 2015 06:05:34 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L65Ywc034484; Sun, 21 Jun 2015 06:05:34 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201506210605.t5L65Ywc034484@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Sun, 21 Jun 2015 06:05:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284664 - head/sys/xen/interface/io X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 06:05:34 -0000 Author: cperciva Date: Sun Jun 21 06:05:33 2015 New Revision: 284664 URL: https://svnweb.freebsd.org/changeset/base/284664 Log: Garbage collect comments which related to the pre-r284296 support for a "segment block" extension in FreeBSD's Xen blkfront/blkback drivers. Since this commit only affects comments, it should have no functional effect. Modified: head/sys/xen/interface/io/blkif.h Modified: head/sys/xen/interface/io/blkif.h ============================================================================== --- head/sys/xen/interface/io/blkif.h Sun Jun 21 05:36:58 2015 (r284663) +++ head/sys/xen/interface/io/blkif.h Sun Jun 21 06:05:33 2015 (r284664) @@ -145,32 +145,6 @@ * The maximum supported size of the request ring buffer in units of * machine pages. The value must be a power of 2. * - * max-requests - * Default Value: BLKIF_MAX_RING_REQUESTS(PAGE_SIZE) - * Maximum Value: BLKIF_MAX_RING_REQUESTS(PAGE_SIZE * max-ring-pages) - * - * The maximum number of concurrent, logical requests supported by - * the backend. - * - * Note: A logical request may span multiple ring entries. - * - * max-request-segments - * Values: - * Default Value: BLKIF_MAX_SEGMENTS_PER_HEADER_BLOCK - * Maximum Value: BLKIF_MAX_SEGMENTS_PER_REQUEST - * - * The maximum value of blkif_request.nr_segments supported by - * the backend. - * - * max-request-size - * Values: - * Default Value: BLKIF_MAX_SEGMENTS_PER_HEADER_BLOCK * PAGE_SIZE - * Maximum Value: BLKIF_MAX_SEGMENTS_PER_REQUEST * PAGE_SIZE - * - * The maximum amount of data, in bytes, that can be referenced by a - * request type that accesses frontend memory (currently BLKIF_OP_READ, - * BLKIF_OP_WRITE, or BLKIF_OP_WRITE_BARRIER). - * *------------------------- Backend Device Properties ------------------------- * * discard-alignment @@ -269,33 +243,6 @@ * The size of the frontend allocated request ring buffer in units of * machine pages. The value must be a power of 2. * - * max-requests - * Values: - * Default Value: BLKIF_MAX_RING_REQUESTS(PAGE_SIZE) - * Maximum Value: BLKIF_MAX_RING_REQUESTS(PAGE_SIZE * max-ring-pages) - * - * The maximum number of concurrent, logical requests that will be - * issued by the frontend. - * - * Note: A logical request may span multiple ring entries. - * - * max-request-segments - * Values: - * Default Value: BLKIF_MAX_SEGMENTS_PER_HEADER_BLOCK - * Maximum Value: MIN(255, backend/max-request-segments) - * - * The maximum value the frontend will set in the - * blkif_request.nr_segments field. - * - * max-request-size - * Values: - * Default Value: BLKIF_MAX_SEGMENTS_PER_HEADER_BLOCK * PAGE_SIZE - * Maximum Value: max-request-segments * PAGE_SIZE - * - * The maximum amount of data, in bytes, that can be referenced by - * a request type that accesses frontend memory (currently BLKIF_OP_READ, - * BLKIF_OP_WRITE, or BLKIF_OP_WRITE_BARRIER). - * *------------------------- Virtual Device Properties ------------------------- * * device-type @@ -457,7 +404,9 @@ #define BLKIF_OP_DISCARD 5 /* - * Maximum scatter/gather segments per request (header + segment blocks). + * Maximum scatter/gather segments per request. + * This is carefully chosen so that sizeof(blkif_ring_t) <= PAGE_SIZE. + * NB. This could be 12 if the ring indexes weren't stored in the same page. */ #define BLKIF_MAX_SEGMENTS_PER_REQUEST 11 @@ -478,21 +427,6 @@ typedef struct blkif_request_segment blk /* * Starting ring element for any I/O request. - * - * One or more segment blocks can be inserted into the request ring - * just after a blkif_request_t, allowing requests to operate on - * up to BLKIF_MAX_SEGMENTS_PER_REQUEST. - * - * BLKIF_SEGS_TO_BLOCKS() can be used on blkif_requst.nr_segments - * to determine the number of contiguous ring entries associated - * with this request. - * - * Note: Due to the way Xen request rings operate, the producer and - * consumer indices of the ring must be incremented by the - * BLKIF_SEGS_TO_BLOCKS() value of the associated request. - * (e.g. a response to a 3 ring entry request must also consume - * 3 entries in the ring, even though only the first ring entry - * in the response has any data.) */ struct blkif_request { uint8_t operation; /* BLKIF_OP_??? */ From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 06:09:54 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 61B407A5; Sun, 21 Jun 2015 06:09:54 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail108.syd.optusnet.com.au (mail108.syd.optusnet.com.au [211.29.132.59]) by mx1.freebsd.org (Postfix) with ESMTP id 0CDB7B62; Sun, 21 Jun 2015 06:09:53 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au (c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197]) by mail108.syd.optusnet.com.au (Postfix) with ESMTPS id 0163F1A2EE7; Sun, 21 Jun 2015 16:09:49 +1000 (AEST) Date: Sun, 21 Jun 2015 16:09:48 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Pedro Giffuni cc: Bruce Evans , Dimitry Andric , David Chisnall , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys In-Reply-To: <55861046.4050501@FreeBSD.org> Message-ID: <20150621154332.U976@besplex.bde.org> References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> MIME-Version: 1.0 X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=XMDNMlVE c=1 sm=1 tr=0 a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=PO7r1zJSAAAA:8 a=JzwRw_2MAAAA:8 a=nlC_4_pT8q9DhB4Ho9EA:9 a=cz2ZRIgtxKwA:10 a=wJWlkF7cXJYA:10 a=c3-DdYJoA5YA:10 a=6I5d2MoRAAAA:8 a=IaeCAZcxxuhpfIh5NXQA:9 a=45ClL6m2LaAA:10 Content-Type: TEXT/PLAIN; charset=X-UNKNOWN; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 06:09:54 -0000 On Sat, 20 Jun 2015, Pedro Giffuni wrote: > On 06/19/15 12:23, Bruce Evans wrote: >> On Fri, 19 Jun 2015, Dimitry Andric wrote: >>=20 >>> On 19 Jun 2015, at 17:02, Pedro Giffuni wrote: >>>>=20 >>>>> On 19/06/2015 05:16 a.m., David Chisnall wrote: >>>>>> I only just caught this (having seen the fallout from NetBSD doing t= he=20 >>>>>> same thing in a shipping release and the pain that it=E2=80=99s caus= ed): >>>>>> __weak is a reserved keyword in Objective-C, please pick another nam= e=20 >>>>>> for this. This in cdefs.h makes it impossible to include any FreeBS= D=20 >>>>>> standard headers in Objective-C programs (of which we have a couple = of=20 >>>>>> hundred in ports) if they use any of the modern Objective-C language= =20 >>>>>> modes. >>> ... >>>> Closely related to this, we are redefining _Noreturn, which is a reser= ved=20 >>>> keyword in C11. >>>=20 >>> No, sys/cdefs.h has: >>>=20 >>> 254 /* >>> 255 * Keywords added in C11. >>> 256 */ >>> 257 >>> 258 #if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L ||= =20 >>> defined(lint) >>> [...] >>> 284 #if defined(__cplusplus) && __cplusplus >=3D 201103L >>> 285 #define _Noreturn [[noreturn]] >>> 286 #else >>> 287 #define _Noreturn __dead2 >>> 288 #endif >>> [...] >>> 320 #endif /* __STDC_VERSION__ || __STDC_VERSION__ < 201112L */ >>>=20 >>> So the whole block redefining all the _Xxx identifiers is skipped for >>> C11 and higher. >>=20 >> I probably pointed this out incorrectly to Pedro. >>=20 >> All uses of _Noreturn are still broken, and also ugly. __dead2 is the >> gcc-2 compatible version of the gcc-1 compatible macro __dead. It is >> syntactically different from __dead and _Noreturn. It must be placed >> after the function parameter list instead of in the function type >> declarator because old versions of gcc only accept attributes there. >> __dead and presumably _Noreturn must be placed in the function type >> declarator. This is incompatible, and also uglier. >>=20 > I was thinking that _Noreturn can be fixed for older compilers > less disruptively. > > I haven't tested the attached patch the idea is to resurrect > __dead and use it for _Noreturn. > >> Correct version with ugly declarations: >>=20 >> __dead void >> foo(void) __dead2; >>=20 > > With the patch we would use: > > __Noreturn void > foo(void) _dead2; > > Which is still ugly but C11-ish. That asks for the same problems as defining __weak. Why not just don't use _Noreturn? It is an unimprovement on the gcc attribute. The attribute works at the beginning or end, while Noreturn only works at the end. I checked this: pts/23:bde@freefall:~/s> cc -O -S a.c -std=3Dc11 a.c:3:26: error: '_Noreturn' keyword must precede function declarator _Noreturn void bar(void) _Noreturn; ^ I also checked if __dead2 works at the beginning in gcc-2.95.4. It does, but other headers are broken, so the support for gcc-2.95.4 in sys/cdefs.h is almost useless: pts/23:bde@freefall:~/s> gcc295 -O -S a.c In file included from /usr/include/machine/_types.h:6, from /usr/include/sys/_types.h:33, from /usr/include/x86/endian.h:37, from /usr/include/machine/endian.h:6, from /usr/include/sys/types.h:44, from a.c:1: /usr/include/x86/_types.h:161: syntax error before `__gnuc_va_list' /usr/include/x86/_types.h:161: warning: data definition has no type or stor= age c lass Here is the broken part of x86/_types.h: %%% #ifdef __GNUCLIKE_BUILTIN_VARARGS typedef __builtin_va_list=09__va_list;=09/* internally known to gcc */ #elif defined(lint) typedef char *=09=09=09__va_list;=09/* pretend */ #endif #if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ && !defined(__NO_GNUC_VA_LIST) #define __GNUC_VA_LIST meta: next is line 161: typedef __va_list=09=09__gnuc_va_list; /* compatibility w/GNU headers*/ #endif %%% Despite (rather, because of) mounds of ifdefs to support old gcc, it doesn'= t actually work. is honestly broken. It knows that it depends on the gcc feature __GNUCLIKE_BUILTIN_STDARG, and aborts with an #error when it is not availab= le. All of the _GNUCLIKE_BUILTIN_* macros for variadic args are controlled by sys/cdefs.h. They are defined when the compiler is either gcc newer than gcc-2.95 or is icc. Bruce From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 06:52:04 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 176AE461; Sun, 21 Jun 2015 06:52:04 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 05308896; Sun, 21 Jun 2015 06:52:04 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L6q3DC060562; Sun, 21 Jun 2015 06:52:03 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L6q3qO060561; Sun, 21 Jun 2015 06:52:03 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201506210652.t5L6q3qO060561@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Sun, 21 Jun 2015 06:52:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284670 - head/sys/dev/xen/blkfront X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 06:52:04 -0000 Author: cperciva Date: Sun Jun 21 06:52:03 2015 New Revision: 284670 URL: https://svnweb.freebsd.org/changeset/base/284670 Log: Garbage collect comments and a macro which related to the pre-r284296 support for a "segment block" extension in FreeBSD's Xen blkfront/blkback drivers. This commit should not result in any functional changes. Modified: head/sys/dev/xen/blkfront/block.h Modified: head/sys/dev/xen/blkfront/block.h ============================================================================== --- head/sys/dev/xen/blkfront/block.h Sun Jun 21 06:49:44 2015 (r284669) +++ head/sys/dev/xen/blkfront/block.h Sun Jun 21 06:52:03 2015 (r284670) @@ -68,9 +68,8 @@ #define XBD_MAX_RING_PAGES 32 /** - * The maximum number of outstanding requests blocks (request headers plus - * additional segment blocks) we will allow in a negotiated block-front/back - * communication channel. + * The maximum number of outstanding requests we will allow in a negotiated + * block-front/back communication channel. */ #define XBD_MAX_REQUESTS \ __CONST_RING_SIZE(blkif, PAGE_SIZE * XBD_MAX_RING_PAGES) @@ -82,15 +81,6 @@ #define XBD_MAX_REQUEST_SIZE \ MIN(MAXPHYS, XBD_SEGS_TO_SIZE(BLKIF_MAX_SEGMENTS_PER_REQUEST)) -/** - * The maximum number of segments (within a request header and accompanying - * segment blocks) per request we will allow in a negotiated block-front/back - * communication channel. - */ -#define XBD_MAX_SEGMENTS_PER_REQUEST \ - (MIN(BLKIF_MAX_SEGMENTS_PER_REQUEST, \ - XBD_SIZE_TO_SEGS(XBD_MAX_REQUEST_SIZE))) - typedef enum { XBDCF_Q_MASK = 0xFF, /* This command has contributed to xbd_qfrozen_cnt. */ From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 06:56:29 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ECDA1725; Sun, 21 Jun 2015 06:56:29 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DAC838BF; Sun, 21 Jun 2015 06:56:29 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L6uTlx061251; Sun, 21 Jun 2015 06:56:29 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L6uTjV061250; Sun, 21 Jun 2015 06:56:29 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201506210656.t5L6uTjV061250@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 21 Jun 2015 06:56:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284672 - head/sys/boot/forth X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 06:56:30 -0000 Author: antoine Date: Sun Jun 21 06:56:29 2015 New Revision: 284672 URL: https://svnweb.freebsd.org/changeset/base/284672 Log: Install version.4th.8 again It was disconnected from installation in r281081, but was never removed from the tree or added to ObsoleteFiles.inc Modified: head/sys/boot/forth/Makefile Modified: head/sys/boot/forth/Makefile ============================================================================== --- head/sys/boot/forth/Makefile Sun Jun 21 06:54:54 2015 (r284671) +++ head/sys/boot/forth/Makefile Sun Jun 21 06:56:29 2015 (r284672) @@ -8,6 +8,7 @@ MAN+= beastie.4th.8 \ loader.conf.5 \ loader.4th.8 \ menu.4th.8 \ - menusets.4th.8 + menusets.4th.8 \ + version.4th.8 .include From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 06:57:41 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E9E986A; Sun, 21 Jun 2015 06:57:41 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2C51F8C7; Sun, 21 Jun 2015 06:57:41 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L6vfBf061438; Sun, 21 Jun 2015 06:57:41 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5L6vfaR061437; Sun, 21 Jun 2015 06:57:41 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201506210657.t5L6vfaR061437@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 21 Jun 2015 06:57:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284673 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 06:57:41 -0000 Author: antoine Date: Sun Jun 21 06:57:40 2015 New Revision: 284673 URL: https://svnweb.freebsd.org/changeset/base/284673 Log: Add more obsolete files Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sun Jun 21 06:56:29 2015 (r284672) +++ head/ObsoleteFiles.inc Sun Jun 21 06:57:40 2015 (r284673) @@ -232,8 +232,8 @@ OLD_FILES+=usr/share/man/man3/nvlist_tak OLD_FILES+=usr/share/man/man3/nvlist_takev_number.3.gz OLD_FILES+=usr/share/man/man3/nvlist_takev_nvlist.3.gz OLD_FILES+=usr/share/man/man3/nvlist_takev_string.3.gz -# 20150429: -OLD_FILES+=usr/share/docs/papers/hwpmc.ascii.gz +# 20150429: remove never written documentation +OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz # 20150427: test/sys/kern/mmap_test moved to test/sys/vm/mmap_test OLD_FILES+=usr/tests/sys/kern/mmap_test # 20150422: zlib.c moved from net to libkern @@ -257,6 +257,42 @@ OLD_FILES+=usr/include/altq/altq_rmclass OLD_FILES+=usr/include/altq/altq_cbq.h OLD_FILES+=usr/include/altq/altq_rio.h OLD_DIRS+=usr/include/altq +# 20150330: ntp 4.2.8p1 +OLD_FILES+=usr/share/doc/ntp/driver1.html +OLD_FILES+=usr/share/doc/ntp/driver10.html +OLD_FILES+=usr/share/doc/ntp/driver11.html +OLD_FILES+=usr/share/doc/ntp/driver12.html +OLD_FILES+=usr/share/doc/ntp/driver16.html +OLD_FILES+=usr/share/doc/ntp/driver18.html +OLD_FILES+=usr/share/doc/ntp/driver19.html +OLD_FILES+=usr/share/doc/ntp/driver2.html +OLD_FILES+=usr/share/doc/ntp/driver20.html +OLD_FILES+=usr/share/doc/ntp/driver22.html +OLD_FILES+=usr/share/doc/ntp/driver26.html +OLD_FILES+=usr/share/doc/ntp/driver27.html +OLD_FILES+=usr/share/doc/ntp/driver28.html +OLD_FILES+=usr/share/doc/ntp/driver29.html +OLD_FILES+=usr/share/doc/ntp/driver3.html +OLD_FILES+=usr/share/doc/ntp/driver30.html +OLD_FILES+=usr/share/doc/ntp/driver32.html +OLD_FILES+=usr/share/doc/ntp/driver33.html +OLD_FILES+=usr/share/doc/ntp/driver34.html +OLD_FILES+=usr/share/doc/ntp/driver35.html +OLD_FILES+=usr/share/doc/ntp/driver36.html +OLD_FILES+=usr/share/doc/ntp/driver37.html +OLD_FILES+=usr/share/doc/ntp/driver4.html +OLD_FILES+=usr/share/doc/ntp/driver5.html +OLD_FILES+=usr/share/doc/ntp/driver6.html +OLD_FILES+=usr/share/doc/ntp/driver7.html +OLD_FILES+=usr/share/doc/ntp/driver8.html +OLD_FILES+=usr/share/doc/ntp/driver9.html +OLD_FILES+=usr/share/doc/ntp/ldisc.html +OLD_FILES+=usr/share/doc/ntp/measure.html +OLD_FILES+=usr/share/doc/ntp/mx4200data.html +OLD_FILES+=usr/share/doc/ntp/notes.html +OLD_FILES+=usr/share/doc/ntp/patches.html +OLD_FILES+=usr/share/doc/ntp/porting.html +OLD_FILES+=usr/share/man/man1/sntp.1.gz # 20150329 .if ${TARGET_ARCH} == "arm" OLD_FILES+=usr/include/bootconfig.h @@ -361,6 +397,8 @@ OLD_FILES+=usr/share/man/man9/splstatclo OLD_FILES+=usr/share/man/man9/spltty.9.gz OLD_FILES+=usr/share/man/man9/splvm.9.gz OLD_FILES+=usr/share/man/man9/splx.9.gz +# 20150122: callout changes reverted +OLD_FILES+=usr/share/man/man9/callout_drain_async.9.gz # 20150118: toeplitz.c moved from netinet to net OLD_FILES+=usr/include/netinet/toeplitz.h # 20150118: new clang import which bumps version from 3.5.0 to 3.5.1. @@ -528,6 +566,9 @@ OLD_LIBS+=usr/lib/libxo.so.0 OLD_FILES+=usr/include/net/if_stf.h OLD_FILES+=usr/include/netinet/in_gif.h OLD_FILES+=usr/include/netinet6/in6_gif.h +# 20141209: pw tests broken into a file per command +OLD_FILES+=usr/tests/usr.sbin/pw/pw_delete +OLD_FILES+=usr/tests/usr.sbin/pw/pw_modify # 20141202: update to mandoc CVS 20141201 OLD_FILES+=usr.bin/preconv OLD_FILES+=share/man/man1/preconv.1.gz @@ -644,6 +685,8 @@ OLD_FILES+=usr/lib/private/libucl.so OLD_FILES+=usr/lib/private/libucl_p.a # 20140803: Remove an obsolete man page OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz +# 20140731 +OLD_FILES+=usr/share/man/man9/SYSCTL_ADD_OID.9.gz # 20140728: libsbuf restored to old version. OLD_LIBS+=lib/libsbuf.so.7 OLD_LIBS+=usr/lib32/libsbuf.so.7 @@ -756,6 +799,12 @@ OLD_FILES+=usr/share/mk/src.opts.mk OLD_FILES+=usr/tests/sbin/ifconfig/fibs_test # 20140502: Removal of lindev(4) OLD_FILES+=usr/share/man/man4/lindev.4.gz +# 20140425 +OLD_FILES+=usr/lib/libssp_p.a +OLD_FILES+=usr/lib/libstand_p.a +OLD_FILES+=usr/lib32/libc_pic.a +OLD_FILES+=usr/lib32/libssp_p.a +OLD_FILES+=usr/lib32/libstand_p.a # 20140314: AppleTalk OLD_DIRS+=usr/include/netatalk OLD_FILES+=usr/include/netatalk/aarp.h From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 07:29:19 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 935C2DB1; Sun, 21 Jun 2015 07:29:19 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-wi0-x22c.google.com (mail-wi0-x22c.google.com [IPv6:2a00:1450:400c:c05::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2A995EF1; Sun, 21 Jun 2015 07:29:19 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: by wiwl6 with SMTP id l6so11196361wiw.0; Sun, 21 Jun 2015 00:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=Q+iV/0nSoCYUue8RuwIWN23qbIO1mvfJKkH7rh6gLTU=; b=WjVMXzS92SZkCimyAxqaDeGbRuz5cUSmOLE+vOZp32+f9M4nGxFPqq80hmdvregsWo yqz4LvvTPjmDhTKwKAj7UJOG9lolzEReaSwrO1rsG/n+55m5RCg80H9xaSk8UacRsfNX ukkSntnTqGR8c1a8D84zLhA1pmvrO2tkByKlGXFinq1WmZQXg6jh0ubFeyCqokiBUDNu KtCnh9imEnQZ84sjneXU1+J9KA2sVRrtKrF6ggfcA+pFYn4UtgwcjVGNVEAn84BDW5Hu +rV293h8ATSGwS0RrtC4dQ4eEJe9Nm8ZlM4mWKzdKjRI9EUiNCC79EwM9AwfCs3jagLz 5kRQ== MIME-Version: 1.0 X-Received: by 10.180.73.145 with SMTP id l17mr21405094wiv.39.1434871757657; Sun, 21 Jun 2015 00:29:17 -0700 (PDT) Sender: antoine.brodin.freebsd@gmail.com Received: by 10.194.17.130 with HTTP; Sun, 21 Jun 2015 00:29:17 -0700 (PDT) In-Reply-To: <201506131920.t5DJKwMH033508@svn.freebsd.org> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> Date: Sun, 21 Jun 2015 09:29:17 +0200 X-Google-Sender-Auth: u4dpyasoJsKUqKqzPWNyljAVftE Message-ID: Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... From: Antoine Brodin To: "Simon J. Gerraty" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 07:29:19 -0000 On Sat, Jun 13, 2015 at 9:20 PM, Simon J. Gerraty wrote: > Author: sjg > Date: Sat Jun 13 19:20:56 2015 > New Revision: 284345 > URL: https://svnweb.freebsd.org/changeset/base/284345 > > Log: > Add META_MODE support. > > Off by default, build behaves normally. > WITH_META_MODE we get auto objdir creation, the ability to > start build from anywhere in the tree. > > Still need to add real targets under targets/ to build packages. > > Differential Revision: D2796 > Reviewed by: brooks imp ... > Modified: ... > head/lib/ncurses/ncurses/Makefile ... Hi, Any reason to not install ncurses html documentation anymore? Cheers, Antoine From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 11:49:29 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9C8E88D9 for ; Sun, 21 Jun 2015 11:49:29 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5B0E0210 for ; Sun, 21 Jun 2015 11:49:29 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by wicnd19 with SMTP id nd19so53548693wic.1 for ; Sun, 21 Jun 2015 04:49:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=1kRxc5pcT/9cf0rz0u//HUxCt6mNirQ+sBShaVYOQyQ=; b=cFmr6aLluoN7RK8J+Ch67pbzoQ9zQRDRUyA+RtYo+13U5mQ/BGqjroCxaWoP0tzXTu ryYKKKu2MP6IF8rFf0Kgo/KbpR8bZHtbkvqetw1TmyjElEsXpMQPqK/CO/ZinH2N1JKD 8kdQ902xcphqjMeWoQjdAofm4ot3dFTz3gL0Leg9CJ1E/s8PlQdhJB+CfuRHbkbAr+wF Su7eI6ptGr0WCi7xFIRjv2r3ReEm+3uc5s+dryWFF2OUw6nFqmXiWKHPaPTV7EWMjqJh WTKz+cdXN/G3+K0kRcXNlAAQO8H/ss8rJd4jBJwcKJN1L/NA6KHm0kvqhr3laoCnA/jT QjCA== X-Gm-Message-State: ALoCoQnIWhYcQhMsS8ikJ0PNTlulmDIpH7GofByRK26UHbIHGca5S9EMfZKN0WcivuVXWSTdorSp MIME-Version: 1.0 X-Received: by 10.194.187.51 with SMTP id fp19mr28596437wjc.67.1434887367385; Sun, 21 Jun 2015 04:49:27 -0700 (PDT) Received: by 10.194.81.106 with HTTP; Sun, 21 Jun 2015 04:49:27 -0700 (PDT) In-Reply-To: <20150621154332.U976@besplex.bde.org> References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> <20150621154332.U976@besplex.bde.org> Date: Sun, 21 Jun 2015 13:49:27 +0200 Message-ID: Subject: Re: svn commit: r268137 - head/sys/sys From: Oliver Pinter To: Bruce Evans Cc: Pedro Giffuni , src-committers@freebsd.org, Dimitry Andric , svn-src-all@freebsd.org, David Chisnall , svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 11:49:29 -0000 On 6/21/15, Bruce Evans wrote: > On Sat, 20 Jun 2015, Pedro Giffuni wrote: > >> On 06/19/15 12:23, Bruce Evans wrote: >>> On Fri, 19 Jun 2015, Dimitry Andric wrote: >>> >>>> On 19 Jun 2015, at 17:02, Pedro Giffuni wrote: >>>>> >>>>>> On 19/06/2015 05:16 a.m., David Chisnall wrote: >>>>>>> I only just caught this (having seen the fallout from NetBSD doing >>>>>>> the >>>>>>> same thing in a shipping release and the pain that it=E2=80=99s cau= sed): >>>>>>> __weak is a reserved keyword in Objective-C, please pick another na= me >>>>>>> >>>>>>> for this. This in cdefs.h makes it impossible to include any FreeB= SD >>>>>>> >>>>>>> standard headers in Objective-C programs (of which we have a couple >>>>>>> of >>>>>>> hundred in ports) if they use any of the modern Objective-C languag= e >>>>>>> >>>>>>> modes. >>>> ... >>>>> Closely related to this, we are redefining _Noreturn, which is a >>>>> reserved >>>>> keyword in C11. >>>> >>>> No, sys/cdefs.h has: >>>> >>>> 254 /* >>>> 255 * Keywords added in C11. >>>> 256 */ >>>> 257 >>>> 258 #if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L || >>>> defined(lint) >>>> [...] >>>> 284 #if defined(__cplusplus) && __cplusplus >=3D 201103L >>>> 285 #define _Noreturn [[noreturn]] >>>> 286 #else >>>> 287 #define _Noreturn __dead2 >>>> 288 #endif >>>> [...] >>>> 320 #endif /* __STDC_VERSION__ || __STDC_VERSION__ < 201112L */ >>>> >>>> So the whole block redefining all the _Xxx identifiers is skipped for >>>> C11 and higher. >>> >>> I probably pointed this out incorrectly to Pedro. >>> >>> All uses of _Noreturn are still broken, and also ugly. __dead2 is the >>> gcc-2 compatible version of the gcc-1 compatible macro __dead. It is >>> syntactically different from __dead and _Noreturn. It must be placed >>> after the function parameter list instead of in the function type >>> declarator because old versions of gcc only accept attributes there. >>> __dead and presumably _Noreturn must be placed in the function type >>> declarator. This is incompatible, and also uglier. >>> >> I was thinking that _Noreturn can be fixed for older compilers >> less disruptively. >> >> I haven't tested the attached patch the idea is to resurrect >> __dead and use it for _Noreturn. >> >>> Correct version with ugly declarations: >>> >>> __dead void >>> foo(void) __dead2; >>> >> >> With the patch we would use: >> >> __Noreturn void >> foo(void) _dead2; >> >> Which is still ugly but C11-ish. > > That asks for the same problems as defining __weak. > > Why not just don't use _Noreturn? It is an unimprovement on the gcc > attribute. The attribute works at the beginning or end, while Noreturn > only works at the end. I checked this: > > pts/23:bde@freefall:~/s> cc -O -S a.c -std=3Dc11 > a.c:3:26: error: '_Noreturn' keyword must precede function declarator > _Noreturn void bar(void) _Noreturn; > ^ > > I also checked if __dead2 works at the beginning in gcc-2.95.4. It > does, but other headers are broken, so the support for gcc-2.95.4 in > sys/cdefs.h is almost useless: > > pts/23:bde@freefall:~/s> gcc295 -O -S a.c > In file included from /usr/include/machine/_types.h:6, > from /usr/include/sys/_types.h:33, > from /usr/include/x86/endian.h:37, > from /usr/include/machine/endian.h:6, > from /usr/include/sys/types.h:44, > from a.c:1: > /usr/include/x86/_types.h:161: syntax error before `__gnuc_va_list' > /usr/include/x86/_types.h:161: warning: data definition has no type or > storage c > lass > > Here is the broken part of x86/_types.h: > > %%% > #ifdef __GNUCLIKE_BUILTIN_VARARGS > typedef __builtin_va_list __va_list; /* internally known to gcc */ > #elif defined(lint) > typedef char * __va_list; /* pretend */ > #endif > #if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ > && !defined(__NO_GNUC_VA_LIST) > #define __GNUC_VA_LIST > meta: next is line 161: > typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ > #endif > %%% > > Despite (rather, because of) mounds of ifdefs to support old gcc, it > doesn't > actually work. > > is honestly broken. It knows that it depends on the gcc featu= re > __GNUCLIKE_BUILTIN_STDARG, and aborts with an #error when it is not > available. > All of the _GNUCLIKE_BUILTIN_* macros for variadic args are controlled by > sys/cdefs.h. They are defined when the compiler is either gcc newer than > gcc-2.95 or is icc. Btw, is there anyone, who tries to compile the _recent_ head or 10-STABLE with gcc-4.x>=3D ? > > Bruce From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 12:37:32 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B91637F1; Sun, 21 Jun 2015 12:37:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A7D7614A; Sun, 21 Jun 2015 12:37:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5LCbWsS027471; Sun, 21 Jun 2015 12:37:32 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5LCbWtl027469; Sun, 21 Jun 2015 12:37:32 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506211237.t5LCbWtl027469@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 21 Jun 2015 12:37:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284676 - head/release X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 12:37:32 -0000 Author: gjb Date: Sun Jun 21 12:37:31 2015 New Revision: 284676 URL: https://svnweb.freebsd.org/changeset/base/284676 Log: Append the hour and minute to the snapshot suffix for EC2 AMIs and Azure VM images. This is particularly helpful for testing to avoid name collisions, but also useful for cases where a necessary rebuild is done before the date changes. MFC after: 3 days Sponsored by: The FreeBSD Foundation Modified: head/release/Makefile.azure head/release/Makefile.ec2 Modified: head/release/Makefile.azure ============================================================================== --- head/release/Makefile.azure Sun Jun 21 08:00:05 2015 (r284675) +++ head/release/Makefile.azure Sun Jun 21 12:37:31 2015 (r284676) @@ -17,7 +17,7 @@ AZURE${VAR}!= grep -E ^AZURE${VAR} ${AZU .endif .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" -SNAPSHOT_DATE!= date +-%Y-%m-%d +SNAPSHOT_DATE!= date +-%Y-%m-%d-%H:%M .endif AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.vhd Modified: head/release/Makefile.ec2 ============================================================================== --- head/release/Makefile.ec2 Sun Jun 21 08:00:05 2015 (r284675) +++ head/release/Makefile.ec2 Sun Jun 21 12:37:31 2015 (r284676) @@ -6,7 +6,7 @@ # .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" -AMINAMESUFFIX!= date +-%Y-%m-%d +AMINAMESUFFIX!= date +-%Y-%m-%d-%H:%M .endif .if defined(EC2PUBLIC) PUBLISH= --public From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 14:18:55 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8AF9444C; Sun, 21 Jun 2015 14:18:55 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 78D9DC10; Sun, 21 Jun 2015 14:18:55 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5LEItnV080695; Sun, 21 Jun 2015 14:18:55 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5LEItGT080693; Sun, 21 Jun 2015 14:18:55 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506211418.t5LEItGT080693@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sun, 21 Jun 2015 14:18:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284681 - head/sys/dev/isp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 14:18:55 -0000 Author: mav Date: Sun Jun 21 14:18:54 2015 New Revision: 284681 URL: https://svnweb.freebsd.org/changeset/base/284681 Log: Rewrite port database handling for target mode. Previous implementation was too fragile to initiator parameters changes. In case of port role change it could not survive different handle assigned to the same initiator by firmware, even though initiator was logged out. The new implementation should be more resillient to this kind of problems, trying to work in any situation and only warn user about suspisious events. MFC after: 1 week Sponsored by: iXsystems, Inc. Modified: head/sys/dev/isp/isp_freebsd.c head/sys/dev/isp/isp_library.c Modified: head/sys/dev/isp/isp_freebsd.c ============================================================================== --- head/sys/dev/isp/isp_freebsd.c Sun Jun 21 14:01:26 2015 (r284680) +++ head/sys/dev/isp/isp_freebsd.c Sun Jun 21 14:18:54 2015 (r284681) @@ -2452,18 +2452,11 @@ isp_handle_platform_atio2(ispsoftc_t *is * If we're not in the port database, add ourselves. */ if (!IS_2100(isp) && isp_find_pdb_by_loopid(isp, 0, atiop->init_id, &lp) == 0) { - uint64_t iid = + uint64_t iid = (((uint64_t) aep->at_wwpn[0]) << 48) | (((uint64_t) aep->at_wwpn[1]) << 32) | (((uint64_t) aep->at_wwpn[2]) << 16) | (((uint64_t) aep->at_wwpn[3]) << 0); - /* - * However, make sure we delete ourselves if otherwise - * we were there but at a different loop id. - */ - if (isp_find_pdb_by_wwn(isp, 0, iid, &lp)) { - isp_del_wwn_entry(isp, 0, iid, lp->handle, lp->portid); - } isp_add_wwn_entry(isp, 0, iid, atiop->init_id, PORT_ANY, 0); } atiop->cdb_len = ATIO2_CDBLEN; Modified: head/sys/dev/isp/isp_library.c ============================================================================== --- head/sys/dev/isp/isp_library.c Sun Jun 21 14:01:26 2015 (r284680) +++ head/sys/dev/isp/isp_library.c Sun Jun 21 14:18:54 2015 (r284681) @@ -2367,18 +2367,17 @@ isp_find_pdb_by_wwn(ispsoftc_t *isp, int fcparam *fcp; int i; - if (chan < isp->isp_nchan) { - fcp = FCPARAM(isp, chan); - for (i = MAX_FC_TARG - 1; i >= 0; i--) { - fcportdb_t *lp = &fcp->portdb[i]; + if (chan >= isp->isp_nchan) + return (0); + fcp = FCPARAM(isp, chan); + for (i = MAX_FC_TARG - 1; i >= 0; i--) { + fcportdb_t *lp = &fcp->portdb[i]; - if (lp->target_mode == 0) { - continue; - } - if (lp->port_wwn == wwn) { - *lptr = lp; - return (1); - } + if (lp->target_mode == 0) + continue; + if (lp->port_wwn == wwn) { + *lptr = lp; + return (1); } } return (0); @@ -2390,19 +2389,12 @@ isp_find_pdb_by_loopid(ispsoftc_t *isp, fcparam *fcp; int i; - if (chan < isp->isp_nchan) { - fcp = FCPARAM(isp, chan); - for (i = MAX_FC_TARG - 1; i >= 0; i--) { - fcportdb_t *lp = &fcp->portdb[i]; - - if (lp->target_mode == 0) { - continue; - } - if (lp->handle == loopid) { - *lptr = lp; - return (1); - } - } + if (chan >= isp->isp_nchan) + return (0); + fcp = FCPARAM(isp, chan); + if ((i = fcp->isp_tgt_map[loopid]) > 0) { + *lptr = &fcp->portdb[i - 1]; + return (1); } return (0); } @@ -2413,17 +2405,14 @@ isp_find_pdb_by_sid(ispsoftc_t *isp, int fcparam *fcp; int i; - if (chan >= isp->isp_nchan) { + if (chan >= isp->isp_nchan) return (0); - } - fcp = FCPARAM(isp, chan); for (i = MAX_FC_TARG - 1; i >= 0; i--) { fcportdb_t *lp = &fcp->portdb[i]; - if (lp->target_mode == 0) { + if (lp->target_mode == 0) continue; - } if (lp->portid == sid) { *lptr = lp; return (1); @@ -2460,125 +2449,151 @@ isp_add_wwn_entry(ispsoftc_t *isp, int c fcparam *fcp; fcportdb_t *lp; isp_notify_t nt; - int i; + int i, something, take, taken; fcp = FCPARAM(isp, chan); - if (nphdl >= MAX_NPORT_HANDLE) { - isp_prt(isp, ISP_LOGWARN, "Chan %d IID 0x%016llx bad N-Port handle 0x%04x Port ID 0x%06x", + isp_prt(isp, ISP_LOGWARN, "Chan %d IID 0x%016llx " + "N-Port handle 0x%04x Port ID 0x%06x -- bad handle", chan, (unsigned long long) ini, nphdl, s_id); return; } - lp = NULL; - if (fcp->isp_tgt_map[nphdl]) { - i = fcp->isp_tgt_map[nphdl] - 1; - lp = &fcp->portdb[i]; - } else { - /* - * Make sure the addition of a new target mode entry doesn't duplicate entries - * with the same N-Port handles, the same portids or the same Port WWN. - */ - for (i = 0; i < MAX_FC_TARG; i++) { - lp = &fcp->portdb[i]; - if (lp->target_mode == 0) { - lp = NULL; - continue; - } - if (lp->handle == nphdl) { - break; - } - if (s_id != PORT_ANY && lp->portid == s_id) { - break; - } - if (VALID_INI(ini) && lp->port_wwn == ini) { - break; - } - lp = NULL; - } - - } - - if (lp) { - int something = 0; - if (lp->handle != nphdl) { - isp_prt(isp, ISP_LOGWARN, "Chan %d attempt to re-enter N-port handle 0x%04x IID 0x%016llx Port ID 0x%06x finds IID 0x%016llx N-Port Handle 0x%04x Port ID 0x%06x", - chan, nphdl, (unsigned long long)ini, s_id, (unsigned long long) lp->port_wwn, lp->handle, lp->portid); - isp_dump_portdb(isp, chan); - return; - } - if (s_id != PORT_NONE) { + /* + * If valid record for requested handle already exists, update it + * with new parameters. Some cases of update can be suspicious, + * so log them verbosely and dump the whole port database. + */ + if ((i = fcp->isp_tgt_map[nphdl]) > 0) { + take = taken = i - 1; + lp = &fcp->portdb[taken]; + something = 0; + if (s_id != PORT_NONE && lp->portid != s_id) { if (lp->portid == PORT_NONE) { - lp->portid = s_id; - isp_prt(isp, ISP_LOGTINFO, "Chan %d N-port handle 0x%04x gets Port ID 0x%06x", chan, nphdl, s_id); - something++; - } else if (lp->portid != s_id) { - isp_prt(isp, ISP_LOGTINFO, "Chan %d N-port handle 0x%04x tries to change Port ID 0x%06x to 0x%06x", chan, nphdl, lp->portid, s_id); - isp_dump_portdb(isp, chan); - return; + isp_prt(isp, ISP_LOGTINFO, + "Chan %d IID 0x%016llx N-port handle 0x%04x " + "gets Port ID 0x%06x", + chan, (unsigned long long) lp->port_wwn, + nphdl, s_id); + } else { + isp_prt(isp, ISP_LOGTINFO|ISP_LOGWARN, + "Chan %d IID 0x%016llx N-port handle 0x%04x " + "changes Port ID 0x%06x to 0x%06x", + chan, (unsigned long long) lp->port_wwn, + nphdl, lp->portid, s_id); + if (isp->isp_dblev & (ISP_LOGTINFO|ISP_LOGWARN)) + isp_dump_portdb(isp, chan); } + lp->portid = s_id; + something++; } - if (VALID_INI(ini)) { + if (VALID_INI(ini) && lp->port_wwn != ini) { if (!VALID_INI(lp->port_wwn)) { - lp->port_wwn = ini; - isp_prt(isp, ISP_LOGTINFO, "Chan %d N-port handle 0x%04x gets WWN 0x%016llxx", chan, nphdl, (unsigned long long) ini); - something++; + isp_prt(isp, ISP_LOGTINFO, + "Chan %d N-port handle 0x%04x Port ID " + "0x%06x gets WWN 0x%016llxx", + chan, nphdl, lp->portid, + (unsigned long long) ini); } else if (lp->port_wwn != ini) { - isp_prt(isp, ISP_LOGWARN, "Chan %d N-port handle 0x%04x tries to change WWN 0x%016llx to 0x%016llx", chan, nphdl, - (unsigned long long) lp->port_wwn, (unsigned long long) ini); - isp_dump_portdb(isp, chan); - return; + isp_prt(isp, ISP_LOGTINFO|ISP_LOGWARN, + "Chan %d N-port handle 0x%04x Port ID " + "0x%06x changes WWN 0x%016llx to 0x%016llx", + chan, nphdl, lp->portid, + (unsigned long long) lp->port_wwn, + (unsigned long long) ini); + if (isp->isp_dblev & (ISP_LOGTINFO|ISP_LOGWARN)) + isp_dump_portdb(isp, chan); } + lp->port_wwn = ini; + something++; } - if (prli_params != lp->prli_word3) { + if (lp->prli_word3 != prli_params) { lp->prli_word3 = prli_params; isp_gen_role_str(buf, sizeof (buf), lp->prli_word3); - isp_prt(isp, ISP_LOGTINFO|ISP_LOGCONFIG, "Chan %d IID 0x%016llx N-Port Handle 0x%04x Port ID 0x%06x new PRLI Word 3 params %s", chan, - (unsigned long long) lp->port_wwn, lp->handle, lp->portid, buf); + isp_prt(isp, ISP_LOGTINFO|ISP_LOGCONFIG, + "Chan %d IID 0x%016llx N-Port Handle 0x%04x " + "Port ID 0x%06x changes PRLI Word 3 %s", + chan, (unsigned long long) lp->port_wwn, + lp->handle, lp->portid, buf); something++; } if (!something) { - isp_prt(isp, ISP_LOGWARN, "Chan %d IID 0x%016llx N-Port Handle 0x%04x Port ID 0x%06x reentered", chan, - (unsigned long long) lp->port_wwn, lp->handle, lp->portid); + isp_prt(isp, ISP_LOGTINFO, + "Chan %d IID 0x%016llx N-Port Handle 0x%04x " + "Port ID 0x%06x reentered", + chan, (unsigned long long) lp->port_wwn, + lp->handle, lp->portid); } - if (fcp->isp_tgt_map[nphdl] == 0) { - fcp->isp_tgt_map[nphdl] = i + 1; - goto notify; - } - return; - } + } else + take = taken = -1; /* - * Find a new spot + * Search for records colliding on handler, Port ID or WWN. + * Remove any found collisions, logging suspicious cases of + * still valid records. */ - for (i = MAX_FC_TARG - 1; i >= 0; i--) { - if (fcp->portdb[i].target_mode == 1) { + for (i = 0; i < MAX_FC_TARG; i++) { + lp = &fcp->portdb[i]; + if (lp->target_mode == 0 || i == take) + continue; + if (lp->handle != nphdl && lp->portid != s_id && + lp->port_wwn != ini) continue; + if (lp->state == FC_PORTDB_STATE_VALID) { + isp_prt(isp, ISP_LOGTINFO|ISP_LOGWARN, + "Chan %d IID 0x%016llx N-Port Handle 0x%04x " + "Port ID 0x%06x is conflicting", + chan, (unsigned long long) lp->port_wwn, + lp->handle, lp->portid); + if (isp->isp_dblev & (ISP_LOGTINFO|ISP_LOGWARN)) + isp_dump_portdb(isp, chan); + isp_del_wwn_entry(isp, chan, + lp->port_wwn, lp->handle, lp->portid); } - if (fcp->portdb[i].state == FC_PORTDB_STATE_NIL) { - break; + ISP_MEMZERO(lp, sizeof (fcportdb_t)); + take = i; + } + + /* If valid record already exists -- we are done. */ + if (taken >= 0) + return; + + /* Search for room to insert new record. */ + if (take < 0) { + for (i = MAX_FC_TARG - 1; i >= 0; i--) { + if (fcp->portdb[i].state == FC_PORTDB_STATE_NIL) { + take = i; + break; + } } } - if (i < 0) { - isp_prt(isp, ISP_LOGWARN, "Chan %d IID 0x%016llx N-Port Handle 0x%04x Port ID 0x%06x- no room in port database", + if (take < 0) { + isp_prt(isp, ISP_LOGTINFO|ISP_LOGWARN, + "Chan %d IID 0x%016llx N-Port Handle 0x%04x Port ID 0x%06x " + "-- no room in port database", chan, (unsigned long long) ini, nphdl, s_id); + if (isp->isp_dblev & (ISP_LOGTINFO|ISP_LOGWARN)) + isp_dump_portdb(isp, chan); return; } - lp = &fcp->portdb[i]; + /* Insert new record and mark it valid. */ + lp = &fcp->portdb[take]; ISP_MEMZERO(lp, sizeof (fcportdb_t)); lp->target_mode = 1; lp->handle = nphdl; lp->portid = s_id; lp->port_wwn = ini; lp->prli_word3 = prli_params; - isp_gen_role_str(buf, sizeof (buf), lp->prli_word3); - fcp->isp_tgt_map[nphdl] = i + 1; + lp->state = FC_PORTDB_STATE_VALID; + fcp->isp_tgt_map[nphdl] = take + 1; - isp_prt(isp, ISP_LOGTINFO, "Chan %d IID 0x%016llx N-Port Handle 0x%04x Port ID 0x%06x vtgt %d %s added", chan, - (unsigned long long) ini, nphdl, s_id, fcp->isp_tgt_map[nphdl] - 1, buf); + isp_gen_role_str(buf, sizeof (buf), lp->prli_word3); + isp_prt(isp, ISP_LOGTINFO, "Chan %d IID 0x%016llx N-Port Handle 0x%04x" + " Port ID 0x%06x vtgt %d %s added", chan, + (unsigned long long) ini, nphdl, s_id, take, buf); -notify: + /* Notify above levels about new initiator arrival. */ ISP_MEMZERO(&nt, sizeof (nt)); nt.nt_hba = isp; nt.nt_wwn = ini; @@ -2617,14 +2632,15 @@ isp_del_wwn_entry(ispsoftc_t *isp, int c } } if (lp == NULL) { - isp_prt(isp, ISP_LOGWARN, "Chan %d IID 0x%016llx N-Port Handle 0x%04x Port ID 0x%06x cannot be found to be cleared", + isp_prt(isp, ISP_LOGWARN, "Chan %d IID 0x%016llx N-Port Handle 0x%04x Port ID 0x%06x cannot be found to be deleted", chan, (unsigned long long) ini, nphdl, s_id); isp_dump_portdb(isp, chan); return; } - isp_prt(isp, ISP_LOGTINFO, "Chan %d IID 0x%016llx N-Port Handle 0x%04x Port ID 0x%06x vtgt %d cleared", + isp_prt(isp, ISP_LOGTINFO, "Chan %d IID 0x%016llx N-Port Handle 0x%04x Port ID 0x%06x vtgt %d deleted", chan, (unsigned long long) lp->port_wwn, nphdl, lp->portid, fcp->isp_tgt_map[nphdl] - 1); fcp->isp_tgt_map[nphdl] = 0; + lp->state = FC_PORTDB_STATE_DEAD; ISP_MEMZERO(&nt, sizeof (nt)); nt.nt_hba = isp; From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 14:21:39 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 702425AB; Sun, 21 Jun 2015 14:21:39 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 45E4BDCB; Sun, 21 Jun 2015 14:21:39 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5LELdRx084659; Sun, 21 Jun 2015 14:21:39 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5LELcqd084657; Sun, 21 Jun 2015 14:21:38 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201506211421.t5LELcqd084657@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sun, 21 Jun 2015 14:21:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284682 - head/share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 14:21:39 -0000 Author: trasz Date: Sun Jun 21 14:21:38 2015 New Revision: 284682 URL: https://svnweb.freebsd.org/changeset/base/284682 Log: Expand sysctls descriptions for iscsi(4) and ctl(4). Differential Revision: https://reviews.freebsd.org/D2876 Reviewed by: wblock@ MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Modified: head/share/man/man4/ctl.4 head/share/man/man4/iscsi.4 Modified: head/share/man/man4/ctl.4 ============================================================================== --- head/share/man/man4/ctl.4 Sun Jun 21 14:18:54 2015 (r284681) +++ head/share/man/man4/ctl.4 Sun Jun 21 14:21:38 2015 (r284682) @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd May 22, 2015 +.Dd June 20, 2015 .Dt CTL 4 .Os .Sh NAME @@ -91,12 +91,17 @@ variables and .Xr loader 8 tunables: .Bl -tag -width indent +.It Va kern.cam.ctl.iscsi.debug +Verbosity level for log messages from the kernel part of iSCSI target. +Set to 0 to disable logging or 1 to warn about potential problems. +Larger values enable debugging output. +Defaults to 1. .It Va kern.cam.ctl.iscsi.maxcmdsn_delta -The number of outstanding commands to advertise to the initiator. -Technically, it's the difference between ExpCmdSN and MaxCmdSN fields +The number of outstanding commands to advertise to the iSCSI initiator. +Technically, it is the difference between ExpCmdSN and MaxCmdSN fields in the iSCSI PDU. .It Va kern.cam.ctl.iscsi.ping_timeout -The number of seconds to wait for the initiator to respond to a NOP-In +The number of seconds to wait for the iSCSI initiator to respond to a NOP-In PDU. In the event that there is no response within that time the session gets forcibly terminated. Modified: head/share/man/man4/iscsi.4 ============================================================================== --- head/share/man/man4/iscsi.4 Sun Jun 21 14:18:54 2015 (r284681) +++ head/share/man/man4/iscsi.4 Sun Jun 21 14:21:38 2015 (r284682) @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd September 11, 2014 +.Dd June 20, 2015 .Dt ISCSI 4 .Os .Sh NAME @@ -65,6 +65,13 @@ variables and .Xr loader 8 tunables: .Bl -tag -width indent +.It Va kern.iscsi.debug +Verbosity level for log messages from the +.Nm +driver. +Set to 0 to disable logging or 1 to warn about potential problems. +Larger values enable debugging output. +Defaults to 1. .It Va kern.iscsi.ping_timeout The number of seconds to wait for the target to respond to a NOP-Out PDU. From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 14:35:52 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1AF3CBA2 for ; Sun, 21 Jun 2015 14:35:52 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm7.bullet.mail.bf1.yahoo.com (nm7.bullet.mail.bf1.yahoo.com [98.139.212.166]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C57F1CC for ; Sun, 21 Jun 2015 14:35:51 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1434897344; bh=6kKyHkTCmrBom2vycpNAmCcnP2p3TtULgrQsNk+MP90=; h=Date:From:To:CC:Subject:References:In-Reply-To:From:Subject; b=m7xcS9jst9ucBszj3b1YLES64HCAURN2XpxiCbsIW/JgiCdoMxaTVCtgbXVnBniUUAYf6dNDdL6zYvmFxP7xZJZNeMX3xVf3XIYZwTGxPMt3DGo25Roo4ABon8S1jLY/M/UNUrKAAKsCY1Fw13OQXXsguebtZEO3VhcpQuG1VAtfsmautFoMhE3I98cK21bTiJYKiu+Qm4t35shA3rfn/g3z7mJT6wlRSm3ZpC7SMbU832XKW78vDI5JugPD9FTdPhlZFjy3GuubT55AdHh5dC99IAK8qUQezLg8HNEiYY1MxVk+nlGk/TaPeaeZHnHQpIf0v1K4kP6VAFujZawPrw== Received: from [98.139.170.180] by nm7.bullet.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 14:35:44 -0000 Received: from [98.139.213.15] by tm23.bullet.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 14:35:44 -0000 Received: from [127.0.0.1] by smtp115.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 14:35:44 -0000 X-Yahoo-Newman-Id: 603517.91100.bm@smtp115.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: H_gJK4UVM1laKl9nzaMAoOxEcoCgKZtuZcNljluVZ3sGfqb 7z5d8COliqsh6ShxSCWhPBQK4gvPXn3hgKHV5AsaRVOndZDbB7l4FVq0Jgel zdkkSB3NkEZEVbxAJaMBQvMopYsrsJuwSY3nksqQyaKUZutechGk5Fx2wHfT oi2r9rsBO1snBLHkPFz_Wen5pKk5dZSi5m4z8hS4M7wb1C_hWHfwYUPIfK_N nFV0cpk116cF2BHLkdJeVSebKaX32Gt0C15JQRyv8.F0Ze_cbQps8hUj_.EW JnHBXJ.ENCEMykXsip800PESSgQr1iqkeWDjw5CX4Fvx90RUEpDRIRoOfls8 A7U70t0NVeIaLthZycYXgdUThlHEzHYyTWb6HujcLF5D_ClwAP3KWkjLdwlP vM.bxEQ8mKOI2_sdj6qe9ALVQXa5AKbfcCMRYSwScMTR_ZIhm.xPTcvly9DW fEFS6hkkbNQJL7XLmxOsL8DtdfkTQq2eLMc4L5VubfLfMIB07zzsL8WknmdG AQqL6rNUgDazTsDaUnrqJjuJnbO.JYPcx X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Message-ID: <5586CBCE.2010608@FreeBSD.org> Date: Sun, 21 Jun 2015 09:35:58 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Bruce Evans CC: Dimitry Andric , David Chisnall , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> <20150621154332.U976@besplex.bde.org> In-Reply-To: <20150621154332.U976@besplex.bde.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 14:35:52 -0000 On 06/21/15 01:09, Bruce Evans wrote: > On Sat, 20 Jun 2015, Pedro Giffuni wrote: > >> On 06/19/15 12:23, Bruce Evans wrote: >>> On Fri, 19 Jun 2015, Dimitry Andric wrote: >>> >>>> On 19 Jun 2015, at 17:02, Pedro Giffuni wrote: >>>>> >>>>>> On 19/06/2015 05:16 a.m., David Chisnall wrote: >>>>>>> I only just caught this (having seen the fallout from NetBSD >>>>>>> doing the same thing in a shipping release and the pain that >>>>>>> it’s caused): >>>>>>> __weak is a reserved keyword in Objective-C, please pick another >>>>>>> name for this. This in cdefs.h makes it impossible to include >>>>>>> any FreeBSD standard headers in Objective-C programs (of which >>>>>>> we have a couple of hundred in ports) if they use any of the >>>>>>> modern Objective-C language modes. >>>> ... >>>>> Closely related to this, we are redefining _Noreturn, which is a >>>>> reserved keyword in C11. >>>> >>>> No, sys/cdefs.h has: >>>> >>>> 254 /* >>>> 255 * Keywords added in C11. >>>> 256 */ >>>> 257 >>>> 258 #if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L >>>> || defined(lint) >>>> [...] >>>> 284 #if defined(__cplusplus) && __cplusplus >= 201103L >>>> 285 #define _Noreturn [[noreturn]] >>>> 286 #else >>>> 287 #define _Noreturn __dead2 >>>> 288 #endif >>>> [...] >>>> 320 #endif /* __STDC_VERSION__ || __STDC_VERSION__ < 201112L */ >>>> >>>> So the whole block redefining all the _Xxx identifiers is skipped for >>>> C11 and higher. >>> >>> I probably pointed this out incorrectly to Pedro. >>> >>> All uses of _Noreturn are still broken, and also ugly. __dead2 is the >>> gcc-2 compatible version of the gcc-1 compatible macro __dead. It is >>> syntactically different from __dead and _Noreturn. It must be placed >>> after the function parameter list instead of in the function type >>> declarator because old versions of gcc only accept attributes there. >>> __dead and presumably _Noreturn must be placed in the function type >>> declarator. This is incompatible, and also uglier. >>> >> I was thinking that _Noreturn can be fixed for older compilers >> less disruptively. >> >> I haven't tested the attached patch the idea is to resurrect >> __dead and use it for _Noreturn. >> >>> Correct version with ugly declarations: >>> >>> __dead void >>> foo(void) __dead2; >>> >> >> With the patch we would use: >> >> __Noreturn void >> foo(void) _dead2; >> >> Which is still ugly but C11-ish. > > That asks for the same problems as defining __weak. > > Why not just don't use _Noreturn? It is an unimprovement on the gcc > attribute. The attribute works at the beginning or end, while Noreturn > only works at the end. As I see it, newer (C11) software is likely to use _Noreturn in their headers > I checked this: > > pts/23:bde@freefall:~/s> cc -O -S a.c -std=c11 > a.c:3:26: error: '_Noreturn' keyword must precede function declarator > _Noreturn void bar(void) _Noreturn; > ^ > > I also checked if __dead2 works at the beginning in gcc-2.95.4. It > does, but other headers are broken, so the support for gcc-2.95.4 in > sys/cdefs.h is almost useless: > > pts/23:bde@freefall:~/s> gcc295 -O -S a.c > In file included from /usr/include/machine/_types.h:6, > from /usr/include/sys/_types.h:33, > from /usr/include/x86/endian.h:37, > from /usr/include/machine/endian.h:6, > from /usr/include/sys/types.h:44, > from a.c:1: > /usr/include/x86/_types.h:161: syntax error before `__gnuc_va_list' > /usr/include/x86/_types.h:161: warning: data definition has no type or > storage c > lass > > Here is the broken part of x86/_types.h: > > %%% > #ifdef __GNUCLIKE_BUILTIN_VARARGS > typedef __builtin_va_list __va_list; /* internally known to gcc */ > #elif defined(lint) > typedef char * __va_list; /* pretend */ > #endif > #if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ > && !defined(__NO_GNUC_VA_LIST) > #define __GNUC_VA_LIST > meta: next is line 161: > typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ > #endif > %%% > > Despite (rather, because of) mounds of ifdefs to support old gcc, it > doesn't > actually work. > > is honestly broken. It knows that it depends on the gcc > feature > __GNUCLIKE_BUILTIN_STDARG, and aborts with an #error when it is not > available. > All of the _GNUCLIKE_BUILTIN_* macros for variadic args are controlled by > sys/cdefs.h. They are defined when the compiler is either gcc newer than > gcc-2.95 or is icc. > You have a point there: I tried to get the core team to at least deprecate gcc <= 2.8.1 and they didn't reach an agreement. :( I still think we could have older gcc work fine with _Noreturn and that would be a step forward. Pedro. From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 14:42:03 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 48C4AAA for ; Sun, 21 Jun 2015 14:42:03 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm34-vm3.bullet.mail.bf1.yahoo.com (nm34-vm3.bullet.mail.bf1.yahoo.com [72.30.239.75]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E5EA330E for ; Sun, 21 Jun 2015 14:42:02 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1434897714; bh=TuZOIkTrTZ3KKelvQmLkj/kJjde3FtX3vCPGNTYEQJU=; h=Date:From:To:CC:Subject:References:In-Reply-To:From:Subject; b=t1t26HCGkmrjTR6KTTfhcDrsJHrUVM+m/kS9KvjJursAQUlaHgvSghXKB0WIFrIiCExqi+poK2ckO3LM1tlFACPmtuKdiGrUh2nTUZf4HxoC5OlAXCRNhX/f6n92JM4m7iwBTGFafVFV0L7j2cluQZzBQWJmZMX5GLF+yMjCfvglMryP/QsrMke+s0tUGyTMsjlz88hKf2ivVeNLGobx0Z7FvSy8AbOj2O/gxZJcztWpN9KtBdOnHuD2SEwnFCaFHwcIksTKxvqndifS8mnQVkjJyKVIunprlwInB4F/EbHAhveEy/37HerYWBSJEmK40TVp6LJujROEOQiOhoHOBQ== Received: from [98.139.170.180] by nm34.bullet.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 14:41:54 -0000 Received: from [68.142.230.78] by tm23.bullet.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 14:41:54 -0000 Received: from [127.0.0.1] by smtp235.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 14:41:54 -0000 X-Yahoo-Newman-Id: 551982.64257.bm@smtp235.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: h.nxDBwVM1nf2on3azSF7j_vnMBVGSDu6HzphtWxlS83s7K eni2vJlTFMFE0HVbXQxxSlUBAOA7tF6_6HBXb2TbPET.XDKhNQFAi3xC3t3F zdVK.oeWvl2caiTkKItUn12YfpqeyZJXV81dLraLZlwM0O2VkUlDavYqMqHh D4XzfCltQvdlFXlJH9WRJcd4j7Ww20lZiuyIwkK.G16S96XwhyQmIhzoeU6t rHkJeagBQaVZ2bk9NGsBvTEIdgJZDuqXOkQY_T6WDUnu3.mQMfwtde_FntAR WWylmRAbM3z5SWT8XnzE5YIHJwzRqrzGTEHWBy2QHNh9YF2gv3n_zOnUrQC5 Yu1WTRxJavXTV4UKWMwaL6iDO9ib6YuAM7Px7sdx38nFcQmvcOJ5ESBAahnM mQ.6eDekgTfiAS9tuPRzqigy1u8bc4KtSENODzHKSmcylIPxlGecev6iLG.t smDZbJ65mjsPfPGIWl6KlY_StsavNv_Fwd.i1EsZdpQN4oy_N9S4UWI5QRI7 jUXysuCdqSlGbbpF4eiCV225lQJxRzWCQ X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Message-ID: <5586CD3F.4000008@FreeBSD.org> Date: Sun, 21 Jun 2015 09:42:07 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Oliver Pinter CC: src-committers@freebsd.org, svn-src-all@freebsd.org, David Chisnall , svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> <20150621154332.U976@besplex.bde.org> In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 14:42:03 -0000 On 06/21/15 06:49, Oliver Pinter wrote: > ... > Btw, is there anyone, who tries to compile the _recent_ head or > 10-STABLE with gcc-4.x>= ? > Sure, MIPS, powerpc and sparc64 still use gcc-4.2.1 so every time we run a tinderbox it's tested. More recently jenkins also runs builds with gcc-4.9. https://jenkins.freebsd.org/job/FreeBSD_HEAD_amd64_gcc4.9/ Pedro. From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 14:44:08 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B1DE825F for ; Sun, 21 Jun 2015 14:44:08 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B34532C for ; Sun, 21 Jun 2015 14:44:07 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by wicnd19 with SMTP id nd19so55572071wic.1 for ; Sun, 21 Jun 2015 07:44:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=wqhKvQf7gCWACU76AE2DZ9LKM5pFR8kyDpifWt8mx/k=; b=ba2uJQ8ydLKBxg2GGnYwYUpiJcIty/9I7RLat1qUp58DS8noK/69o+nx+BB9exCZ8k qpu5sDan07VortMcWulPQK/Q+Ohn2cNug5rEoMvHetq09NnA0JUvwad1t4D3xC8RRAFM II0r4BpGOmTSXDjGdbIwcboqDivL73Gs6v9fzbs/mVOpQQzYF6/adD/Jy9Rsp0Kgs+Ym nSxFtkQdyoQbkMgZuWkvjavEQ03zs6WtU+GAHg2woWldW0bvVnRW0it0Nbjxgsvvho/4 gk8CWcmLSx2y9fKzdVKzUuxdlOvQiPeFdd6S+DvI49zfohR/3qjznBkDMcdeL7cAAPRi sdmg== X-Gm-Message-State: ALoCoQnDQCQKCOyE+Qtii72FPjZkckSInIyjs631hNpRfh5Pn8wxergC5FEfY0LVGrHir/nuRAM1 MIME-Version: 1.0 X-Received: by 10.194.187.51 with SMTP id fp19mr29615341wjc.67.1434897846494; Sun, 21 Jun 2015 07:44:06 -0700 (PDT) Received: by 10.194.81.106 with HTTP; Sun, 21 Jun 2015 07:44:06 -0700 (PDT) In-Reply-To: <5586CD3F.4000008@FreeBSD.org> References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> <20150621154332.U976@besplex.bde.org> <5586CD3F.4000008@FreeBSD.org> Date: Sun, 21 Jun 2015 16:44:06 +0200 Message-ID: Subject: Re: svn commit: r268137 - head/sys/sys From: Oliver Pinter To: Pedro Giffuni Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, David Chisnall , svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 14:44:08 -0000 On 6/21/15, Pedro Giffuni wrote: > > > On 06/21/15 06:49, Oliver Pinter wrote: >> ... >> Btw, is there anyone, who tries to compile the _recent_ head or >> 10-STABLE with gcc-4.x>= ? >> > > Sure, MIPS, powerpc and sparc64 still use gcc-4.2.1 so > every time we run a tinderbox it's tested. More recently > jenkins also runs builds with gcc-4.9. > > https://jenkins.freebsd.org/job/FreeBSD_HEAD_amd64_gcc4.9/ Yes, I known about gcc-4.2, but who uses older gcc than 4.0 (that's why I wrote gcc-4.x >= ) with recent HEAD (11-CURRENT) ? > > Pedro. > From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 15:39:32 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C7981CB3; Sun, 21 Jun 2015 15:39:32 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Received: from mail-wi0-x234.google.com (mail-wi0-x234.google.com [IPv6:2a00:1450:400c:c05::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5A220FEA; Sun, 21 Jun 2015 15:39:32 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Received: by wiwl6 with SMTP id l6so16727177wiw.0; Sun, 21 Jun 2015 08:39:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=xHROkoTP7OykafAW1Haa3r5VVHAFA6bfquZ5r7vs6jQ=; b=X88hjE63NsTQq1D2qoI3KHZ8HtBbWOMlNK4uQ4tZrJymz8lmahAdYWXPrRezSbpYV9 eXlZ65GpyVnSOqOi+2jK0QD0fSh7RvxXsNiLxMGuqz/N0QQDfw5lYG4wEBiGh0FAGxBj XaRJTAW1g3nKxCjs5XlCichCJt4QIH+ZnscfmpDvInJlkNQ0YG3IpWnG8nEsYqOemwLY QQFS+VxIbaS5CYVw9ho+op9RfF7wQaaI2L+X2kw5Kul+NLf4+nITMAC79zc2WvLvOxxu xJa7pmgD4kUN/5T8fMN8ZRgWGjhnq92AhF4Jr7OofJwd8nsCGTDtM+t3wr7GdxNRgi9p l6lQ== MIME-Version: 1.0 X-Received: by 10.195.13.113 with SMTP id ex17mr42725752wjd.17.1434901170436; Sun, 21 Jun 2015 08:39:30 -0700 (PDT) Received: by 10.27.87.195 with HTTP; Sun, 21 Jun 2015 08:39:30 -0700 (PDT) In-Reply-To: References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> <20150621154332.U976@besplex.bde.org> <5586CD3F.4000008@FreeBSD.org> Date: Sun, 21 Jun 2015 11:39:30 -0400 Message-ID: Subject: Re: svn commit: r268137 - head/sys/sys From: Benjamin Kaduk To: Oliver Pinter Cc: Pedro Giffuni , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , David Chisnall Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 15:39:33 -0000 On Sun, Jun 21, 2015 at 10:44 AM, Oliver Pinter < oliver.pinter@hardenedbsd.org> wrote: > Yes, I known about gcc-4.2, but who uses older gcc than 4.0 (that's > why I wrote gcc-4.x >= ) with recent HEAD (11-CURRENT) ? > Your running prose makes it sound like you are talking about gcc versions older than 4.0, but your inequality symbol makes it sound like you are talking about gcc versions 4.0 and newer. It seems like this is confusing people. -Ben From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 15:42:00 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7DDD1E12; Sun, 21 Jun 2015 15:42:00 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail109.syd.optusnet.com.au (mail109.syd.optusnet.com.au [211.29.132.80]) by mx1.freebsd.org (Postfix) with ESMTP id 3E92F265; Sun, 21 Jun 2015 15:41:59 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au (c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197]) by mail109.syd.optusnet.com.au (Postfix) with ESMTPS id 64BD5D61742; Mon, 22 Jun 2015 01:41:52 +1000 (AEST) Date: Mon, 22 Jun 2015 01:41:51 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Pedro Giffuni cc: Bruce Evans , Dimitry Andric , David Chisnall , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys In-Reply-To: <5586CBCE.2010608@FreeBSD.org> Message-ID: <20150622012426.S2603@besplex.bde.org> References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> <20150621154332.U976@besplex.bde.org> <5586CBCE.2010608@FreeBSD.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=XMDNMlVE c=1 sm=1 tr=0 a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=PO7r1zJSAAAA:8 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=jgUvnYShLB1bKa5NIEwA:9 a=CjuIK1q_8ugA:10 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 15:42:00 -0000 On Sun, 21 Jun 2015, Pedro Giffuni wrote: > On 06/21/15 01:09, Bruce Evans wrote: >> On Sat, 20 Jun 2015, Pedro Giffuni wrote: >* ... >>> With the patch we would use: >>> >>> __Noreturn void >>> foo(void) _dead2; >>> >>> Which is still ugly but C11-ish. >> >> That asks for the same problems as defining __weak. >> >> Why not just don't use _Noreturn? It is an unimprovement on the gcc >> attribute. The attribute works at the beginning or end, while Noreturn >> only works at the end. > > As I see it, newer (C11) software is likely to use _Noreturn in their > headers We can define _Noreturn to support this (but possibly shouldn't). The newer software many be pure C11. Then it doesn't need any definition, and just doesn't compile with non-C11 compilers. If we defined _Noreturn, it would be to use it in non-C11 software, like we do in stdlib.h. This is a fragile compatibility hack so it should be avoided if possible. We can easily avoid it in our own headers by not changing anything. Just use the old declaration, with __dead2 placed at the end. Any reasonable implementation of __attribute__() must be able to support any new attribute that a new standard might add. Bruce From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 15:42:07 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C1E8F54 for ; Sun, 21 Jun 2015 15:42:07 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm38-vm3.bullet.mail.bf1.yahoo.com (nm38-vm3.bullet.mail.bf1.yahoo.com [72.30.239.19]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB06A275 for ; Sun, 21 Jun 2015 15:42:06 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1434901319; bh=0/Tknk9zcAPboB7ioXxJY+WmUubAqdCXDrpRILhSClM=; h=Date:From:To:CC:Subject:References:In-Reply-To:From:Subject; b=IMVqW6Tu0RDV7kutjvjU/ZrYEYAE1GrLjcGngTxggz3i5Xhitudc8zfWadoacvsiHD5UXlwmSeZkrmsLgCfcrkJHHvCMluKp3DW3RGbKDdI75ReJdueNHvLmTgPwIsojpeVHn58UbYa3kr7sY7Lk8tWe6MNPVyotFXfoYxfXKvdX9CGIxoBXltNLAMbzUpq19ReP693DdCUuFcSnk4eDGz08vajtxuvQRO3YWueUjyLxURJC0ppgPJPaIQJdYSKqy+CQQANRO0ygZDHozrZpfcB1JxINp8I/LiU2e8Eorl37Jcah0dGcWw1KzNm+/KADcElJX0JTsU/nb5v7NYQ85A== Received: from [66.196.81.172] by nm38.bullet.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 15:41:59 -0000 Received: from [68.142.230.76] by tm18.bullet.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 15:41:59 -0000 Received: from [127.0.0.1] by smtp233.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 15:41:59 -0000 X-Yahoo-Newman-Id: 414367.82631.bm@smtp233.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: jmi_5cQVM1ki47lQ1u3Abfg7e34Zn1yyFbv8LzGW8xowIOt gRWoaih7Ctpm8HFh4AOi5yyI8gNcxhrSXkhWcXEKARKXVI.KqWAsEl0kAPnT 1UNP3SgwASZ8AGemtOYl6I_QyxpRZdPMODNR4Edkxin7WgNeQPqLdKi5TwOM MkZyZ4kse_u6i.vXSdN.mpQly.IiJpedo.60kBaVPjLyVDxQ4BBmfDroWs4q BA2DSpt6E3irni1z4RpQKDtSnYc.EJn.nwCkzL6xf.fj92IgEuQqHoHEJufE mxTaGAuXPn1BQdjr8B4_e_pUB1_cSkUPP1b7k8h4ZCwjUkOSuVbkeMJClYXu .n_tGlqSMKMTX5oXhJrzv7MDyEa19N.yrQRyHm18nDS0KMuDp8ZTCq5MFSwh XrZFsjZCNCRncKbLpPaMvg8lH.ZzEfJ51qxCA73sGZ8s6hLXXK0I_f_WPd6m 517e2prJ_Jt31u8otCgySzLhaJrUTpDPDZy995iVHYpzDb2NgqPyblJ4pU59 xomoIAahVogdVW2D2o7lGs7AeuZqyWkzh X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Message-ID: <5586DB53.8080800@FreeBSD.org> Date: Sun, 21 Jun 2015 10:42:11 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Oliver Pinter CC: src-committers@freebsd.org, svn-src-all@freebsd.org, David Chisnall , svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> <20150621154332.U976@besplex.bde.org> <5586CD3F.4000008@FreeBSD.org> In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 15:42:07 -0000 On 06/21/15 09:44, Oliver Pinter wrote: > On 6/21/15, Pedro Giffuni wrote: >> >> On 06/21/15 06:49, Oliver Pinter wrote: >>> ... >>> Btw, is there anyone, who tries to compile the _recent_ head or >>> 10-STABLE with gcc-4.x>= ? >>> >> Sure, MIPS, powerpc and sparc64 still use gcc-4.2.1 so >> every time we run a tinderbox it's tested. More recently >> jenkins also runs builds with gcc-4.9. >> >> https://jenkins.freebsd.org/job/FreeBSD_HEAD_amd64_gcc4.9/ > Yes, I known about gcc-4.2, but who uses older gcc than 4.0 (that's > why I wrote gcc-4.x >= ) with recent HEAD (11-CURRENT) ? > ohh .. then you wrote is not what you meant ... I agree no one should be using ancient compilers but it may be that some downstream FreeBSD consumers are using custom compilers that still need a C90 or C89 support. As I wrote, I tried to get the core team to deprecate at least gcc-2.8.1 so I could use variadic macros in cdefs.h and there was no consensus. (The topic may still be under debate for for all I know) Pedro. From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 16:17:31 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82821B83 for ; Sun, 21 Jun 2015 16:17:31 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm38-vm0.bullet.mail.bf1.yahoo.com (nm38-vm0.bullet.mail.bf1.yahoo.com [72.30.239.16]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2C6BAB38 for ; Sun, 21 Jun 2015 16:17:31 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1434903052; bh=2qg63C6Z8mIo8Qzl4rVrH+SiQgZZav3Ldi4DDsBkIRk=; h=Date:From:To:CC:Subject:References:In-Reply-To:From:Subject; b=laJXBQKrAw9Ey0HfY2eNcZVYQIMZ9nzPqv7JfkKixyEFASzTkedcnI5dkf0+OvEZL6Bi8TrAgBKmFGhsUp6DCPH09y7iLRpr9fBAcru2uPWG8NkYLTeX8/lKXopmZp7WIiuD5UdRGX4MpnQ1Npp4/tNcY5gv5LxXsi0hlKlfHTYXXZh714qDEvJKpq+2isQCOjG9P5gsglmIlB1mLq3MY1poiiQcWK1+5+aIR+mxgisdugwwE3wJ3PGTKlKt3CWbrRA95GRe6WHBxnaRXhUVO9jVXB51uU71gGlZFmS20PRutLNMfGrTkmpnfJx4vckoljAVqp1zVUWAHyPmpN8DPw== Received: from [98.139.170.182] by nm38.bullet.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 16:10:52 -0000 Received: from [98.139.211.196] by tm25.bullet.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 16:10:52 -0000 Received: from [127.0.0.1] by smtp205.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 16:10:52 -0000 X-Yahoo-Newman-Id: 855087.19819.bm@smtp205.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: l.4Z67gVM1nCuGRwI4jyxy7vj5DAriBV58ypxmSOYmiDE4R 7rDdYYYg5Yz4ippAeKKPvIjzXjS0KDokhu2YOzvcy1pCFNTvcfzwd_H96qaF 5ohewuyNK8oy4nDYOTR2QB3EteYmO0GI65BaBukKRsN9ynswlHVO2xq.GwYa bUsRkY70IzRXNWNp9HE0LBKhP32_gP6VngSYki3FxX5wpsOnQOzZ1V5J6hjx wdneuzRCmrNbYmucDgSVwy7NZ6uZ2nicdZz4Iim5EAYaxuoZ.rjkOSlkspFv G8oVQjyv4XiZjXPGgpf75GEwgV1wcqt.EwPVG1nygomL5fLXPtGDY4.cmFZK FR1wKXp0Wl32Dojc5N.C8uIIbBQysN7xNHWwuVFfhmPYmjRnGLJek81lop3d ceVpiJWgGaST_XfuUEmaeqi8H8_dKnJ53XOOCWn9e6vWZPlQK3KVdEQ2Vris DhWqzrs0GXEz_Q9.h1QDobTSZFDQR10JO5S5IBoBo.VgWqg9gJu0OEO0yBL8 FnYI15H8_Uq5TB12zRSxEuqlrWed5o91Z X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Message-ID: <5586E219.2010805@FreeBSD.org> Date: Sun, 21 Jun 2015 11:11:05 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Bruce Evans CC: Dimitry Andric , David Chisnall , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> <20150621154332.U976@besplex.bde.org> <5586CBCE.2010608@FreeBSD.org> <20150622012426.S2603@besplex.bde.org> In-Reply-To: <20150622012426.S2603@besplex.bde.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 16:17:31 -0000 On 06/21/15 10:41, Bruce Evans wrote: > On Sun, 21 Jun 2015, Pedro Giffuni wrote: > >> On 06/21/15 01:09, Bruce Evans wrote: >>> On Sat, 20 Jun 2015, Pedro Giffuni wrote: >> * ... >>>> With the patch we would use: >>>> >>>> __Noreturn void >>>> foo(void) _dead2; >>>> >>>> Which is still ugly but C11-ish. >>> >>> That asks for the same problems as defining __weak. >>> >>> Why not just don't use _Noreturn? It is an unimprovement on the gcc >>> attribute. The attribute works at the beginning or end, while Noreturn >>> only works at the end. >> >> As I see it, newer (C11) software is likely to use _Noreturn in their >> headers > > We can define _Noreturn to support this (but possibly shouldn't). > > The newer software many be pure C11. Then it doesn't need any > definition, > and just doesn't compile with non-C11 compilers. > Well, the fact this we just do this in the tree and no one has bothered to "clean" the situation for older compilers just indicates that no one *cares* about older compilers. > If we defined _Noreturn, it would be to use it in non-C11 software, like > we do in stdlib.h. This is a fragile compatibility hack so it should > be avoided if possible. We can easily avoid it in our own headers by > not changing anything. Just use the old declaration, with __dead2 placed > at the end. Any reasonable implementation of __attribute__() must be > able > to support any new attribute that a new standard might add. > The thing is, why bother with gnuisms at all? I am personally OK with making it easier for everyone to use more modern constructs but I am not going out of my way to support gcc-1 or gcc-2. Let's just admit it: the build is basically broken for older compilers and no one cares enough to fix them. (Not ideal, just what we have). Pedro. From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 16:48:27 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C8CE618B; Sun, 21 Jun 2015 16:48:27 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail108.syd.optusnet.com.au (mail108.syd.optusnet.com.au [211.29.132.59]) by mx1.freebsd.org (Postfix) with ESMTP id 87F0520B; Sun, 21 Jun 2015 16:48:26 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au (c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197]) by mail108.syd.optusnet.com.au (Postfix) with ESMTPS id 0DB2A1A1A4D; Mon, 22 Jun 2015 02:48:16 +1000 (AEST) Date: Mon, 22 Jun 2015 02:48:16 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Pedro Giffuni cc: Bruce Evans , Dimitry Andric , David Chisnall , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Subject: Re: svn commit: r268137 - head/sys/sys In-Reply-To: <5586E219.2010805@FreeBSD.org> Message-ID: <20150622022837.D2823@besplex.bde.org> References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> <20150621154332.U976@besplex.bde.org> <5586CBCE.2010608@FreeBSD.org> <20150622012426.S2603@besplex.bde.org> <5586E219.2010805@FreeBSD.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=XMDNMlVE c=1 sm=1 tr=0 a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=PO7r1zJSAAAA:8 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=UjiPEAWIfi4Qi1PlpzoA:9 a=CjuIK1q_8ugA:10 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 16:48:28 -0000 On Sun, 21 Jun 2015, Pedro Giffuni wrote: > On 06/21/15 10:41, Bruce Evans wrote: >> On Sun, 21 Jun 2015, Pedro Giffuni wrote: >> >>> On 06/21/15 01:09, Bruce Evans wrote: >>>> On Sat, 20 Jun 2015, Pedro Giffuni wrote: >>> * ... >>>>> With the patch we would use: >>>>> >>>>> __Noreturn void >>>>> foo(void) _dead2; >>>>> >>>>> Which is still ugly but C11-ish. >>>> >>>> That asks for the same problems as defining __weak. >>>> >>>> Why not just don't use _Noreturn? It is an unimprovement on the gcc >>>> attribute. The attribute works at the beginning or end, while Noreturn >>>> only works at the end. >>> >>> As I see it, newer (C11) software is likely to use _Noreturn in their >>> headers >> >> We can define _Noreturn to support this (but possibly shouldn't). >> >> The newer software many be pure C11. Then it doesn't need any definition, >> and just doesn't compile with non-C11 compilers. > > Well, the fact this we just do this in the tree and no one has bothered to > "clean" the situation for older compilers just indicates that no one *cares* > about older compilers. No, we don't do this with older compilers, except for for a couple of pre-C90 cases. We are careful to only define names in our namespace, e.g., __signed but not the C90 keyword 'signed'. This is still fragile. __signed is a keyword for gcc, and it is confusing that some of our use of it require it to have the gcc meaning. __signed is in the implementation namespace so we don't own it completely. This is what is now causing problems with defining __weak. The situation with older compilers has not been cleaned because it either works or is not used. Since it did work with older compilers when it was written, the only way it can not still work is because of "cleaning" it combined with null testing and null use so that bugs in the "cleaning" are not detected. >> If we defined _Noreturn, it would be to use it in non-C11 software, like >> we do in stdlib.h. This is a fragile compatibility hack so it should >> be avoided if possible. We can easily avoid it in our own headers by >> not changing anything. Just use the old declaration, with __dead2 placed >> at the end. Any reasonable implementation of __attribute__() must be able >> to support any new attribute that a new standard might add. > > The thing is, why bother with gnuisms at all? There is no other way to declare necessary attributes that __attribute__(()). Not even __attribute__() like I wrote above -- that is just a syntax error since it is missing parentheses. __attribute__(()) is now a de-facto standard for gnuish compilers, but it is not in any C standard and has little chance of working with Microsoft compilers. It must be wrapped in a #define like we do. > I am personally OK with making it easier for everyone to use more > modern constructs but I am not going out of my way to support > gcc-1 or gcc-2. >From there, it is only a small step to not supporting any compiler except the current version of gcc (not even clang). Bruce From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 17:03:59 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 614CF754; Sun, 21 Jun 2015 17:03:59 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x235.google.com (mail-ig0-x235.google.com [IPv6:2607:f8b0:4001:c05::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 264978B2; Sun, 21 Jun 2015 17:03:59 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igin14 with SMTP id n14so3167274igi.1; Sun, 21 Jun 2015 10:03:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=Iuchb2KY0Ochif+uKW7NF/Aofyc3hgtUWu7AMTMNudw=; b=eUKoBkEvR+1I4bb4dcU8UyuxTf/T4k5gspJhl3QB6dzcC9u1vvaeuZNG2OxHZf7365 ZjaCza1eeE/1XxcCZe7mqYme7vHuIR6wTJQEm3aS5oARrUzee3BPbFpXLv5yEJyZlt00 ljVMjwljfSC7OvZork8kWYHA5uhOuxUXg9AU2Rla1kHVj6poXMapSyJfXNC2DaIjrIZ3 f+Tmiq+1J1sg7FjLCnlq8GsN9GhOw3RfCdbgzRcrL6h0c9WPp6sPTWZ4CK4yEhTjrOcZ 4wHBYc2cUVe13gz78kXlmQG5VqNX/LsTwbkUwFOj+rD4FaCYzkUSiblLF2eoygk1GIUh f5Rg== MIME-Version: 1.0 X-Received: by 10.107.11.164 with SMTP id 36mr5170834iol.8.1434906238475; Sun, 21 Jun 2015 10:03:58 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Sun, 21 Jun 2015 10:03:58 -0700 (PDT) In-Reply-To: <5586DB53.8080800@FreeBSD.org> References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> <20150621154332.U976@besplex.bde.org> <5586CD3F.4000008@FreeBSD.org> <5586DB53.8080800@FreeBSD.org> Date: Sun, 21 Jun 2015 13:03:58 -0400 X-Google-Sender-Auth: K_EYQWRSa7U0ISiSrrPwFaFOMW4 Message-ID: Subject: Re: svn commit: r268137 - head/sys/sys From: Adrian Chadd To: Pedro Giffuni Cc: Oliver Pinter , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , David Chisnall , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 17:03:59 -0000 Hi, I don't think we should be worrying about what hypothetical downstream users of freebsd are doing. If they want to actively ensure things are backwards compatible for their needs, then they should step up and actively fund + participate in development. So if we're somehow /still/ supporting gcc-2.8.1 because -core decided that we should support it - please step up and tell us why and who. Otherwise, let's keep pushing forward to at least the busted old gcc we /do/ support, with an eye towards the future. -adrian From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 18:43:32 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9DA6F3A9 for ; Sun, 21 Jun 2015 18:43:32 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm33-vm2.bullet.mail.bf1.yahoo.com (nm33-vm2.bullet.mail.bf1.yahoo.com [72.30.239.202]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 57971C8 for ; Sun, 21 Jun 2015 18:43:32 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1434911860; bh=dZNTkF2jwui1Zb5bJzjYPZwkwJTOhOfyWI7ahigYdzU=; h=Date:From:To:CC:Subject:References:In-Reply-To:From:Subject; b=L+53G3S1v9n8ehNYOUAPdpjIWqT0Ofw/kEn2D8c0o3bUHKmuJy9fPkanUeVSz8iM6IF+pOIveahG6qwJRTHUGnwg6BDgcqUj++1Q6TVcM0H8Zm3leAChnaLMjYvi0ZYYsmiRvaPcQRpo6FlMokDDlDDqo92Ew/HYM4uqx3zCsEZhsM76lyDAyzik5dDlV3zRZmU+D9632eei67w/ZaM5Z0Oa+m3P7vgjUp48wtOxqgtDo09CfjhGPFmqT0ICKxfk1ZpNB6LFKj18ayTgCUqLfHA75lRubLHsRcbZApc4KLQI07LMCKjhcRl54giCFzU01yUneBB8SfLeDTvlwb2hTw== Received: from [66.196.81.174] by nm33.bullet.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 18:37:40 -0000 Received: from [98.139.211.199] by tm20.bullet.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 18:37:40 -0000 Received: from [127.0.0.1] by smtp208.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 18:37:40 -0000 X-Yahoo-Newman-Id: 337703.1539.bm@smtp208.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: DOKPOwcVM1mgNIhTVZrt.qefikIVjT1o.WxryRRTax9CoK5 074HVEPlqc0p2Q7IjaxBwtgTyVuEJ9WS.ORlHe43Uxa2Fb3jbynrcUVNQVxy NCju6x.KHeKqZHfM8T.T5rmVyPB9rbsN5oDGihmYu3QG9EQ850FiluK9Ka3m FiYwpx1BjunNXZ.51A0RfIKRI8c4.vFpDyy6CUKImA9c4iUtXNdEhBZb4FYZ RoNepGTSSPbeqJ91HymRv5TRiai7F66ZMl5wGmL7LoZt4jw2OqAFOJXBxI2Y D.2QyAdKogjGE85SgqKxygfNkUcqITKIfWw2oY73TW9HJCJyiKJWc3vgodZc nLU9Z3XZy0SwBO9Z2UB7QQu5w0c7yxvJG.X_lbyNLp3vsCNb5Mu5hJc3wcV0 QyedMc3wtaRGHZZ8Rr72.r5ORD8.Vn703P8OZQahv2Ztie785eL75sqknVK3 lV8yIvnoHMDtHft9Eu9VIdmE.3mWPytqPl79GLnq3jMXCwrkp8ci5RE4t0F3 _DE89_AsE1oUjhpuPs8cd2rC942pf_4N7 X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Message-ID: <5587047A.2060007@FreeBSD.org> Date: Sun, 21 Jun 2015 13:37:46 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Bruce Evans CC: Dimitry Andric , David Chisnall , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> <20150621154332.U976@besplex.bde.org> <5586CBCE.2010608@FreeBSD.org> <20150622012426.S2603@besplex.bde.org> <5586E219.2010805@FreeBSD.org> <20150622022837.D2823@besplex.bde.org> In-Reply-To: <20150622022837.D2823@besplex.bde.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 18:43:32 -0000 On 06/21/15 11:48, Bruce Evans wrote: > On Sun, 21 Jun 2015, Pedro Giffuni wrote: > >> On 06/21/15 10:41, Bruce Evans wrote: >>> On Sun, 21 Jun 2015, Pedro Giffuni wrote: >>> >>>> On 06/21/15 01:09, Bruce Evans wrote: >>>>> On Sat, 20 Jun 2015, Pedro Giffuni wrote: >>>> * ... >>>>>> With the patch we would use: >>>>>> >>>>>> __Noreturn void >>>>>> foo(void) _dead2; >>>>>> >>>>>> Which is still ugly but C11-ish. >>>>> >>>>> That asks for the same problems as defining __weak. >>>>> >>>>> Why not just don't use _Noreturn? It is an unimprovement on the gcc >>>>> attribute. The attribute works at the beginning or end, while >>>>> Noreturn >>>>> only works at the end. >>>> >>>> As I see it, newer (C11) software is likely to use _Noreturn in their >>>> headers >>> >>> We can define _Noreturn to support this (but possibly shouldn't). >>> >>> The newer software many be pure C11. Then it doesn't need any >>> definition, >>> and just doesn't compile with non-C11 compilers. >> >> Well, the fact this we just do this in the tree and no one has >> bothered to >> "clean" the situation for older compilers just indicates that no one >> *cares* >> about older compilers. > > No, we don't do this with older compilers, except for for a couple of > pre-C90 cases. We are careful to only define names in our namespace, > e.g., __signed but not the C90 keyword 'signed'. This is still fragile. > __signed is a keyword for gcc, and it is confusing that some of our use > of it require it to have the gcc meaning. __signed is in the > implementation > namespace so we don't own it completely. This is what is now causing > problems > with defining __weak. > We have plenty of C++-style comments and C99 initializers in the tree. We also use gcc constructor and destructor attributes. We can pretend we are supporting a lot of stuff, including the intel C compiler, which AFAICT was hacked to produce FreeBSD binaries but was never really native, but the truth is 100% portability has never been there. We just support what ever compiler was used to build FreeBSD at the time. > The situation with older compilers has not been cleaned because it either > works or is not used. Since it did work with older compilers when it was > written, the only way it can not still work is because of "cleaning" it > combined with null testing and null use so that bugs in the "cleaning" > are not detected. > >>> If we defined _Noreturn, it would be to use it in non-C11 software, >>> like >>> we do in stdlib.h. This is a fragile compatibility hack so it should >>> be avoided if possible. We can easily avoid it in our own headers by >>> not changing anything. Just use the old declaration, with __dead2 >>> placed >>> at the end. Any reasonable implementation of __attribute__() must >>> be able >>> to support any new attribute that a new standard might add. >> >> The thing is, why bother with gnuisms at all? > > There is no other way to declare necessary attributes that > __attribute__(()). > Not even __attribute__() like I wrote above -- that is just a syntax > error > since it is missing parentheses. __attribute__(()) is now a de-facto > standard for gnuish compilers, but it is not in any C standard and has > little chance of working with Microsoft compilers. It must be wrapped > in a #define like we do. > I mean really old gnuisms. We accommodate just fine for gcc 4.x and clang drew the line in gcc-4.2. Anything before that we should just deprecate, Anything after that we can work out relatively easy. >> I am personally OK with making it easier for everyone to use more >> modern constructs but I am not going out of my way to support >> gcc-1 or gcc-2. > > From there, it is only a small step to not supporting any compiler > except the current version of gcc (not even clang). > I agree it would not be impossible to support older compilers and leave space for bare standard ones, but perhaps it would be more realistic to draw a line somewhere and have a list of supported compilers. And if some FreeBSD consumers need a specific compiler it would be great to have them involved in the project. Pedro. From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 18:49:50 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 68252581 for ; Sun, 21 Jun 2015 18:49:50 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm36-vm2.bullet.mail.bf1.yahoo.com (nm36-vm2.bullet.mail.bf1.yahoo.com [72.30.238.138]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C670F8 for ; Sun, 21 Jun 2015 18:49:49 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1434912582; bh=8GRTanxztseJqi+izTNwBEHRGSUATc3wYkQv44oSm78=; h=Date:From:To:CC:Subject:References:In-Reply-To:From:Subject; b=QfjYvAKWkOwp+ha7WcCr6/OkZfusTkxYlwh2hnh2sXAqOanJ4KdHeDAS9O/HlZ8rruTUljjT4mO7IlxWepMnKLomZnNJRBBTa3i5MEcGUyA7bMLZ+vUFftxfJoFEc6ECLlAwzs293ccOPqAiTxaxsdnhFtQxDhvsEYsnrHnx7R695EVOJa6OG3VDd0a5HsEhmcMFRBrDgqOZ9quXDyS9w706k5v2xQF+RZj+ksG8kdveblpG7rYg20lbJTdNDnJf8xgGxidQOvHbN0oaetNOb8HkE8ZwUKQa1O8bGAVZBMeF5xWrhjy6hxPgQHnwSUjnqK3lmXExVTcv+w1oaEglcA== Received: from [98.139.214.32] by nm36.bullet.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 18:49:42 -0000 Received: from [68.142.230.76] by tm15.bullet.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 18:49:42 -0000 Received: from [127.0.0.1] by smtp233.mail.bf1.yahoo.com with NNFMP; 21 Jun 2015 18:49:42 -0000 X-Yahoo-Newman-Id: 130054.23921.bm@smtp233.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 5dtQaCkVM1naoI2Olmu6WZvpGfIdIqywOWOQ2DKOGGBgrlE vVEImgLluQkJvFJkdoEivNepflxyQKECcVfFnWGgiFQMDIiK739y5URD.13N 2zz1VFhjboOGlVa5bsfRHsL7hhHGmoyLclJRsnsO..BJDx4X_rWfnukF440s P8.D.NG4YR6NNkqijnw5RNwDKPY2BIEjoo5vJNGw.Z46VQ9SgYzYdTU7ZQf9 GNbcO3TtFwtX_RUSFtoz9AmrB2LZCcOLHhK309vbGzDTb.3amdSE_ZLcmfll N1zk22glKW7_MPlcUDED4.WgrI0keggoBz.xOrwVA6Ivx4v5KvO859oK3WmP ZrlSDO5YgZK.Ek4shoW585PJzFRe9rALLMiJIhtRKocnWrcDEYAOPS1ZnSaH o7Y9kUw2GKugQ2qSjcP.MRF5o8QD3Dk49PzT.UN15fVGWRH4QwTsCc6yGy64 Emc47GuPv5kn6jcQuNX1BUJTY8e_sdMwysfqHUvbyBdhz01ZFsMl8lI1sda_ o7_j9PwdyW0IlJ6w2vd3ZUSWoOX.hxPgm X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Message-ID: <55870752.6060802@FreeBSD.org> Date: Sun, 21 Jun 2015 13:49:54 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Adrian Chadd CC: Oliver Pinter , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , David Chisnall , "svn-src-head@freebsd.org" Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> <20150621154332.U976@besplex.bde.org> <5586CD3F.4000008@FreeBSD.org> <5586DB53.8080800@FreeBSD.org> In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 18:49:50 -0000 Hi; On 06/21/15 12:03, Adrian Chadd wrote: > Hi, > > I don't think we should be worrying about what hypothetical downstream > users of freebsd are doing. If they want to actively ensure things are > backwards compatible for their needs, then they should step up and > actively fund + participate in development. I agree, but I don't set the policies and we do carry stuff related to older compilers and things like the old linux i386-only intel compiler. > So if we're somehow /still/ supporting gcc-2.8.1 because -core decided > that we should support it - please step up and tell us why and who. > Otherwise, let's keep pushing forward to at least the busted old gcc > we /do/ support, with an eye towards the future. > For reference. I had to do this to accommodate for pre-C99 compilers: https://svnweb.freebsd.org/base?view=revision&revision=280801 I don't see myself going back to redo the headers to take advantage of the variadic macros, but it would be nice to have a policy that doesn't keep us in the past. Pedro. From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 19:11:30 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C85F890C; Sun, 21 Jun 2015 19:11:30 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0117.outbound.protection.outlook.com [207.46.100.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7B87A923; Sun, 21 Jun 2015 19:11:28 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from BY1PR0501CA0008.namprd05.prod.outlook.com (10.162.139.18) by DM2PR05MB783.namprd05.prod.outlook.com (10.141.179.152) with Microsoft SMTP Server (TLS) id 15.1.190.14; Sun, 21 Jun 2015 18:38:11 +0000 Received: from BY2FFO11FD027.protection.gbl (2a01:111:f400:7c0c::122) by BY1PR0501CA0008.outlook.office365.com (2a01:111:e400:4821::18) with Microsoft SMTP Server (TLS) id 15.1.195.15 via Frontend Transport; Sun, 21 Jun 2015 18:38:11 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=juniper.net; FreeBSD.org; dkim=none (message not signed) header.d=none; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.19 as permitted sender) Received: from P-EMF02-SAC.jnpr.net (66.129.239.19) by BY2FFO11FD027.mail.protection.outlook.com (10.1.15.216) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Sun, 21 Jun 2015 18:38:10 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Sun, 21 Jun 2015 11:38:09 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id t5LIasD26914; Sun, 21 Jun 2015 11:36:54 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id 65933580AA; Sun, 21 Jun 2015 11:36:54 -0700 (PDT) To: Antoine Brodin CC: , , Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... In-Reply-To: References: <201506131920.t5DJKwMH033508@svn.freebsd.org> Comments: In-reply-to: Antoine Brodin message dated "Sun, 21 Jun 2015 09:29:17 +0200." From: "Simon J. Gerraty" X-Mailer: MH-E 8.0.3; nmh 1.3; GNU Emacs 22.3.1 Date: Sun, 21 Jun 2015 11:36:54 -0700 Message-ID: <7022.1434911814@chaos> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD027; 1:SE2FN7dbHQfYd5XcNa/oavau2mKzkdel+7WKiBg/eqsw5Y3PicE9ItzgqC1pgXJR/cI24r/yat6pgXy0fqpK/qp2L3YQPtljKtmVmM9UdaNPZ3TVqC27EzOHwOov4mN6DESuZEI+0calakwXisd0d1N9ybnVInsuN2JW6TotT4xKUUsIVasYpMoCUPcHWjwJbo3jze1+Smthn3aaGv+Hq782zPe96Fz6rpkRTVLENmiCqR+ImY53eDmxCwfnpuuwy5i3aVrtx6WLu++P5bC328MAiY0SIYE+w3XSGnimUJw= X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(189002)(24454002)(51704005)(199003)(19580405001)(76176999)(19580395003)(50466002)(50226001)(48376002)(76506005)(6806004)(87936001)(50986999)(57986006)(86362001)(77096005)(117636001)(450100001)(2950100001)(33716001)(47776003)(46102003)(77156002)(105596002)(92566002)(5001960100002)(62966003)(110136002)(189998001)(106466001)(42262002)(62816006); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR05MB783; H:P-EMF02-SAC.jnpr.net; FPR:; SPF:SoftFail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB783; 2:biyVaj1VcznLammGe9puEXWsJKIHXCwWnajtwvp888RWEUXStOcGf0n+OdMP/gTI; 2:iTsFjmDf+b0uok/INmvvBINHk9+D9SktblE96TsnBSdiam2TgxgFxdTsI8TLmJzZ5Kj0UyvNvvrCkucxHvbwuR24NFoW399vcccIbAOJDVILdTOmvYQEN81N1QDaDh4CynLFKPoOhvgW5cBMOkqdL0v3haXDSnj6piTm47j64o99vWvQkbqSd78hSyJ/TchjCPISu9hrGT0NbrMp54UBNC75PFSczW3oWXmOkFtAeYI=; 6:WT8ARqYN6VDIcvV8InqDhEhUBt+sE1vhcrtpoBxLZZDu2VJ8EAFm3gaBaVellTbXQUjOdmeqtvlzl6Bkv0yBZBCbG0ftzmFUESvQolketZMwfM0uvA3esW9GV89Em76T1NDAosMggnk9/yyIUYpXbS/X9BolbWT77c4Rt4w/V5Hbwgd14mUTTFeD6Srnr56O/sWCKyUX7BBjYlKxNWlisR2vg/fGpsvIK2RQuakp1ZFT9/QdkWMy2yt9w062Yg/1NXD8zOCgsgMIo3YVd7WlDZ3/d5CZtAYkCDPXKIMwxVGBcCFCBhLkBS+aqEhd3y2RAv2FYQ0sweJO/xQlLh/AJm8sWgBhW/57StrX5IOkEn02LbDdP4Fbv6Vfaj3FBmZ5rQQKFOrtLeEJlvZwcqsCWWL3pgEcydTHqdDbfDf8km59OerPvPKa5B8pv8cApAVjv2yt4gcrCpdNJniD7TKconc9YrqEnnzBYDYKHnuV94c3HSKsAJ0V3YG/Gi7wDXgc X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR05MB783; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(10322497157591); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520004)(5005006)(3002001); SRVR:DM2PR05MB783; BCL:0; PCL:0; RULEID:; SRVR:DM2PR05MB783; X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB783; 3:TF6GfLjM9taZ/tNfruK9WkKEcJg0Uv5K/MnPssGi9wKkDMRS8Hc0vD9aYWUtNB+MBZAF++BardmxjujTkd15gSwgLr/cQ856BNI1TUcC8zo0IeB9XBJQchLOc9gmXzLSCv3WWr87fcXw15tjHAnkzQe8Mi5QNwGEVCJh45OM4EidE9mvO75885mLfSEbPmHLI9VV0jqLV9BCJpHbltm/a4nC49HmS6b+osqgnwM2rba64PVvUQkJ5+vxwavMgNv8TM+pd5WTsMqoUOcrQ3ViGkgZn99xHhz+bo0/NOo3GYxOJC1mmT5xYRyBIkOhBuD1 X-Forefront-PRVS: 06141B80DC X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB783; 9:feiCIExmoOJ2e3RL4dhp1Wjy3JB6Bi2UkyR5NynfxNiAsX2fOaaUEoKDnX2H63WbKNRPs476I6PP6MMp0G/ZmA+GvZnN0gyiPzJ/b+CBO2P8g8dSZJ+Cke70ss/AZdR/ArEg0RtvBfggD7ry+Bxzi3WKr1g05qb2qXS/R4rr4BUSUWBtuLlWS43dhzO97AcojLBHSfvRFHxmD1sXCTvx9en/RL8pVgIRpcKkYhW+NOtgOFu+3OxHDMT2b6n12PCMKXTRQYSI3bWa/JClrKcAHSxmA1TDyVjlV2jXOT73dC8fvMTMbcxaunel5VQWCIPhjdQwtiM939N7TaVU3Sptt7EB+O/NuXQ/+LG9mXVd8s1SvCAcoav3TMHnVRBXeM6aYdjpfRahp1MTVeoj5S8ncNBEJ6gm9vaB6UyvU3cFE0fLSuR0pHC3NFa/tU9k8a2CzDChqG+Ccnjn86Ys1jz0CVwBehd9SOM3uduB4t+Ue7Mra5C0vynpjt7h6u1MMVjIrQuy/cWYUOL5ZF+m0tFz52fFI3mS0fVjGrc6bFjCtR+/7ATTyDssAypjnmUg/fDZbQXY0AGhRvrbWTJdT06pgeWNKYaABKhXNtw4ImqoRWJ9NvgfsEesbVNmQ9T+xcYOC4fnOhuSVtpPqW6BUuBwbEl9DhKD2aJht+IlKj8HEUZjeJIwOz84Z3qNdh9jnKezqbABVBDyo24hyW8lhy7/vNISj35c1L6RVBqrTi5psKXzhjqX4hke7sbUOfcSz0H4nMicJnDIT2l4kEu7srToYSyVl9EuDbahD9fUImLDRTDz+Hd/vwcPMuhNk7vCZYkXBeryplPB64aiT16FNL4D3/oyTKF7yfZENRmuRel2YjaUnW1vZe6GDqOIz3MeSy2S4kkG7JtaD8HxnMKDMAUGB4bZIaF04lozlK6EveHF8wA= X-Microsoft-Exchange-Diagnostics: 1; DM2PR05MB783; 3:E/p85prSQ3LRGQBUoXAgypewVLBk3Mo5MsaWrUptX3AoS0bS4qRnb4eFOjTrhJTqEo7fVs34fla6rtHYAyEyvQld05G1v+DZeNk6cJ08NH/CxOjAukErEDhw4nCy2lQmhl844JzSVVbYTe9LiH5/9w==; 10:sXhMTTrGKQwRCf/S1Ot7MlYpArjCRsZ/0JRYznLEYHaZ634rOD+5afRjTnvqycoOTGFIJKmuL7H67lK8ZdDT9K5wq+FT7m80dNldeuhf8zg=; 6:yb48etofX5SwwiaZddztIgHEEq+/rTx8wjKC+Uon0InTwZfXFrKLsk7kwQWs8KVb X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2015 18:38:10.4705 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[P-EMF02-SAC.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR05MB783 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 19:11:31 -0000 Antoine Brodin wrote: > > head/lib/ncurses/ncurses/Makefile > ... > > Hi, > > Any reason to not install ncurses html documentation anymore? No, but it should only be done once. Peviously both variants of ncurses were installing the same files. Which was causing a staging conflict. From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 19:25:29 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A3B98BD4; Sun, 21 Jun 2015 19:25:29 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail108.syd.optusnet.com.au (mail108.syd.optusnet.com.au [211.29.132.59]) by mx1.freebsd.org (Postfix) with ESMTP id 621D3BB4; Sun, 21 Jun 2015 19:25:28 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au (c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197]) by mail108.syd.optusnet.com.au (Postfix) with ESMTPS id EDD491A23BF; Mon, 22 Jun 2015 05:25:25 +1000 (AEST) Date: Mon, 22 Jun 2015 05:25:24 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Pedro Giffuni cc: Bruce Evans , Dimitry Andric , David Chisnall , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys In-Reply-To: <5587047A.2060007@FreeBSD.org> Message-ID: <20150622045721.W3492@besplex.bde.org> References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> <20150621154332.U976@besplex.bde.org> <5586CBCE.2010608@FreeBSD.org> <20150622012426.S2603@besplex.bde.org> <5586E219.2010805@FreeBSD.org> <20150622022837.D2823@besplex.bde.org> <5587047A.2060007@FreeBSD.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=XMDNMlVE c=1 sm=1 tr=0 a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=PO7r1zJSAAAA:8 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=xVeHPsXgE_qfO4LVfbgA:9 a=CjuIK1q_8ugA:10 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 19:25:29 -0000 On Sun, 21 Jun 2015, Pedro Giffuni wrote: > On 06/21/15 11:48, Bruce Evans wrote: >> On Sun, 21 Jun 2015, Pedro Giffuni wrote: >>> ... >>> Well, the fact this we just do this in the tree and no one has bothered to >>> "clean" the situation for older compilers just indicates that no one >>> *cares* >>> about older compilers. >> >> No, we don't do this with older compilers, except for for a couple of >> pre-C90 cases. We are careful to only define names in our namespace, >> e.g., __signed but not the C90 keyword 'signed'. This is still fragile. >> __signed is a keyword for gcc, and it is confusing that some of our use >> of it require it to have the gcc meaning. __signed is in the >> implementation >> namespace so we don't own it completely. This is what is now causing >> problems >> with defining __weak. > > We have plenty of C++-style comments and C99 initializers in the tree. Headers cannot use these unconditionally. FreeBSD attempts to support: - user code written in K&R C using __P(()) to ifdef for prototypes. __P(()) and missing prototypes still turn up frequently. Most recently in zfs code with missing prototypes. - ISO C90, including all C90 compilers, all C90 headers and all C90 libraries - POSIX.1-1990. - the POSIX.2 compiler c89. This is one of the C90 compilers. Actually it is C94 or C95 (-std=iso9899:199409). c89 is especially strict. Most carefully written C90 code can be compiled by a C11 compiler with C11 constructs in compiled but not really used parts of standard headers. But c89 forces the compiler/language back to an old standard. This requires the visible parts of standard headers to be written carefully to the old standard too. The support mostly works. The only brokenness that I know of in it is the stdarg thing. I defended against breaking it by using variadic macros Bruce From owner-svn-src-head@FreeBSD.ORG Sun Jun 21 19:50:03 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3BE85F5C; Sun, 21 Jun 2015 19:50:03 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A409FE1; Sun, 21 Jun 2015 19:50:03 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5LJo3X4040728; Sun, 21 Jun 2015 19:50:03 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5LJo3ox040727; Sun, 21 Jun 2015 19:50:03 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506211950.t5LJo3ox040727@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 21 Jun 2015 19:50:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284683 - head/etc/etc.arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 19:50:03 -0000 Author: gjb Date: Sun Jun 21 19:50:02 2015 New Revision: 284683 URL: https://svnweb.freebsd.org/changeset/base/284683 Log: Enable ttyu1, ttyu2, ttyu3 for arm installations. This should make all consoles available, whether it is VGA, HDMI, serial, or JTAG, but more importantly enables all consoles when ttyu0 is not predictable. For example, the Pandaboard ES apparently has three consoles available, but the DB9/RS232 serial port is ttyu2, so not available by default after the system boots. MFC after: 3 days Sponsored by: The FreeBSD Foundation Modified: head/etc/etc.arm/ttys Modified: head/etc/etc.arm/ttys ============================================================================== --- head/etc/etc.arm/ttys Sun Jun 21 14:21:38 2015 (r284682) +++ head/etc/etc.arm/ttys Sun Jun 21 19:50:02 2015 (r284683) @@ -42,8 +42,8 @@ ttyv7 "/usr/libexec/getty Pc" xterm off # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ttyu0 "/usr/libexec/getty 3wire" vt100 onifconsole secure -ttyu1 "/usr/libexec/getty std.9600" dialup off secure -ttyu2 "/usr/libexec/getty std.9600" dialup off secure -ttyu3 "/usr/libexec/getty std.9600" dialup off secure +ttyu1 "/usr/libexec/getty 3wire" vt100 onifconsole secure +ttyu2 "/usr/libexec/getty 3wire" vt100 onifconsole secure +ttyu3 "/usr/libexec/getty 3wire" vt100 onifconsole secure # Dumb console dcons "/usr/libexec/getty std.9600" vt100 off secure From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 01:08:06 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 048FFC80; Mon, 22 Jun 2015 01:08:06 +0000 (UTC) (envelope-from jmg@gold.funkthat.com) Received: from gold.funkthat.com (gate2.funkthat.com [208.87.223.18]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "gold.funkthat.com", Issuer "gold.funkthat.com" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id D505E634; Mon, 22 Jun 2015 01:08:05 +0000 (UTC) (envelope-from jmg@gold.funkthat.com) Received: from gold.funkthat.com (localhost [127.0.0.1]) by gold.funkthat.com (8.14.5/8.14.5) with ESMTP id t5LLJEoR001005 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 21 Jun 2015 14:19:14 -0700 (PDT) (envelope-from jmg@gold.funkthat.com) Received: (from jmg@localhost) by gold.funkthat.com (8.14.5/8.14.5/Submit) id t5LLJECk001004; Sun, 21 Jun 2015 14:19:14 -0700 (PDT) (envelope-from jmg) Date: Sun, 21 Jun 2015 14:19:14 -0700 From: John-Mark Gurney To: Glen Barber Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284683 - head/etc/etc.arm Message-ID: <20150621211914.GU96349@funkthat.com> References: <201506211950.t5LJo3ox040727@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201506211950.t5LJo3ox040727@svn.freebsd.org> X-Operating-System: FreeBSD 9.1-PRERELEASE amd64 X-PGP-Fingerprint: 54BA 873B 6515 3F10 9E88 9322 9CB1 8F74 6D3F A396 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html X-TipJar: bitcoin:13Qmb6AeTgQecazTWph4XasEsP7nGRbAPE X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger? User-Agent: Mutt/1.5.21 (2010-09-15) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (gold.funkthat.com [127.0.0.1]); Sun, 21 Jun 2015 14:19:14 -0700 (PDT) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 01:08:06 -0000 Glen Barber wrote this message on Sun, Jun 21, 2015 at 19:50 +0000: > Author: gjb > Date: Sun Jun 21 19:50:02 2015 > New Revision: 284683 > URL: https://svnweb.freebsd.org/changeset/base/284683 > > Log: > Enable ttyu1, ttyu2, ttyu3 for arm installations. > > This should make all consoles available, whether it > is VGA, HDMI, serial, or JTAG, but more importantly > enables all consoles when ttyu0 is not predictable. > For example, the Pandaboard ES apparently has three > consoles available, but the DB9/RS232 serial port is > ttyu2, so not available by default after the system > boots. I was about to do the same for at least ttyu1 for amd64/i386 as the RCC-VE 4860 from Netgate has the console on com2 (2f8) instead of com1(3f8)... I couldn't use the live cd part of the memstick because of this... -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 01:10:35 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6FAF5CF9; Mon, 22 Jun 2015 01:10:35 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 5AE76B10; Mon, 22 Jun 2015 01:10:35 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by freefall.freebsd.org (Postfix) with ESMTP id AAD041611; Mon, 22 Jun 2015 01:10:34 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Date: Mon, 22 Jun 2015 01:10:32 +0000 From: Glen Barber To: John-Mark Gurney Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284683 - head/etc/etc.arm Message-ID: <20150622011032.GA70255@FreeBSD.org> References: <201506211950.t5LJo3ox040727@svn.freebsd.org> <20150621211914.GU96349@funkthat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="CE+1k2dSO48ffgeK" Content-Disposition: inline In-Reply-To: <20150621211914.GU96349@funkthat.com> X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event X-PEKBAC-Definition: Problem Exists, Keyboard Between Admin/Computer User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 01:10:35 -0000 --CE+1k2dSO48ffgeK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jun 21, 2015 at 02:19:14PM -0700, John-Mark Gurney wrote: > Glen Barber wrote this message on Sun, Jun 21, 2015 at 19:50 +0000: > > Author: gjb > > Date: Sun Jun 21 19:50:02 2015 > > New Revision: 284683 > > URL: https://svnweb.freebsd.org/changeset/base/284683 > >=20 > > Log: > > Enable ttyu1, ttyu2, ttyu3 for arm installations. > > =20 > > This should make all consoles available, whether it > > is VGA, HDMI, serial, or JTAG, but more importantly > > enables all consoles when ttyu0 is not predictable. > > For example, the Pandaboard ES apparently has three > > consoles available, but the DB9/RS232 serial port is > > ttyu2, so not available by default after the system > > boots. >=20 > I was about to do the same for at least ttyu1 for amd64/i386 as the > RCC-VE 4860 from Netgate has the console on com2 (2f8) instead of > com1(3f8)... >=20 > I couldn't use the live cd part of the memstick because of this... >=20 This is on my todo list as well. Not just fixing the ttyuN, but creating a fully-functional memstick image for those specifically. Glen --CE+1k2dSO48ffgeK Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVh2CIAAoJEAMUWKVHj+KT42cP/3Tmi0LY2oAemjk7LEAV9RTf vU4DjXWYVrll1qaEN9pC/QFMVVmOPNgy0KXzqJG1PtKqG1TMo032Zf5VZw8LKfTD mfa20wpdXV2ZRz8t6EgwUPXzHpoGnJV9WHdhVdiR4R1s03vsYkYU30pvvRUODQTu bSKwJOZaTwklMAuikc9LJMpTK6wIuxCCYQmTGE6vUBR+fffP6NZSiRuocsURwtpm ytPz/S97Fw6hmI4LtYbjXSCvoSZtOjUYbAZKEYkx8uycnedhHPv6x+c6Ha/5yOiL GJdNRz8MX4HP+gXsxzC06QPhYBCvwscUZNaEUs0JSLY3K5LzFeJtfDQedoo8Ji+e 3AkHoQBwD6oQcvDE5WehhePOoWPtQBBFKQ3ecJvFcldNg5fSeRP/SjyTh9CXVurS 4x+n2Yg4kIcE3toTkgVy2tNouT8bgu95K7+6TkrLLi2LLprPTrnGmF/ksAeNN/zZ uH2tZWwPcrpHNq7syZNGPAzjMDXugJwf2mL0QQwhjKthJ6iHlZ7r5TnWMCkdrvqf TVyx+z2d35n6nAIXqnW7M24CIzFAeZsgvnnEAJSi9qHXPnf/fHNLH0EbfCLS2tqD Xbud4RbhPnqz2tu44rA3fRCZVfd+J4cHprelzpKJUZaKlZUM48fHKCG3ArBHuul6 qQCtPkpTEOHXLqscTqvB =+6L4 -----END PGP SIGNATURE----- --CE+1k2dSO48ffgeK-- From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 01:11:25 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C1B32D98; Mon, 22 Jun 2015 01:11:25 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 971CCEF2; Mon, 22 Jun 2015 01:11:25 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5M0UYwK083615; Mon, 22 Jun 2015 00:30:34 GMT (envelope-from neel@FreeBSD.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5M0UYWf083614; Mon, 22 Jun 2015 00:30:34 GMT (envelope-from neel@FreeBSD.org) Message-Id: <201506220030.t5M0UYWf083614@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org using -f From: Neel Natu Date: Mon, 22 Jun 2015 00:30:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284688 - head/lib/libvmmapi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 01:11:25 -0000 Author: neel Date: Mon Jun 22 00:30:34 2015 New Revision: 284688 URL: https://svnweb.freebsd.org/changeset/base/284688 Log: Fix a regression in "movs" emulation after r284539. The regression was caused due to a change in behavior of the 'vm_map_gpa()'. Prior to r284539 if 'vm_map_gpa()' was called to map an address range in the guest MMIO region then it would return NULL. This was used by the "movs" emulation to detect if the 'src' or 'dst' operand was in MMIO space. Post r284539 'vm_map_gpa()' started returning a non-NULL pointer even when mapping the guest MMIO region. Fix this by returning non-NULL only if [gaddr, gaddr+len) is entirely within the 'lowmem' or 'highmem' regions and NULL otherwise. Pointy hat to: neel Reviewed by: grehan Reported by: tychon, Ben Perrault (ben.perrault@gmail.com) MFC after: 1 week Modified: head/lib/libvmmapi/vmmapi.c Modified: head/lib/libvmmapi/vmmapi.c ============================================================================== --- head/lib/libvmmapi/vmmapi.c Mon Jun 22 00:05:22 2015 (r284687) +++ head/lib/libvmmapi/vmmapi.c Mon Jun 22 00:30:34 2015 (r284688) @@ -415,19 +415,28 @@ vm_setup_memory(struct vmctx *ctx, size_ return (0); } +/* + * Returns a non-NULL pointer if [gaddr, gaddr+len) is entirely contained in + * the lowmem or highmem regions. + * + * In particular return NULL if [gaddr, gaddr+len) falls in guest MMIO region. + * The instruction emulation code depends on this behavior. + */ void * vm_map_gpa(struct vmctx *ctx, vm_paddr_t gaddr, size_t len) { - vm_paddr_t start, end, mapend; - start = gaddr; - end = gaddr + len; - mapend = ctx->highmem ? 4*GB + ctx->highmem : ctx->lowmem; + if (ctx->lowmem > 0) { + if (gaddr < ctx->lowmem && gaddr + len <= ctx->lowmem) + return (ctx->baseaddr + gaddr); + } - if (start <= end && end <= mapend) - return (ctx->baseaddr + start); - else - return (NULL); + if (ctx->highmem > 0) { + if (gaddr >= 4*GB && gaddr + len <= 4*GB + ctx->highmem) + return (ctx->baseaddr + gaddr); + } + + return (NULL); } size_t From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 01:11:25 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9AEADD97; Mon, 22 Jun 2015 01:11:25 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 854CBEF0; Mon, 22 Jun 2015 01:11:25 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5M0YUUG087648; Mon, 22 Jun 2015 00:34:30 GMT (envelope-from marcel@FreeBSD.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5M0YU34087647; Mon, 22 Jun 2015 00:34:30 GMT (envelope-from marcel@FreeBSD.org) Message-Id: <201506220034.t5M0YU34087647@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcel set sender to marcel@FreeBSD.org using -f From: Marcel Moolenaar Date: Mon, 22 Jun 2015 00:34:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284689 - head/sys/dev/proto X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 01:11:25 -0000 Author: marcel Date: Mon Jun 22 00:34:29 2015 New Revision: 284689 URL: https://svnweb.freebsd.org/changeset/base/284689 Log: Change the probe to what was intended: attach to devices with a type 0 header and not to function 0 devices. Modified: head/sys/dev/proto/proto_bus_pci.c Modified: head/sys/dev/proto/proto_bus_pci.c ============================================================================== --- head/sys/dev/proto/proto_bus_pci.c Mon Jun 22 00:30:34 2015 (r284688) +++ head/sys/dev/proto/proto_bus_pci.c Mon Jun 22 00:34:29 2015 (r284689) @@ -64,8 +64,7 @@ proto_pci_probe(device_t dev) { struct sbuf *sb; - /* For now we only attach to function 0 devices. */ - if (pci_get_function(dev) != 0) + if ((pci_read_config(dev, PCIR_HDRTYPE, 1) & PCIM_HDRTYPE) != 0) return (ENXIO); sb = sbuf_new_auto(); From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 01:11:27 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 39C3BD9B; Mon, 22 Jun 2015 01:11:27 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 28D38F1A; Mon, 22 Jun 2015 01:11:27 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5LMjsN1029487; Sun, 21 Jun 2015 22:45:54 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5LMjsOa029486; Sun, 21 Jun 2015 22:45:54 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506212245.t5LMjsOa029486@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 21 Jun 2015 22:45:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284686 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 01:11:27 -0000 Author: bapt Date: Sun Jun 21 22:45:53 2015 New Revision: 284686 URL: https://svnweb.freebsd.org/changeset/base/284686 Log: Only build gperf as a bootstrap tool if gcc is going to be built Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Jun 21 22:42:55 2015 (r284685) +++ head/Makefile.inc1 Sun Jun 21 22:45:53 2015 (r284686) @@ -1258,7 +1258,7 @@ _bt= _bootstrap-tools _strfile= games/fortune/strfile .endif -.if ${MK_CXX} != "no" +.if ${MK_GCC} != "no" && ${MK_CXX} != "no" _gperf= gnu/usr.bin/gperf .endif From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 01:11:27 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 54A4CD9C; Mon, 22 Jun 2015 01:11:27 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 36757F1D; Mon, 22 Jun 2015 01:11:27 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5LMgtBL029034; Sun, 21 Jun 2015 22:42:55 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5LMgtqX029033; Sun, 21 Jun 2015 22:42:55 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506212242.t5LMgtqX029033@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 21 Jun 2015 22:42:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284685 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 01:11:27 -0000 Author: bapt Date: Sun Jun 21 22:42:55 2015 New Revision: 284685 URL: https://svnweb.freebsd.org/changeset/base/284685 Log: Simplify code to install manpages and it symlinks Use the bmake's .for multi variable loops to simplify and make the code more readable Modified: head/share/mk/bsd.man.mk Modified: head/share/mk/bsd.man.mk ============================================================================== --- head/share/mk/bsd.man.mk Sun Jun 21 22:27:52 2015 (r284684) +++ head/share/mk/bsd.man.mk Sun Jun 21 22:42:55 2015 (r284685) @@ -186,17 +186,11 @@ _maninstall: ${MAN} .endif .endfor .else - @set ${.ALLSRC:C/\.([^.]*)$/.\1 \1/}; \ - while : ; do \ - case $$# in \ - 0) break;; \ - 1) echo "warn: missing extension: $$1"; break;; \ - esac; \ - page=$$1; shift; sect=$$1; shift; \ - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ - ${ECHO} ${MINSTALL} $${page} $${d}; \ - ${MINSTALL} $${page} $${d}; \ - done +.for _page _sect ${.ALLSRC:C/\.([^.]*)$/.\1 \1/} + @d=${DESTDIR}${MANDIR}${_sect}${MANSUBDIR}; \ + ${ECHO} ${MINSTALL} ${_page} $${d}; \ + ${MINSTALL} $${page} $${d}; +.endfor .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) .for __page in ${MAN} ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ @@ -217,35 +211,21 @@ _maninstall: ${MAN} .endif .if !defined(NO_MLINKS) && defined(MLINKS) && !empty(MLINKS) - @set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \ - while : ; do \ - case $$# in \ - 0) break;; \ - [123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \ - esac; \ - name=$$1; shift; sect=$$1; shift; \ - l=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \ - name=$$1; shift; sect=$$1; shift; \ - t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \ - ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \ - rm -f $${t} $${t}${MCOMPRESS_EXT}; \ - ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \ - done +.for _oname _osect _dname _dsect in ${MLINKS:C/\.([^.]*)$/.\1 \1/} + @l=${DESTDIR}${MANDIR}${_osect}${MANSUBDIR}/${_oname}; \ + t=${DESTDIR}${MANDIR}${_dsect}${MANSUBDIR}/${_dname}; \ + ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \ + rm -f $${t} $${t}${MCOMPRESS_EXT}; \ + ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT} +.endfor .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) - @set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \ - while : ; do \ - case $$# in \ - 0) break;; \ - [123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \ - esac; \ - name=$$1; shift; sect=$$1; shift; \ - l=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \ - name=$$1; shift; sect=$$1; shift; \ - t=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \ - ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \ - rm -f $${t} $${t}${MCOMPRESS_EXT}; \ - ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \ - done +.for _oname _osect _dname _dsect in ${MLINKS:C/\.([^.]*)$/.\1 \1/} + @l=${DESTDIR}${MANDIR}${_osect}${MANSUBDIR}/${_oname}; \ + t=${DESTDIR}${MANDIR}${_dsect}${MANSUBDIR}/${_dname}; \ + ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \ + rm -f $${t} $${t}${MCOMPRESS_EXT}; \ + ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT} +.endfor .endif .endif From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 01:11:27 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D7ABED9D; Mon, 22 Jun 2015 01:11:27 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C1D51F42; Mon, 22 Jun 2015 01:11:27 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5LMRrc1020050; Sun, 21 Jun 2015 22:27:53 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5LMRr6k020049; Sun, 21 Jun 2015 22:27:53 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506212227.t5LMRr6k020049@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 21 Jun 2015 22:27:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284684 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 01:11:27 -0000 Author: bapt Date: Sun Jun 21 22:27:52 2015 New Revision: 284684 URL: https://svnweb.freebsd.org/changeset/base/284684 Log: Simplify symlinks on include files by using bmake's multivariable .for loops Modified: head/share/mk/bsd.incs.mk Modified: head/share/mk/bsd.incs.mk ============================================================================== --- head/share/mk/bsd.incs.mk Sun Jun 21 19:50:02 2015 (r284683) +++ head/share/mk/bsd.incs.mk Sun Jun 21 22:27:52 2015 (r284684) @@ -77,15 +77,10 @@ _${group}INS: ${_${group}INCS} .if defined(INCSLINKS) && !empty(INCSLINKS) installincludes: - @set ${INCSLINKS}; \ - while test $$# -ge 2; do \ - l=$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ${INSTALL_SYMLINK} $$l $$t; \ - done; true +.for s t in ${INCSLINKS} + @${ECHO} "$t -> $s" ; \ + ${INSTALL_SYMLINK} $s ${DESTDIR}$t +.endfor .endif .endif # !target(installincludes) From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 01:39:56 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2F0B6C5; Mon, 22 Jun 2015 01:39:56 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: from mail.soaustin.net (mail.soaustin.net [66.135.54.68]) by mx1.freebsd.org (Postfix) with ESMTP id 0E01B1EF5; Mon, 22 Jun 2015 01:39:55 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: by mail.soaustin.net (Postfix, from userid 502) id 880BC5607A; Sun, 21 Jun 2015 18:14:23 -0500 (CDT) Date: Sun, 21 Jun 2015 18:14:23 -0500 From: Mark Linimon To: Pedro Giffuni Cc: Bruce Evans , svn-src-head@freebsd.org, David Chisnall , svn-src-all@freebsd.org, src-committers@freebsd.org, Dimitry Andric Subject: Re: svn commit: r268137 - head/sys/sys Message-ID: <20150621231423.GB6157@lonesome.com> References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> <55842F16.5040608@FreeBSD.org> <20150620023835.N2562@besplex.bde.org> <55861046.4050501@FreeBSD.org> <20150621154332.U976@besplex.bde.org> <5586CBCE.2010608@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5586CBCE.2010608@FreeBSD.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 01:39:56 -0000 On Sun, Jun 21, 2015 at 09:35:58AM -0500, Pedro Giffuni wrote: > You have a point there: I tried to get the core team to at least > deprecate gcc <= 2.8.1 and they didn't reach an agreement. :( When was this? mcl From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 03:44:36 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B84A8AD8; Mon, 22 Jun 2015 03:44:36 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebius.int.ru", Issuer "cell.glebius.int.ru" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 416B0B19; Mon, 22 Jun 2015 03:44:35 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.9/8.14.9) with ESMTP id t5M3iQGZ058013 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 22 Jun 2015 06:44:26 +0300 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.9/8.14.9/Submit) id t5M3iQWw058012; Mon, 22 Jun 2015 06:44:26 +0300 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Mon, 22 Jun 2015 06:44:26 +0300 From: Gleb Smirnoff To: Mark Linimon Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284529 - in head/sys: cddl/contrib/opensolaris/uts/common/fs/zfs fs/nfsclient vm Message-ID: <20150622034426.GY73119@FreeBSD.org> References: <201506172244.t5HMiShN079772@svn.freebsd.org> <20150619174434.GB17459@lonesome.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150619174434.GB17459@lonesome.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 03:44:36 -0000 On Fri, Jun 19, 2015 at 12:44:34PM -0500, Mark Linimon wrote: M> On Wed, Jun 17, 2015 at 10:44:28PM +0000, Gleb Smirnoff wrote: M> > Log: M> > o Un-inline vm_pager_get_pages(), vm_pager_get_pages_async(). M> > o Provide an extensive set of assertions for input array of pages. M> > o Remove now duplicate assertions from different pagers. M> M> Out of curiosity, what is the effect of these changes? These changes are non-functional, but they will reduce size of future commit and make it more readable. https://lists.freebsd.org/pipermail/freebsd-arch/2015-April/017154.html -- Totus tuus, Glebius. From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 04:25:42 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1F020C09; Mon, 22 Jun 2015 04:25:42 +0000 (UTC) (envelope-from julian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 07385B88; Mon, 22 Jun 2015 04:25:42 +0000 (UTC) (envelope-from julian@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5M4PfgF099068; Mon, 22 Jun 2015 04:25:41 GMT (envelope-from julian@FreeBSD.org) Received: (from julian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5M4PfpI099067; Mon, 22 Jun 2015 04:25:41 GMT (envelope-from julian@FreeBSD.org) Message-Id: <201506220425.t5M4PfpI099067@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: julian set sender to julian@FreeBSD.org using -f From: Julian Elischer Date: Mon, 22 Jun 2015 04:25:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284691 - head/etc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 04:25:42 -0000 Author: julian Date: Mon Jun 22 04:25:41 2015 New Revision: 284691 URL: https://svnweb.freebsd.org/changeset/base/284691 Log: remove 16 rules and replace by 2 by using a table I've been doing this ever since there were tables coudl make more efficient by using "in recv" and "out xmit" instead of via but I'll leave that. MFC after: 1 week Modified: head/etc/rc.firewall Modified: head/etc/rc.firewall ============================================================================== --- head/etc/rc.firewall Mon Jun 22 00:54:47 2015 (r284690) +++ head/etc/rc.firewall Mon Jun 22 04:25:41 2015 (r284691) @@ -266,6 +266,7 @@ case ${firewall_type} in # firewall_simple_oif_ipv6: Outside IPv6 network interface. # firewall_simple_onet_ipv6: Outside IPv6 network prefix. ############ + BAD_ADDR_TBL=13 # set these to your outside interface network oif="$firewall_simple_oif" @@ -290,19 +291,23 @@ case ${firewall_type} in fi fi + # define stuff we should never send out or receive in # Stop RFC1918 nets on the outside interface - ${fwcmd} add deny all from any to 10.0.0.0/8 via ${oif} - ${fwcmd} add deny all from any to 172.16.0.0/12 via ${oif} - ${fwcmd} add deny all from any to 192.168.0.0/16 via ${oif} + ${fwcmd} table ${BAD_ADDR_TBL} flush + ${fwcmd} table ${BAD_ADDR_TBL} add 10.0.0.0/8 + ${fwcmd} table ${BAD_ADDR_TBL} add 172.16.0.0/12 + ${fwcmd} table ${BAD_ADDR_TBL} add 192.168.0.0/16 # Stop draft-manning-dsua-03.txt (1 May 2000) nets (includes RESERVED-1, # DHCP auto-configuration, NET-TEST, MULTICAST (class D), and class E) # on the outside interface - ${fwcmd} add deny all from any to 0.0.0.0/8 via ${oif} - ${fwcmd} add deny all from any to 169.254.0.0/16 via ${oif} - ${fwcmd} add deny all from any to 192.0.2.0/24 via ${oif} - ${fwcmd} add deny all from any to 224.0.0.0/4 via ${oif} - ${fwcmd} add deny all from any to 240.0.0.0/4 via ${oif} + ${fwcmd} table ${BAD_ADDR_TBL} add 0.0.0.0/8 + ${fwcmd} table ${BAD_ADDR_TBL} add 169.254.0.0/16 + ${fwcmd} table ${BAD_ADDR_TBL} add 192.0.2.0/24 + ${fwcmd} table ${BAD_ADDR_TBL} add 224.0.0.0/4 + ${fwcmd} table ${BAD_ADDR_TBL} add 240.0.0.0/4 + + ${fwcmd} add deny all from any to "table($BAD_ADDR_TBL)" via ${oif} # Network Address Translation. This rule is placed here deliberately # so that it does not interfere with the surrounding address-checking @@ -319,20 +324,7 @@ case ${firewall_type} in ;; esac - # Stop RFC1918 nets on the outside interface - ${fwcmd} add deny all from 10.0.0.0/8 to any via ${oif} - ${fwcmd} add deny all from 172.16.0.0/12 to any via ${oif} - ${fwcmd} add deny all from 192.168.0.0/16 to any via ${oif} - - # Stop draft-manning-dsua-03.txt (1 May 2000) nets (includes RESERVED-1, - # DHCP auto-configuration, NET-TEST, MULTICAST (class D), and class E) - # on the outside interface - ${fwcmd} add deny all from 0.0.0.0/8 to any via ${oif} - ${fwcmd} add deny all from 169.254.0.0/16 to any via ${oif} - ${fwcmd} add deny all from 192.0.2.0/24 to any via ${oif} - ${fwcmd} add deny all from 224.0.0.0/4 to any via ${oif} - ${fwcmd} add deny all from 240.0.0.0/4 to any via ${oif} - + ${fwcmd} add deny all from "table($BAD_ADDR_TBL)" to any via ${oif} if [ -n "$inet6" ]; then # Stop unique local unicast address on the outside interface ${fwcmd} add deny all from fc00::/7 to any via ${oif6} From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 05:41:14 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C759FEEE; Mon, 22 Jun 2015 05:41:14 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B39F6E21; Mon, 22 Jun 2015 05:41:14 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5M5fENG036536; Mon, 22 Jun 2015 05:41:14 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5M5fEJ3036535; Mon, 22 Jun 2015 05:41:14 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201506220541.t5M5fEJ3036535@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Mon, 22 Jun 2015 05:41:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284695 - head/lib/ncurses/ncurses X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 05:41:14 -0000 Author: antoine Date: Mon Jun 22 05:41:13 2015 New Revision: 284695 URL: https://svnweb.freebsd.org/changeset/base/284695 Log: Install ncurses html documentation again after r284345 Modified: head/lib/ncurses/ncurses/Makefile Modified: head/lib/ncurses/ncurses/Makefile ============================================================================== --- head/lib/ncurses/ncurses/Makefile Mon Jun 22 05:36:08 2015 (r284694) +++ head/lib/ncurses/ncurses/Makefile Mon Jun 22 05:41:13 2015 (r284695) @@ -308,7 +308,7 @@ SYMLINKS+= libncurses${LIB_SUFFIX}_p.a $ SYMLINKS+= libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtinfo${LIB_SUFFIX}_p.a .endif -.if ${.CURDIR:T} == "ncurses" +.if ${.CURDIR:T} == "ncursesw" .if defined(ENABLE_WIDEC) DOCSDIR= ${SHAREDIR}/doc/ncurses DOCS= ncurses-intro.html hackguide.html From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 06:30:02 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DCB5917D; Mon, 22 Jun 2015 06:30:02 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CB75B323; Mon, 22 Jun 2015 06:30:02 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5M6U2oI057498; Mon, 22 Jun 2015 06:30:02 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5M6U29v057497; Mon, 22 Jun 2015 06:30:02 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506220630.t5M6U29v057497@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 22 Jun 2015 06:30:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284697 - head/sys/dev/isp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 06:30:03 -0000 Author: mav Date: Mon Jun 22 06:30:02 2015 New Revision: 284697 URL: https://svnweb.freebsd.org/changeset/base/284697 Log: Add logging of executed mailbox command names. Previously those commands were logged only as part of register dump, that is not very readable. Modified: head/sys/dev/isp/isp.c Modified: head/sys/dev/isp/isp.c ============================================================================== --- head/sys/dev/isp/isp.c Mon Jun 22 06:06:38 2015 (r284696) +++ head/sys/dev/isp/isp.c Mon Jun 22 06:30:02 2015 (r284697) @@ -7344,6 +7344,7 @@ isp_mboxcmd(ispsoftc_t *isp, mbreg_t *mb isp_prt(isp, ISP_LOGERR, "Unknown Command 0x%x", opcode); return; } + cname = fc_mbcmd_names[opcode]; ibits = ISP_FC_IBITS(opcode); obits = ISP_FC_OBITS(opcode); } else { @@ -7352,9 +7353,15 @@ isp_mboxcmd(ispsoftc_t *isp, mbreg_t *mb isp_prt(isp, ISP_LOGERR, "Unknown Command 0x%x", opcode); return; } + cname = scsi_mbcmd_names[opcode]; ibits = ISP_SCSI_IBITS(opcode); obits = ISP_SCSI_OBITS(opcode); } + if (cname == NULL) { + cname = tname; + ISP_SNPRINTF(tname, sizeof tname, "opcode %x", opcode); + } + isp_prt(isp, ISP_LOGDEBUG3, "Mailbox Command '%s'", cname); /* * Pick up any additional bits that the caller might have set. @@ -7440,11 +7447,6 @@ isp_mboxcmd(ispsoftc_t *isp, mbreg_t *mb if (mbp->logval == 0 || opcode == MBOX_EXEC_FIRMWARE) { return; } - cname = (IS_FC(isp))? fc_mbcmd_names[opcode] : scsi_mbcmd_names[opcode]; - if (cname == NULL) { - cname = tname; - ISP_SNPRINTF(tname, sizeof tname, "opcode %x", opcode); - } /* * Just to be chatty here... From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 08:26:29 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 07EA890A; Mon, 22 Jun 2015 08:26:29 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E2D6D16F3; Mon, 22 Jun 2015 08:26:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5M8QSjc015482; Mon, 22 Jun 2015 08:26:28 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5M8QS0n015481; Mon, 22 Jun 2015 08:26:28 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506220826.t5M8QS0n015481@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 22 Jun 2015 08:26:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284698 - head/sys/dev/isp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 08:26:29 -0000 Author: mav Date: Mon Jun 22 08:26:28 2015 New Revision: 284698 URL: https://svnweb.freebsd.org/changeset/base/284698 Log: Dump additional config bytes for INIT_FIRMWARE_MULTI_ID. Modified: head/sys/dev/isp/isp.c Modified: head/sys/dev/isp/isp.c ============================================================================== --- head/sys/dev/isp/isp.c Mon Jun 22 06:30:02 2015 (r284697) +++ head/sys/dev/isp/isp.c Mon Jun 22 08:26:28 2015 (r284698) @@ -2182,6 +2182,11 @@ isp_fibre_init_2400(ispsoftc_t *isp) isp_put_vp_port_info(isp, &pi, pdst); amt += ICB2400_VPOPT_WRITE_SIZE; } + if (isp->isp_dblev & ISP_LOGDEBUG1) { + isp_print_bytes(isp, "isp_fibre_init_2400", + amt - ICB2400_VPINFO_OFF, + (char *)fcp->isp_scratch + ICB2400_VPINFO_OFF); + } } /* From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 16:13:18 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B7D013F3; Mon, 22 Jun 2015 16:13:18 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A68753C2; Mon, 22 Jun 2015 16:13:18 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MGDI6G049226; Mon, 22 Jun 2015 16:13:18 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5MGDIDN049225; Mon, 22 Jun 2015 16:13:18 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506221613.t5MGDIDN049225@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Mon, 22 Jun 2015 16:13:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284699 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 16:13:18 -0000 Author: sjg Date: Mon Jun 22 16:13:17 2015 New Revision: 284699 URL: https://svnweb.freebsd.org/changeset/base/284699 Log: targets now needs .PHONY Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Mon Jun 22 08:26:28 2015 (r284698) +++ head/Makefile Mon Jun 22 16:13:17 2015 (r284699) @@ -408,7 +408,7 @@ UNIVERSE_TARGET?= buildworld .endif KERNSRCDIR?= ${.CURDIR}/sys -targets: +targets: .PHONY @echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets" .for target in ${TARGETS} .for target_arch in ${TARGET_ARCHES_${target}} From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 17:04:25 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0152D72F; Mon, 22 Jun 2015 17:04:24 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E4343FA7; Mon, 22 Jun 2015 17:04:24 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MH4OiI076715; Mon, 22 Jun 2015 17:04:24 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5MH4Oll076714; Mon, 22 Jun 2015 17:04:24 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201506221704.t5MH4Oll076714@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Mon, 22 Jun 2015 17:04:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284701 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 17:04:25 -0000 Author: sbruno Date: Mon Jun 22 17:04:24 2015 New Revision: 284701 URL: https://svnweb.freebsd.org/changeset/base/284701 Log: Make imgact_binmisc_exec() static. Submitted by: kib Reviewed by: sson Modified: head/sys/kern/imgact_binmisc.c Modified: head/sys/kern/imgact_binmisc.c ============================================================================== --- head/sys/kern/imgact_binmisc.c Mon Jun 22 16:24:27 2015 (r284700) +++ head/sys/kern/imgact_binmisc.c Mon Jun 22 17:04:24 2015 (r284701) @@ -101,9 +101,6 @@ static int interp_list_entry_count = 0; static struct sx interp_list_sx; -int imgact_binmisc_exec(struct image_params *imgp); - - /* * Populate the entry with the information about the interpreter. */ @@ -576,7 +573,7 @@ imgact_binmisc_find_interpreter(const ch return (NULL); } -int +static int imgact_binmisc_exec(struct image_params *imgp) { const char *image_header = imgp->image_header; From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 17:16:10 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9BDEA860; Mon, 22 Jun 2015 17:16:10 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8A51295E; Mon, 22 Jun 2015 17:16:10 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MHGAwG082317; Mon, 22 Jun 2015 17:16:10 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5MHGAnF082316; Mon, 22 Jun 2015 17:16:10 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201506221716.t5MHGAnF082316@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Mon, 22 Jun 2015 17:16:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284702 - head/sys/dev/uart X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 17:16:10 -0000 Author: sbruno Date: Mon Jun 22 17:16:09 2015 New Revision: 284702 URL: https://svnweb.freebsd.org/changeset/base/284702 Log: Add new UART device presented on newer AMT enabled systems/laptops. Tested on Dell Latitude E7240. MFC after: 2 weeks Relnotes: yes Modified: head/sys/dev/uart/uart_bus_pci.c Modified: head/sys/dev/uart/uart_bus_pci.c ============================================================================== --- head/sys/dev/uart/uart_bus_pci.c Mon Jun 22 17:04:24 2015 (r284701) +++ head/sys/dev/uart/uart_bus_pci.c Mon Jun 22 17:16:09 2015 (r284702) @@ -136,6 +136,7 @@ static const struct pci_id pci_ns8250_id { 0x8086, 0x8814, 0xffff, 0, "Intel EG20T Serial Port 3", 0x10 }, { 0x8086, 0x8c3d, 0xffff, 0, "Intel Lynx Point KT Controller", 0x10 }, { 0x8086, 0x8cbd, 0xffff, 0, "Intel Wildcat Point KT Controller", 0x10 }, +{ 0x8086, 0x9c3d, 0xffff, 0, "Intel Lynx Point-LP HECI KT", 0x10 }, { 0x9710, 0x9820, 0x1000, 1, "NetMos NM9820 Serial Port", 0x10 }, { 0x9710, 0x9835, 0x1000, 1, "NetMos NM9835 Serial Port", 0x10 }, { 0x9710, 0x9865, 0xa000, 0x1000, "NetMos NM9865 Serial Port", 0x10 }, From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 17:23:37 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E21C8AD; Mon, 22 Jun 2015 17:23:37 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6AC20E37; Mon, 22 Jun 2015 17:23:37 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MHNbSu086959; Mon, 22 Jun 2015 17:23:37 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5MHNbqD086958; Mon, 22 Jun 2015 17:23:37 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201506221723.t5MHNbqD086958@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 22 Jun 2015 17:23:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284703 - head/tools/build/options X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 17:23:37 -0000 Author: emaste Date: Mon Jun 22 17:23:36 2015 New Revision: 284703 URL: https://svnweb.freebsd.org/changeset/base/284703 Log: Report failing value from 'make showconfig' in build option script Sponsored by: The FreeBSD Foundation Modified: head/tools/build/options/makeman Modified: head/tools/build/options/makeman ============================================================================== --- head/tools/build/options/makeman Mon Jun 22 17:16:09 2015 (r284702) +++ head/tools/build/options/makeman Mon Jun 22 17:23:36 2015 (r284703) @@ -46,7 +46,7 @@ show_options() echo ${opt} ;; *) - echo 'make showconfig broken' >&2 + echo "make showconfig broken: ${val} is not yes or no" >&2 exit 1 ;; esac @@ -107,7 +107,7 @@ show() echo ${no_prefix}_${opt} ;; *) - echo 'make showconfig broken' >&2 + echo "make showconfig broken: ${val} is not yes or no" >&2 exit 1 ;; esac From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 18:58:55 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ABF4DF47; Mon, 22 Jun 2015 18:58:55 +0000 (UTC) (envelope-from loos.br@gmail.com) Received: from mail-la0-x230.google.com (mail-la0-x230.google.com [IPv6:2a00:1450:4010:c03::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4AF8E3B6; Mon, 22 Jun 2015 18:58:55 +0000 (UTC) (envelope-from loos.br@gmail.com) Received: by lagx9 with SMTP id x9so27846034lag.1; Mon, 22 Jun 2015 11:58:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=/33HhX45uvW8bx40E9vCfRF9erZdEu5ej57n9sTVqvw=; b=WEx57gFz42+fUCQ7goyP4XAo7epB3Eklm8aVx4/v7KOl8N13bfhufSNXiNeY4FSVPc po9ZxWOevuFciuC6Bh1cyeYGQO1c1WIHezygi+yV4+TTqxEuVJCE0lt217mxO5AupRgS oMyhBK5c1nA9fP7GrJCulp0wUAMofuzMFdqyO71ctZQZgC9+61RAo8/v7lYl0kCAJwrF OVRr/SJ6Q8jXZv67buC5baJIyQDrxB/n9WjLRMWOknOWB38HnA+qSSnBklVk1J+wotLG Y3rc3hwiSzGgvsG9hHN1D8TU0WL0phAZIIFvpQw5Q9supimOf5+4pm1bL8/cZf2uC6OJ fBFg== MIME-Version: 1.0 X-Received: by 10.112.190.10 with SMTP id gm10mr30573628lbc.2.1434999533283; Mon, 22 Jun 2015 11:58:53 -0700 (PDT) Received: by 10.112.52.170 with HTTP; Mon, 22 Jun 2015 11:58:53 -0700 (PDT) In-Reply-To: References: <201506192224.t5JMOxpC097306@svn.freebsd.org> <1434755385.1415.114.camel@freebsd.org> <1434818987.1415.120.camel@freebsd.org> Date: Mon, 22 Jun 2015 15:58:53 -0300 Message-ID: Subject: Re: svn commit: r284614 - head/sys/boot/uboot/lib From: Luiz Otavio O Souza To: Maxim Sobolev Cc: Ian Lepore , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 18:58:55 -0000 On Sun, Jun 21, 2015 at 12:32 AM, Maxim Sobolev wrote: > Kewl, have you bothered to report it back to u-boot guys by any chance? > > -Max Well, I started to read the patches submission requirements and gave up (shame on me). I'll try once more with a little bit more of patience, but in any case, feel free to submit this fix if you already know the u-boot rules. Luiz From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 19:01:10 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 88533F74; Mon, 22 Jun 2015 19:01:10 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 76C818E2; Mon, 22 Jun 2015 19:01:10 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MJ1AZR041445; Mon, 22 Jun 2015 19:01:10 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5MJ1Asg041422; Mon, 22 Jun 2015 19:01:10 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506221901.t5MJ1Asg041422@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Mon, 22 Jun 2015 19:01:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284705 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 19:01:10 -0000 Author: sjg Date: Mon Jun 22 19:01:09 2015 New Revision: 284705 URL: https://svnweb.freebsd.org/changeset/base/284705 Log: Appy := to dependent opts once value determined. This is needed to fix output from 'make showconfig' Modified: head/share/mk/bsd.mkopt.mk Modified: head/share/mk/bsd.mkopt.mk ============================================================================== --- head/share/mk/bsd.mkopt.mk Mon Jun 22 18:18:15 2015 (r284704) +++ head/share/mk/bsd.mkopt.mk Mon Jun 22 19:01:09 2015 (r284705) @@ -81,5 +81,6 @@ MK_${vv:H}?= no .else MK_${vv:H}?= ${MK_${vv:T}} .endif +MK_${vv:H}:= ${MK_${vv:H}} .endfor .undef __DEFAULT_DEPENDENT_OPTIONS From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 19:07:07 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D0E95FD0 for ; Mon, 22 Jun 2015 19:07:07 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from pmta2.delivery6.ore.mailhop.org (pmta2.delivery6.ore.mailhop.org [54.200.129.228]) by mx1.freebsd.org (Postfix) with SMTP id A9C52BA8 for ; Mon, 22 Jun 2015 19:07:07 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from ilsoft.org (unknown [73.34.117.227]) by outbound2.ore.mailhop.org (Halon Mail Gateway) with ESMTPSA; Mon, 22 Jun 2015 19:07:19 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.14.9/8.14.9) with ESMTP id t5MJ6w7R028146; Mon, 22 Jun 2015 13:06:58 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1435000018.33313.4.camel@freebsd.org> Subject: Re: svn commit: r284614 - head/sys/boot/uboot/lib From: Ian Lepore To: Luiz Otavio O Souza Cc: Maxim Sobolev , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Mon, 22 Jun 2015 13:06:58 -0600 In-Reply-To: References: <201506192224.t5JMOxpC097306@svn.freebsd.org> <1434755385.1415.114.camel@freebsd.org> <1434818987.1415.120.camel@freebsd.org> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.12.10 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 19:07:07 -0000 On Mon, 2015-06-22 at 15:58 -0300, Luiz Otavio O Souza wrote: > On Sun, Jun 21, 2015 at 12:32 AM, Maxim Sobolev wrote: > > Kewl, have you bothered to report it back to u-boot guys by any chance? > > > > -Max > > Well, I started to read the patches submission requirements and gave > up (shame on me). I'll try once more with a little bit more of > patience, but in any case, feel free to submit this fix if you already > know the u-boot rules. > > Luiz > The same thing happened to me, that's why all our u-boot ports have the same set of patches -- that's lower-cost to me than learning how to submit patches back to u-boot. (Are we the only project around that takes fixes in pretty much any form these days? It seems like most projects work hard to erect barriers to contribution.) -- Ian From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 19:43:09 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7FDCE2F2; Mon, 22 Jun 2015 19:43:09 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 53D3BA7C; Mon, 22 Jun 2015 19:43:09 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MJh9h3064088; Mon, 22 Jun 2015 19:43:09 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5MJh8ZY064085; Mon, 22 Jun 2015 19:43:08 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506221943.t5MJh8ZY064085@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Mon, 22 Jun 2015 19:43:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284707 - in head: lib/csu/aarch64 libexec/rtld-elf/aarch64 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 19:43:09 -0000 Author: andrew Date: Mon Jun 22 19:43:08 2015 New Revision: 284707 URL: https://svnweb.freebsd.org/changeset/base/284707 Log: Add a workaround to correctly align the stack before calling into C code. When enough time has passed for users to update their userland the kernel fix will be applied. This will change the ABI to have x0 point to the args and sp be correctly aligned. It is expected this compatibility code can be removed when the kernel and qemu usermode emulation have both been updated for the new ABI. This fixes clang failures, and most likely other crashes. Obtained from: ABT Systems Ltd Sponsored by: The FreeBSD Foundation Modified: head/lib/csu/aarch64/crt1.c head/libexec/rtld-elf/aarch64/rtld_start.S Modified: head/lib/csu/aarch64/crt1.c ============================================================================== --- head/lib/csu/aarch64/crt1.c Mon Jun 22 19:37:04 2015 (r284706) +++ head/lib/csu/aarch64/crt1.c Mon Jun 22 19:43:08 2015 (r284707) @@ -58,9 +58,13 @@ __asm(" .text \n" " .align 0 \n" " .globl _start \n" " _start: \n" -" mov x3, x2 \n" /* cleanup */ -" ldr x0, [sp] \n" /* Load argc */ -" add x1, sp, #8 \n" /* load argv */ +/* TODO: Remove this when the kernel correctly aligns the stack */ +" cbnz x0, 1f \n" /* Are we using a new kernel? */ +" mov x0, sp \n" /* No, load the args from sp */ +" and sp, x0, #~0xf \n" /* And align the stack */ +"1: mov x3, x2 \n" /* cleanup */ +" add x1, x0, #8 \n" /* load argv */ +" ldr x0, [x0] \n" /* load argc */ " add x2, x1, x0, lsl #3 \n" /* env is after argv */ " add x2, x2, #8 \n" /* argv is null terminated */ " b __start "); Modified: head/libexec/rtld-elf/aarch64/rtld_start.S ============================================================================== --- head/libexec/rtld-elf/aarch64/rtld_start.S Mon Jun 22 19:37:04 2015 (r284706) +++ head/libexec/rtld-elf/aarch64/rtld_start.S Mon Jun 22 19:43:08 2015 (r284707) @@ -34,10 +34,14 @@ ENTRY(.rtld_start) mov x19, x0 /* Put ps_strings in a callee-saved register */ mov x20, sp /* And the stack pointer */ - sub x8, x20, #16 /* Make room for obj_main & exit proc */ - mov sp, x8 /* Update the stack pointer */ + /* Handle the old style stack */ + /* TODO: Remove this when the kernel correctly aligns the stack */ + cbnz x0, 1f + mov x0, sp /* sp points to the args */ + and sp, x0, #~0xf /* Align the stack as needed */ + +1: sub sp, sp, #16 /* Make room for obj_main & exit proc */ - mov x0, x20 /* Pass the stack we were given to _rtld */ mov x1, sp /* exit_proc */ add x2, x1, #8 /* obj_main */ bl _rtld /* Call the loader */ From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 20:22:02 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E37CE62A; Mon, 22 Jun 2015 20:22:01 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C50E33D4; Mon, 22 Jun 2015 20:22:01 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MKM1sT084194; Mon, 22 Jun 2015 20:22:01 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5MKLwqp084129; Mon, 22 Jun 2015 20:21:58 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506222021.t5MKLwqp084129@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Mon, 22 Jun 2015 20:21:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284708 - in head: share/man/man5 share/mk tools/build/options X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 20:22:02 -0000 Author: sjg Date: Mon Jun 22 20:21:57 2015 New Revision: 284708 URL: https://svnweb.freebsd.org/changeset/base/284708 Log: Fix generation of src.conf.5 Since makeman turns all options on, we need to guard somethings from make(showconfig) Added: head/tools/build/options/WITH_AUTO_OBJ (contents, props changed) head/tools/build/options/WITH_DIRDEPS_CACHE (contents, props changed) head/tools/build/options/WITH_META_FILES (contents, props changed) head/tools/build/options/WITH_META_MODE (contents, props changed) head/tools/build/options/WITH_STAGING (contents, props changed) head/tools/build/options/WITH_STAGING_MAN (contents, props changed) head/tools/build/options/WITH_STAGING_PROG (contents, props changed) head/tools/build/options/WITH_STALE_STAGED (contents, props changed) head/tools/build/options/WITH_SYSROOT (contents, props changed) Modified: head/share/man/man5/src.conf.5 head/share/mk/local.meta.sys.mk head/tools/build/options/makeman Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Mon Jun 22 19:43:08 2015 (r284707) +++ head/share/man/man5/src.conf.5 Mon Jun 22 20:21:57 2015 (r284708) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\" $FreeBSD$ -.Dd June 11, 2015 +.Dd June 22, 2015 .Dt SRC.CONF 5 .Os .Sh NAME @@ -126,6 +126,9 @@ Set to not build Set to not build .Xr autofs 4 related programs, libraries, and kernel modules. +.It Va WITH_AUTO_OBJ +.\" $FreeBSD$ +Enable automatic creation of objdirs. .It Va WITHOUT_BHYVE .\" from FreeBSD: head/tools/build/options/WITHOUT_BHYVE 277727 2015-01-26 06:44:48Z ngie Set to not build or install @@ -392,6 +395,12 @@ and are located automatically by .It Va WITHOUT_DICT .\" from FreeBSD: head/tools/build/options/WITHOUT_DICT 156932 2006-03-21 07:50:50Z ru Set to not build the Webster dictionary files. +.It Va WITH_DIRDEPS_CACHE +.\" $FreeBSD$ +Cache result of dirdeps.mk which can save significant time +for subsequent builds. +Depends on +.Va WITH_META_MODE . .It Va WITHOUT_DMAGENT .\" from FreeBSD: head/tools/build/options/WITHOUT_DMAGENT 262335 2014-02-22 13:05:23Z bapt Set to not build dma Mail Transport Agent @@ -851,6 +860,56 @@ Set to not build utilities for manual pa .Xr whatis 1 , .Xr manctl 8 , and related support files. +.It Va WITH_META_FILES +.\" $FreeBSD$ +Create meta files during non META_MODE build. +The meta files can be useful for debugging. +.It Va WITH_META_MODE +.\" $FreeBSD$ +Enable building in meta mode. +.Pp +The build is driven by dirdeps.mk using DIRDEPS stored in +Makefile.depend files found in each directory. +.Pp +The build can be started from anywhere, and behaves the same. +The initial instance of make recursively reads DIRDEPS from Makefile.depend +computing a graph of tree dependencies from the current origin. +See http://www.crufty.net/help/sjg/dirdeps.htm +.Pp +As each target is made +.Xr make 1 +produces a meta file which is used to capture (and compare) +the command line, +as well as any command output. +If +.Xr filemon 4 +is available the meta file will also capture a record of syscalls +used to produce the target. +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITH_AUTO_OBJ +.It +.Va WITH_INSTALL_AS_USER +.It +.Va WITH_STAGING +.It +.Va WITH_SYSROOT +.El +.Pp +When set, the following options are also in effect: +.Pp +.Bl -inset -compact +.It Va WITH_STAGING_MAN +(unless +.Va WITHOUT_STAGING_MAN +is set explicitly) +.It Va WITH_STAGING_PROG +(unless +.Va WITHOUT_STAGING_PROG +is set explicitly) +.El .It Va WITH_NAND .\" from FreeBSD: head/tools/build/options/WITH_NAND 235537 2012-05-17 10:11:18Z gber Set to build the NAND Flash components. @@ -1093,6 +1152,35 @@ Set to not build kernel modules that inc .It Va WITHOUT_SSP .\" from FreeBSD: head/tools/build/options/WITHOUT_SSP 180012 2008-06-25 21:33:28Z ru Set to not build world with propolice stack smashing protection. +.It Va WITH_STAGING +.\" $FreeBSD$ +Enable staging of files to a stage tree. +This can be best thought of as auto-install to +.Va DESTDIR +with some extra meta data to ensure dependencies can be tracked. +Depends on +.Va WITH_META_MODE . +When set, the following options are also in effect: +.Pp +.Bl -inset -compact +.It Va WITH_STAGING_MAN +(unless +.Va WITHOUT_STAGING_MAN +is set explicitly) +.It Va WITH_STAGING_PROG +(unless +.Va WITHOUT_STAGING_PROG +is set explicitly) +.El +.It Va WITH_STAGING_MAN +.\" $FreeBSD$ +Enable staging of MAN pages to stage tree. +.It Va WITH_STAGING_PROG +.\" $FreeBSD$ +Enable staging of PROGs to stage tree. +.It Va WITH_STALE_STAGED +.\" $FreeBSD$ +Check staged files are not stale. .It Va WITH_SVN .\" from FreeBSD: head/tools/build/options/WITH_SVN 252561 2013-07-03 12:36:47Z zeising Set to install @@ -1117,6 +1205,11 @@ support files such as keyboard maps, fon Set to not build .Xr sysinstall 8 and related programs. +.It Va WITH_SYSROOT +.\" $FreeBSD$ +Enable use of sysroot during build. +Depends on +.Va WITH_META_MODE . .It Va WITHOUT_TALK .\" from FreeBSD: head/tools/build/options/WITHOUT_TALK 277676 2015-01-25 04:37:44Z ngie Set to not build or install Modified: head/share/mk/local.meta.sys.mk ============================================================================== --- head/share/mk/local.meta.sys.mk Mon Jun 22 19:43:08 2015 (r284707) +++ head/share/mk/local.meta.sys.mk Mon Jun 22 20:21:57 2015 (r284708) @@ -8,6 +8,7 @@ MK_INSTALL_AS_USER= yes .if empty(OBJROOT) || ${.MAKE.LEVEL} == 0 +.if !make(showconfig) .if defined(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}) .warning MAKEOBJDIRPREFIX not supported; setting MAKEOBJDIR... # put things approximately where they want @@ -20,6 +21,7 @@ MAKEOBJDIRPREFIX= # now for our own use MAKEOBJDIR= ${.CURDIR:S,${SRCTOP},${OBJTOP},} .endif +.endif .if !empty(SB) SB_OBJROOT ?= ${SB}/obj/ # this is what we use below Added: head/tools/build/options/WITH_AUTO_OBJ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_AUTO_OBJ Mon Jun 22 20:21:57 2015 (r284708) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Enable automatic creation of objdirs. Added: head/tools/build/options/WITH_DIRDEPS_CACHE ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_DIRDEPS_CACHE Mon Jun 22 20:21:57 2015 (r284708) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Cache result of dirdeps.mk which can save significant time +for subsequent builds. +Depends on +.Va WITH_META_MODE . Added: head/tools/build/options/WITH_META_FILES ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_META_FILES Mon Jun 22 20:21:57 2015 (r284708) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Create meta files during non META_MODE build. +The meta files can be useful for debugging. Added: head/tools/build/options/WITH_META_MODE ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_META_MODE Mon Jun 22 20:21:57 2015 (r284708) @@ -0,0 +1,20 @@ +.\" $FreeBSD$ +Enable building in meta mode. +.Pp +The build is driven by dirdeps.mk using DIRDEPS stored in +Makefile.depend files found in each directory. +.Pp +The build can be started from anywhere, and behaves the same. +The initial instance of make recursively reads DIRDEPS from Makefile.depend +computing a graph of tree dependencies from the current origin. +See http://www.crufty.net/help/sjg/dirdeps.htm +.Pp +As each target is made +.Xr make 1 +produces a meta file which is used to capture (and compare) +the command line, +as well as any command output. +If +.Xr filemon 4 +is available the meta file will also capture a record of syscalls +used to produce the target. Added: head/tools/build/options/WITH_STAGING ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_STAGING Mon Jun 22 20:21:57 2015 (r284708) @@ -0,0 +1,7 @@ +.\" $FreeBSD$ +Enable staging of files to a stage tree. +This can be best thought of as auto-install to +.Va DESTDIR +with some extra meta data to ensure dependencies can be tracked. +Depends on +.Va WITH_META_MODE . Added: head/tools/build/options/WITH_STAGING_MAN ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_STAGING_MAN Mon Jun 22 20:21:57 2015 (r284708) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Enable staging of MAN pages to stage tree. Added: head/tools/build/options/WITH_STAGING_PROG ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_STAGING_PROG Mon Jun 22 20:21:57 2015 (r284708) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Enable staging of PROGs to stage tree. Added: head/tools/build/options/WITH_STALE_STAGED ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_STALE_STAGED Mon Jun 22 20:21:57 2015 (r284708) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Check staged files are not stale. Added: head/tools/build/options/WITH_SYSROOT ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_SYSROOT Mon Jun 22 20:21:57 2015 (r284708) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Enable use of sysroot during build. +Depends on +.Va WITH_META_MODE . Modified: head/tools/build/options/makeman ============================================================================== --- head/tools/build/options/makeman Mon Jun 22 19:43:08 2015 (r284707) +++ head/tools/build/options/makeman Mon Jun 22 20:21:57 2015 (r284708) @@ -46,7 +46,7 @@ show_options() echo ${opt} ;; *) - echo "make showconfig broken: ${val} is not yes or no" >&2 + echo "make showconfig broken: ${var} ${_} ${val} (not yes or no)" >&2 exit 1 ;; esac @@ -96,7 +96,7 @@ show() exit 1 ;; esac - ${make} "$@" showconfig __MAKE_CONF=/dev/null | + ${make} .MAKE.MODE=normal "$@" showconfig __MAKE_CONF=/dev/null | while read var _ val ; do opt=${var#MK_} case ${val} in @@ -107,7 +107,7 @@ show() echo ${no_prefix}_${opt} ;; *) - echo "make showconfig broken: ${val} is not yes or no" >&2 + echo "make showconfig broken: ${var} ${_} ${val} (not yes or no)" >&2 exit 1 ;; esac From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 20:25:00 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4AB7A66C; Mon, 22 Jun 2015 20:25:00 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F54C7B9; Mon, 22 Jun 2015 20:25:00 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MKOxPf084552; Mon, 22 Jun 2015 20:25:00 GMT (envelope-from wblock@FreeBSD.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5MKOxFR084551; Mon, 22 Jun 2015 20:24:59 GMT (envelope-from wblock@FreeBSD.org) Message-Id: <201506222024.t5MKOxFR084551@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: wblock set sender to wblock@FreeBSD.org using -f From: Warren Block Date: Mon, 22 Jun 2015 20:24:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284709 - head/libexec/atrun X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 20:25:00 -0000 Author: wblock (doc committer) Date: Mon Jun 22 20:24:59 2015 New Revision: 284709 URL: https://svnweb.freebsd.org/changeset/base/284709 Log: Call /etc/crontab the "system crontab", not "root's crontab". While here, fix some other wording issues PR: 201048 Submitted by: teksimian@gmail.com MFC after: 1 week Modified: head/libexec/atrun/atrun.man Modified: head/libexec/atrun/atrun.man ============================================================================== --- head/libexec/atrun/atrun.man Mon Jun 22 20:21:57 2015 (r284708) +++ head/libexec/atrun/atrun.man Mon Jun 22 20:24:59 2015 (r284709) @@ -1,5 +1,5 @@ .\" $FreeBSD$ -.Dd October 30, 2012 +.Dd June 22, 2015 .Dt ATRUN 8 .Os .Sh NAME @@ -14,32 +14,32 @@ runs jobs queued by .Xr at 1 . .Pp -Root's +The system .Xr crontab 5 file .Pa /etc/crontab -has to contain the line +must contain the line .Bd -literal */5 * * * * root /usr/libexec/atrun .Ed .Pp -so that +so .Nm -gets invoked every five minutes. +is invoked every five minutes. .Pp At every invocation, .Nm -will start all the jobs in the lowercase queues whose start +starts all the jobs in the lowercase queues whose start time has elapsed. In addition, if the load average over the last minute was less than -the specified limit then a maximum of one batch job (denoted by the +the specified limit, then a maximum of one batch job (denoted by the uppercase queues) is started. .Pp Before starting a job, .Nm -will check the status of its owner's account with +checks the status of its owner's account with .Xr pam 3 -and refuse to run the job if the account is unavailable, +and refuses to run the job if the account is unavailable, e.g., locked out or expired. .Sh OPTIONS .Bl -tag -width indent @@ -53,9 +53,11 @@ Debug; print error messages to standard .Sh WARNINGS For .Nm -to work, you have to start up a +to work, a .Xr cron 8 -daemon. +daemon must be running +.Nm +periodically. .Sh FILES .Bl -tag -width /etc/pam.d/atrun -compact .It Pa /etc/pam.d/atrun From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 21:53:56 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7992FE84; Mon, 22 Jun 2015 21:53:56 +0000 (UTC) (envelope-from hiren@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6770C88; Mon, 22 Jun 2015 21:53:56 +0000 (UTC) (envelope-from hiren@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MLrucZ031828; Mon, 22 Jun 2015 21:53:56 GMT (envelope-from hiren@FreeBSD.org) Received: (from hiren@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5MLrufV031827; Mon, 22 Jun 2015 21:53:56 GMT (envelope-from hiren@FreeBSD.org) Message-Id: <201506222153.t5MLrufV031827@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hiren set sender to hiren@FreeBSD.org using -f From: Hiren Panchasara Date: Mon, 22 Jun 2015 21:53:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284710 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 21:53:56 -0000 Author: hiren Date: Mon Jun 22 21:53:55 2015 New Revision: 284710 URL: https://svnweb.freebsd.org/changeset/base/284710 Log: Fix a typo: s/iff/if/ Sponsored by: Limelight Networks Modified: head/sys/netinet/tcp_input.c Modified: head/sys/netinet/tcp_input.c ============================================================================== --- head/sys/netinet/tcp_input.c Mon Jun 22 20:24:59 2015 (r284709) +++ head/sys/netinet/tcp_input.c Mon Jun 22 21:53:55 2015 (r284710) @@ -2476,7 +2476,7 @@ tcp_do_segment(struct mbuf *m, struct tc /* * Compute the amount of data in flight first. - * We can inject new data into the pipe iff + * We can inject new data into the pipe if * we have less than 1/2 the original window's * worth of data in flight. */ From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 22:16:06 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E19CCEC; Mon, 22 Jun 2015 22:16:06 +0000 (UTC) (envelope-from hiren@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CFDA6EE5; Mon, 22 Jun 2015 22:16:06 +0000 (UTC) (envelope-from hiren@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MMG6T2044515; Mon, 22 Jun 2015 22:16:06 GMT (envelope-from hiren@FreeBSD.org) Received: (from hiren@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5MMG6Io044514; Mon, 22 Jun 2015 22:16:06 GMT (envelope-from hiren@FreeBSD.org) Message-Id: <201506222216.t5MMG6Io044514@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hiren set sender to hiren@FreeBSD.org using -f From: Hiren Panchasara Date: Mon, 22 Jun 2015 22:16:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284711 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 22:16:07 -0000 Author: hiren Date: Mon Jun 22 22:16:06 2015 New Revision: 284711 URL: https://svnweb.freebsd.org/changeset/base/284711 Log: Reverting r284710. Today I learned: iff == if and only if. Suggested by: many Modified: head/sys/netinet/tcp_input.c Modified: head/sys/netinet/tcp_input.c ============================================================================== --- head/sys/netinet/tcp_input.c Mon Jun 22 21:53:55 2015 (r284710) +++ head/sys/netinet/tcp_input.c Mon Jun 22 22:16:06 2015 (r284711) @@ -2476,7 +2476,7 @@ tcp_do_segment(struct mbuf *m, struct tc /* * Compute the amount of data in flight first. - * We can inject new data into the pipe if + * We can inject new data into the pipe iff * we have less than 1/2 the original window's * worth of data in flight. */ From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 22:21:45 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 05924125 for ; Mon, 22 Jun 2015 22:21:45 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound3.ore.mailhop.org (erouter6.ore.mailhop.org [54.187.213.119]) by mx1.freebsd.org (Postfix) with SMTP id D7BE1125C for ; Mon, 22 Jun 2015 22:21:44 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from ilsoft.org (unknown [73.34.117.227]) by outbound3.ore.mailhop.org (Halon Mail Gateway) with ESMTPSA; Mon, 22 Jun 2015 22:20:05 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.14.9/8.14.9) with ESMTP id t5MMKZLg028866; Mon, 22 Jun 2015 16:20:35 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1435011635.33313.5.camel@freebsd.org> Subject: Re: svn commit: r284711 - head/sys/netinet From: Ian Lepore To: Hiren Panchasara Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Mon, 22 Jun 2015 16:20:35 -0600 In-Reply-To: <201506222216.t5MMG6Io044514@svn.freebsd.org> References: <201506222216.t5MMG6Io044514@svn.freebsd.org> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.12.10 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 22:21:45 -0000 On Mon, 2015-06-22 at 22:16 +0000, Hiren Panchasara wrote: > Author: hiren > Date: Mon Jun 22 22:16:06 2015 > New Revision: 284711 > URL: https://svnweb.freebsd.org/changeset/base/284711 > > Log: > Reverting r284710. > Today I learned: iff == if and only if. > > Suggested by: many > > Modified: > head/sys/netinet/tcp_input.c > > Modified: head/sys/netinet/tcp_input.c > ============================================================================== > --- head/sys/netinet/tcp_input.c Mon Jun 22 21:53:55 2015 (r284710) > +++ head/sys/netinet/tcp_input.c Mon Jun 22 22:16:06 2015 (r284711) > @@ -2476,7 +2476,7 @@ tcp_do_segment(struct mbuf *m, struct tc > > /* > * Compute the amount of data in flight first. > - * We can inject new data into the pipe if > + * We can inject new data into the pipe iff > * we have less than 1/2 the original window's > * worth of data in flight. > */ > I think this is a bad idea. "iff" means "if and only if" in mathematics and formal logic. Comments are written in English. -- Ian From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 22:22:45 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 12CE3150; Mon, 22 Jun 2015 22:22:45 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qc0-x231.google.com (mail-qc0-x231.google.com [IPv6:2607:f8b0:400d:c01::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C1112151A; Mon, 22 Jun 2015 22:22:44 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by qcbcf1 with SMTP id cf1so29359234qcb.0; Mon, 22 Jun 2015 15:22:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=r41OS/bUYcc9NpDhYor10uEFBgnTHXpA1KGZuFLLpsk=; b=pXn1HvN7ssjqdSYTO4+ovjajS+oCWomqB6OJoMD55mu87zk3od234/sMMIkmpxG/I5 qk1zLo814gUqPI/8l9db2hBjhslrUSqFoyw4q7Qg5upgKBwyPTPSlnCjMtbNI76YJCYU gagdgIra5gIECYpxXr6CPlahvSSOhflt4lw4eRpULL/n9onOuMeMXnCpV5sanqURpgHd +e4IWabLMVQVgWTc8FJM/n2erU/g6LX0mXN8AGAdYe8g6GsdRZN32mVLZjTf0ZQIUJdz MnijbQeHDXaT6pP48SyuxYoJG1r05QzA0duYRK5OAi2wk/FwWkxqA3aNeR8NANwBI93J 5Flg== MIME-Version: 1.0 X-Received: by 10.55.16.100 with SMTP id a97mr61847702qkh.8.1435011763964; Mon, 22 Jun 2015 15:22:43 -0700 (PDT) Received: by 10.140.98.73 with HTTP; Mon, 22 Jun 2015 15:22:43 -0700 (PDT) In-Reply-To: <201506222153.t5MLrufV031827@svn.freebsd.org> References: <201506222153.t5MLrufV031827@svn.freebsd.org> Date: Mon, 22 Jun 2015 15:22:43 -0700 Message-ID: Subject: Re: svn commit: r284710 - head/sys/netinet From: NGie Cooper To: Hiren Panchasara Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 22:22:45 -0000 On Mon, Jun 22, 2015 at 2:53 PM, Hiren Panchasara wrote: > Author: hiren > Date: Mon Jun 22 21:53:55 2015 > New Revision: 284710 > URL: https://svnweb.freebsd.org/changeset/base/284710 > > Log: > Fix a typo: s/iff/if/ > > Sponsored by: Limelight Networks > > Modified: > head/sys/netinet/tcp_input.c > > Modified: head/sys/netinet/tcp_input.c > ============================================================================== > --- head/sys/netinet/tcp_input.c Mon Jun 22 20:24:59 2015 (r284709) > +++ head/sys/netinet/tcp_input.c Mon Jun 22 21:53:55 2015 (r284710) > @@ -2476,7 +2476,7 @@ tcp_do_segment(struct mbuf *m, struct tc > > /* > * Compute the amount of data in flight first. > - * We can inject new data into the pipe iff > + * We can inject new data into the pipe if > * we have less than 1/2 the original window's > * worth of data in flight. > */ iff sometimes means "if and only if": http://encyclopedia.thefreedictionary.com/If+and+Only+If From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 22:24:21 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 74FB218B; Mon, 22 Jun 2015 22:24:21 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qk0-x233.google.com (mail-qk0-x233.google.com [IPv6:2607:f8b0:400d:c09::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 30D56193F; Mon, 22 Jun 2015 22:24:21 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by qkfe185 with SMTP id e185so108111511qkf.3; Mon, 22 Jun 2015 15:24:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=WFQxfGrLRaONlrSor0GZIxJliG+2L6zsChwqC4RXmQA=; b=srzZ+LF9Rw2W612H+rCj9dRBN/+CAJuPitKW1UOKLTdNJmZBPU+C1Is+5bYwSJ9p// Y6t2veK7no8D8LDpHCqGIL9UYVDWSeiqYWPrUxpJymu0rivTR8GTBBVEftP+I2FqhHpG yddLkjXL065cQNq81LN03mrJ3vyhRJ7vtwnx/Ze11Zn5SfwnedWyRNEQKtqmQCcQqOkj Bjuhio9i0rEDXd/8cpdfXzgC0m0HcdcFITQrsutdjIHiwXC2cnZU4HP/fQOd4BZ+jPEo Q0peuxgbHJALEaTfI8ga1+LnXwRMl1tXhOadZA/NF+n8v6vIhIQj1B1IVN6+0fD6/bxT l7kw== MIME-Version: 1.0 X-Received: by 10.140.84.104 with SMTP id k95mr39939516qgd.45.1435011860293; Mon, 22 Jun 2015 15:24:20 -0700 (PDT) Received: by 10.140.98.73 with HTTP; Mon, 22 Jun 2015 15:24:20 -0700 (PDT) In-Reply-To: <1435011635.33313.5.camel@freebsd.org> References: <201506222216.t5MMG6Io044514@svn.freebsd.org> <1435011635.33313.5.camel@freebsd.org> Date: Mon, 22 Jun 2015 15:24:20 -0700 Message-ID: Subject: Re: svn commit: r284711 - head/sys/netinet From: NGie Cooper To: Ian Lepore Cc: Hiren Panchasara , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 22:24:21 -0000 On Mon, Jun 22, 2015 at 3:20 PM, Ian Lepore wrote: ... > I think this is a bad idea. "iff" means "if and only if" in mathematics > and formal logic. Comments are written in English. It should have been capitalized if it was an acronym. From owner-svn-src-head@FreeBSD.ORG Mon Jun 22 22:34:40 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F05B124D; Mon, 22 Jun 2015 22:34:39 +0000 (UTC) (envelope-from hiren@freebsd.org) Received: from mail.strugglingcoder.info (strugglingcoder.info [65.19.130.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D76FB1E85; Mon, 22 Jun 2015 22:34:39 +0000 (UTC) (envelope-from hiren@freebsd.org) Received: from localhost (unknown [10.1.1.3]) (Authenticated sender: hiren@strugglingcoder.info) by mail.strugglingcoder.info (Postfix) with ESMTPSA id C1EA218ED4; Mon, 22 Jun 2015 15:34:38 -0700 (PDT) Date: Mon, 22 Jun 2015 15:34:38 -0700 From: Hiren Panchasara To: NGie Cooper Cc: Ian Lepore , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284711 - head/sys/netinet Message-ID: <20150622223438.GU37728@strugglingcoder.info> References: <201506222216.t5MMG6Io044514@svn.freebsd.org> <1435011635.33313.5.camel@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="oIMVlEQ///Q2JYC7" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 22:34:40 -0000 --oIMVlEQ///Q2JYC7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 06/22/15 at 03:24P, NGie Cooper wrote: > On Mon, Jun 22, 2015 at 3:20 PM, Ian Lepore wrote: > ... > > I think this is a bad idea. "iff" means "if and only if" in mathematics > > and formal logic. Comments are written in English. >=20 > It should have been capitalized if it was an acronym. > While I generally agree to the sentiments, I've spent enough commits on this trivial thing. :-) I am trying to patch a much larger chunk around this code and misunderstood this as a plain English typo. Having said that, I won't object to anyone else trying to make it more read= able. Cheers, Hiren --oIMVlEQ///Q2JYC7 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQF8BAEBCgBmBQJViI1+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNEUyMEZBMUQ4Nzg4RjNGMTdFNjZGMDI4 QjkyNTBFMTU2M0VERkU1AAoJEIuSUOFWPt/lPCYH+wcZOprhXigJqF5XL3MJ+DeB 2jDyktHcEIRLi/f881ZqT8k+dXsaWKQYmRPeh5tqA8mneGkcOa4ukJ17wDZYeBbN jt9xzXtsfdtuqc10Tfh5BBCmEfk250i3THjXGp8yVGIlcuA1IZNlfO378OjB5L7s vwrJdrIV2LrF6dVSfRvVQU/vjR8nWWuXSyHjsB62jNWOaHRVbO4Ha4TG8KNPcCfY QC7KKQ4CDGx68oOsx6a1hrBGlFqifjiTXM10pUkg/gdogrNtJhZYsi1maKpYTXJ+ FPUOG9oz5XiNyLeE1LHyqxoiaDLCAPJkYpCWU3jJzH1Sd/dIKEDHtCrRmKUQLCg= =ZpkD -----END PGP SIGNATURE----- --oIMVlEQ///Q2JYC7-- From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 02:17:25 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 76079C11; Tue, 23 Jun 2015 02:17:25 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5776C1B8; Tue, 23 Jun 2015 02:17:25 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5N2HP2b093424; Tue, 23 Jun 2015 02:17:25 GMT (envelope-from neel@FreeBSD.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5N2HOQ7093416; Tue, 23 Jun 2015 02:17:24 GMT (envelope-from neel@FreeBSD.org) Message-Id: <201506230217.t5N2HOQ7093416@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org using -f From: Neel Natu Date: Tue, 23 Jun 2015 02:17:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284712 - head/sys/amd64/vmm/amd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 02:17:25 -0000 Author: neel Date: Tue Jun 23 02:17:23 2015 New Revision: 284712 URL: https://svnweb.freebsd.org/changeset/base/284712 Log: Restore the host's GS.base before returning from 'svm_launch()'. Previously this was done by the caller of 'svm_launch()' after it returned. This works fine as long as no code is executed in the interim that depends on pcpu data. The dtrace probe 'fbt:vmm:svm_launch:return' broke this assumption because it calls 'dtrace_probe()' which in turn relies on pcpu data. Reported by: avg MFC after: 1 week Modified: head/sys/amd64/vmm/amd/svm.c head/sys/amd64/vmm/amd/svm.h head/sys/amd64/vmm/amd/svm_genassym.c head/sys/amd64/vmm/amd/svm_support.S Modified: head/sys/amd64/vmm/amd/svm.c ============================================================================== --- head/sys/amd64/vmm/amd/svm.c Mon Jun 22 22:16:06 2015 (r284711) +++ head/sys/amd64/vmm/amd/svm.c Tue Jun 23 02:17:23 2015 (r284712) @@ -1916,7 +1916,6 @@ svm_vmrun(void *arg, int vcpu, register_ struct vlapic *vlapic; struct vm *vm; uint64_t vmcb_pa; - u_int thiscpu; int handled; svm_sc = arg; @@ -1928,19 +1927,10 @@ svm_vmrun(void *arg, int vcpu, register_ vmexit = vm_exitinfo(vm, vcpu); vlapic = vm_lapic(vm, vcpu); - /* - * Stash 'curcpu' on the stack as 'thiscpu'. - * - * The per-cpu data area is not accessible until MSR_GSBASE is restored - * after the #VMEXIT. Since VMRUN is executed inside a critical section - * 'curcpu' and 'thiscpu' are guaranteed to identical. - */ - thiscpu = curcpu; - gctx = svm_get_guest_regctx(svm_sc, vcpu); vmcb_pa = svm_sc->vcpu[vcpu].vmcb_pa; - if (vcpustate->lastcpu != thiscpu) { + if (vcpustate->lastcpu != curcpu) { /* * Force new ASID allocation by invalidating the generation. */ @@ -1961,7 +1951,7 @@ svm_vmrun(void *arg, int vcpu, register_ * This works for now but any new side-effects of vcpu * migration should take this case into account. */ - vcpustate->lastcpu = thiscpu; + vcpustate->lastcpu = curcpu; vmm_stat_incr(vm, vcpu, VCPU_MIGRATIONS, 1); } @@ -2007,14 +1997,14 @@ svm_vmrun(void *arg, int vcpu, register_ svm_inj_interrupts(svm_sc, vcpu, vlapic); - /* Activate the nested pmap on 'thiscpu' */ - CPU_SET_ATOMIC_ACQ(thiscpu, &pmap->pm_active); + /* Activate the nested pmap on 'curcpu' */ + CPU_SET_ATOMIC_ACQ(curcpu, &pmap->pm_active); /* * Check the pmap generation and the ASID generation to * ensure that the vcpu does not use stale TLB mappings. */ - check_asid(svm_sc, vcpu, pmap, thiscpu); + check_asid(svm_sc, vcpu, pmap, curcpu); ctrl->vmcb_clean = vmcb_clean & ~vcpustate->dirty; vcpustate->dirty = 0; @@ -2022,23 +2012,9 @@ svm_vmrun(void *arg, int vcpu, register_ /* Launch Virtual Machine. */ VCPU_CTR1(vm, vcpu, "Resume execution at %#lx", state->rip); - svm_launch(vmcb_pa, gctx); - - CPU_CLR_ATOMIC(thiscpu, &pmap->pm_active); + svm_launch(vmcb_pa, gctx, &__pcpu[curcpu]); - /* - * Restore MSR_GSBASE to point to the pcpu data area. - * - * Note that accesses done via PCPU_GET/PCPU_SET will work - * only after MSR_GSBASE is restored. - * - * Also note that we don't bother restoring MSR_KGSBASE - * since it is not used in the kernel and will be restored - * when the VMRUN ioctl returns to userspace. - */ - wrmsr(MSR_GSBASE, (uint64_t)&__pcpu[thiscpu]); - KASSERT(curcpu == thiscpu, ("thiscpu/curcpu (%u/%u) mismatch", - thiscpu, curcpu)); + CPU_CLR_ATOMIC(curcpu, &pmap->pm_active); /* * The host GDTR and IDTR is saved by VMRUN and restored Modified: head/sys/amd64/vmm/amd/svm.h ============================================================================== --- head/sys/amd64/vmm/amd/svm.h Mon Jun 22 22:16:06 2015 (r284711) +++ head/sys/amd64/vmm/amd/svm.h Tue Jun 23 02:17:23 2015 (r284712) @@ -29,6 +29,8 @@ #ifndef _SVM_H_ #define _SVM_H_ +struct pcpu; + /* * Guest register state that is saved outside the VMCB. */ @@ -49,6 +51,6 @@ struct svm_regctx { register_t sctx_r15; }; -void svm_launch(uint64_t pa, struct svm_regctx *); +void svm_launch(uint64_t pa, struct svm_regctx *gctx, struct pcpu *pcpu); #endif /* _SVM_H_ */ Modified: head/sys/amd64/vmm/amd/svm_genassym.c ============================================================================== --- head/sys/amd64/vmm/amd/svm_genassym.c Mon Jun 22 22:16:06 2015 (r284711) +++ head/sys/amd64/vmm/amd/svm_genassym.c Tue Jun 23 02:17:23 2015 (r284712) @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include "svm.h" @@ -46,3 +47,4 @@ ASSYM(SCTX_R12, offsetof(struct svm_regc ASSYM(SCTX_R13, offsetof(struct svm_regctx, sctx_r13)); ASSYM(SCTX_R14, offsetof(struct svm_regctx, sctx_r14)); ASSYM(SCTX_R15, offsetof(struct svm_regctx, sctx_r15)); +ASSYM(MSR_GSBASE, MSR_GSBASE); Modified: head/sys/amd64/vmm/amd/svm_support.S ============================================================================== --- head/sys/amd64/vmm/amd/svm_support.S Mon Jun 22 22:16:06 2015 (r284711) +++ head/sys/amd64/vmm/amd/svm_support.S Tue Jun 23 02:17:23 2015 (r284712) @@ -42,13 +42,17 @@ #define VMSAVE .byte 0x0f, 0x01, 0xdb /* - * svm_launch(uint64_t vmcb, struct svm_regctx *gctx) + * svm_launch(uint64_t vmcb, struct svm_regctx *gctx, struct pcpu *pcpu) * %rdi: physical address of VMCB * %rsi: pointer to guest context + * %rdx: pointer to the pcpu data */ ENTRY(svm_launch) VENTER + /* save pointer to the pcpu data */ + push %rdx + /* * Host register state saved across a VMRUN. * @@ -116,6 +120,13 @@ ENTRY(svm_launch) pop %r12 pop %rbx + /* Restore %GS.base to point to the host's pcpu data */ + pop %rdx + mov %edx, %eax + shr $32, %rdx + mov $MSR_GSBASE, %ecx + wrmsr + VLEAVE ret END(svm_launch) From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 04:33:54 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E3F16577; Tue, 23 Jun 2015 04:33:54 +0000 (UTC) (envelope-from gshapiro@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D1DF0BB1; Tue, 23 Jun 2015 04:33:54 +0000 (UTC) (envelope-from gshapiro@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5N4XsvW069901; Tue, 23 Jun 2015 04:33:54 GMT (envelope-from gshapiro@FreeBSD.org) Received: (from gshapiro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5N4XsPX069900; Tue, 23 Jun 2015 04:33:54 GMT (envelope-from gshapiro@FreeBSD.org) Message-Id: <201506230433.t5N4XsPX069900@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gshapiro set sender to gshapiro@FreeBSD.org using -f From: Gregory Neil Shapiro Date: Tue, 23 Jun 2015 04:33:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284717 - head/contrib/sendmail/src X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 04:33:55 -0000 Author: gshapiro Date: Tue Jun 23 04:33:54 2015 New Revision: 284717 URL: https://svnweb.freebsd.org/changeset/base/284717 Log: An additional fix for the openssl Weak DH remediation: The import of openssl to address the FreeBSD-SA-15:10.openssl security advisory includes a change which rejects handshakes with DH parameters below 768 bits. sendmail releases prior to 8.15.2 (not yet released), defaulted to a 512 bit DH parameter setting for client connections. The first fix committed last week changed the default to 1024 bits. This commit fixes the case where the DHParameters option is set to a file which doesn't exist, which is the case on newer versions of FreeBSD which enable STARTTLS by default by auto-creating TLS certificates. MFC after: 2 days Modified: head/contrib/sendmail/src/sendmail.h Modified: head/contrib/sendmail/src/sendmail.h ============================================================================== --- head/contrib/sendmail/src/sendmail.h Tue Jun 23 04:17:12 2015 (r284716) +++ head/contrib/sendmail/src/sendmail.h Tue Jun 23 04:33:54 2015 (r284717) @@ -1935,7 +1935,7 @@ struct termescape /* server requirements */ #define TLS_I_SRV (TLS_I_SRV_CERT | TLS_I_RSA_TMP | TLS_I_VRFY_PATH | \ - TLS_I_VRFY_LOC | TLS_I_TRY_DH | TLS_I_DH512 | \ + TLS_I_VRFY_LOC | TLS_I_TRY_DH | TLS_I_DH1024 | \ TLS_I_CACHE) /* client requirements */ From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 05:55:14 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 303A88BA; Tue, 23 Jun 2015 05:55:14 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F2B5B39; Tue, 23 Jun 2015 05:55:14 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5N5tDlL009674; Tue, 23 Jun 2015 05:55:13 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5N5tDlQ009672; Tue, 23 Jun 2015 05:55:13 GMT (envelope-from np@FreeBSD.org) Message-Id: <201506230555.t5N5tDlQ009672@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Tue, 23 Jun 2015 05:55:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284718 - head/sys/dev/cxgbe X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 05:55:14 -0000 Author: np Date: Tue Jun 23 05:55:13 2015 New Revision: 284718 URL: https://svnweb.freebsd.org/changeset/base/284718 Log: cxgbe: get_fl_payload returns a header mbuf when successful. MFC after: 3 days Modified: head/sys/dev/cxgbe/t4_sge.c Modified: head/sys/dev/cxgbe/t4_sge.c ============================================================================== --- head/sys/dev/cxgbe/t4_sge.c Tue Jun 23 04:33:54 2015 (r284717) +++ head/sys/dev/cxgbe/t4_sge.c Tue Jun 23 05:55:13 2015 (r284718) @@ -1724,6 +1724,7 @@ get_segment: } *pnext = NULL; + M_ASSERTPKTHDR(m0); return (m0); } From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 06:12:14 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E96C2996; Tue, 23 Jun 2015 06:12:14 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D44007E0; Tue, 23 Jun 2015 06:12:14 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5N6CEhZ019312; Tue, 23 Jun 2015 06:12:14 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5N6CELN019311; Tue, 23 Jun 2015 06:12:14 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201506230612.t5N6CELN019311@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 23 Jun 2015 06:12:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284719 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 06:12:15 -0000 Author: kib Date: Tue Jun 23 06:12:14 2015 New Revision: 284719 URL: https://svnweb.freebsd.org/changeset/base/284719 Log: Only take previous buffer queue lock (olock) when needed for REMFREE in binsfree(). Submitted by: Conrad Meyer Sponsored by: EMC / Isilon Storage Division Review: https://reviews.freebsd.org/D2882 MFC after: 1 week Modified: head/sys/kern/vfs_bio.c Modified: head/sys/kern/vfs_bio.c ============================================================================== --- head/sys/kern/vfs_bio.c Tue Jun 23 05:55:13 2015 (r284718) +++ head/sys/kern/vfs_bio.c Tue Jun 23 06:12:14 2015 (r284719) @@ -994,21 +994,23 @@ binsfree(struct buf *bp, int qindex) BUF_ASSERT_XLOCKED(bp); - olock = bqlock(bp->b_qindex); nlock = bqlock(qindex); - mtx_lock(olock); /* Handle delayed bremfree() processing. */ - if (bp->b_flags & B_REMFREE) + if (bp->b_flags & B_REMFREE) { + olock = bqlock(bp->b_qindex); + mtx_lock(olock); bremfreel(bp); + if (olock != nlock) { + mtx_unlock(olock); + mtx_lock(nlock); + } + } else + mtx_lock(nlock); if (bp->b_qindex != QUEUE_NONE) panic("binsfree: free buffer onto another queue???"); bp->b_qindex = qindex; - if (olock != nlock) { - mtx_unlock(olock); - mtx_lock(nlock); - } if (bp->b_flags & B_AGE) TAILQ_INSERT_HEAD(&bufqueues[bp->b_qindex], bp, b_freelist); else From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 06:42:31 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 97EC5B30; Tue, 23 Jun 2015 06:42:31 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8408E7F6; Tue, 23 Jun 2015 06:42:31 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5N6gVbI033903; Tue, 23 Jun 2015 06:42:31 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5N6gV5X033902; Tue, 23 Jun 2015 06:42:31 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201506230642.t5N6gV5X033902@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 23 Jun 2015 06:42:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284721 - head/contrib/elftoolchain/libdwarf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 06:42:31 -0000 Author: dim Date: Tue Jun 23 06:42:30 2015 New Revision: 284721 URL: https://svnweb.freebsd.org/changeset/base/284721 Log: Fix endless recursion in dwarf_get_section_max_offsets(), found by clang 3.7.0. Reviewed by: emaste Modified: head/contrib/elftoolchain/libdwarf/dwarf_sections.c Modified: head/contrib/elftoolchain/libdwarf/dwarf_sections.c ============================================================================== --- head/contrib/elftoolchain/libdwarf/dwarf_sections.c Tue Jun 23 06:30:36 2015 (r284720) +++ head/contrib/elftoolchain/libdwarf/dwarf_sections.c Tue Jun 23 06:42:30 2015 (r284721) @@ -104,8 +104,8 @@ dwarf_get_section_max_offsets(Dwarf_Debu Dwarf_Unsigned *debug_ranges, Dwarf_Unsigned *debug_pubtypes) { - return (dwarf_get_section_max_offsets(dbg, debug_info, debug_abbrev, + return (dwarf_get_section_max_offsets_b(dbg, debug_info, debug_abbrev, debug_line, debug_loc, debug_aranges, debug_macinfo, debug_pubnames, debug_str, debug_frame, debug_ranges, - debug_pubtypes)); + debug_pubtypes, NULL)); } From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 06:42:38 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 84C68B58; Tue, 23 Jun 2015 06:42:38 +0000 (UTC) (envelope-from peter@rulingia.com) Received: from vps.rulingia.com (vps.rulingia.com [103.243.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps.rulingia.com", Issuer "CAcert Class 3 Root" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id B8BAB91D; Tue, 23 Jun 2015 06:42:37 +0000 (UTC) (envelope-from peter@rulingia.com) Received: from server.rulingia.com (c220-239-242-83.belrs5.nsw.optusnet.com.au [220.239.242.83]) by vps.rulingia.com (8.14.9/8.14.9) with ESMTP id t5N6Rh6H056747 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 23 Jun 2015 16:27:49 +1000 (AEST) (envelope-from peter@rulingia.com) X-Bogosity: Ham, spamicity=0.000000 Received: from server.rulingia.com (localhost.rulingia.com [127.0.0.1]) by server.rulingia.com (8.14.9/8.14.9) with ESMTP id t5N6Rb6d020100 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 23 Jun 2015 16:27:37 +1000 (AEST) (envelope-from peter@server.rulingia.com) Received: (from peter@localhost) by server.rulingia.com (8.14.9/8.14.9/Submit) id t5N6Rbeo020099; Tue, 23 Jun 2015 16:27:37 +1000 (AEST) (envelope-from peter) Date: Tue, 23 Jun 2015 16:27:37 +1000 From: Peter Jeremy To: NGie Cooper Cc: Ian Lepore , Hiren Panchasara , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r284711 - head/sys/netinet Message-ID: <20150623062737.GB82138@server.rulingia.com> References: <201506222216.t5MMG6Io044514@svn.freebsd.org> <1435011635.33313.5.camel@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="EVF5PPMfhYS0aIcm" Content-Disposition: inline In-Reply-To: X-PGP-Key: http://www.rulingia.com/keys/peter.pgp User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 06:42:38 -0000 --EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2015-Jun-22 15:24:20 -0700, NGie Cooper wrote: >On Mon, Jun 22, 2015 at 3:20 PM, Ian Lepore wrote: >... >> I think this is a bad idea. "iff" means "if and only if" in mathematics >> and formal logic. Comments are written in English. > >It should have been capitalized if it was an acronym. It's not an acronym. I've only ever seen it written as 'iff'. --=20 Peter Jeremy --EVF5PPMfhYS0aIcm Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJViPxZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFRUIyOTg2QzMwNjcxRTc0RTY1QzIyN0Ux NkE1OTdBMEU0QTIwQjM0AAoJEBall6Dkogs0rMkQAITKKRoZQC0XvoaewRRlXAs6 0PMa+zAFjaYIn/mF+ogncIOkVJlFh7SLb9pgONsTbKZuQMda3lkrQ82QVLuK9+DI O2elIQL4n3d1YTSpSyiuyr3AVESqJUYjgoB00MeOKcH3qcsvaDsoVQ+7Bv0MyfhM k3Eips+OEHcfTS0VTmmTjcpI0ANc3TNBCae9nk9aJSd1jdkHEj613u298sl52WFH Cyg1XtvWDx9N+wCrA1kPtn8+LF6FnlvB5okHYn+LFMBOaaZflEMYA/XuWaWN2Fh1 gAM35jKbT91he36ptX0lw5IIRpdcmJLW97I0otljoyGPdrFmFR6xNmW9nQLkgsga hIescf0odZIz0DjGCO9tRPuFtg9QBPCxkOx2vx4AGNTp6pv8qHNQGHG8TEXAQqO6 xQixJEYvdZXC+KQMSZy155b0UJAkH48DLZ3CqdVQ0k6EY8xkkI8sLku+HhCty06j TLpiEdtvZTZBidB5M+ffK1Vr7LBRmbrK3+WJuB7Y0tmLn6Hhx6UweVz/8VQfkfkn IU8jcTchybee1X6pnOQmbZ1rjSrUub3Pip9V1NYb/ufReE5zzbRw2SKboQD013I7 xWFdUSHH+qtWvThgNVW7F+yQkNPpBZusw9z7WLAbAQpuFOKLH+5Nuc5mEcUF6TTd ckPOoLhech9a6VH8dgyR =C6CC -----END PGP SIGNATURE----- --EVF5PPMfhYS0aIcm-- From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 06:48:03 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 400EABE0; Tue, 23 Jun 2015 06:48:03 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2E673B98; Tue, 23 Jun 2015 06:48:03 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5N6m3Tv034647; Tue, 23 Jun 2015 06:48:03 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5N6m3d0034646; Tue, 23 Jun 2015 06:48:03 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201506230648.t5N6m3d0034646@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 23 Jun 2015 06:48:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284722 - head/sys/dev/ti X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 06:48:03 -0000 Author: dim Date: Tue Jun 23 06:48:02 2015 New Revision: 284722 URL: https://svnweb.freebsd.org/changeset/base/284722 Log: Fix endless recursion in ti(4)'s ti_ifmedia_upd(), found by clang 3.7.0. Modified: head/sys/dev/ti/if_ti.c Modified: head/sys/dev/ti/if_ti.c ============================================================================== --- head/sys/dev/ti/if_ti.c Tue Jun 23 06:42:30 2015 (r284721) +++ head/sys/dev/ti/if_ti.c Tue Jun 23 06:48:02 2015 (r284722) @@ -3350,7 +3350,7 @@ ti_ifmedia_upd(struct ifnet *ifp) sc = ifp->if_softc; TI_LOCK(sc); - error = ti_ifmedia_upd(ifp); + error = ti_ifmedia_upd_locked(ifp); TI_UNLOCK(sc); return (error); From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 06:50:04 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A0D80C13; Tue, 23 Jun 2015 06:50:04 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E37ED1C; Tue, 23 Jun 2015 06:50:04 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5N6o4LN034983; Tue, 23 Jun 2015 06:50:04 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5N6o4Lk034982; Tue, 23 Jun 2015 06:50:04 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201506230650.t5N6o4Lk034982@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Tue, 23 Jun 2015 06:50:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284723 - head/sys/dev/xen/blkfront X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 06:50:04 -0000 Author: cperciva Date: Tue Jun 23 06:50:03 2015 New Revision: 284723 URL: https://svnweb.freebsd.org/changeset/base/284723 Log: Rename mksegarray to xbd_mksegarray for consistency with other function names in this file. Submitted by: royger Modified: head/sys/dev/xen/blkfront/blkfront.c Modified: head/sys/dev/xen/blkfront/blkfront.c ============================================================================== --- head/sys/dev/xen/blkfront/blkfront.c Tue Jun 23 06:48:02 2015 (r284722) +++ head/sys/dev/xen/blkfront/blkfront.c Tue Jun 23 06:50:03 2015 (r284723) @@ -156,7 +156,7 @@ xbd_free_command(struct xbd_command *cm) } static void -mksegarray(bus_dma_segment_t *segs, int nsegs, +xbd_mksegarray(bus_dma_segment_t *segs, int nsegs, grant_ref_t * gref_head, int otherend_id, int readonly, grant_ref_t * sg_ref, blkif_request_segment_t * sg) { @@ -230,7 +230,7 @@ xbd_queue_cb(void *arg, bus_dma_segment_ ring_req->handle = (blkif_vdev_t)(uintptr_t)sc->xbd_disk; ring_req->nr_segments = nsegs; cm->cm_nseg = nsegs; - mksegarray(segs, nsegs, &cm->cm_gref_head, + xbd_mksegarray(segs, nsegs, &cm->cm_gref_head, xenbus_get_otherend_id(sc->xbd_dev), cm->cm_operation == BLKIF_OP_WRITE, cm->cm_sg_refs, ring_req->seg); From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 06:59:47 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B93A2D52; Tue, 23 Jun 2015 06:59:47 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A71DD785; Tue, 23 Jun 2015 06:59:47 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5N6xlFu039810; Tue, 23 Jun 2015 06:59:47 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5N6xlc8039809; Tue, 23 Jun 2015 06:59:47 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201506230659.t5N6xlc8039809@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 23 Jun 2015 06:59:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284724 - head/sys/dev/ti X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 06:59:47 -0000 Author: dim Date: Tue Jun 23 06:59:46 2015 New Revision: 284724 URL: https://svnweb.freebsd.org/changeset/base/284724 Log: Fix r284722, by making it actually compile. Pointy hat to: dim Modified: head/sys/dev/ti/if_ti.c Modified: head/sys/dev/ti/if_ti.c ============================================================================== --- head/sys/dev/ti/if_ti.c Tue Jun 23 06:50:03 2015 (r284723) +++ head/sys/dev/ti/if_ti.c Tue Jun 23 06:59:46 2015 (r284724) @@ -3350,7 +3350,7 @@ ti_ifmedia_upd(struct ifnet *ifp) sc = ifp->if_softc; TI_LOCK(sc); - error = ti_ifmedia_upd_locked(ifp); + error = ti_ifmedia_upd_locked(sc); TI_UNLOCK(sc); return (error); From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 09:13:48 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7956C706; Tue, 23 Jun 2015 09:13:48 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail109.syd.optusnet.com.au (mail109.syd.optusnet.com.au [211.29.132.80]) by mx1.freebsd.org (Postfix) with ESMTP id 3D640881; Tue, 23 Jun 2015 09:13:47 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au (c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197]) by mail109.syd.optusnet.com.au (Postfix) with ESMTPS id CB51AD6309F; Tue, 23 Jun 2015 19:13:44 +1000 (AEST) Date: Tue, 23 Jun 2015 19:13:39 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Ian Lepore cc: Hiren Panchasara , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284711 - head/sys/netinet In-Reply-To: <1435011635.33313.5.camel@freebsd.org> Message-ID: <20150623184657.K917@besplex.bde.org> References: <201506222216.t5MMG6Io044514@svn.freebsd.org> <1435011635.33313.5.camel@freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=ItbjC+Lg c=1 sm=1 tr=0 a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=PO7r1zJSAAAA:8 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=6I5d2MoRAAAA:8 a=4cTVh48sa_4A-9iS_q4A:9 a=CjuIK1q_8ugA:10 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 09:13:48 -0000 On Mon, 22 Jun 2015, Ian Lepore wrote: > On Mon, 2015-06-22 at 22:16 +0000, Hiren Panchasara wrote: >> Author: hiren >> Date: Mon Jun 22 22:16:06 2015 >> New Revision: 284711 >> URL: https://svnweb.freebsd.org/changeset/base/284711 >> >> Log: >> Reverting r284710. >> Today I learned: iff == if and only if. >> >> Suggested by: many >> >> Modified: >> head/sys/netinet/tcp_input.c >> >> Modified: head/sys/netinet/tcp_input.c >> ============================================================================== >> --- head/sys/netinet/tcp_input.c Mon Jun 22 21:53:55 2015 (r284710) >> +++ head/sys/netinet/tcp_input.c Mon Jun 22 22:16:06 2015 (r284711) >> @@ -2476,7 +2476,7 @@ tcp_do_segment(struct mbuf *m, struct tc >> >> /* >> * Compute the amount of data in flight first. >> - * We can inject new data into the pipe if >> + * We can inject new data into the pipe iff >> * we have less than 1/2 the original window's >> * worth of data in flight. >> */ It would be nice if people also learned to format code to 80 columns. (This comment and its code are the only places in the file with gross misformatting to 96 columns. Elsewhere in the file, only the FBSDID() line, 2 SYSCTL_INT()s, 1 comment line and 6 scattered statement lines are not formatted for 80 columns. Several more lines have length exactly 80. style(9) implicitly specifies formatting to 79 columns to avoid line wrap for width exactly 80 on some 80-column terminals, but I don't mind using the full 80 if necessary to avoid line splitting.) > I think this is a bad idea. "iff" means "if and only if" in mathematics > and formal logic. Comments are written in English. No, "iff" means "if and only if" in informal mathematics and informal logic. It is used because being formally correct is too painful, while plain "if" is just ambiguous or wrong. Only very carefully written comments are written in English. The above comment is quite carefully written except for its indentation. I think some English style rules disallow writing "half" as "1/2", and both "half" and "1/2" in it should probably be followed by "of", but I object to following any English style rules that require replacing small numbers like "1" by words like "one". Bruce From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 10:20:58 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AEDCCBBF; Tue, 23 Jun 2015 10:20:58 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 36965A2F; Tue, 23 Jun 2015 10:20:57 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from localhost (localhost [127.0.0.1]) by woozle.rinet.ru (8.14.5/8.14.5) with ESMTP id t5NAKjCa018798; Tue, 23 Jun 2015 13:20:45 +0300 (MSK) (envelope-from marck@rinet.ru) Date: Tue, 23 Jun 2015 13:20:45 +0300 (MSK) From: Dmitry Morozovsky To: John-Mark Gurney cc: Glen Barber , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r284683 - head/etc/etc.arm In-Reply-To: <20150621211914.GU96349@funkthat.com> Message-ID: References: <201506211950.t5LJo3ox040727@svn.freebsd.org> <20150621211914.GU96349@funkthat.com> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) X-NCC-RegID: ru.rinet X-OpenPGP-Key-ID: 6B691B03 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (woozle.rinet.ru [0.0.0.0]); Tue, 23 Jun 2015 13:20:46 +0300 (MSK) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 10:20:58 -0000 On Sun, 21 Jun 2015, John-Mark Gurney wrote: > Glen Barber wrote this message on Sun, Jun 21, 2015 at 19:50 +0000: > > Author: gjb > > Date: Sun Jun 21 19:50:02 2015 > > New Revision: 284683 > > URL: https://svnweb.freebsd.org/changeset/base/284683 > > > > Log: > > Enable ttyu1, ttyu2, ttyu3 for arm installations. > > > > This should make all consoles available, whether it > > is VGA, HDMI, serial, or JTAG, but more importantly > > enables all consoles when ttyu0 is not predictable. > > For example, the Pandaboard ES apparently has three > > consoles available, but the DB9/RS232 serial port is > > ttyu2, so not available by default after the system > > boots. > > I was about to do the same for at least ttyu1 for amd64/i386 as the > RCC-VE 4860 from Netgate has the console on com2 (2f8) instead of > com1(3f8)... > > I couldn't use the live cd part of the memstick because of this... also, many, if not all, IPMI default configs have SOL console on either com3 or com2 -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: marck@FreeBSD.org ] ------------------------------------------------------------------------ *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru *** ------------------------------------------------------------------------ From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 10:32:27 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C9DDEC77; Tue, 23 Jun 2015 10:32:27 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6246F90; Tue, 23 Jun 2015 10:32:27 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NAWRdS044546; Tue, 23 Jun 2015 10:32:27 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5NAWRKc044545; Tue, 23 Jun 2015 10:32:27 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506231032.t5NAWRKc044545@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 23 Jun 2015 10:32:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284725 - head/libexec/rtld-elf/aarch64 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 10:32:27 -0000 Author: andrew Date: Tue Jun 23 10:32:26 2015 New Revision: 284725 URL: https://svnweb.freebsd.org/changeset/base/284725 Log: Also save x8. It may be passed into a function as the indirect result location pointer when the return value doesn't fit in a register, e.g. when returning a struct. Obtained from: ABT Systems Ltd Sponsored by: The FreeBSD Foundation Modified: head/libexec/rtld-elf/aarch64/rtld_start.S Modified: head/libexec/rtld-elf/aarch64/rtld_start.S ============================================================================== --- head/libexec/rtld-elf/aarch64/rtld_start.S Tue Jun 23 06:59:46 2015 (r284724) +++ head/libexec/rtld-elf/aarch64/rtld_start.S Tue Jun 23 10:32:26 2015 (r284725) @@ -68,6 +68,7 @@ ENTRY(_rtld_bind_start) stp x2, x3, [sp, #-16]! stp x4, x5, [sp, #-16]! stp x6, x7, [sp, #-16]! + stp x8, xzr, [sp, #-16]! /* Calculate reloff */ ldr x2, [x17, #0] /* Get the address of the entry */ @@ -84,12 +85,13 @@ ENTRY(_rtld_bind_start) bl _rtld_bind /* Restore the registers saved by the plt code */ - ldp xzr, x30, [sp, #(4 * 16)] + ldp xzr, x30, [sp, #(5 * 16)] /* Backup the address to branch to */ mov x16, x0 /* restore the arguments */ + ldp x8, xzr, [sp], #16 ldp x6, x7, [sp], #16 ldp x4, x5, [sp], #16 ldp x2, x3, [sp], #16 From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 16:13:15 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C46944A3; Tue, 23 Jun 2015 16:13:15 +0000 (UTC) (envelope-from cochard@gmail.com) Received: from mail-lb0-x231.google.com (mail-lb0-x231.google.com [IPv6:2a00:1450:4010:c04::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 53C8FB3; Tue, 23 Jun 2015 16:13:15 +0000 (UTC) (envelope-from cochard@gmail.com) Received: by lbnk3 with SMTP id k3so9930408lbn.1; Tue, 23 Jun 2015 09:13:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=WmpTRR4+IdGwZL0ccGYnYeqexv0topA065ShOboAMpg=; b=LpHFpT710VLdGLMqJycH5hycbjrHw5uNfHrSrIVSUXlG1MHXIhadlH2jjtxr5SdYwJ nIW3zBzDiSklP14CzPrHQSnmWFHyl++0p4emVuTQBiLwAPVvdyrhwLa/NUjk2zH/3JKm AfZVb0BE9Evrcg17xLRIbZLp+x2naQHr7gXMP2MPNOLiv/Vmf7lFJmIO8a/2RdLrSRzQ okCXuQnLF+IRPRZwsWceG7l2n6XZyo/W15FPJz0n/uIEVHmSUQku1+lotrr/55JWgbMC zuVHHWm6YY4V5HhLWcF2Vluef010wMw4ah73ZEAcdMobxgYsmes08IQXGTIvqLYgihxC XU7A== X-Received: by 10.112.131.98 with SMTP id ol2mr36667202lbb.56.1435075990966; Tue, 23 Jun 2015 09:13:10 -0700 (PDT) MIME-Version: 1.0 Sender: cochard@gmail.com Received: by 10.152.135.173 with HTTP; Tue, 23 Jun 2015 09:12:51 -0700 (PDT) In-Reply-To: <201506190509.t5J593PV089167@svn.freebsd.org> References: <201506190509.t5J593PV089167@svn.freebsd.org> From: =?UTF-8?Q?Olivier_Cochard=2DLabb=C3=A9?= Date: Tue, 23 Jun 2015 18:12:51 +0200 X-Google-Sender-Auth: oCVjIb8Lmt7jpRfyh-VVkd-FuWI Message-ID: Subject: Re: svn commit: r284589 - head/usr.sbin/fstyp To: Allan Jude Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 16:13:16 -0000 On Fri, Jun 19, 2015 at 7:09 AM, Allan Jude wrote: > Author: allanjude (doc committer) > Date: Fri Jun 19 05:09:02 2015 > New Revision: 284589 > URL: https://svnweb.freebsd.org/changeset/base/284589 > > Log: > Add the ability to detect ZFS and GELI encrypted file systems to fstyp(= 8) > > Functionality is hidden behind the -u flag to avoid confusing > automounters > > PR: 200823 > Reviewed by: asomers, eadler, wblock (man page) > Approved by: trasz > MFC after: 10 days > Relnotes: yes > Sponsored by: ScaleEngine Inc. > Differential Revision: https://reviews.freebsd.org/D2045 > > > + > +.if ${MK_CDDL} !=3D "no" > +SRCS +=3D zfs.c > +.endif > + > =E2=80=8BHi,=E2=80=8B =E2=80=8BMy nanobsd use WITHOUT_ZFS (MK_ZFS=3D"no") but kept CDDL=E2=80=8B = enabled for dtrace (MK_CDDL=3D "yes"): Then it failed to build world on usr.sbin/fstyp. Regards, From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 16:13:21 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5F934BF; Tue, 23 Jun 2015 16:13:21 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A070712A; Tue, 23 Jun 2015 16:13:21 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NGDLWX015359; Tue, 23 Jun 2015 16:13:21 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5NGDL6l015357; Tue, 23 Jun 2015 16:13:21 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506231613.t5NGDL6l015357@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 23 Jun 2015 16:13:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284727 - head/sys/dev/isp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 16:13:21 -0000 Author: mav Date: Tue Jun 23 16:13:20 2015 New Revision: 284727 URL: https://svnweb.freebsd.org/changeset/base/284727 Log: Add dev.isp.X.role sysctl in addition to tunable. It (mostly) allows to enable/disable initiator mode in run time. Target mode control is blocked here to force coordination with CTL. While there, add separate tunables/sysctls for virtual channels. Modified: head/sys/dev/isp/isp_freebsd.c head/sys/dev/isp/isp_pci.c Modified: head/sys/dev/isp/isp_freebsd.c ============================================================================== --- head/sys/dev/isp/isp_freebsd.c Tue Jun 23 15:49:12 2015 (r284726) +++ head/sys/dev/isp/isp_freebsd.c Tue Jun 23 16:13:20 2015 (r284727) @@ -84,6 +84,43 @@ static struct cdevsw isp_cdevsw = { }; static int +isp_role_sysctl(SYSCTL_HANDLER_ARGS) +{ + ispsoftc_t *isp = (ispsoftc_t *)arg1; + int chan = arg2; + int error, old, value; + + value = FCPARAM(isp, chan)->role; + + error = sysctl_handle_int(oidp, &value, 0, req); + if ((error != 0) || (req->newptr == NULL)) + return (error); + + if (value < ISP_ROLE_NONE || value > ISP_ROLE_BOTH) + return (EINVAL); + + ISP_LOCK(isp); + old = FCPARAM(isp, chan)->role; + + /* If nothing has changed -- we are done. */ + if (value == old) { + ISP_UNLOCK(isp); + return (0); + } + + /* We don't allow target mode switch from here. */ + if ((value ^ old) & ISP_ROLE_TARGET) { + ISP_UNLOCK(isp); + return (EPERM); + } + + /* Actually change the role. */ + error = isp_fc_change_role(isp, chan, value); + ISP_UNLOCK(isp); + return (error); +} + +static int isp_attach_chan(ispsoftc_t *isp, struct cam_devq *devq, int chan) { struct ccb_setasync csa; @@ -138,6 +175,9 @@ isp_attach_chan(ispsoftc_t *isp, struct } else { fcparam *fcp = FCPARAM(isp, chan); struct isp_fc *fc = ISP_FC_PC(isp, chan); + struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(isp->isp_osinfo.dev); + struct sysctl_oid *tree = device_get_sysctl_tree(isp->isp_osinfo.dev); + char name[16]; ISP_LOCK(isp); fc->sim = sim; @@ -178,17 +218,21 @@ isp_attach_chan(ispsoftc_t *isp, struct } ISP_FC_PC(isp, chan)->num_threads += 1; #endif - if (chan == 0) { - struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(isp->isp_osinfo.dev); - struct sysctl_oid *tree = device_get_sysctl_tree(isp->isp_osinfo.dev); - SYSCTL_ADD_QUAD(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "wwnn", CTLFLAG_RD, &FCPARAM(isp, 0)->isp_wwnn, "World Wide Node Name"); - SYSCTL_ADD_QUAD(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "wwpn", CTLFLAG_RD, &FCPARAM(isp, 0)->isp_wwpn, "World Wide Port Name"); - SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "loop_down_limit", CTLFLAG_RW, &ISP_FC_PC(isp, 0)->loop_down_limit, 0, "Loop Down Limit"); - SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "gone_device_time", CTLFLAG_RW, &ISP_FC_PC(isp, 0)->gone_device_time, 0, "Gone Device Time"); + if (chan > 0) { + snprintf(name, sizeof(name), "chan%d", chan); + tree = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(tree), + OID_AUTO, name, CTLFLAG_RW, 0, "Virtual channel"); + } + SYSCTL_ADD_QUAD(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "wwnn", CTLFLAG_RD, &FCPARAM(isp, chan)->isp_wwnn, "World Wide Node Name"); + SYSCTL_ADD_QUAD(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "wwpn", CTLFLAG_RD, &FCPARAM(isp, chan)->isp_wwpn, "World Wide Port Name"); + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "loop_down_limit", CTLFLAG_RW, &ISP_FC_PC(isp, chan)->loop_down_limit, 0, "Loop Down Limit"); + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "gone_device_time", CTLFLAG_RW, &ISP_FC_PC(isp, chan)->gone_device_time, 0, "Gone Device Time"); #if defined(ISP_TARGET_MODE) && defined(DEBUG) - SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "inject_lost_data_frame", CTLFLAG_RW, &ISP_FC_PC(isp, 0)->inject_lost_data_frame, 0, "Cause a Lost Frame on a Read"); + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "inject_lost_data_frame", CTLFLAG_RW, &ISP_FC_PC(isp, chan)->inject_lost_data_frame, 0, "Cause a Lost Frame on a Read"); #endif - } + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "role", CTLTYPE_INT | CTLFLAG_RW, isp, chan, + isp_role_sysctl, "I", "Current role"); } return (0); } Modified: head/sys/dev/isp/isp_pci.c ============================================================================== --- head/sys/dev/isp/isp_pci.c Tue Jun 23 15:49:12 2015 (r284726) +++ head/sys/dev/isp/isp_pci.c Tue Jun 23 16:13:20 2015 (r284727) @@ -527,8 +527,15 @@ isp_get_specific_options(device_t dev, i { const char *sptr; int tval = 0; + char prefix[12], name[16]; - if (resource_int_value(device_get_name(dev), device_get_unit(dev), "iid", &tval)) { + if (chan == 0) + prefix[0] = 0; + else + snprintf(prefix, sizeof(prefix), "chan%d.", chan); + snprintf(name, sizeof(name), "%siid", prefix); + if (resource_int_value(device_get_name(dev), device_get_unit(dev), + name, &tval)) { if (IS_FC(isp)) { ISP_FC_PC(isp, chan)->default_id = 109 - chan; } else { @@ -548,13 +555,15 @@ isp_get_specific_options(device_t dev, i } tval = -1; - if (resource_int_value(device_get_name(dev), device_get_unit(dev), "role", &tval) == 0) { + snprintf(name, sizeof(name), "%srole", prefix); + if (resource_int_value(device_get_name(dev), device_get_unit(dev), + name, &tval) == 0) { switch (tval) { case ISP_ROLE_NONE: case ISP_ROLE_INITIATOR: case ISP_ROLE_TARGET: - case ISP_ROLE_INITIATOR|ISP_ROLE_TARGET: - device_printf(dev, "setting role to 0x%x\n", tval); + case ISP_ROLE_BOTH: + device_printf(dev, "Chan %d setting role to 0x%x\n", chan, tval); break; default: tval = -1; @@ -572,11 +581,15 @@ isp_get_specific_options(device_t dev, i ISP_FC_PC(isp, chan)->def_role = tval; tval = 0; - if (resource_int_value(device_get_name(dev), device_get_unit(dev), "fullduplex", &tval) == 0 && tval != 0) { + snprintf(name, sizeof(name), "%sfullduplex", prefix); + if (resource_int_value(device_get_name(dev), device_get_unit(dev), + name, &tval) == 0 && tval != 0) { isp->isp_confopts |= ISP_CFG_FULL_DUPLEX; } sptr = 0; - if (resource_string_value(device_get_name(dev), device_get_unit(dev), "topology", (const char **) &sptr) == 0 && sptr != 0) { + snprintf(name, sizeof(name), "%stopology", prefix); + if (resource_string_value(device_get_name(dev), device_get_unit(dev), + name, (const char **) &sptr) == 0 && sptr != 0) { if (strcmp(sptr, "lport") == 0) { isp->isp_confopts |= ISP_CFG_LPORT; } else if (strcmp(sptr, "nport") == 0) { @@ -589,13 +602,17 @@ isp_get_specific_options(device_t dev, i } tval = 0; - (void) resource_int_value(device_get_name(dev), device_get_unit(dev), "nofctape", &tval); + snprintf(name, sizeof(name), "%snofctape", prefix); + (void) resource_int_value(device_get_name(dev), device_get_unit(dev), + name, &tval); if (tval) { isp->isp_confopts |= ISP_CFG_NOFCTAPE; } tval = 0; - (void) resource_int_value(device_get_name(dev), device_get_unit(dev), "fctape", &tval); + snprintf(name, sizeof(name), "%sfctape", prefix); + (void) resource_int_value(device_get_name(dev), device_get_unit(dev), + name, &tval); if (tval) { isp->isp_confopts &= ~ISP_CFG_NOFCTAPE; isp->isp_confopts |= ISP_CFG_FCTAPE; @@ -611,7 +628,9 @@ isp_get_specific_options(device_t dev, i * 'w' (e..g w50000000aaaa0001). Sigh. */ sptr = 0; - tval = resource_string_value(device_get_name(dev), device_get_unit(dev), "portwwn", (const char **) &sptr); + snprintf(name, sizeof(name), "%sportwwn", prefix); + tval = resource_string_value(device_get_name(dev), device_get_unit(dev), + name, (const char **) &sptr); if (tval == 0 && sptr != 0 && *sptr++ == 'w') { char *eptr = 0; ISP_FC_PC(isp, chan)->def_wwpn = strtouq(sptr, &eptr, 16); @@ -622,7 +641,9 @@ isp_get_specific_options(device_t dev, i } sptr = 0; - tval = resource_string_value(device_get_name(dev), device_get_unit(dev), "nodewwn", (const char **) &sptr); + snprintf(name, sizeof(name), "%snodewwn", prefix); + tval = resource_string_value(device_get_name(dev), device_get_unit(dev), + name, (const char **) &sptr); if (tval == 0 && sptr != 0 && *sptr++ == 'w') { char *eptr = 0; ISP_FC_PC(isp, chan)->def_wwnn = strtouq(sptr, &eptr, 16); @@ -633,7 +654,9 @@ isp_get_specific_options(device_t dev, i } tval = 0; - (void) resource_int_value(device_get_name(dev), device_get_unit(dev), "hysteresis", &tval); + snprintf(name, sizeof(name), "%shysteresis", prefix); + (void) resource_int_value(device_get_name(dev), device_get_unit(dev), + "name", &tval); if (tval >= 0 && tval < 256) { ISP_FC_PC(isp, chan)->hysteresis = tval; } else { @@ -641,7 +664,9 @@ isp_get_specific_options(device_t dev, i } tval = -1; - (void) resource_int_value(device_get_name(dev), device_get_unit(dev), "loop_down_limit", &tval); + snprintf(name, sizeof(name), "%sloop_down_limit", prefix); + (void) resource_int_value(device_get_name(dev), device_get_unit(dev), + name, &tval); if (tval >= 0 && tval < 0xffff) { ISP_FC_PC(isp, chan)->loop_down_limit = tval; } else { @@ -649,7 +674,9 @@ isp_get_specific_options(device_t dev, i } tval = -1; - (void) resource_int_value(device_get_name(dev), device_get_unit(dev), "gone_device_time", &tval); + snprintf(name, sizeof(name), "%sgone_device_time", prefix); + (void) resource_int_value(device_get_name(dev), device_get_unit(dev), + name, &tval); if (tval >= 0 && tval < 0xffff) { ISP_FC_PC(isp, chan)->gone_device_time = tval; } else { From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 16:15:17 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 036F2506; Tue, 23 Jun 2015 16:15:17 +0000 (UTC) (envelope-from allanjude@freebsd.org) Received: from mx1.scaleengine.net (mx1.scaleengine.net [209.51.186.6]) by mx1.freebsd.org (Postfix) with ESMTP id D0FDE3CD; Tue, 23 Jun 2015 16:15:16 +0000 (UTC) (envelope-from allanjude@freebsd.org) Received: from [192.168.1.2] (unknown [192.168.1.2]) (Authenticated sender: allanjude.freebsd@scaleengine.com) by mx1.scaleengine.net (Postfix) with ESMTPSA id 0FA6E9CE7; Tue, 23 Jun 2015 16:15:09 +0000 (UTC) Message-ID: <55898612.2060009@freebsd.org> Date: Tue, 23 Jun 2015 12:15:14 -0400 From: Allan Jude User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: =?UTF-8?B?T2xpdmllciBDb2NoYXJkLUxhYmLDqQ==?= CC: src-committers , svn-src-all , svn-src-head Subject: Re: svn commit: r284589 - head/usr.sbin/fstyp References: <201506190509.t5J593PV089167@svn.freebsd.org> In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="OO3pm279Op3mvjFPlleqLnl2Tw7jpnQbD" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 16:15:17 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --OO3pm279Op3mvjFPlleqLnl2Tw7jpnQbD Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2015-06-23 12:12, Olivier Cochard-Labb=C3=A9 wrote: >=20 > On Fri, Jun 19, 2015 at 7:09 AM, Allan Jude > wrote: >=20 > Author: allanjude (doc committer) > Date: Fri Jun 19 05:09:02 2015 > New Revision: 284589 > URL: https://svnweb.freebsd.org/changeset/base/284589 >=20 > Log: > Add the ability to detect ZFS and GELI encrypted file systems to > fstyp(8) >=20 > Functionality is hidden behind the -u flag to avoid confusing > automounters >=20 > PR: 200823 > Reviewed by: asomers, eadler, wblock (man page) > Approved by: trasz > MFC after: 10 days > Relnotes: yes > Sponsored by: ScaleEngine Inc. > Differential Revision: https://reviews.freebsd.org/D2045 >=20 >=20 > + > +.if ${MK_CDDL} !=3D "no" > +SRCS +=3D zfs.c > +.endif > + > =20 >=20 >=20 > =E2=80=8BHi,=E2=80=8B >=20 > =E2=80=8BMy nanobsd use WITHOUT_ZFS (MK_ZFS=3D"no") but kept CDDL=E2=80= =8B enabled for > dtrace (MK_CDDL=3D "yes"): Then it failed to build world on usr.sbin/fs= typ. >=20 > Regards, >=20 Yes, I have a fix for this, I just need approval to commit it https://reviews.freebsd.org/D2045 --=20 Allan Jude --OO3pm279Op3mvjFPlleqLnl2Tw7jpnQbD Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (MingW32) iQIcBAEBAgAGBQJViYYZAAoJEBmVNT4SmAt++cEP/1hpxj/+82s4iZDE19G5cIml cxMuwRh9vrmiZ2y2FKsr0voJ3at6E/3nOKM3VMqGWMJR+KWIVv227PGAWIOqAgWV phq3xQjQVlkuovWPSYRGqcJjY08KU33J37W39QcCbjjULEjgoPO3sjxvq0GG9d3V BIlJKGzQOnnSk5M6sCaMx1ULG+PsVVzBhJQzWjd7h19gTKk6/vaL5waf2oluwiOc fgu/ZQEps5FFHbTHcTdvN7inSuc3d57HusgynFie9r9372osxV18OVzPCqD7oTQJ BqtysGHCb8aot2ZW2cKB9TgZWLKX1yVE787q38JsbIFgtRVcnELyn3w5Q5n9eV7a qd1WbBDrL167nRlo5vAhKB/vsvNPi6nTcSB+5te0ja7GsmSs5G6eydj72frcKkcT RjAoGevrtsAIOB3N9leNoEDqYj48MNrpBZrRgkle1rw3melDfDxa1SqggNeMCT7m y84rpfXePqDCwSBiw/jeHXSMsvDnP/+LtkAcYkdLAMcn4Dz6TEg+fTnP8nTqxwpO 9Fn8BaBhOnNjOrqWSzRGFjlY67ns7ybWOM4xvifluvdOGxlCRGZAtV4ScQEp0F7W Ctu/x6nkhUo1Lrzicxm3HcaboCascubTHi1b6uaNo5Pyrgl+G2/CHdFbKYmZ11rJ YO+j3wL8Qh/fpFhkudX+ =IQEZ -----END PGP SIGNATURE----- --OO3pm279Op3mvjFPlleqLnl2Tw7jpnQbD-- From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 16:34:45 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4CAF65AC; Tue, 23 Jun 2015 16:34:45 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 20876369; Tue, 23 Jun 2015 16:34:45 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NGYjWd025956; Tue, 23 Jun 2015 16:34:45 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5NGYiuQ025950; Tue, 23 Jun 2015 16:34:44 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <201506231634.t5NGYiuQ025950@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Tue, 23 Jun 2015 16:34:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284728 - head/usr.sbin/fstyp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 16:34:45 -0000 Author: allanjude (doc committer) Date: Tue Jun 23 16:34:43 2015 New Revision: 284728 URL: https://svnweb.freebsd.org/changeset/base/284728 Log: Switch fstyp build to toggle ZFS support on WITHOUT_ZFS rather than WITHOUT_CDDL PR: 200976 Approved by: imp MFC after: 1 week Sponsored by: ScaleEngine Inc. Differential Revision: https://reviews.freebsd.org/D2045 Modified: head/usr.sbin/fstyp/Makefile head/usr.sbin/fstyp/fstyp.c head/usr.sbin/fstyp/fstyp.h Modified: head/usr.sbin/fstyp/Makefile ============================================================================== --- head/usr.sbin/fstyp/Makefile Tue Jun 23 16:13:20 2015 (r284727) +++ head/usr.sbin/fstyp/Makefile Tue Jun 23 16:34:43 2015 (r284728) @@ -5,7 +5,7 @@ PROG= fstyp SRCS= cd9660.c ext2fs.c fstyp.c geli.c msdosfs.c ntfs.c ufs.c -.if ${MK_CDDL} != "no" +.if ${MK_ZFS} != "no" SRCS += zfs.c .endif @@ -13,10 +13,10 @@ MAN= fstyp.8 WARNS?= 0 -.if ${MK_CDDL} != "no" +.if ${MK_ZFS} != "no" IGNORE_PRAGMA= YES -CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_CDDL +CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_ZFS CFLAGS+= -I${.CURDIR}/../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/lib/libumem @@ -33,7 +33,7 @@ CFLAGS+=-I${.CURDIR}/../../sys DPADD= ${LIBGEOM} ${LIBMD} LDADD= -lgeom -lmd -.if ${MK_CDDL} != "no" +.if ${MK_ZFS} != "no" DPADD += ${LIBNVPAIR} ${LIBZFS} LDADD += -lnvpair -lzfs .endif Modified: head/usr.sbin/fstyp/fstyp.c ============================================================================== --- head/usr.sbin/fstyp/fstyp.c Tue Jun 23 16:13:20 2015 (r284727) +++ head/usr.sbin/fstyp/fstyp.c Tue Jun 23 16:34:43 2015 (r284728) @@ -63,7 +63,7 @@ static struct { { "msdosfs", &fstyp_msdosfs, false }, { "ntfs", &fstyp_ntfs, false }, { "ufs", &fstyp_ufs, false }, -#ifdef HAVE_CDDL +#ifdef HAVE_ZFS { "zfs", &fstyp_zfs, true }, #endif { NULL, NULL, NULL } Modified: head/usr.sbin/fstyp/fstyp.h ============================================================================== --- head/usr.sbin/fstyp/fstyp.h Tue Jun 23 16:13:20 2015 (r284727) +++ head/usr.sbin/fstyp/fstyp.h Tue Jun 23 16:34:43 2015 (r284728) @@ -44,7 +44,7 @@ int fstyp_geli(FILE *fp, char *label, si int fstyp_msdosfs(FILE *fp, char *label, size_t size); int fstyp_ntfs(FILE *fp, char *label, size_t size); int fstyp_ufs(FILE *fp, char *label, size_t size); -#ifdef HAVE_CDDL +#ifdef HAVE_ZFS int fstyp_zfs(FILE *fp, char *label, size_t size); #endif From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 17:26:17 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB45E826; Tue, 23 Jun 2015 17:26:17 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D7B61257; Tue, 23 Jun 2015 17:26:17 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NHQHOa050828; Tue, 23 Jun 2015 17:26:17 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5NHQHmC050824; Tue, 23 Jun 2015 17:26:17 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506231726.t5NHQHmC050824@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 23 Jun 2015 17:26:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284730 - head/sys/dev/hpt27xx X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 17:26:18 -0000 Author: delphij Date: Tue Jun 23 17:26:16 2015 New Revision: 284730 URL: https://svnweb.freebsd.org/changeset/base/284730 Log: Update vendor driver to 1.2.7. This update improves driver reliability and adds support of 4Kn drives and report LUNs command. This driver update is intended for 10.2-RELEASE. Many thanks to HighPoint for providing this driver update. Submitted by: Steve Chang MFC after: 3 days Modified: head/sys/dev/hpt27xx/README head/sys/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu (contents, props changed) head/sys/dev/hpt27xx/array.h head/sys/dev/hpt27xx/him.h head/sys/dev/hpt27xx/himfuncs.h head/sys/dev/hpt27xx/hpt27xx_config.c head/sys/dev/hpt27xx/hpt27xx_config.h head/sys/dev/hpt27xx/hpt27xx_os_bsd.c head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c head/sys/dev/hpt27xx/hptintf.h head/sys/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu head/sys/dev/hpt27xx/ldm.h head/sys/dev/hpt27xx/list.h head/sys/dev/hpt27xx/os_bsd.h head/sys/dev/hpt27xx/osm.h Modified: head/sys/dev/hpt27xx/README ============================================================================== --- head/sys/dev/hpt27xx/README Tue Jun 23 17:26:05 2015 (r284729) +++ head/sys/dev/hpt27xx/README Tue Jun 23 17:26:16 2015 (r284730) @@ -1,10 +1,34 @@ RocketRAID Controller Driver for FreeBSD -Copyright (C) 2011 HighPoint Technologies, Inc. All rights reserved. +Copyright (C) 2005-2015 HighPoint Technologies, Inc. All rights reserved. ############################################################################# Revision History: - v1.0 2011-12-27 - First source code release + v1.2.7.1 06/08/2015 + * Add 10.x comment and correct file name in readme. + + v1.2.7 05/22/2015 + * Support Report Luns command. + + v1.2.6 04/13/2015 + * Fix a bug that some disks will be dropped when data integrity test over + one hour on 32bit system. + + v1.2.5 01/26/2015 + * Fix a bug that failed to verify controller by retrying 8 times. + * Supported 4Kn drive. + + v1.2.4 09/29/2014 + * Fix a bug that memory would be corrupted and caused strange system + behavior when running IO and WebGUI + + v1.2.3 01/24/2014 + * fixup system crash while write date to raid5. + + v1.1 07/01/2013 + * Fix 2nd RAID controller can not load as multipath issue. + + v1.0 12/13/2011 + * First source code release ############################################################################# @@ -40,7 +64,7 @@ Revision History: 2) Extract the driver files under the kernel source tree: # cd /usr/src/sys/ - # tar xvzf /your/path/to/hpt27xx-freebsd-src-v1.0-111227.tgz + # tar xvzf /your/path/to/HPT27xx_FreeBSD_Src_v1.2.7.1_15_06_08.tgz 3) Update the kernel configuration file to include the HighPoint source. Assume the configure file is GENERIC, and new kernel configure file is @@ -62,8 +86,8 @@ Revision History: compile-with "uudecode < $S/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu" \ no-implicit-rule - dev/hpt27xx/os_bsd.c optional hpt27xx - dev/hpt27xx/osm_bsd.c optional hpt27xx + dev/hpt27xx/hpt27xx_os_bsd.c optional hpt27xx + dev/hpt27xx/hpt27xx_osm_bsd.c optional hpt27xx dev/hpt27xx/hpt27xx_config.c optional hpt27xx For amd64 system, edit /usr/src/sys/conf/files.amd64 and append the lines @@ -74,13 +98,13 @@ Revision History: compile-with "uudecode < $S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \ no-implicit-rule - dev/hpt27xx/os_bsd.c optional hpt27xx - dev/hpt27xx/osm_bsd.c optional hpt27xx + dev/hpt27xx/hpt27xx_os_bsd.c optional hpt27xx + dev/hpt27xx/hpt27xx_osm_bsd.c optional hpt27xx dev/hpt27xx/hpt27xx_config.c optional hpt27xx 6) Rebuild and install the kernel: - a) for FreeBSD 5.x-i386/6.x-i386/7.x-i386/8.x-i386/9.x-i386: + a) for FreeBSD 5.x-i386/6.x-i386/7.x-i386/8.x-i386/9.x-i386/10.x-i386: # cd /usr/src/sys/i386/conf/ # /usr/sbin/config MYKERNEL @@ -89,7 +113,7 @@ Revision History: # make # make install - b) for FreeBSD 5.x-amd64/6.x-amd64/7.x-amd64/8.x-amd64/9.x-amd64: + b) for FreeBSD 5.x-amd64/6.x-amd64/7.x-amd64/8.x-amd64/9.x-amd64/10.x-amd64: # cd /usr/src/sys/amd64/conf/ # /usr/sbin/config MYKERNEL @@ -122,7 +146,7 @@ Revision History: 2) Extract the driver files under the kernel source tree: # cd /usr/src/sys/ - # tar xvzf /your/path/to/hpt27xx-freebsd-src-v1.0-111227.tgz + # tar xvzf /your/path/to/HPT27xx_FreeBSD_Src_v1.2.7.1_15_06_08.tgz 4) Build the driver module: @@ -136,7 +160,7 @@ Revision History: # cp hpt27xx.ko /modules/ - For FreeBSD 5.x/6.x/7.x/8.x/9.x: + For FreeBSD 5.x/6.x/7.x/8.x/9.x/10.x: # cp hpt27xx.ko /boot/kernel/ @@ -162,7 +186,7 @@ Revision History: /modules/hpt27xx.ko text=0xf571 data=0x2c8+0x254 ok boot - For FreeBSD 5.x/6.x/7.x/8.x/9.x, you can select 6 on the boot menu to get a loader + For FreeBSD 5.x/6.x/7.x/8.x/9.x/10.x, you can select 6 on the boot menu to get a loader prompt. 7) You can add a below line into /boot/defaults/loader.conf to load the Modified: head/sys/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu ============================================================================== --- head/sys/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu Tue Jun 23 17:26:05 2015 (r284729) +++ head/sys/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu Tue Jun 23 17:26:16 2015 (r284730) @@ -1,13034 +1,14239 @@ begin 644 hpt27xx_lib.o -M?T5,1@(!`0D```````````$`/@`!`````````````````````````(A^"@`` -M`````````$```````$``$``-`,8'",9'`1)`@/X!&<#WT(/@!(A'`L9'`P#& -M1P0`QD<%`,9'!@#&1P<`QD<(`,9'"0#&1PH`QD<+`(#Z`1G`@^`@B$<,QD<- -M`,9'#@#&1P\`QD<0`,9'$0#&1Q(`QD<3`+@4````PV9F9I!F9I!F9I!(@^PX -M2(E<)`A(B6PD$$R)9"083(EL)"!,B70D*$R)?"0P28G_2(GU08G608G-Z``` -M``!)B<2X`````$V%Y`^$HP```$F+7"0000^VU4$/MO9(C7L$Z`````!!B<7& -M`P#&0P$`QD,"`,9#`P!(B>Y,B?_H`````+D`````NA````!(C44XB`A(_\!( -M_\IU]D&-103&13@5QD4Y$8A%/,9%/0!(C5U81`^VZ$2);33'A90````````` -M28M$)!!(B45(3(EE>+X`````2(G?Z`````!)BW0D&$2)ZDB)W^@`````N`$` -M``!(BUPD"$B+;"003(MD)!A,BVPD($R+="0H3(M\)#!(@\0XPY"0D)"0D$&) -M\&:)=PC&1PX`9L='#```O@````!F1#G&`^2\/E<"`^8\/E<(/ML"%P@^%S0$```^V1SB#^"\/A*X` -M``"#^"]_.8/X"G1[@_@*D'\.@_@(='#IA@$``&9F9I"#^"@/A(<```"#^"IF -M9F:0#X1Z````Z6D;`0`` -M#[9'.8/@'\'@$`^V5SK!X@@)T`^V5SL)T(G"#[9//.D%`0``9F:09I`/ME(8#[9'.\'@$`G"#[9'/,'@"`G"#[9'/0G"B=(/MD\_P>$(#[9'0`G!Z(8#[9'.\'@$`G"#[9'/,'@"`G"#[9'/0G"B=(/MD\^P>$8#[9' -M/\'@$`G!#[9'0,'@"`G!#[9'00G!Z8@```!(#[97.DC!XCA(#[9'.TC!X#!( -M"<)(#[9'/$C!X"A("<)(#[9'/4C!X"!("<)(#[9'/DC!X!A("<)(#[9'/TC! -MX!!("<)(#[9'0$C!X`A("<)(#[9'04@)P@^V3T+!X1@/MD=#P>`0"<$/MD=$ -MP>`("<$/MD=%"<'K#KH`````N0````!F9F:02(F7B````(F/D````&:#3R(! -M\\-F9F:09F9FD&9F9I!32(/L8$B)^T0/MD\[1`^V1SH/MD\Y#[97.`^V1T>) -M1"18#[9'1HE$)%`/MD=%B40D2`^V1T2)1"1`#[9'0XE$)#@/MD="B40D,`^V -M1T&)1"0H#[9'0(E$)"`/MD<_B40D&`^V1SZ)1"00#[9'/8E$)`@/MD<\B00D -M2(G^2,?'`````+@`````Z``````/MW,@2,?'`````+@`````Z`````!(@\1@ -M6\-F9F:09F9FD+K_____N0````!F.?%S(4G'P``````/M\$/M@0X,=`/ML#! -MZ@A!,Q2`_\%F.?%RYHG0PY"0D)"0D)"0D)"0D)!(BP>+D`0!``")%0````") -MT8'A?O_^_TB+!XF(!`$``(G1@>%^__+_2(M'"(D(2(M'"(E(#$B+1PB)2!!( -MBT<(B4@42(M'"(E(&$B+1PB)2`1(BP>+@%0!``")!0````")P8'A_@#__TB+ -M!XF(5`$``,-F9F:09F9FD&9FD&9FD%532(/L"(GS2(LO@_X#=AB-!-W@____ -MBX0HH`$``(D%`````(G!ZQB-!-T`````B<"+A"B``0``B04`````B<&#X?Z# -M^P-V$(T$W>#___^)C"B@`0``ZQ"-!-T`````B<")C"B``0``A-(/A*````"# -M^P-V&(T$G?#___^+A"C@`0``B04`````B<'K&(T$G0````")P(N$*-`!``") -M!0````")P8/)`H/[`W80C02=\/___XF,*.`!``#K$(T$G0````")P(F,*-`! -M``"-!)T`````C7#PB<)F9F:09F:0@_L#=A&+A"[@`0``B04`````B<'K#XN$ -M*M`!``")!0````")P?;!`G76Z94```"0@_L#=A2-!-W@____QX0H4`(````` -M``#K%(T$W0````")P,>$*%`"````````OQ`G``#H`````(/[`W88C03=X/__ -M_XN$*%0"``")!0````")P>L8C03=`````(G`BX0H5`(``(D%`````(G!@\D! -M@_L#=A"-!-W@____B8PH5`(``.L0C03=`````(G`B8PH5`(``$B#Q`A;7<-F -M9I!FD$%6055!5%5328G\08GU08G62(LONP````"`?SX`#X1.`@``1(GJ#[;" -MB=E(T_BH`0^$*P(``(/[`W88C03=X/___XN$**0!``")!0````")PNL8C03= -M`````(G`BX0HA`$``(D%`````(G"@^+^@_L#=A"-!-W@____B90HI`$``.L0 -MC03=`````(G`B90HA`$``+\0)P``Z`````!%A/8/A)H```"#^P-V&(T$G?#_ -M__^+A"C@`0``B04`````B<+K&(T$G0````")P(N$*-`!``")!0````")PH/* -M`H/[`W80C02=\/___XF4*.`!``#K$(T$G0````")P(F4*-`!``"-!)T````` -MC7#PB<&0@_L#=A&+A"[@`0``B04`````B<+K#XN$*=`!``")!0````")PO;" -M`G76Z94```"0@_L#=A2-!-W@____QX0H4`(```````#K%(T$W0````")P,>$ -M*%`"````````OQ`G``#H`````(/[`W88C03=X/___XN$*%0"``")!0````") -MPNL8C03=`````(G`BX0H5`(``(D%`````(G"@\H!@_L#=A"-!-W@____B90H -M5`(``.L0C03=`````(G`B90H5`(``(/[`W87C03=X/___\>$**`!```!```` -MZQ=F9I"-!-T`````B<#'A"B``0```0```(/[`W88C03=X/___XN$**0!``") -M!0````")PNL8C03=`````(G`BX0HA`$``(D%`````(G"@\H!@_L#=A"-!-W@ -M____B90HI`$``.L0C03=`````(G`B90HA`$``/_#00^V1"0^.=@/A[+]__]; -M74%<05U!7L-F9I!F9I")\4B+!XN`!`$``(D%`````$&)P`^W1SQF/8!D#Y3" -M9CV`D0^4P`G0J`%U"&:!?SR`E'42#[;)@\$(N`$```#3X$$)P.L10`^VSH/! -M#+@!````T^!!"+@`0! -M``")!0````!!B<`/MT<\9CV`9`^4PF8]@)$/E,`)T*@!=0AF@7\\@)1U$@^V -MR8/!"+C^____T\!!(<#K$4`/MLZ#P0RX_O___]/`02'`2(L'1(F`!`$``,-F -M9F:09F9FD&9FD&9FD$B#[!A(B5PD"$R)9"0028G\0`^VWHG>Z`````"_$"<` -M`.@`````B=Y,B>?H`````$B+7"0(3(MD)!!(@\08PY")\4"`_O]T>$"`_A]W -M-HN7&`$``(D5`````+@!````T^")P??0(=")AQ@!``"+AU@!``")!0`````A -MR'1#B8=8`0``PXN7'`$``(D5`````$`/MLZ#Z2"X`0```-/@B<'WT"'0B8<< -M`0``BX=@`0``B04`````($(``"```,`0``ZQQF9I!( -MC03=`````"7X!P``0L>$(``"```,`0``OQ`G``#H`````(#[`W8X2(T,W0`` -M``"!X?@'```/ME4#P>(8#[9%`L'@$`G"#[9%`<'@"`G"#[9%``G"0HF4(00" -M``#K-I!(C0S=`````('A^`<```^V50/!XA@/MD4"P>`0"<(/MD4!P>`("<(/ -MMD4`"<)"B90A!`(``(#[`W8;2(T$W0`````E^`<``$+'A"```@``$`$``.L9 -M2(T$W0`````E^`<``$+'A"```@``$`$``+\0)P``Z`````"`^P-V-TB-#-T` -M````@>'X!P``#[95!\'B&`^V10;!X!`)P@^V107!X`@)P@^V100)PD*)E"$$ -M`@``ZS5(C0S=`````('A^`<```^V50?!XA@/MD4&P>`0"<(/MD4%P>`("<(/ -MMD4$"<)"B90A!`(``%M=05S#D)!32(/L8$B)^P^W?SQ(C40D7DB)1"0X2(U$ -M)%Q(B40D,$B-1"1:2(E$)"A(C40D6$B)1"0@2(U$)%9(B40D&$B-1"152(E$ -M)!!(C40D5$B)1"0(2(U$)%)(B00D3(U,)%%,C40D3DB-3"1-2(U4)$Q(C70D -M2^@`````#[94)$L/MG0D3$B-?"1$Z`````!(#[94)$M(:=*(`0``2(MS($B- -MN_@(``"Y`0```.@`````2`^V5"1-2&G2T````$B+(#2(MS($B-NW`)``"Y`0```.@`````2`^W5"1.2&G2J````$B+(%2(MS($B-NY@*``"Y`0`` -M`.@`````2`^V5"152(T4DDC!X@5(BW,@2(V[P`H``+D!````Z`````!(#[=4 -M)%)(C1222,'B`TB+("2(MS($B-NS`1 -M``!!N`$```"Y!````.@`````#[94)%3!X@M(BW,@2(V[8!$``$&X`0```+D( -M````Z`````!(#[=4)%)(:=*,`0``2(MS($B!PY`1``!!N`$```"Y"````$B) -MW^@`````N`````!(@\1@6\-F9I!FD$%6055!5%532(/L8$F)_$&^`````,9' -M40#&1U``QD=/`$C'A_@3````````QH?Q$P```+D`````NJ`!``!(C8=`$@`` -MB`A(_\!(_\IU]DF-A"3H````28F$).@```!)B80D\````$F-A"3X````28F$ -M)/@```!)B80D``$``$F-A"0(`0``28F$)`@!``!)B80D$`$``$F-A"08`0`` -M28F$)!@!``!)B80D(`$``$F-A"0H`0``28F$)"@!``!)B80D,`$``$F-A"1( -M`0``28F$)$@!``!)B80D4`$``$F-A"18`0``28F$)%@!``!)B80D8`$``$F- -MA"0X`0``28F$)#@!``!)B80D0`$``$$/MWPD/$B-1"1>2(E$)#A(C40D7$B) -M1"0P2(U$)%I(B40D*$B-1"182(E$)"!(C40D5DB)1"082(U$)%5(B40D$$B- -M1"142(E$)`A(C40D4DB)!"1,C4PD44R-1"1.2(U,)$U(C50D3$B-="1+Z``` -M```/MD0D2T&(1"1&#[9$)$Q!B$0D1P^V1"1-08B$).$````/MT0D5F9!B40D -M6(M$)%QF08F$)#P2```/MT0D7O_(9D&)A"0^$@``00^W1"0\/8"1``!T"SV` -ME```#X4C"0``0<9$)$T$0<9$)$,$0<9$)$Y`0<9$)$P`0<:$)-X````)0<9$ -M)$0`28V\)/@(``#H`````$F)A"08"0``N0````!(#[94)$M(:=*(`0``ZPB( -M"$C_RDC_P$B%TG7S28V\)"`)``#H`````$F)A"1`"0``N0````!(#[94)$U( -M:=+0````2(72=`J("$C_P$C_RG7V28V\)$@)``#H`````$F)A"1H"0``N0`` -M``!(#[94)$Q(:=+(#P``2(72=`J("$C_P$C_RG7V28V\)'`)``#H`````$F) -MA"20"0``N0````!(#[=4)%9(P>(#=`J("$C_P$C_RG7V28V\)``*``#H```` -M`$F)A"0@"@``28V\)-@)``#H`````$F)A"3X"0``2(G#28V\)$@*``#H```` -M`$F)A"1H"@``2(G"O0````!F.VPD3G-$28V,)`@!``!(B5I@#[9$)%&(0EA( -MBT$(2(E1"$B)"DB)0@A(B1!(#[9$)%%(C01`2(T<@TB!PJ@```#_Q68[;"1. -MAWW4F-O"3`"@``Z`````!)B80DX`H` -M`$B)PKT`````@'PD50!T+DF-C"1(`0``2(M!"$B)40A(B0I(B4((2(D02('" -MH````/_%9@^V1"159CGH=]I)C;PDZ`H``.@`````28F$)`@+``!(B<*]```` -M`&8[;"12!QF!7``"Y`````(GR2(72=`J("$C_P$C_RG7V28N$)&@0 -M``"),$F+E"1H$```#[9$)$R(0@0/ME0D3$F+O"1H$```Z`````"]`````$&` -M?"0^`'1]#[?%2&G`J````$P!X$R-L*`!``!!B&X(0<9&"0!,B:"@`0``0<9& -M#@!!QD98`$'&1B@`0<>&H`````````!(C9#0`0``28E6,$F)5CA(C9#H`0`` -M28E62$F)5E!(!0`"``!)B49@28E&:$'&1@H"_\5F00^V1"0^9CGH=X-!QD0D -M3`"]``````^WQ4+&A"#&"```___%9H/]`W;LO0````"`?"1+``^$D`````^W -MS4F+E"08"0``2&G!B`$``,9$$$,!28N4)!@)``#&1!!"`$F+E"08"0``QD00 -M>/])BY0D&`D``,9$$&K_28N4)!@)``!FQX00P```````2<>$S$`$```````` -M2(G!20.,)!@)``!(C5$@2(E1($D#A"08"0``2(/`($B)0`C_Q68/MD0D2V8Y -MZ`^'@/AS[___]!QH0DWP```("] -M`````(!\)$T`#X2'````#[?528N$)$`)``!(:=+0````9L=$`DX$`$F+A"1` -M"0``QD0"0@!)BX0D0`D``,9$`D3_28N$)$`)``#&1`)0_TB)T4D#C"1`"0`` -M2(U!*$B)02A(B=!)`X0D0`D``$B#P"A(B4`(28N$)$`)``!,B;0"B````/_% -M9@^V1"1-9CGH#X=Y____0<:$).````""28VT))@0``!)C;PD_H`````$B)PTB+10A( -MB5T(2(DK2(E#"$B)&$B#>S@`=!I(BU,X28NT)-`(``"_!0```.@`````@$M$ -M`DB)VKX"````3(GWZ`````"`>WL`=!A,B>?H`````+\!````Z`````"`>WL` -M=>A!_\5%.&\.=XO^1"0'@'PD!P,/AC[___],B>?H`````$B#Q`A;74%<05U! -M7D%?PY!(@^P(2#E^*'5F#[9..(#Y"`^5P(#Y*`^5P@^VP(7"=&B`^:AT8X#Y -MB'1>@/D*#Y7`@/DJ#Y7"#[;`A<)T2X#YJG1&@/F*=$%(C9?H````2(N'Z``` -M`$B)<`A(B09(B58(2(FWZ````.L?9F:09F:02(V'Z````$B+4`A(B7`(2(D& -M2(E6"$B),N@`````2(/$",-F9F:09F:09F:09F:02(/L".@`````2(/$",-F -MD$%455-(B?-(B=5!O`````!F@7XXX0%U"P^V1CJ#Z!$\`78R2(L72(NR&`D` -M`$R-IGB&`0!F@7L@A0!W&4@/MT,@2`^VA!!`"```2&G`B`$``$R-)`;&100% -M@&4%_H!E`-^Z`````&:!>SCA`742#[9#.O_(/`&X`0````]&T&:0B=#!X``&@^*_"<*(50!F@7LXX0%U$@^V0SJ# -MZ!$\`7<'9HE-".L'.!(`````2`^WCS@2``!(BY<@$0`` -MBP:)!(H/MX+___\?"<*)$0^V00.#R!"# -MX/>(00/V1PH!=!1$BR"!`'R"%``^'H0```$@/MT,@0H"\ -M($`(``#_#X2-````9H-[(']W)DH/MH0@0`@``$F+E"08"0``2&G`B`$``$B+ -M1!!(1`^V:`CK:&:09H%[(($`=RE(#[=#($H/MH0@0`@``$F+E"1H"0``2&G` -MR`\``$B+1!`(1`^V:`CK-4@/MT,@2@^VA"!`"```28N4)$`)``!(:<#0```` -M2(N$$(@```!$#[9H".L)9F:00;W_____NO\```!F@7L@A0!W#T@/MT,@9D(/ -MMI0@0`@``$2)Z0^VP4H/MJP@Q@@``$AI[:@```!*C:PEH`$```^WPDAIP(@! -M``!)B<9-`[0D&`D``&:!>SCA`74*#[9#.O_(/`%V*6:!^O\`=`=!]D9#!'4; -MQD,D!D''!P````"X`0```.G6`@``9F:09F:020^V1D"H`70GJ`1T(T$/MD0D -M1$$Z1"1.3(GWZ`````"$P'45QD,D!$''!P````"X`0`` -M`.E>`@``08!^>Q]V$4''!P$```"X`0```.E&`@``]H.6`````70&]D4,`70; -M]H.6`````74&]D4,`74,@'LD@70&]D4,"'0A00^V]4R)Y^@`````A,!T$4'' -M!P$```"X`0```.G[`0``]H.6`````0^$;@$``/9%#`$/A&0!``!,B??H```` -M`&:#^!\/AE(!``!!QPT$Z1GIR$4''!P$```"X`0```.F/`0``BT,X)?___P`]X0$0 -M``^$_````$D/MT9B2(G"2-'J@^(!N0$```"`>SCA#X7?````@'LY`0^%U0`` -M``^V0SJ#Z`:#^`D/AZT```")P/\DQ0`````/MLFZ`0```$B)WDR)Y^@````` -MA,`/A:$```!!QP<"````N`$```#I$`$```^VR;H`````2(G>3(GGZ`````"$ -MP'5Y0<<'`@```+@!````Z>@````/MM*Y`0```$B)WDR)Y^@`````A,!U44'' -M!P(```"X`0```.G`````#[;2N0````!(B=Y,B>?H`````(3`=2E!QP<"```` -MN`$```#IF````,9#)`1!QP<`````N`$```#I@P```&9FD$F-O"18#P``Z``` -M``"$P'0/0<<'`0```+@!````ZV&0@'LXX751@'LY`75+@'LZ#W5%@'L]`74_ -M9@^V$!$``/A1(!``"_B!,``.@`````9H%]((4`#X><````2`^W -M12!"@+PP0`@``/\/A(@```!F@WT@?W`B^`````+JP!```2(G(9F9FD$"(,$C_P$C_RG7U9H%]..$! -M=6H/MD4Z@^@1/`%W7TB-3"1`2(M$)#`/ME`(2(GN2(M\)!#H`````$$/M\=( -M:<"P!```2`-$)"!)*X;P$```2(G&20.V^!```$B!QB`$``!(BT0D,(EP$$B) -M\DC!ZB!(BT0D,(E0%.F8`0``2(M$)!CV0`H!=2V+13@E____`#WA`1``#X0% -M`0``2(M4)!!(#[9"0*@!#X3S````J`0/A.L```#VA98````@=`](C70D0$B) -M[^@`````ZQM(C4PD0$B+1"0P#[90"$B)[DB+?"00Z`````!!#[?'2&G`L`0` -M`$@#1"0@22N&\!```$B)QDD#MO@0``!(@<8@!```2(M$)#")H@ -M2(M$)#")4!1F@7TXX0%U#P^V13J#Z!$\`0^&UP```$B+3"002`^V04"H`@^$ -MQ0```*@$#X2]````J`$/A+4```!!#[?'2&G`L`0``$@#1"0@22N&\!```$B) -MQDD#MO@0``!(BT0D,(EP&$B)\DC!ZB!(BT0D,(E0'.M[9F:09F:02(M$)!CV -M0`H"=&I!#[?'2&G`L`0``$@#1"0@2(G"22N6\!```$B)UDD#MO@0``!(BU0D -M,(ER&$B)\4C!Z2!(BU0D,(E*'$DKAO`0``!(B<9)`[;X$```2('&(`0``$B+ -M1"0PB7`02(GR2,'J($B+1"0PB5`42(M$)#"`2`$"9@^V55E(BT0D,&:)4`*_ -M`````(!]60!T+8GX2(T$0$C!X`)(B<9(`W,02(M-8$B+%`A(B1:+1`@(B48( -M_\Y(BWPD -M&.@`````2(M4)!B`8@S^Z6,%``!(BTPD&/9!"@(/A-T$``!(BT0D,,9`!OY( -MBT0D,(!@!_Y(@WPD$``/A.T```!(BUPD$$@/MD-`J`(/A-L```"H!`^$TP`` -M`*@!#X3+````00^WSTB+5"0P2(GN2(M\)!CH`````/:%E@````%T$$B+1"0P -M#[=`",'@`XA$)$%(C4PD0$$/M]=(:=*P!```2`-4)"!(B>Y(BWPD&.@````` -M]H66`````70+2(M$)!B`2`P!ZPE(BU0D&(!B#/Y!#[?/2&G)L`0``$B+7"0@ -MQ@09H4B+1"00#[:0X@```(/B#P^V1!D!@^#P"="(1!D!2(M4)!`/MT(P_\`/ -MMM#!X@@/ML0)T&:)1!D"3(ML)!!)@<7,````Z:X#``!F@7TXX0$/A7@"```/ -MMD4Z@_@/=`Z#^!`/A.(```#IBP,``&8/ME4\P>((9@^V13L!PDB+1"0PQD`$ -M#4B+1"0P@&`%_H!,)"\(2(MT)#`/MD4E00^VCMX```#3X&8)1@A(BTPD,`^V -M00&#X!^#R""(00%!#[?/2&G)L`0``$B+7"0@2(TT&4B+13Y(B88X!```#[;" -MP>`(#[;6"<)FB9091`0```^V13V(A!E"!```Q@:12(M4)!`/MT(P_\`/MM#! -MX@@/ML0)T&:)1!D"2(M<)!`/MI/B````@^(/2(M<)"`/MD09`8/@\`G0B$09 -M`4R+;"0028'%S````.FN`@``2(M4)#`/MD4E00^VCMX```#3X&8)0@A!#[?7 -M2&G2L`0``$B+1"0@Q@0"@6;'1`("__]!#[:,)+L```"#X0](BUPD(`^V1!H! -M@^#P"[H`````(/@#TB+3"0@#[94"P&#XO`) -MPHA4"P'K`TV)Y;X$````2(M52`^V0@$]DP```'=VB<#_),4`````@\8$ZVB# -MQ@3K8X/&".M>@\8(9F:0ZU:#Q@CK48/&".M,@\8(D.M&@\8(ZT&#QACK/(/& -M&)#K-H/&#.LQ@\8(ZRP/MG($C32U"````.L?@<:(````D.L6@\8DZQ&#QB3K -M#(/&))#K!H'&B````(U6`\'J`DB+1"0PB%`$2(M,)#!FP>H(@^(!#[9!!8/@ -M_@G0B$$%00^W_TAI_[`$``!(BUPD($B-O!\@!```B?)(BW5(Z`````#I*@$` -M``^V13B#Z`0]JP```'<_B<#_),4`````#[9%0,'@"`^V54&-#!"#^0UW&+@! -M````2-/@J=@^``!T"4B+1"0P@$@!!$B+1"0P@$@!`>L)2(M$)#"`8`'[2(M$ -M)##&0`0-2(M$)#"`8`7^2(M4)#`/MD4E00^VCMX```#3X&8)0@A(BT0D,(!@ -M`1]!#[??2&G;L`0``$B+1"0@QH0#(`0```9,BVPD$$F!Q[H`````$F-O"0E!```3(GNZ`````!(BT4X28F$)$0$``!(BT5` -M28F$)$P$``!!Q@0DD4B+3"00#[:1X@```(/B#TB+3"0@#[9$"P&#X/`)T(A$ -M"P%(BU0D$`^W0C#_P`^VT,'B"`^VQ`G09HE$"P)-A>T/A)(```!!#[?'2&G` -ML`0``$F+50!(BTPD($B)5`@$ZW=(BUPD&/9#"@%T;$$/M\](BU0D,$B)[DB) -MW^@`````]H66`````7002(M$)#`/MT`(P>`#B$0D04B-3"1`00^WUTAITK`$ -M``!(`U0D($B)[DB+?"08Z`````#VA98````!=`M(BT0D&(!(#`'K"4B+5"08 -M@&(,_D$/M]=)BX:0"0``2(DLT$2)^F;!Z@4/M])$B?F#X1^X`0```$C3X$$) -MA):8"0``BT4X)?___P`]X0$0`'4O00^W]TB-3"0LN@````!(BWPD&.@````` -MBT0D+"7___\?#0```$")1"0LZ:$```!F@7TXX0%U-@^V13J#Z!$\`7N````2`^W1B"`O#A`"```_P^$FP```&:#?B!_=RE(#[:$.$`( -M``!(BY<8"0``2&G`B`$``$B+1!!(2`^V0`A(!<`(``#K<&:!?B"!`'$R) -MY^@`````9F:02(GN3(GGZ`````!,B>Y(B=]!_Y6@````2(M<)`A(BVPD$$R+ -M9"083(ML)"!(@\0HPV9F9I!F9F:09F9FD&9FD$B#[#A(B5PD"$B);"003(ED -M)!A,B6PD($R)="0H3(E\)#!)B?9)B?U,BS](C5](2(G?Z`````!)B<1)@^PX -M3(G_Z`````!(B<5)C40D.$B+4PA(B4,(28E<)#A(B5`(2(D"N`$```!(A>UT -M>4B-?5C&13CAQD4Y`<9%.A"`33L!28N&H````$B)16A(BT5P3(EP*$F-AI`` -M``!(B450QD4ES&9!#[9$)%MFB44@28M%`$B)12C'1320````3(EU2$C'A:`` -M````````O@````#H`````$B)[DR)_^@`````N`````!(BUPD"$B+;"003(MD -M)!A,BVPD($R+="0H3(M\)#!(@\0XPV9F9I!F9F:02(/L*$B)'"1(B6PD"$R) -M9"003(EL)!A,B70D($B)\TB)_4R+;TA-BV4`#[=.,HG.9L'N!0^WQD&+1(1< -M@^$?2-/XJ`$/A68#``!)BQ0D#[?&C02%``,``(F"<`$``$F+!"2+@'0!``") -M!0````")PL9#)"&+0S@E____`#WA`0\`=2*^`````$B)W^@`````N@````!( -MB=Y,B>?H`````.D+`P``B=`/MTLR@^$?2-/XJ`%T&[X!````2(G?Z`````!, -MB>?H`````&9FD&9FD`^VA>````"#^`0/A]`"``")P/\DQ0````#&A>`````! -MN@$```!(B=Y,B>_H`````.FK`@``QH7@`````KH(````2(G>3(GOZ`````#I -MCP(``,:%X`````-(B>J^(0```$R)[^@`````2(-]4`!T(`^V57E(BW500;@` -M````N0$```!,B>_H`````.E1`@``00^V=0VZ`````$R)Y^@`````Z3H"``#& -MA>`````$2(-]4`!T,$B)ZKXA````3(GOZ``````/ME5Y2(MU4$&X`````+D" -M````3(GOZ`````#I_`$``+H`````OB$```!,B>_H`````$$/MG4-N@$```!, -MB>?H`````.G3`0``2(GJO@8```!,B>_H`````$B#?3@`=!9(BT4XBT@$C5$! -MB5`$@_D%#X:F`0``QD5#`<9%0@"`?7L`=!A,B>?H`````+\!````Z`````"` -M?7L`=>A(@WU0`'082(M5&$B+11!(B5`(2(D"2(M%4/Y(6.L92(-]6`!T$DB+ -M55A(#[9%>4C'1,)8`````$B+50A(BT4`2(E0"$B)`D'^30Y(@[T8`0```'08 -M#[:U!0$``$B+O1@!``"Z`0```.@`````2(-]4`!T$@^V=7E(BWU0N@$```#H -M`````$B#?3@`#X2"````2(M%.$C'0&``````0?Z$).\3``!,B>?H`````$B+ -M13@/MG`!N@$```!,B>?H`````$B+13@/ME`"#[9P`4C'QP````"X`````.@` -M````2(M5.$F+M"30"```OP$```#H`````$B+53A)B[0DT`@``+\&````Z``` -M``!(QT4X`````$B)[DR)Y^@`````08!]"?]T6T&^`````$&`?0X`=CE)C5U@ -M2(G?Z`````!(B<5(BT,(2(EK"$B)70!(B44(2(DH@'U"_W4+0?_&13AU#G?3 -MZP9%.'4.=Q5!QD4)_TR)[DR)Y^@`````9F:09I!(BQPD2(ML)`A,BV0D$$R+ -M;"083(MT)"!(@\0HPV9FD$B#[#A(B5PD"$B);"003(ED)!A,B6PD($R)="0H -M3(E\)#!(B?-(B?U,BV=(38LL)$&_`````$'V1"0,$'0'QH?@````!@^VA>`` -M``"#^`$/A(L```"#^`%_"X7`=!YFD.G[`P``@_@$#X2B````@_@Y`0`` -MZ>0#``#&A>`````!2(GN3(GOZ`````#&0R2!08!,)`P(2(.[@`````!T#TB- -MLX````!,B>_H`````$F-E>@```!)BX7H````2(E8"$B)`TB)4PA)B9WH```` -M3(GOZ`````#I@@,``&:008!D)`SW_H7C````QH7@`````,9#)`)(B=Y,B>_H -M`````$R)[^@`````Z5$#``"0QH7C`````$B#?3@`#X1.`0``2(M%.(M(!(U1 -M`8E0!(/Y!0^'.`$``$&`9"0,]TB#NX``````=`](C;.`````3(GOZ`````!) -MC97H````28N%Z````$B)6`A(B0-(B5,(28F=Z````$&`3"0,$$B#?5``="`/ -MME5Y2(MU4$&X`````+D"````3(GGZ`````#IO`(``,9$)`<`08!\)`X`#X:G -M````38UT)&!F9I!F9I!,B??H`````$B)PTF+1@A)B5X(3(DS2(E#"$B)&$B# -M>S@`=!Q(BU,X28NUT`@``+\%````Z`````"`2T0"9F:02(G:O@8```!,B>?H -M`````(![>P!T,D2)^$'_QSU_EI@`=R5,B>_H`````+\!````Z`````"`>WL` -M=`U$B?A!_\<]?Y:8`';;_D0D!P^V1"0'03A$)`X/AV3____&14(#2(GN3(GO -MZ`````#I\`$``$F-E>@```!)BX7H````2(E8"$B)`TB)4PA)B9WH````2(-] -M.`!T%DB+13B+2`2-40&)4`2#^04/AI8!``!(Q\<`````N`````#H`````$B) -MZKX&````3(GGZ`````!!_DPD#DB+50A(BT4`2(E0"$B)`DB#?5``=!A(BT50 -M_DA82(M5&$B+11!(B5`(2(D"ZQ](@WU8`'082(M56$@/MD5Y2,=$PE@````` -M9F:09F:0@'U[`'0R1(GX0?_'/7^6F`!W)4R)[^@`````OP$```#H`````(!] -M>P!T#42)^$'_QSU_EI@`=MM(BU4(2(M%`$B)4`A(B0)(@[T8`0```'0?#[:U -M!0$``$B+O1@!``"Z`0```.@`````9F9FD&9FD$B#?5``=!D/MG5Y2(M]4+H! -M````Z`````!F9F:09F:02(-].`!T?TB+13A(QT!@`````$'^A>\3``!,B>_H -M`````$B+13@/MG`!N@$```!,B>_H`````$B+13@/ME`"#[9P`4C'QP````"X -M`````.@`````2(M5.$F+M=`(``"_`0```.@`````2(M5.$F+M=`(``"_!@`` -M`.@`````2,=%.`````!(B>Y,B>_H`````.L02(GJO@(```!,B>?H`````$R) -M[^@`````9F:09I!(BUPD"$B+;"003(MD)!A,BVPD($R+="0H3(M\)#!(@\0X -MPV9F9I!F9I!F9I!F9I!!5D%505154TB)\TF)_$R+KX@```!)BVT`0?9%#!!T -M!,9'409!#[9$)%&#^`$/A(D```"#^`%_#87`="!F9F:0Z7L#``"#^`0/A)H` -M``"#^`4/A)_H`````$B-E>@```!(BX7H````2(E8"$B)`TB) -M4PA(B9WH````2(GOZ`````#I!`,``$&`90SW0?Y$)%)!QD0D40#&0R0"2(G> -M2(GOZ`````!(B>_H`````.G8`@``08!E#/=(@[N``````'0/2(VS@````$B) -M[^@`````2(V%Z````$B+E>@```!(B5H(2(D32(E#"$B)G>@```"Z`````+X& -M````3(GOZ`````!!#[9U#;H!````2(GOZ`````!!O@````!!@'T.``^&?``` -M`$V-96"03(GGZ`````!(B<-)BT0D"$F)7"0(3(DC2(E#"$B)&$B#>S@`=!I( -MBU,X2(NUT`@``+\%````Z`````"`2T0"D$B)VKX&````3(GOZ`````"`>WL` -M=!A(B>_H`````+\!````Z`````"`>WL`=>A!_\9%.'4.=XE!QD4)`$&`30P0 -M3(GOZ`````#IT@$``$&`90SW2(.[@`````!T#TB-LX````!(B>_H`````$B- -MA>@```!(BY7H````2(E:"$B)$TB)0PA(B9WH````28U%8$B)PDDY16`/A.$` -M``!)B<9(B=?H`````$B)PTB#>#@`=!Y(BU`X2(NUT`@``+\%````Z`````"` -M2T0"9F:09I!(B=J^!@```$R)[^@`````@'M[`'082(GOZ`````"_`0```.@` -M````@'M[`'7H2(-[.`!T84B+0SA(QT!@`````/Z%[Q,``$B)[^@`````2(M# -M.`^V<`&Z`0```$B)[^@`````2(M3.$B+M=`(``"_`0```.@`````2(M3.$B+ -MM=`(``"_!@```.@`````2,=#.`````!(B=Y(B>_H`````$R)\DTY=6`/A2+_ -M__^Z`````+X&````3(GOZ`````!,B>9(B>_H`````$G'14``````2(M%`(N0 -M6`$``(D5`````(72=`I(BT4`B9!8`0``0?9%"@%T6$&^`````(!]0P!V&TD/ -MME4-2(G01(GQ2-/XJ`%U"4'_QD0X=4-WZD$/MO9(B>_H`````$R)[DB)[^@` -M````1(GR#[;"2&O`:$C'A"A($@```````&9F9I!;74%<05U!7L-F9F:09F:0 -M05=!5D%505154TB#[`A)B?Q,BW=(28L>2(G^2(G?Z`````!!@+PDXP````%V -M"4'&A"3@````!$F-;"0@23EL)"`/A#D"``!(B>_H`````$F)QTF+1"0@3(EX -M"$F)!TF);PA-B7PD($&]`````.G6`0``00^WU4B+@Y`)``!(BRS02(7M#X2[ -M`0``00^W1"0P9CM%(`^%JP$```^WBSH2``!(BX-0$0``.0AT5&9F9I#_P0^W -M@SX2```YR+@`````#T;(C5$!2(N#4!$``(L$D*D```@`=1XE_P\``&9!.<5U -M$TDY[W492(G?Z`````"0Z8L!``!(BX-0$0``.0AUL$&`?E@`#X4Z`0``9H%] -M((4`#X@%#[?` -M@^$?2-/B]](A5(-<3#G]=$E(BU4(2(M%`$B)4`A(B0)(@[V``````'0/2(VU -M@````$B)W^@`````2(V3Z````$B+@^@```!(B6@(2(E%`$B)50A(B:OH```` -M#[=U,DB-NU@/``#H`````$'^3"1[ZQ)!]D8*`G0+2(GN3(GGZ`````!!_\5F -M1#EK6`^''_[__TV%Y'0H20^V1"1`J`%T'J@$=!I)BU<(28L'2(E0"$B)`DR) -M_DR)Y^@`````D$B#Q`A;74%<05U!7D%?PY!!5D%505154TF)_$R+MX@```!) -MBQY(B?Y(B=_H`````$&`?"12`78&0<9$)%$$28UL)"A).6PD*`^$\@$``$B) -M[^@`````28G%28M$)"A,B6@(28E%`$F);0A-B6PD*+T`````Z9L!``!F9F:0 -M9F:0#[?52(N#D`D``$B+--!(A?8/A'L!``!!#[=$)$!F.T8@#X5K`0``#[>+ -M.A(``$B+@U`1```Y"'179F9FD&9FD/_!#[>#/A(``#G(N``````/1LB-40%( -MBX-0$0``BP20J0``"`!U'B7_#P``9CG%=11).?5U&DB)W^@`````9I#I.P$` -M`$B+@U`1```Y"'6P9H%^((4`#X?V````2`^W1B"`O!A`"```_P^$XP```$&` -M?E@`#X78````0?9&"@$/A,T```!(BQ,/MT8R9L'H!0^WP(T$A0`#``")@G`! -M``!(BP,/MTXR@^$?N@$```!(B==(T^>)N'0!``!(#[=.,DB+@Y`)``!(QP3( -M``````^W3C*)R&;!Z`4/M\"#X1](B==(T^=(B?GWT2&,@Y@)```/MTXRB@%#[?`@^$?2-/B]](A5(-<3#GN="Y(BU8(2(L&2(E0"$B)`DB-D^@```!( -MBX/H````2(EP"$B)!DB)5@A(B;/H````#[=V,DB-NU@/``#H`````$'^3"1% -M_\5F.6M8#X=B_O__0?9&"@%T&TF+50A)BT4`2(E0"$B)`DR)[DR)Y^@````` -MD%M=05Q!74%>PV9F9I!F9I!!5T%6055!5%532(/L"$B)_4&^`````$B-A^@` -M``!(B<)(.8?H````#X33`0``28G'28G%28G42(G7Z`````!(B<-(@WAP`'4O -M2(GOZ`````!(B4-P2(7`=1Y(BX7H````2(E8"$B)`TR)8PA(B9WH````Z8D! -M``"+0S@E____`#WA`1``#X3L````9H%[((``#X3@````9@^V0R!FB4,@9H/X -M?W8:9H%[..$!=2D/MD,Z@^@1/`%W'F9F9I!F9I!F@7L@A0!W#T@/MT,@@+PH -M0`@``/]U&<9#)`9(B=Y(B>_H`````.D&`0``9F:09I!F@7LXX0%U"P^V0SJ# -MZ!$\`78O2(N5&`D``$R-LGB&`0!F@7L@A0!W&4@/MT,@2`^VA"A`"```2&G` -MB`$``$R--`)F@7LXX0%U"@^V0SK_R#P!=C-F@7L@@`!T*V:!>SCA`74+#[9# -M.H/H$3P!=AA!]D9#!'41QD,D!DB)WDB)[^@`````ZWI(B=Y(B>_H`````(/X -M`G<+@_@!2(GOZ`````!F9I#K -M/TB#NX``````=`](C;.`````2(GOZ`````!(BX7H````2(E8"$B)`TR)>PA( -MB9WH````ZQM(B=Y(B>_H`````$R)ZDPYK>@````/A3/^__](@\0(6UU!7$%= -M05Y!7\-!5T%6055!5%532(/L2$F)_4"(="0P2`^V5"0P2&O2:$@!^DR+LD@2 -M``!(Q\#^____B?%(T\`B@FD2``"(1"0O3(L_QT0D*`````!`@/X#=@U!QX=P -M`0``Q`$``.L+0<>'<`$``*@!``!!BX=T`0``B04`````#[9,)#"#X0.[!P`` -M`-/CB<4)W4&)KW0!``"_Z`,``.@`````]],AW4&)KW0!``"`?"0P`W8@#[9$ -M)#!(P>`")?P#``!"BX0XT`$``(D%`````(G%ZQX/MD0D,$C!X`(E_`,``$*+ -MA#C0`0``B04`````B<6#S0B`?"0P`W88#[9$)#!(P>`")?P#``!"B:PXT`$` -M`.L6#[9$)#!(P>`")?P#``!"B:PXT`$``(!\)#`#=AP/MD0D,$C!X`,E^`<` -M`$+'A#@``@``.````.L:#[9$)#!(P>`#)?@'``!"QX0X``(``#@```"_$"<` -M`.@`````@'PD,`-V'`^V1"0P2,'@`R7X!P``0L>$.`0"````````ZQH/MD0D -M,$C!X`,E^`<``$+'A#@$`@```````$V%]@^$[@<``$&\`````$&`?4,`=BUF -M9F:020^V1@U!#[;,2-/XJ`%T$+H!````B_H`````)!!_\1%.&5#=]=! -M]D8*`71B3(GV3(GOZ``````/MG0D,$R)[^@`````2`^V1"0P2&O`:$J-E"A@ -M$@``BT(,J0``$`!T""7__^__B4(,3(GV3(GOZ`````!(#[9$)#!(:\!H2L>$ -M*$@2````````Z4L'``!!@'Y8`'0328N]:!```$R)]N@`````0?Y.6(!\)"\` -M#X2I`@``2,=$)"``````QD0D'P`/MG0D,$R)[^@`````2`^V1"0P2&O`:$J- -ME"A@$@``BT(,J0``$`!T""7__^__B4(,#[9$)"]!B$8-0;P`````08!]0P`/ -MAI,!``!(#[94)"](B50D$`^VR(E,)`Q!#[;,2(M$)!!(T_BH`0^$8`$``$2) -MX@^VPDAKP&@/ME0D+T*(E"AI$@``08#\`W87C03-`````$B80L>$.``"```X -M````ZQE*C03E`````"7X!P``0L>$.``"```X````OQ`G``#H`````$&`_`-V -M&TJ-!.4`````)?@'``"+3"0,0HF,.`0"``#K&4J-!.4`````)?@'``"+5"0, -M0HF4.`0"``!!@/P#=@U!QX=P`0``Q`$``.L+0<>'<`$``*@!``!!BX=T`0`` -MB04`````1(GA@^$#NP<```#3XXG%"=U!B:]T`0``O^@#``#H`````/?3(=U! -MB:]T`0``08#\`W8?2HT$I0`````E_`,``$*+A#C0`0``B04`````B<7K'4J- -M!*4`````)?P#``!"BX0XT`$``(D%`````(G%@\T(08#\`W872HT$I0`````E -M_`,``$*)K#C0`0``ZQ5*C02E`````"7\`P``0HFL.-`!``!!_\1%.&5##X=_ -M_O__28U&2$B)PDDY1DAT-DB)TTB)U^@`````2(U(R$B)3"0@2(M3"$B)0PA( -MB1A(B5`(2(D"2(-XV`!T"4B)VDDY7DAURDB#?"0@`'1%2(M$)"#&0%H`0;P` -M````08!]0P!V+TD/MD8-1(GA2-/XJ`%T%T@/MD0D'TB+5"0@1(AD$'#^0EK^ -M1"0?0?_$13AE0W?1N@````"^@0```$R)]^@`````2`^V1"0P2&O`:$K'A"A( -M$@```````.EH`P``N@````"^!@```$R)]^@`````#[9T)#!,B>_H`````$@/ -MMD0D,$AKP&A*C90H8!(``(M"#*D``!``=`@E___O_XE"#$F-1DA(B<)).49( -M#X3L`0``2(D$)$B)U^@`````3(U@R$B-4!!(.5`0#X2Q`0``28U\)$CH```` -M`$B-6/"`>T$-=1I(C;!(`0``2(M#2$B+`$B+>"CH`````&9FD$B+4PA(BP-( -MB5`(2(D"@'M[`'083(GOZ`````"_`0```.@`````@'M[`'7H2(-[.``/A"@! -M``!(BT,X2,=`8`````"`>WL`#X29````O0````!F08-]6``/A(@```!FD$AC -MU4F+A9`)``!(BS302(7V=&0/MT8@9CM#,'5:9CV%`'=4#[?`0H"\*$`(``#_ -M=$9)BU4`#[=&,F;!Z`4/M\"-!(4``P``B8)P`0``28M%``^W3C*#X1^Z`0`` -M`$C3XHF0=`$``,9&)"&Z`````$R)[^@`````_\5!#[=%6#GH#X]Z____]D-$ -M!'4D0?Z%[Q,``$R)[^@`````2(M#.`^V<`&Z`0```$R)[^@`````2(M#.`^V -M4`(/MG`!2,?'`````+@`````Z`````!(BU,X28NUT`@``+\!````Z`````!( -MBU,X28NUT`@``+\&````Z`````!(QT,X`````$'^3@Y!_DPD6$B)WDR)[^@` -M````28U$)$A).40D2`^%3_[__T'^3BA,B>9,B>_H`````$B+%"1).59(#X48 -M_O__28U&8$B)PDDY1F`/A/8```!(B<5(B=?H`````$B)PX!X>P!T-HM$)"C_ -M1"0H/7^6F`!W)TR)[^@`````OP$```#H`````(![>P!T#XM$)"C_1"0H/7^6 -MF`!VV4B#>S@`#X2%````2(M#.$C'0&``````]D-$!'4D0?Z%[Q,``$R)[^@` -M````2(M#.`^V<`&Z`0```$R)[^@`````2(M#.`^V4`(/MG`!2,?'`````+@` -M````Z`````!(BU,X28NUT`@``+\!````Z`````!(BU,X28NUT`@``+\&```` -MZ`````!(QT,X`````$'^3@Y(B=Y,B>_H`````$B)ZDDY;F`/A0W___],B?9, -MB>_H`````$@/MD0D,$AKP&A*QX0H2!(```````!!O`````!!@'U#``^&!`$` -M`$P/MG0D+Y!,B?)$B>%(T_I$.F0D,`^4P`G0J`$/A-4```!!@/P#=@U!QX=P -M`0``Q`$``.L+0<>'<`$``*@!``!!BX=T`0``B04`````1(GA@^$#C0Q)NP<` -M``#3XXG%"=U!B:]T`0``O^@#``#H`````/?3(=U!B:]T`0``08#\`W8?2HT$ -MI0`````E_`,``$*+A#C0`0``B04`````B<7K'4J-!*4`````)?P#``!"BX0X -MT`$``(D%`````(G%@\T(08#\`W872HT$I0`````E_`,``$*)K#C0`0``ZQA* -MC02E`````"7\`P``0HFL.-`!``!F9I!!_\1%.&5##X<#____2(/$2%M=05Q! -M74%>05_#9F9FD$B#[`A,BP>Z`````$&`>$,`=AP/ML)(:\!H2HV$`$`2``!( -M.?AT"/_"03A00W?D#[;"2&O`:$P!P$B+L$@2``!(A?9T:_9&"@)T94@%0!(` -M`$@Y1B!U68!^6`!T*/Y&6.M._D9800^VB;L```!)B[AH$```21``=,))BT$X3(U(R$@Y -MT'7L9F:02(/$",-F9F:09F9FD&9FD$%505154TB#[`A!B?1)B?V[`````(GR -M#[;"2&O`:$B-%#A(BZI($@``2(7M#X2!`0``2,?`_O___XGQ2-/`A$4-#X5L -M`0``2(U%2$@Y14AT$4B-ND`2``#H`````.G^`@``0;P`````@'T.``^&[@(` -M`$B-76!(B=_H`````$B)P4B+0PA(B4L(2(D92(E!"$B)"(!Y00`/A00!``!( -M#[=!,$F#O,5`!````'4+2(-Y.``/A-,```!(#[=!,$F+A,5`!```2(.X@``` -M```/A*$```#&@>``````2`^V04"H`G0MJ`1T*:@!="7&04(%QD%#!`^V47E( -MBW%02(MY2.@`````Z9@```!F9F:09F:02`^V04"H`G4GJ`1F9I!FD'0>J`%T -M&L9!0@/&04,$2(G.3(GOZ`````#K9F9FD&:02`^V04"H`G18J`1F9I!FD'1/ -MJ`%U2\9!0P;&04(%9L>!P```````2(G.3(GOZ`````#K+4B+43A)B[70"``` -MOP0```#H`````.L62`^W43!)B[70"```OP(```#H`````$'_Q$0X90X/A\C^ -M___IK0$``&:!^_,!=V=*C02E`````$B)Q8'E_`,``&9FD&:0OQ`G``#H```` -M`$&`_`-V($F+10"+A"C0`0``B04`````J0``$`!U*>L>9F:09F:028M%`(N$ -M*-`!``")!0````"I```0`'4)_\-F@?OS`7:O00^V]$R)[^@`````3(GOZ``` -M``!$B>(/ML)(:\!H2HNL*$@2``!(A>T/A!`!``"[`````$&`?4,`=BQF9F:0 -M2`^V10T/MLM(T_BH`701N@````")SDR)[^@`````9I#_PT$X74-WV$2)X0^V -MP4AKP&A*C80H0!(``$B)12!(C45(2#E%2'4.2(U%8$@Y16`/A(8```"^```` -M`$&\`````$B-14A(B<)(.45(=#-FD$B)TTB)U^@`````2(UPR$B+4PA(B4,( -M2(D82(E0"$B)`DB#>-@`=`E(B=I(.5U(=<](A?9T6L9&6@"Y`````$&`?4,` -M=DI(#[9%#4C3^*@!=!!$B>(/ML*(3#!P_D9:0?_$_\%!.$U#=]SK)/9%"@%T -M#4B)[DR)[^@`````ZQ&^`````$B)[^@`````9F9FD$B#Q`A;74%<05W#9F:0 -M9I!(@^P(2(GX2(L_9L=`3B``2(G&Z`````!(@\0(PV9FD%-(BP]$BT4,`=AL/ML-(:\!H2(V$"$`2``!(.?AT!__#.%E#=^6`^P-V+4B-!)T` -M````)?P#``!(BQ&+A`+0`0``B04`````J0``$`!U+>L[9F9FD&9FD$B-!)T` -M````)?P#``!(BQ&+A`+0`0``B04`````J0``$`!T$`^V\T2)PDB)S^@````` -MZPL/MO-(B<_H`````%O#9F9FD&9F9I!F9F:09F:02(N'P!```(L`B04````` -M2(N'P!```(M`!(D%`````$B+A\`0``"+0`B)!0````!(BX?`$```BT`,B04` -M````PT%7059!54%455-(@^P8B70D%$F)_$&^`````(!_0P`/ADD(``"+="04 -M00^VUHU*"$B)\$C3^*@!=1&-2A!(B?!(T_BH`0^$%0@``$&`_@-V)TJ-!/4` -M````)?@'``!)BQ0DBX0"@`$``(D%`````*D```@`=2?K0TJ-!/4`````)?@' -M``!)BQ0DBX0"@`$``(D%`````*D```@`=!Y,B>?H`````$2)\@^VPDAKP&A" -M@8P@_H`````$'_QT4X?0YWH[H@H0<` -MZR!!#[;VN@$```!,B>?H`````+^@A@$`Z`````"Z`"TQ`42)\0^VP4AKP&A, -M`>!(C;!X$@``B9!X$@``2,=&$`````!(!4`2``!(B48828M\)"CH`````$&` -M_@-V($J-!/4`````)?@'``!)BQ0DBX0"@`$``(D%`````.L>2HT$]0`````E -M^`<``$F+%"2+A`*``0``B04`````08#^`W8L2HT$]0`````E^`<``$F+%"2+ -MA`*``0``B04`````J8````!U,.G"````9I!*C03U`````"7X!P``28L4)(N$ -M`H`!``")!0````"I@`````^$EP```$&`_@-V(DJ-!/4`````)?@'``!)BQ0D -MBX0"A`$``(D%`````(G&ZR!*C03U`````"7X!P``28L4)(N$`H0!``")!0`` -M``")QD&`_@-V(DJ-!/4`````)?@'``!)BPPDB?*!R@```0")E`&$`0``ZR=* -MC03U`````"7X!P``28L,)(GR@X"``!$B?$/ML%(:\!H3HNL($@2``!)@WU```^$V0`` -M`$F+14!(#[=03O;&`0^%QP```$B)Q?;"`@^$M0```$B-L)````!)BWPD*.@` -M````0;X`````@'T[`'9I1(GR#[;"2(MS@`=!I(BU,X28NT -M)-`(``"_!0```.@`````@$M$`DB)VKX&````3(GOZ`````"`>WL`=!F03(GG -MZ`````"_`0```.@`````@'M[`'7H0?_&1#AU.W>7QX60````(*$'`$C'A:`` -M````````2(FMJ````$B-M9````!)BWPD*.@`````ZP9F@4A.@`!!@/X#=BA* -MC03U`````"7X!P``28L4)(N$`H`!``")!0````#VQ`%U+.D\`0``2HT$]0`` -M```E^`<``$F+%"2+A`*``0``B04`````]L0!#X05`0``08#^`W8G2HT$]0`` -M```E^`<``$F+%"2+A`*``0``B04`````J`%T*^GH````2HT$]0`````E^`<` -M`$F+%"2+A`*``0``B04`````J`$/A<(```!$B?%$#[;I36OM:$^-K"5`$@`` -M28-]"``/A*0```!)BT4(2(E$)`A)C74X28M\)"CH`````$&_`````$B+5"0( -M@'H.`'932(G52(/%8$B)[^@`````2(G#2(M%"$B)70A(B2M(B4,(2(D82(-[ -M.`!T&DB+4SA)B[0DT`@``+\%````Z`````"`2T0"0?_'2(M,)`A$.'D.=[1! -MQT4X@(0>`$G'14@`````38EM4$F-=3A)BWPD*.@`````9F9FD&9FD$&`_@-V -M(DJ-!/4`````)?@'``!)BQ0DBX0"@`$``(D%`````(G!ZR!*C03U`````"7X -M!P``28L4)(N$`H`!``")!0````")P4&`_@-V&DJ-!/4`````)?@'``!)BQ0D -MB8P"@`$``.L82HT$]0`````E^`<``$F+%"2)C`*``0``0?_&13AT)$,/A[?W -M__](@\086UU!7$%=05Y!7\-F9I!!5T%6055!5%532(/L&$B)_4F)]4B+EQ@) -M``!,C:)XA@$`9H%^((4`=QE(#[=&($@/MH0X0`@``$AIP(@!``!,C20"00^V -M1"1JP>`(2)A(BY7`$```BX0"0`@``(D%`````$&)QD'![A!!B<=!P>\800^V -M1"1JP>`(2)A(BY7`$```BX0"1`@``(D%`````(A$)!!(C70D$(G"P>H(B%8! -MP>@0B$8"00^V1"1JP>`(2)A(BY7`$```BX0"2`@``(D%`````(A&`XG"P>H( -MB%8$P>@0B$8%QD8&`,9&!P"+3"0000^VUT$/MMY$BT8$B=Y(Q\<`````N``` -M``#H`````$6$]@^5P(/S`878=!)!QD4D`+@`````Z;,"``!F9I!!@'TD@74I -M00^VUT$/MO9(C4PD$$R)[^@`````0<9%)`*X`````.F%`@``9F:09I!!BT4X -M)?___P`]X0$.`'400<9%)"&X`````.EA`@``D$'VA98````!=19!]L8!=!!! -M@'PD0O\/A2<"``!F9F:03(GF2(GOZ`````!,B>9(B>_H`````$B+50!!#[=% -M,F;!Z`4/M\"-!(4``P``B8)P`0``2(M%`$$/MTTR@^$?N@$```!(B=-(T^.) -MF'0!``!)#[=-,DB+A9`)``!(QP3(`````$$/MTTRB@%#[?`@^$?2(G3 -M2-/C2(G9]]$AC(68"0``00^W33*)R&;!Z`4/M\"#X1](T^+WTB%4A5Q)BU4( -M28M%`$B)4`A(B0)!#[=U,DB-O5@/``#H`````$'^3"1[0<9%)(%)@[V````` -M`'0/28VU@````$B)[^@`````28U$)"!(B<)).40D(`^$!@$``$&^`0```$B- -MA>@```!(B40D"$F)UV9F9I!(B=?H`````$B)PTB+50`/MT`R9L'H!0^WP(T$ -MA0`#``")@G`!``!(BT4`#[=+,H/A'TR)\DC3XHF0=`$``$@/MU,R2(N%D`D` -M`$C'!-``````#[=+,HG(9L'H!0^WP(/A'TR)\DC3XDB)T??1(8R%F`D```^W -M2S*)R&;!Z`4/M\"#X1],B?)(T^)(B='WT2%,A5P/MW,R2(V]6`\``.@````` -M0?Y,)'M(@[N``````'0/2(VS@````$B)[^@`````2(N%Z````$B)6`A(B0-( -MBT0D"$B)0PA(B9WH````3(GZ33E\)"`/A1/___]!@:64````___^_T'&A"3@ -M````!$R)[DR)Y^@`````N`$```#K'4$/MM=!#[;V2(U,)!!,B>_H`````+@` -M````9F:02(/$&%M=05Q!74%>05_#D$B#[$A(B5PD&$B);"0@3(ED)"A,B6PD -M,$R)="0X3(E\)$!(B50D$(GU2(L?3(NS\!```$&]`````$B%T@^$!0,```^W -MUDAIPK`$``!"]D0P(0)T$4B+@Y`)``!(BP30QD`D`NL2#[?&2(N3D`D``$B+ -M!,+&0"0A#[?%2(N3D`D``$B+%,*+0C@E____`#WA`1``#X2X`0``N/____]F -M@7H@A0!W#4@/MT(@#[:$&$`(```\_W4:#[?%2(N3D`D``$B+!,+&0"0&Z3,) -M``!F9I`/ML!(:<"(`0``28G%3`.K&`D``(!\)!,`>6])#[9%0*@"="RH!'0H -MJ`%T)$B+`XN`6`$``(D%`````(G"A$!#@`/A(`'``!!#[9%:L'@"$B82(N3 -MP!```(N$`D`(``")!0````")QL'N$$&)P$'!Z!A!#[9%:L'@"$B82(N3P!`` -M`(N$`D0(``")!0````"(1"0(2(U,)`B)PL'J"(A1`<'H$(A!`D$/MD5JP>`( -M2)A(BY/`$```BX0"2`@``(D%`````(A!`XG"P>H(B%$$P>@0B$$%QD$&`,9! -M!P#VAY8````!=1A`#[;V0/;&`70.00^VT.@`````Z2!@`` -MN`$```!(T^"IP#````^%\@```*D`@```=0VI```!`'5?D.EK!@``#[?62(N# -MD`D``$B+#-!,:<*P!```0P^V1#`SB$$D2(N#D`D``$B+!-#V0",$#X0X!@`` -M@'@D``^$+@8``$B#>%``#X0C!@``2(M04$,/MD0P,X@"Z1(&```/M]9(:=*P -M!```1`^WYDB+@Y`)``!*BPS@0@^V1#(JB$$D2(N#D`D``$J+!.!(@WA(``^$ -MV@4``$(/MKPR(00``.@`````B<)(BX.0"0``2HL$X#M0-'8#BU`T#[?U2(N# -MD`D``$B+!/!(BWA(B=)(:?:P!```2HUT-BCH`````.F-!0``#[?&2(N3D`D` -M`$B+!,+&0"0`Z78%``!F9I!F9I`/M]9(BX.0"0``3(LDT$V+?"1HN/____]F -M08%\)""%`'<.20^W1"0@#[:$&$`(```/ML!(:<"(`0``28G%3`.K&`D``$'& -MA>``````20^V14"H`@^$EP$``*@$#X2/`0``J`$/A(TF#?"1(`'1S0;X`````28._ -ML`````!T$T'VAZD````!=0E-B[>P````ZR%(B[,@"@``N@$```!,B?]!_Y>X -M````A`(2)A(BY/`$```BX0"0`@``(D%```` -M`(G"P>H008B7FP```,'H&&9!B8>0````00^V16K!X`A(F$B+D\`0``"+E`)$ -M"```B14`````9@^VPF9!B8>4````#[;&9D&)AY8```")T,'H$&8/ML!F08F' -MF````,'J&$&(EYH```!!#[9%:L'@"$B82(N3P!```(N$`DP(``")!0````!F -M#[;`9D&)AY(```#IA0,``&9FD&:0#[?52&G*L`0``$(/MD0Q,X3`#X6_```` -M2(N#D`D``$B+!-#&0"0`08N4))0```!(P>H4387_#Y7`#[;`A<(/A#P#``!" -M#[9$,3-!B(>2````00^VAZD```"H`@^$'P,``+T`````28._L`````!T#:@! -M=0E)BZ^P````ZR%(B[,@"@``N@$```!,B?]!_Y>X````AZ`````"+10!(`<-(C44$2(/% -M$(,X`'3>Z:D"```\`@^%6`(```^W_4AI_[`$``!*C7PW0+Y_````0"(WQD0D -M`P#&1"0"`,9$)`$`#[?%2&G`L`0``$*+1#`XB40D!$B-3"0$#[94)`3!XA@/ -MMD$!P>`0"<(/MD$"P>`("<(/MD$#08G500G%0(#^<78P08/]`78+#[9'`8/@ -M#XA$)`-!@_T"=@@/MD\"B$PD`D&#_0-V30^V?P-`B'PD`>M"08/]`G8+#[9' -M`H/@#XA$)`-!@_T'=BL/MD<'@\`(03G%1`]'Z$&#_0QV"`^V3PR(3"0"08/] -M#78)#[9_#4"(?"0!#[?U2(N#D`D``$B+#/"`>3``#Y7`187M#Y7"#[;`A<)T -M2<9!)"!(BX.0"0``2(L$\$0X:#!S!40/MF@P#[?-2(N#D`D``$B+!,A(@WA0 -M`'0L2(MX4$2)ZDAI\;`$``!*C70V0.@`````ZQ(/M\5(BY.0"0``2(L$PL9` -M)"*`?"0#!'42#[?%2(N3D`D``$B+!,+&0"0"23E<)"@/EI -M`````G0R1(GH13AL)#!S!D$/MD0D,(3`=!Y)B[^@````#[;0#[?U2&GVL`0` -M`$J-=#9`Z``````/MD0D`X/X"W==B<#_),4`````0<:'J@````'IF@```(!\ -M)`($#Y3`@'PD`0(/E,(/ML`AT(/X`1G`@^#Q@\`108B'J@```.MQ0<:'J@`` -M`!#K9T'&AZH````+ZUU!QH>J````!NM30<:'J@````WK23PH=1]!#[9%>__( -M08A%>@^WU4B+@Y`)``!(BP30QD`D@>LF/`AU"K\0)P``Z``````/M\5(BY.0 -M"0``2(L$PL9`)"%F9I!F9I!(BUPD&$B+;"0@3(MD)"A,BVPD,$R+="0X3(M\ -M)$!(@\1(PV9F9I!F9I!F9I!F9I!54TB#[`A(B?M(B?U(BP>+@%`!``")!0`` -M``")QDB+!XFP4`$``/?&`/__`'0(2(GOZ#KI__](BP.+@%`!``")!0````") -MQDB+`XFP4`$``/?&`/__`'7.N`````!(@\0(6UW#9F9FD&9F9I!F9F:005=! -M5D%505154TB#[$A(B?U(B7PD.$0/MZ_H`````&9!@7X@A0`/A\X```!)#[=&(("\*$`( -M``#_#X2[````9D&#?B!_=R=(#[:$*$`(``!(BY48"0``2&G`B`$``$B+1!!( -M@'@(_W5AZ8P```!F08%^(($`=RE)#[=&($@/MH0H0`@``$B+E6@)``!(:<#( -M#P``2(M$$`B`>`C_=2SK6DD/MT8@2`^VA"A`"```2(N50`D``$AIP-````!( -MBX00B````(!X"/]T,$R)]DB)[^@`````2(N%Z````$R)<`A)B09(BTPD&$F) -M3@A,B;7H````Z>@#``!FD$F-1A!(BTPD$$B+40A(B4$(28E.$$B)4`A(B0+I -MQ0,``$2)Z&;!Z`4/M\"+1(5<1(GI@^$?2-/XJ`$/A:8#``!!#[?52(N%D`D` -M`$B+!-!F@7@@A0`/A[,```!(#[=0(("\*D`(``#_#X2@````9H-X(']W(D@/ -MMH0J0`@``$B+E1@)``!(:<"(`0``2(M$$$@/ME`(ZWQ!#[?52(N%D`D``$B+ -M!-!F@7@@@0!W)T@/MT`@2`^VA"A`"```2(N5:`D``$AIP,@/``!(BT00"`^V -M4`CK/D$/M]5(BX60"0``2(L$T$@/MT`@2`^VA"A`"```2(N50`D``$AIP-`` -M``!(BX00B`````^V4`CK!;K_____@/K_=`T/ML*`O"C&"```_W5&1(GH9L'H -M!0^WP(M$A5Q$B>F#X1](T_BH`0^%H@(``$'&1B0&O@````!,B??H`````+H` -M````3(GV2(GOZ`````#I>P(```^VPD@/MIPHQ@@``$AIVZ@```!(C9PKH`$` -M`$B%_W0(]\8```(`=06_`````/9#"@(/A($!``!!#[?U2(GZ2(G?Z`````!$ -MB>AFP>@%#[?`BT2%7$2)Z8/A'TC3^*@!#X46`@``08!^)($/A9$```!)#[=6 -M,DB+A9`)``!(QP30`````$$/MTXRB@%#[?`@^$?N@$```!(T^)(B='W -MT2&,A9@)``!!#[=V,DB-O5@/``#H`````$R)]DB)[^@`````28.^@`````!T -M#TF-MH````!(B>_H`````$B+A>@```!,B7`(28D&2(M,)!A)B4X(3(FUZ``` -M`.EZ`0``0;\`````QD0D(`!(BX7X````2#E$)!!T$DB-E?@```!!_\=(BP!( -M.<)U]46$_W0\2(M<)`A(B=_H`````$B-2/!(BU,(2(E#"$B)&$B)4`A(B0), -M.?&X`0````^V5"0@#T30B%0D($'^SW7)@'PD(``/A0,!``!)C4802(M,)!!( -MBU$(2(E!"$F)3A!(B5`(2(D"1(GH9L'H!0^WP$2)Z8/A'[H!````2-/B"92% -MG````.G#````00^W]4B)^DB)W^@`````0;\`````QD0D(`!(BX7X````2#E$ -M)!!T$DB-E?@```!!_\=(BP!(.<)U]46$_W0[2(L<)$B)W^@`````2(U(\$B+ -M4PA(B4,(2(D82(E0"$B)`DPY\;@!````#[9,)"`/1,B(3"0@0?[/=AFP>@% -M#[?`1(GI@^$?N@$```!(T^()E(6<````9D0YI3H2```/A8SY__](C87X```` -M2(G"2#F%^````'130;P!````9F:02(G32(G7Z`````!(C7#P#[=.,HG(9L'H -M!0^WP(/A'TR)XDC3XDB)T??1(8R%G````+H`````2(GOZ`````!(B=I(.9WX -M````=;9(B>_H`````+@!````2(/$2%M=05Q!74%>05_#9F9FD&9FD&9FD$B# -M["A(B5PD"$B);"003(ED)!A,B6PD(&;'1"0&``!(BZ_0"```0;P`````3(UL -M)`9(BT4`BX!0`0``B04`````2(M5`(F"4`$``(7`="%(BT4`QX!0`0```0`` -M`$ECW$B)[^@`````08A$'0!F9I!(@<4`%```0?_$08/\`7ZQ@'PD!@!U#+@` -M````@'PD!P!T!;@!````2(M<)`A(BVPD$$R+9"083(ML)"!(@\0HPV9F9I!F -M9F:09F9FD&9FD$%7059!54%455-(@^P(2(G]28GUN0````!F#[9'0XG&9H/X -M`'8;20^V50UF9I!FD$B)T$C3^*@!=0?_P68YSG?O28-]0`!T($F+=4!(@<:0 -M````2(M]*.@`````28MU0$B)[^@`````28U%8$B)PDDY16`/A&P`/A*````!!O`````!F@WU8 -M``^$CP```$&_`0```$ECU$B+A9`)``!(BS302(7V=&8/MT8@9CM#,'5<9CV% -M`'=6#[?`@+PH0`@``/]T24B+50`/MT8R9L'H!0^WP(T$A0`#``")@G`!``!( -MBT4`#[=.,H/A'TR)^DC3XHF0=`$``,9&)"&Z`````$B)[^@`````9F:09I!! -M_\0/MT581#G@#X]W____2(M#.$C'0&``````]D-$!'4C_H7O$P``2(GOZ``` -M``!(BT,X#[9P`;H!````2(GOZ`````!(BT,X#[90`@^V<`%(Q\<`````N``` -M``#H`````$B+4SA(B[70"```OP$```#H`````$B+4SA(B[70"```OP8```#H -M`````$C'0S@`````0?Y-#DB)WDB)[^@`````3(GR33EU8`^%H/[__TG'14`` -M````2(M%`(N(6`$``(D-`````(7)=`I(BT4`B8A8`0``2(/$"%M=05Q!74%> -M05_#9F9FD&9F9I!F9I!!5%532(G]28GTNP````"`?T,`=AY(#[96#69FD&9F -MD$B)T(G92-/XJ`%U!__#.%U#=^U!]D0D#`)U#$F-1"1@23E$)&!U:4R)Y^@` -M````A,!T4$B)[^@`````2(G&2(7`=$U)C40D8$B+4`A(B7`(2(D&2(E6"$B) -M,D'^1"0.3(EF2,9&0`7&1D$`QD9Y#[D!````N@$```!,B>?H`````.L-#[;S -M2(GOZ`````!FD%M=05S#9F9FD&9F9I!F9I!(@^PH2(D<)$B);"0(3(ED)!!, -MB6PD&$R)="0@28G]28GT3(NVB`````^V5D=(B?Y,B??H`````$B)Q69!@TPD -M3A"[`````&9!#[9%0XG&9H/X`'8>20^V5@UF9I!F9I!(B=")V4C3^*@!=0?_ -MPV8YWG?M9H/[`W8G2(T$G0`````E_/\#`$F+50"+A`+0`0``B04`````J0`` -M$`!U-^LE2(T$G0`````E_/\#`$F+50"+A`+0`0``B04`````J0``$`!U$`^V -M\TR)[^@`````Z9L!``!)C49@23E&8`^$C0$``$B%[0^$A`$``$@/MD5Y2<=$ -MQ%@`````2(M5"$B+10!(B5`(2(D"2(GJO@8```!,B??H`````(!]>P!T&9!, -MB>_H`````+\!````Z`````"`?7L`=>A(@WTX`'132(M%.$C'0&``````]D5$ -M!'4/0?Z%[Q,``$R)[^@`````2(M5.$F+M=`(``"_`0```.@`````2(M5.$F+ -MM=`(``"_!@```.@`````2,=%.`````!!_DX.2(GN3(GOZ`````!)BT4`BY!8 -M`0``B14`````A=)T"DF+10")D%@!``!!QD0D0@!F08-D)$[ONP````!!@'PD -M.P!T(69!#[94)#L/M\-)BVS$6$B%[70&@'U"_W5]_\-F.=IWYD'V1"1.@'0- -M3(GF3(GOZ`````#K8;L`````08!\)#L`=$)F9F:0#[?#28MLQ%A(A>UT(_9% -M1`)T'4B+53A)B[70"```OP8```#H`````(!E1/UF9F:0_\-F00^V1"0[9CG8 -M=\)F0<=$)$X"`$&`9"1)_69F9I!(BQPD2(ML)`A,BV0D$$R+;"083(MT)"!( -M@\0HPV9FD$B#[`A(BX:(````N0````"`?T,`=AM(#[90#69FD&:02(G02-/X -MJ`%U!__!.$]#=^_&1D(,Z`````!(@\0(PY!!54%455-(@^P(28G\B?6[```` -M`$B-!*T`````28G%08'E_`,``+\0)P``Z`````!`@/T#=AM)BP0D0HN$*-`! -M``")!0````"I```0`'4DZQE)BP0D0HN$*-`!``")!0````"I```0`'4)_\-F -M@?OS`7:S0`^V]4R)Y^@`````3(GGZ`````")Z@^VPDAKP&A,`>#V@&@2```! -M=`](B[!($@``3(GGZ`````!(@\0(6UU!7$%=PV9F9I!F9I!F9I!(@^PH2(E< -M)`A(B6PD$$R)9"083(EL)"!(B10D3(LG#[?V28N$))`)``!(BQSP0;T````` -MO0````!F@7LXX0%U'P^V0SJ#Z!$\`7<42(MO0$B%TG5*QD51`.M$9F:09I!) -MBY0D&`D``$R-JGB&`0!F@7L@A0!W&4@/MT,@2@^VA"!`"```2&G`B`$``$R- -M+`)(@SPD`'4(0<:%X`````"`>R2!=0N`9PSW9F9FD&9FD$B#/"0`#X7[```` -MQD,D`/:#E@```"`/A!8"``!(BVMH2(7M#X0)`@``]H6I`````G0D2(.]H``` -M``!T&DB#>T@`=!-(B[V@````BU,T2(MS2.@`````00^V16K!X`A(F$F+E"3` -M$```BX0"0`@``(D%`````(G"P>H0B)6;````P>@89HF%D````$$/MD5JP>`( -M2)A)BY0DP!```(N4`D0(``")%0````!F#[;"9HF%E`````^VQF:)A98```") -MT,'H$&8/ML!FB868````P>H8B)6:````00^V16K!X`A(F$F+E"3`$```BX0" -M3`@``(D%`````&8/ML!FB862````Z2P!``"`>R2`=03&0R0A2(LT)$C'QP`` -M``"X`````.@`````9H%[..$!=1@/MD,Z@^@1/`%W#4B)[^@`````Z>T```#V -M1"0#`71YBT,X)?___P`]X0$.`'1J00^V16K!X`A(F$F+E"3`$```BX0"0`@` -M`(D%`````$$/MD5JP>`(2)A)BY0DP!```(N$`D0(``")!0````!!#[9%:L'@ -M"$B828N4),`0``"+A`)("```B04`````2(G>3(GGZ`````#K;8!\)`,`>21) -MBP0DBX!8`0``B04`````B<&%P'1028L$)(F(6`$``.M$9I"`/"0`>#R`?"0' -M`'DU28L4)`^W0S)FP>@%#[?`C02%``,``(F"<`$``$F+%"0/MTLR@^$?N`$` -M``!(T^")@G0!``!(BUPD"$B+;"003(MD)!A,BVPD($B#Q"C#D)"0D)!(@^PH -M2(E<)`A(B6PD$$R)9"083(EL)"!(B?-)B?Q$#[9N)$B+EQ@)``!(C:IXA@$` -M9H%^((4`=QE(#[=&($@/MH0X0`@``$AIP(@!``!(C2P"183M=2!FQX7````` -M``"`>S@<=1&`>SH"=0M(B=Y(B>_H`````$B#>W@`=!)(C7-X3(GGZ`````!F -M9I!F9I!(B=Y,B>?H`````$&`_09T/4B-G5@!``!)BWPD*$B)WN@`````QX58 -M`0``@(0>`$C'A6@!````````2(FM<`$``$F+?"0H2(G>Z`````!(BUPD"$B+ -M;"003(MD)!A,BVPD($B#Q"C#9F:09F:09F:02(/L*$B)'"1(B6PD"$R)9"00 -M3(EL)!A,B70D($B)_4B%_P^$PP```$B+1TA,BRA,B>_H`````$B)PTR-<%A( -MA<`/A*0```!,B>_H`````$F)Q$B%P'402(G>3(GOZ`````#IA````,9#):P/ -MMT4P9HE#($R):RC'@Y0````(````3(EC>$F+1"002(E#2,=#-``(``!(C87D -M````2(E#4,9#,"!(QX.@`````````,9#.!S&0SD!QD,Z`L9#.PC&0SP`O@`` -M``!,B??H`````(M3-$F+="083(GWZ`````!(B=Y,B>_H`````$B+'"1(BVPD -M"$R+9"003(ML)!A,BW0D($B#Q"C#9F9FD&9F9I!!5T%6055!5%532(/L"$F) -M_TF)]4&)UDB+1TA(BRA!O`````!$B>(/ML(/MH0H0`@``#S_=$L/ML!(:=B( -M`0``2(G?2`.]&`D``$B!Q\P```"Z"````$F-=0SH`````(3`=!Y(BX48"0`` -M1(BT`P8!``!(BX48"0``3(F\`Q@!``!!_L1YGDB#Q`A;74%<05U!7D%?PV9F -M9I!F9F:09F:02(/L2$B)7"082(EL)"!,B60D*$R);"0P3(ET)#A,B7PD0$B) -M?"003(MV2$$/MD8"08G%0<'E"&9!#[9&`T$!Q4$/M\6#P`0/MU8T.=`/C]L` -M``!)C5X(0;\`````00^WQ4J-1#`$2#G8#X:P````D`^V`X3`#XB%````@^`/ -M/`9U?O9#`\!T!O9#!Y( -MBWPD$.@`````2(/%'$'_Q$0X8P1WXNL]2(UK!$&\`````(![`@!V+4$/ML>) -M1"0,9F:09I"+5"0,2(GN2(M\)!#H`````$B#Q1Q!_\1$.&,"=^)FD$'_QT@/ -MMD,!2(U<&`)!#[?%2HU$,`1(.=@/AU'___^^`0```$B+?"00Z`````!(BUPD -M&$B+;"0@3(MD)"A,BVPD,$R+="0X3(M\)$!(@\1(PV9F9I!F9F:09F9FD&9F -MD$&)RTB+1TA,BPBY`````$2-%!8/ML%"#[:$"$`(```\_W0]#[;`28N1&`D` -M`$QIP(@!``!!.+00!@$``'4B23F\$!@!``!U&$6(E!`%`0``28N!&`D``$6( -MG``$`0``D/[!>:_SPV9F9I!F9I!F9I!(BW]0@+_`````3W`$B(PXR````/Z'P``` -M`//#9F9FD&9FD&9FD$%7059!54%455-(@^P(28G_2(M.2`^V00+!X`AF#[91 -M`P'0#[?`@\`$#[=6-#G0#X\%`0``2(U1",9$)`<`0;X`````#[9)`0^V0@(` -M1"0'2`^V0@-(C50"!$'_QD0X\7/F2(G50;T`````0;X`````1#IT)`),B?_H```` -M`/_#1#CK05_#9F9FD&9FD$B#["A)B?E!N/__ -M__](B>?\N0(```"X`````/-(J\<'`````&8Y\7-59F9FD&9FD&:#^0YW"P^W -MT4(/M@0*B`04#[?!0@^V!`B#Z#`\"7<$2(V\+]@````/MM))C74$Z`````"0_\.# -M^T]^F4B#Q`A;74%<05W#9F9FD&9F9I!F9I!F9I!!5T%6055!5%532(/L*$B) -M?"0@0;T`````2(M&2$B)1"08#[9``HG!P>$(2(M4)!AF#[9"`P'!#[?!@\`$ -M#[=6-#G0#X\7`0``3(MD)!A)@\0(QD0D%P`/M\%(BU0D&$B-1!`$3#G@#X;D -M````#[?!2(U$$`1(B40D"`^WR4B)#"1!#[9$)`+!X`AF00^V5"0#1(TT`D$/ -MM_9)C7PD!.@`````//]U:4&)Q4$/M\9*C5P@!$@Y7"0(=FU(BP0D2(M4)!A, -MC7P0!`^V0P+!X`AF#[93`XTL`@^W]4B->P3H`````#S_=0Y!@/W_=3I!O0`` -M``#K,D0XZ$0/0N@/M\5(C5P8!$DYWW>_ZQQF9I!FD(G"1"CJ#[;2#[9T)!=( -MBWPD(.@`````#[94)!=,B>9(BWPD(.@`````_D0D%T$/M\9.C60@!$PY9"0( -M#X05_#D%-(B?M(BTY( -M#[9!`L'@"&8/ME$#`=`/M\"-4`0/MT8T.<)_'TB+OR`!``!(8])(B<[H```` -M`+X`````2(G?Z`````!;PV9F9I!F9F:09F:02(/L.$B)7"0(2(EL)!!,B60D -M&$R);"0@3(ET)"A,B7PD,$F)]4F)_@^V1B2(1"0'9H%^((4`#X>K````2`^W -M1B"`O#A`"```_P^$F````&:#?B!_=RI(#[:$.$`(``!(BY<8"0``2&G`B`$` -M`$B+1!!(2`^V0`A(!<`(``#K;9!F@7X@@0!W+D@/MT8@2`^VA#A`"```2(N7 -M:`D``$AIP,@/``!(BT00"$@/MD`(2`7`"```ZS9(#[=&($@/MH0X0`@``$B+ -MET`)``!(:<#0````2(N$$(@```!(#[9`"$@%P`@``.L%N+\)``!-#[9\!@9- -M:?^H````3XV\-Z`!``!)BY88"0``2(VJ>(8!`&9!@7T@A0!W&4D/MT4@2@^V -MA#!`"```2&G`B`$``$B-+`*`?"0'``^%-`(``&;'A<```````$&`?3@<#X4@ -M`@``00^V13J#^`)T48/X`G\*@_@!="?I!P(``(/X!V9F9I!T*8/X"@^%]0$` -M`$R)[DB)[^@`````Z>4!``!,B>Y(B>_H`````.G5`0``3(GN2(GOZ`````#I -MQ0$``$R)[DB)[^@`````2(V=6`$``$B+14A(BP!(BW@H2(G>Z`````#'A5@! -M``"`A!X`2,>%:`$```````!(B:UP`0``2(M%2$B+`$B+>"A(B=[H`````)#& -M14+_0;P`````08!_#@`/AJ\```!)C5]@9F9FD&9FD$B)W^@`````2(G%2(M# -M"$B):PA(B5T`2(E%"$B)*(!]0O]T;(!]00!U;8"]X0`````/A!D!``!(#[9% -M0*@"=`RH!'0(J`$/A=(```!(#[9%0*@"=0RH!'0(J`$/A=(```!(#[9%0*@" -M#X3B````J`0/A-H```"H`0^%T@```$B)[DR)]^@`````Z<(```!FD,:%X0`` -M``!!_\1%.&<.#X=<____13AG#G570;P`````08!_#@!V2DF-7V!F9I!FD$B) -MW^@`````2(G%2(M#"$B):PA(B5T`2(E%"$B)*(!]0O]T%`^V14$\(@^4PCP- -M#Y3`"="H`75*0?_$13AG#G>_0<9'"?],B?Y,B??H`````(!\)`<`#X6%```` -MZS(/ME5Y2(MU4$B)Z4R)_^@`````ZQU(B>Y,B??H`````&:0ZPZ^"@```$B) -M[^@`````D$F#?7@`=`Q)C75X3(GWZ`````!,B>Y,B??H`````(!\)`<`="QF -M_X7`````9H.]P`````IV#F;'A<```````.E,_O__O@H```!(B>_H`````$B+ -M7"0(2(ML)!!,BV0D&$R+;"0@3(MT)"A,BWPD,$B#Q#C#9F9FD&9F9I!F9F:0 -M2(/L.$B)7"0(2(EL)!!,B60D&$R);"0@3(ET)"A,B7PD,$B)_4&)]TB+1TA, -MBRA,B>_H`````$B)PTR-<%A(A<`/A*0```!,B>_H`````$F)Q$B%P'402(G> -M3(GOZ`````#IA````,9#):P/MT4P9HE#($R):RC'@Y0````(````3(EC>$F+ -M1"002(E#2,=#-``(``!(C87D````2(E#4,9#,"!(QX.@`````````,9#.!S& -M0SD!1(A[.L9#.PC&0SP`O@````!,B??H`````(M3-$F+="083(GWZ`````!( -MB=Y,B>_H`````$B+7"0(2(ML)!!,BV0D&$R+;"0@3(MT)"A,BWPD,$B#Q#C# -M9I!(@^PX2(E<)`A(B6PD$$R)9"083(EL)"!,B70D*$R)?"0P28G]2(M'2$R+ -M,$B+ER`!```/MD("BY,B??H`````.F: -M````3(UE6$B+>!`/M]N#PP1(8]-)B[4@`0``Z`````#&126L00^W13!FB44@ -M3(EU*(E=-(.-E````!))BT<02(E%2$R)?7A)C87D````2(E%4,9%,"!(QX6@ -M`````````,9%.!W&13D0QD4Z`@^VQXA%.XA=/+X`````3(GGZ`````"+531) -MBW<83(GGZ`````!(B>Y,B??H`````$B+7"0(2(ML)!!,BV0D&$R+;"0@3(MT -M)"A,BWPD,$B#Q#C#9F9FD&9F9I!F9I!328G208G+2(M'2$R+`$R+3U"[```` -M``^VPT(/MI0`0`@``(#Z_W18#[;"28N(&`D``$AIP(@!``!(.;P(&`$``'4] -M0#BT"`4!``!U,T6$VW0-2(N$"!`!``!)B0+K)0^VPDF+B!@)``!(:<"(`0`` -M28L22(F4"!`!``#K!V9FD/[#>9.[`````&9F9I!F9I`/ML-(C01`2,'@!$J- -M/`A(C8_`````#[91"(#Z`0^7P(#Z%P^5P@^VP(7"=#-`.'$)=2U%A-MT#$B+ -MA]````!)B0+K(P^VPTB-!$!(P>`$28L22HF4"-````#K"V9F9I#_PX#[3W:9 -M6\-F9F:09F:02(/L*$B)7"0(2(EL)!!,B60D&$R);"0@28G\B?%(BY<@`0`` -M#[9"`HG'P><(9@^V0@,!QP^WQX/`!#T`"```?V1`A/9T#D$/MH0D"`$``(A" -M`>L,#[9"`4&(A"0(`0``2(U""$B)!"2[``````^WQTB-1!`$2#L$)'8J1`^V -MZ0^WQTB-;!`$#[;S1(GI2(GB3(GGZ`````#_PTB#!"0$2#LL)'?B2(M<)`A( -MBVPD$$R+9"083(ML)"!(@\0HPV:02(/L&$B)7"0(2(EL)!!(B?N)U4C'!"0` -M````@']#`70_0`^V]KD!````2(GBZ`````!(@SPD`'0G2(L$)(`(@$"$[70+ -M2(L$)(!(`R#K"9!(BP0D@&`#WTB)W^@`````2(M<)`A(BVPD$$B#Q!C#D$B# -M[!A(B1PD2(EL)`A,B60D$$B)\TF)_$B+;FAF@7X@A0`/AY@```!(#[=&(("\ -M.$`(``#_#X2%````9H-^(']W(D@/MH0X0`@``$B+EQ@)``!(:<"(`0``2(M$ -M$$@/ME`(ZV%F@7X@@0!W)T@/MT8@2`^VA#A`"```2(N7:`D``$AIP,@/``!( -MBT00"`^V4`CK,D@/MT8@2`^VA#A`"```2(N70`D``$AIP-````!(BX00B``` -M``^V4`CK"&9FD+K_____N?____]F@7L@A0!W#D@/MT,@0@^VC"!`"```@/K_ -M="$/ML)"@+P@Q@@``/\/E,*`^?\/E,`)T*@!=0:`>R0&=3I(@WMX`'032(US -M>$R)Y^@`````9F9FD&9FD$B)WDR)Y^@`````QT50_____TB)[_]52.MV9F:0 -M9F:0@'LD`'4[]H.4````"&9FD'002(M],(M3-$B+$R)Y^@`````2(G>3(GGZ`````!FD$B+'"1(BVPD"$R+9"002(/$&,-F -M9F:09F:09F:09F:02(/L2$B)7"082(EL)"!,B60D*$R);"0P3(ET)#A,B7PD -M0$B)_4&)UT&)SDR)1"0(0(AT)!=(BT=(3(LH3(GOZ`````!(B<-(C4!82(D$ -M)$B%VP^$V````$R)[^@`````28G$2(7`=1!(B=Y,B>_H`````.FX````QD,E -MK`^W13!FB4,@2(M4)`A(B5-H3(EK*,>#E`````@```!,B6-X28M$)!!(B4-( -M1(ES-$B-A>0```!(B4-0QD,P($C'@Z``````````QD,X/,9#.0(/MD0D%XA# -M.D2)^,'H$(A#.TR)^@^VQHA#/$2(>SU$B?#!Z!"(0SY,B?(/ML:(0S]$B'-` -MQD-!`+X`````2(L\).@`````BU,T28MT)!A(BSPDZ`````!(B=Y,B>_H```` -M`$B+7"082(ML)"!,BV0D*$R+;"0P3(MT)#A,BWPD0$B#Q$C#9F9FD&9FD&9F -MD&9FD$B#[$A(B5PD&$B);"0@3(ED)"A,B6PD,$R)="0X3(E\)$!)B?R)TT&) -MSDR)1"0(0(AT)!=(BT=(3(LX3(G_Z`````!(B<5(A<`/A.X```!,B?_H```` -M`$F)Q4B%P'412(GN3(G_Z`````#IS@```)!(C4582(D$)$F+?1!$B?))B[0D -M(`$``.@`````QD4EK$$/MT0D,&:)12!(BU0D"$B)56A,B7TH1(EU-(.-E``` -M`!))BT402(E%2$R);7A)C80DY````$B)15#&13`@2,>%H`````````#&13@[ -MQD4Y`@^V1"07B$4ZB=C!Z!"(13L/ML>(13R(73U$B?#!Z!"(13Y,B?(/ML:( -M13]$B'5`QD5!`+X`````2(L\).@`````BU4T28MU&$B+/"3H`````$B)[DR) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 17:54:25 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5DC66987; Tue, 23 Jun 2015 17:54:25 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 44CB1771; Tue, 23 Jun 2015 17:54:25 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NHsPOi065638; Tue, 23 Jun 2015 17:54:25 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5NHsPvC065637; Tue, 23 Jun 2015 17:54:25 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201506231754.t5NHsPvC065637@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 23 Jun 2015 17:54:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284732 - head/lib/libcxxrt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 17:54:25 -0000 Author: dim Date: Tue Jun 23 17:54:24 2015 New Revision: 284732 URL: https://svnweb.freebsd.org/changeset/base/284732 Log: Add __cxa_deleted_virtual to libcxxrt's version map. This symbol can sometimes be emitted by clang++, and was not yet exported from libcxxrt. Attempt to be compatible with libsupc++ by using the same CXXABI_1.3.6 symbol version. Reported by: yuri@rawbw.com PR: 200863 Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D2850 Modified: head/lib/libcxxrt/Version.map Modified: head/lib/libcxxrt/Version.map ============================================================================== --- head/lib/libcxxrt/Version.map Tue Jun 23 17:26:46 2015 (r284731) +++ head/lib/libcxxrt/Version.map Tue Jun 23 17:54:24 2015 (r284732) @@ -254,6 +254,10 @@ CXXABI_1.3.1 { __cxa_get_exception_ptr; } CXXABI_1.3; +CXXABI_1.3.6 { + __cxa_deleted_virtual; +} CXXABI_1.3.1; + CXXRT_1.0 { @@ -286,7 +290,7 @@ CXXRT_1.0 { __cxa_increment_exception_refcount; __cxa_rethrow_primary_exception; -} CXXABI_1.3.1; +} CXXABI_1.3.6; GLIBCXX_3.4 { From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 18:40:21 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2B9BFB12; Tue, 23 Jun 2015 18:40:21 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1A26D1B2; Tue, 23 Jun 2015 18:40:21 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NIeK5E087338; Tue, 23 Jun 2015 18:40:20 GMT (envelope-from jmg@FreeBSD.org) Received: (from jmg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5NIeKpU087337; Tue, 23 Jun 2015 18:40:20 GMT (envelope-from jmg@FreeBSD.org) Message-Id: <201506231840.t5NIeKpU087337@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jmg set sender to jmg@FreeBSD.org using -f From: John-Mark Gurney Date: Tue, 23 Jun 2015 18:40:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284733 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 18:40:21 -0000 Author: jmg Date: Tue Jun 23 18:40:20 2015 New Revision: 284733 URL: https://svnweb.freebsd.org/changeset/base/284733 Log: zero this struct as it depends upon it... Reviewed by: mjg Differential Revision: https://reviews.freebsd.org/D2890 Modified: head/sys/kern/vfs_subr.c Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Tue Jun 23 17:54:24 2015 (r284732) +++ head/sys/kern/vfs_subr.c Tue Jun 23 18:40:20 2015 (r284733) @@ -3602,7 +3602,7 @@ v_addpollinfo(struct vnode *vp) if (vp->v_pollinfo != NULL) return; - vi = uma_zalloc(vnodepoll_zone, M_WAITOK); + vi = uma_zalloc(vnodepoll_zone, M_WAITOK | M_ZERO); mtx_init(&vi->vpi_lock, "vnode pollinfo", NULL, MTX_DEF); knlist_init(&vi->vpi_selinfo.si_note, vp, vfs_knllock, vfs_knlunlock, vfs_knl_assert_locked, vfs_knl_assert_unlocked); From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 18:48:41 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E8485C3B; Tue, 23 Jun 2015 18:48:41 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D5596CE0; Tue, 23 Jun 2015 18:48:41 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NImf9p091868; Tue, 23 Jun 2015 18:48:41 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5NImf5O091867; Tue, 23 Jun 2015 18:48:41 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201506231848.t5NImf5O091867@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 23 Jun 2015 18:48:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284736 - head/sys/net X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 18:48:42 -0000 Author: dim Date: Tue Jun 23 18:48:41 2015 New Revision: 284736 URL: https://svnweb.freebsd.org/changeset/base/284736 Log: Fix endless recursion in sys/net/if.c's drbr_inuse_drv(), found by clang 3.7.0. Reviewed by: marcel Modified: head/sys/net/if.c Modified: head/sys/net/if.c ============================================================================== --- head/sys/net/if.c Tue Jun 23 18:46:29 2015 (r284735) +++ head/sys/net/if.c Tue Jun 23 18:48:41 2015 (r284736) @@ -4005,7 +4005,7 @@ if_setgetcounterfn(if_t ifp, if_get_coun int drbr_inuse_drv(if_t ifh, struct buf_ring *br) { - return drbr_inuse_drv(ifh, br); + return drbr_inuse(ifh, br); } struct mbuf* From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 20:01:13 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ACBACF2E; Tue, 23 Jun 2015 20:01:13 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9AB0E904; Tue, 23 Jun 2015 20:01:13 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NK1DlP030603; Tue, 23 Jun 2015 20:01:13 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5NK1DSO030602; Tue, 23 Jun 2015 20:01:13 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201506232001.t5NK1DSO030602@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Tue, 23 Jun 2015 20:01:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284738 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 20:01:13 -0000 Author: sjg Date: Tue Jun 23 20:01:12 2015 New Revision: 284738 URL: https://svnweb.freebsd.org/changeset/base/284738 Log: Remove entry about make.conf - no longer relevant Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Jun 23 18:55:08 2015 (r284737) +++ head/UPDATING Tue Jun 23 20:01:12 2015 (r284738) @@ -32,23 +32,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 "ln -s 'abort:false,junk:false' /etc/malloc.conf".) 20150616: - /etc/make.conf now included earlier. - sys.mk now includes /etc/make.conf and {local,src}.sys.mk earlier - than previously. - This makes it simple to interpose external toolchains etc. - However it may cause problems for users who have things like:: - - INSTALL+= something - - in /etc/make.conf, since INSTALL is not yet defined. - A safe fix for that is to have:: - - INSTALL?= install - INSTALL+= something - - which is equivalent to previous behavior. - -20150616: FreeBSD's old make (fmake) has been removed from the system. It is available as the devel/fmake port or via pkg install fmake. From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 20:09:53 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81378F8E; Tue, 23 Jun 2015 20:09:53 +0000 (UTC) (envelope-from davidcs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6FA7ECB7; Tue, 23 Jun 2015 20:09:53 +0000 (UTC) (envelope-from davidcs@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NK9rhL034643; Tue, 23 Jun 2015 20:09:53 GMT (envelope-from davidcs@FreeBSD.org) Received: (from davidcs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5NK9rmL034642; Tue, 23 Jun 2015 20:09:53 GMT (envelope-from davidcs@FreeBSD.org) Message-Id: <201506232009.t5NK9rmL034642@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: davidcs set sender to davidcs@FreeBSD.org using -f From: David C Somayajulu Date: Tue, 23 Jun 2015 20:09:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284739 - head/sys/dev/bxe X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 20:09:53 -0000 Author: davidcs Date: Tue Jun 23 20:09:52 2015 New Revision: 284739 URL: https://svnweb.freebsd.org/changeset/base/284739 Log: tx_mtx should be grabbed before calling buf_ring_dequeue_sc() Submitted by:Attilio.Rao@isilon.com MFC after:5 days Modified: head/sys/dev/bxe/bxe.c Modified: head/sys/dev/bxe/bxe.c ============================================================================== --- head/sys/dev/bxe/bxe.c Tue Jun 23 20:01:12 2015 (r284738) +++ head/sys/dev/bxe/bxe.c Tue Jun 23 20:09:52 2015 (r284739) @@ -6547,10 +6547,14 @@ bxe_free_fp_buffers(struct bxe_softc *sc #if __FreeBSD_version >= 800000 if (fp->tx_br != NULL) { - struct mbuf *m; /* just in case bxe_mq_flush() wasn't called */ - while ((m = buf_ring_dequeue_sc(fp->tx_br)) != NULL) { - m_freem(m); + if (mtx_initialized(&fp->tx_mtx)) { + struct mbuf *m; + + BXE_FP_TX_LOCK(fp); + while ((m = buf_ring_dequeue_sc(fp->tx_br)) != NULL) + m_freem(m); + BXE_FP_TX_UNLOCK(fp); } buf_ring_free(fp->tx_br, M_DEVBUF); fp->tx_br = NULL; From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 22:22:38 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F24348E4; Tue, 23 Jun 2015 22:22:37 +0000 (UTC) (envelope-from davidcs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD9D7948; Tue, 23 Jun 2015 22:22:37 +0000 (UTC) (envelope-from davidcs@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NMMbeT010683; Tue, 23 Jun 2015 22:22:37 GMT (envelope-from davidcs@FreeBSD.org) Received: (from davidcs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5NMMbQx010681; Tue, 23 Jun 2015 22:22:37 GMT (envelope-from davidcs@FreeBSD.org) Message-Id: <201506232222.t5NMMbQx010681@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: davidcs set sender to davidcs@FreeBSD.org using -f From: David C Somayajulu Date: Tue, 23 Jun 2015 22:22:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284741 - in head/sys: dev/qlxgbe modules/qlxgbe X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 22:22:38 -0000 Author: davidcs Date: Tue Jun 23 22:22:36 2015 New Revision: 284741 URL: https://svnweb.freebsd.org/changeset/base/284741 Log: Updated Copyright information Added support for the following: - iSCSI TLV (requires 64 Tx and 32 Rx rings - 9K receive buffers for jumbo frames (feature may be enabled/disabled) - builtin firmware, bootloader and minidump template - quick stats - async event handling for SFP insertion/removal and DCBX changes - Configuring DCBX and interrupt coalescing parameters Added: head/sys/dev/qlxgbe/ql_boot.c (contents, props changed) head/sys/dev/qlxgbe/ql_fw.c (contents, props changed) head/sys/dev/qlxgbe/ql_minidump.c (contents, props changed) Modified: head/sys/dev/qlxgbe/ql_dbg.c head/sys/dev/qlxgbe/ql_dbg.h head/sys/dev/qlxgbe/ql_def.h head/sys/dev/qlxgbe/ql_glbl.h head/sys/dev/qlxgbe/ql_hw.c head/sys/dev/qlxgbe/ql_hw.h head/sys/dev/qlxgbe/ql_inline.h head/sys/dev/qlxgbe/ql_ioctl.c head/sys/dev/qlxgbe/ql_ioctl.h head/sys/dev/qlxgbe/ql_isr.c head/sys/dev/qlxgbe/ql_misc.c head/sys/dev/qlxgbe/ql_os.c head/sys/dev/qlxgbe/ql_os.h head/sys/dev/qlxgbe/ql_reset.c head/sys/dev/qlxgbe/ql_tmplt.h head/sys/dev/qlxgbe/ql_ver.h head/sys/modules/qlxgbe/Makefile Added: head/sys/dev/qlxgbe/ql_boot.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/qlxgbe/ql_boot.c Tue Jun 23 22:22:36 2015 (r284741) @@ -0,0 +1,10964 @@ +/* + * Copyright (c) 2012-2016 Qlogic Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE 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. + */ + +/* + * File: ql_boot.c + */ +#include +__FBSDID("$FreeBSD$"); + +#include "ql_os.h" + +unsigned int ql83xx_bootloader_version_major = 5; +unsigned int ql83xx_bootloader_version_minor = 2; +unsigned int ql83xx_bootloader_version_sub = 7; +unsigned char ql83xx_bootloader[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x04, 0x00, 0x80, 0x82, 0x05, 0x1f, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x1e, 0x02, 0x21, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x20, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x21, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2f, 0x00, 0x7c, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xf7, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x83, 0x14, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xf0, 0x03, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 0x3e, 0x1a, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x04, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, + 0x00, 0x00, 0xc4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00, + 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x10, 0x0c, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x68, 0x00, 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x00, 0x10, + 0x00, 0x00, 0x06, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0x0a, 0x30, 0x84, 0x42, 0x41, 0x28, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x20, 0x00, 0x00, 0x0a, 0x1a, 0x00, 0x00, + 0x00, 0x00, 0x20, 0x00, 0x20, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x5a, 0x05, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfd, 0x1f, 0x00, 0x20, 0x50, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x11, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x0e, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x2b, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x48, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x57, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x65, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x82, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x91, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x9f, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xae, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0xbc, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xcb, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0xd9, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xe8, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0xf6, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x05, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x13, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x22, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x30, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3f, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x4d, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x5c, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x6a, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x87, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x96, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0xa4, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xb3, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0xc1, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xd0, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0xde, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xed, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0xfb, 0x01, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0a, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x18, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x27, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x35, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x44, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x52, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x61, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x6f, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7e, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x8c, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x9b, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0xa9, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xb8, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0xc6, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xd5, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0xe3, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xf2, 0x02, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x00, 0x03, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0f, 0x03, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x1d, 0x03, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x2c, 0x03, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x3a, 0x03, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x49, 0x03, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x57, 0x03, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x66, 0x03, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x74, 0x03, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x83, 0x03, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x91, 0x03, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x03, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x04, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x70, 0x01, + 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x05, 0x00, 0x00, 0x34, 0x00, + 0x00, 0x04, 0x00, 0xa0, 0x00, 0x00, 0x5a, 0x05, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xfe, 0x1f, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x30, 0x80, + 0x04, 0x00, 0x00, 0x00, 0x29, 0x32, 0x5e, 0x49, 0x11, 0x00, 0x84, 0x95, + 0x00, 0x00, 0x70, 0x80, 0x04, 0x00, 0x00, 0xd0, 0x28, 0x84, 0xd5, 0xca, + 0x4c, 0x01, 0x10, 0x91, 0x00, 0x00, 0xb0, 0x80, 0x04, 0x00, 0x00, 0xa0, + 0x6c, 0x1d, 0x3c, 0x3a, 0x00, 0x00, 0x84, 0x95, 0x00, 0x00, 0xf0, 0x80, + 0x04, 0x00, 0x00, 0xd0, 0x28, 0x84, 0xd5, 0xec, 0x6e, 0x01, 0xa0, 0x91, + 0x00, 0x00, 0x30, 0x81, 0x04, 0x00, 0x00, 0x00, 0x6a, 0x53, 0xc7, 0x2e, + 0x23, 0x00, 0x84, 0x95, 0x00, 0x00, 0x70, 0x81, 0x04, 0x00, 0x00, 0xd0, + 0x28, 0x84, 0xd5, 0x0e, 0x91, 0x01, 0x30, 0x92, 0x00, 0x00, 0xb0, 0x81, + 0x04, 0x00, 0x00, 0x00, 0x29, 0x32, 0x5e, 0x49, 0xd1, 0x00, 0x84, 0x95, + 0x00, 0x00, 0xf0, 0x81, 0x04, 0x00, 0x00, 0xd0, 0x28, 0x84, 0xd5, 0xca, + 0x4c, 0x01, 0x10, 0x91, 0x00, 0x00, 0x30, 0x82, 0x04, 0x00, 0x00, 0x50, + 0x49, 0x2e, 0x05, 0x29, 0x2d, 0x00, 0x84, 0x95, 0x00, 0x00, 0x70, 0x82, + 0x04, 0x00, 0x00, 0xd0, 0x28, 0x84, 0xd5, 0x52, 0xd5, 0x01, 0x50, 0x93, + 0x00, 0x00, 0xb0, 0x82, 0x04, 0x00, 0x00, 0x60, 0x3a, 0x5a, 0xa6, 0x6c, + 0x06, 0x00, 0x84, 0x95, 0x00, 0x00, 0xf0, 0x82, 0x04, 0x00, 0x00, 0xd0, + 0x28, 0x84, 0xd5, 0x74, 0xf7, 0x01, 0x60, 0x90, 0x00, 0x00, 0x30, 0x83, + 0x04, 0x00, 0x00, 0x00, 0x29, 0x32, 0x5e, 0x49, 0xd1, 0x01, 0x84, 0x95, + 0x00, 0x00, 0x70, 0x83, 0x04, 0x00, 0x00, 0xd0, 0x28, 0x84, 0xd5, 0xca, + 0x4c, 0x01, 0x10, 0x91, 0x00, 0x00, 0xb0, 0x83, 0x04, 0x00, 0x00, 0xa0, + 0xbf, 0xf1, 0x24, 0x36, 0x08, 0x00, 0x84, 0x95, 0x00, 0x00, 0xf0, 0x83, + 0x04, 0x00, 0x00, 0xd0, 0x28, 0x84, 0xd5, 0xb8, 0x3b, 0x00, 0x50, 0x91, + 0x00, 0x00, 0x30, 0x84, 0x04, 0x00, 0x00, 0x70, 0x10, 0xc7, 0x40, 0x14, + 0x00, 0x00, 0x84, 0x95, 0x00, 0x00, 0x70, 0x84, 0x04, 0x00, 0x00, 0xd0, + 0x28, 0x84, 0xd5, 0xda, 0x5d, 0x7e, 0x08, 0x90, 0x00, 0x00, 0xb0, 0x84, + 0x04, 0x00, 0x00, 0x60, 0x0c, 0x86, 0x30, 0x10, 0x1a, 0x00, 0x84, 0x95, + 0x00, 0x00, 0xf0, 0x84, 0x04, 0x00, 0x00, 0xd0, 0x28, 0x84, 0xd5, 0x3c, + 0x62, 0x7e, 0x88, 0x90, 0x00, 0x00, 0x30, 0x85, 0x04, 0x00, 0x00, 0x50, + 0x08, 0x45, 0x20, 0x0c, 0x23, 0x00, 0x84, 0x95, 0x00, 0x00, 0x70, 0x85, + 0x04, 0x00, 0x00, 0xd0, 0x28, 0x84, 0xd5, 0x42, 0x84, 0x7e, 0x08, 0x91, + 0x00, 0x00, 0xb0, 0x85, 0x04, 0x00, 0x00, 0x40, 0x04, 0x04, 0x10, 0x08, + 0x0c, 0x00, 0x84, 0x95, 0x00, 0x00, 0xf0, 0x85, 0x04, 0x00, 0x00, 0xd0, + 0x28, 0x84, 0xd5, 0x64, 0xa6, 0x7e, 0x88, 0x91, 0x00, 0x00, 0x30, 0x86, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x70, 0x86, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x86, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x86, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x30, 0x87, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x87, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x87, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xf0, 0x87, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x88, 0x04, 0x00, 0x00, 0x40, + 0x14, 0x46, 0x61, 0x1c, 0x20, 0x10, 0x35, 0x9a, 0x00, 0x00, 0x70, 0x88, + 0x04, 0x00, 0x00, 0xa0, 0x30, 0x62, 0x04, 0x2b, 0x6f, 0x7f, 0x88, 0x90, + 0x00, 0x00, 0xb0, 0x88, 0x04, 0x00, 0x00, 0x50, 0x18, 0x87, 0x71, 0x14, + 0x29, 0x10, 0x35, 0x9a, 0x00, 0x00, 0xf0, 0x88, 0x04, 0x00, 0x00, 0xa0, + 0x30, 0x62, 0x04, 0x4d, 0x91, 0x7f, 0x08, 0x91, 0x00, 0x00, 0x30, 0x89, + 0x04, 0x00, 0x00, 0x60, 0x1c, 0xc2, 0x01, 0x04, 0x32, 0x10, 0x35, 0x9a, + 0x00, 0x00, 0x70, 0x89, 0x04, 0x00, 0x00, 0xa0, 0x30, 0x62, 0x04, 0x6f, + 0xb3, 0x7f, 0x88, 0x91, 0x00, 0x00, 0xb0, 0x89, 0x04, 0x00, 0x00, 0x70, + 0x1c, 0x01, 0x10, 0x08, 0x3b, 0x10, 0x35, 0x9a, 0x00, 0x00, 0xf0, 0x89, + 0x04, 0x00, 0x00, 0xa0, 0x30, 0x62, 0x04, 0x91, 0xd5, 0x7f, 0x08, 0x92, + 0x00, 0x00, 0x30, 0x8a, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x1c, + 0x20, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x8a, 0x04, 0x00, 0x00, 0x00, + 0x0b, 0x0c, 0x00, 0x08, 0x4d, 0x61, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x8a, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x1c, 0x20, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xf0, 0x8a, 0x04, 0x00, 0x00, 0x00, 0x8b, 0x01, 0x00, 0x08, + 0x4d, 0x61, 0x00, 0x90, 0x00, 0x00, 0x30, 0x8b, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x8b, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xb0, 0x8b, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x8b, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x8c, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x70, 0x8c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x8c, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x8c, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x30, 0x8d, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x8d, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x8d, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xf0, 0x8d, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x8e, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x8e, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xb0, 0x8e, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x8e, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x8f, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x70, 0x8f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x8f, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x8f, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x30, 0x40, 0x04, 0x00, 0x00, 0x80, 0x68, 0xec, 0x06, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x40, 0x04, 0x00, 0x00, 0xe0, + 0x23, 0xda, 0x76, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x40, + 0x04, 0x00, 0x00, 0xc0, 0xfa, 0xc8, 0x86, 0x03, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xf0, 0x40, 0x04, 0x00, 0x00, 0xa0, 0xb1, 0xfe, 0xf6, 0x03, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x41, 0x04, 0x00, 0x00, 0x10, + 0x8d, 0x35, 0x09, 0x40, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x41, + 0x04, 0x00, 0x00, 0x70, 0x44, 0x23, 0x79, 0x40, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xb0, 0x41, 0x04, 0x00, 0x00, 0x50, 0x1f, 0x91, 0x8d, 0x43, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x41, 0x04, 0x00, 0x00, 0x30, + 0xd6, 0x87, 0xfd, 0x43, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x42, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x70, 0x42, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x42, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x42, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x30, 0x43, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x43, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x43, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xf0, 0x43, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x44, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x44, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xb0, 0x44, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x44, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x45, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x70, 0x45, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x45, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x45, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x30, 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x46, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x46, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xf0, 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x47, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x47, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xb0, 0x47, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x47, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x48, + 0x04, 0x00, 0x00, 0x50, 0x55, 0xd5, 0xf6, 0x03, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x70, 0x48, 0x04, 0x00, 0x00, 0xd0, 0x75, 0xdd, 0xf6, 0x03, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x48, 0x04, 0x00, 0x00, 0x50, + 0x96, 0xe5, 0xf6, 0x03, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x48, + 0x04, 0x00, 0x00, 0xd0, 0xb6, 0xed, 0xf6, 0x03, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x30, 0x49, 0x04, 0x00, 0x00, 0x60, 0x3b, 0xab, 0xfd, 0x03, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x49, 0x04, 0x00, 0x00, 0x60, + 0x5b, 0xb4, 0xfd, 0x03, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x49, + 0x04, 0x00, 0x00, 0x60, 0x7b, 0x85, 0xfd, 0x03, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xf0, 0x49, 0x04, 0x00, 0x00, 0xf0, 0x9f, 0x8e, 0xfd, 0x03, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x4a, 0x04, 0x00, 0x00, 0xf0, + 0xbf, 0x90, 0xfd, 0x03, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x4a, + 0x04, 0x00, 0x00, 0xf0, 0xdf, 0x99, 0xfd, 0x03, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xb0, 0x4a, 0x04, 0x00, 0x00, 0x00, 0x11, 0x22, 0xf9, 0x03, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x4a, 0x04, 0x00, 0x00, 0x90, + 0x35, 0x2b, 0xf9, 0x03, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x4b, + 0x04, 0x00, 0x00, 0x20, 0x42, 0x04, 0xf9, 0x03, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x70, 0x4b, 0x04, 0x00, 0x00, 0xb0, 0x66, 0x0d, 0xf9, 0x03, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x4b, 0x04, 0x00, 0x00, 0x40, + 0x88, 0x10, 0xf9, 0x03, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x4b, + 0x04, 0x00, 0x00, 0xd0, 0xac, 0x19, 0xf9, 0x03, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x30, 0x4c, 0x04, 0x00, 0x00, 0x00, 0xc0, 0xc7, 0xf6, 0x03, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x4c, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x4c, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xf0, 0x4c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x4d, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x4d, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xb0, 0x4d, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x4d, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x4e, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x70, 0x4e, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x4e, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xf0, 0x4e, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x30, 0x4f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x70, 0x4f, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0xb0, 0x4f, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0xf0, 0x4f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x09, 0x04, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, 0x42, 0x05, 0x00, 0x00, + 0x00, 0xe0, 0x27, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x10, 0x80, 0x00, 0x00, 0x2e, 0x1e, 0x00, 0x00, 0x10, 0x42, 0x30, 0x00, + 0x00, 0x02, 0x00, 0xa0, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x80, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0xa0, 0x01, 0xa0, + 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x34, 0x00, + 0x00, 0x04, 0x00, 0xa0, 0x08, 0x04, 0x00, 0x00, 0x41, 0x14, 0x20, 0x03, + 0x00, 0xf8, 0x27, 0x00, 0x20, 0x04, 0x00, 0xa0, 0x00, 0x00, 0x3a, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfe, 0x1f, 0x00, 0x20, 0x50, + 0x00, 0x10, 0x00, 0x00, 0x08, 0x18, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, + 0x20, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x11, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, + 0x00, 0x80, 0x00, 0x00, 0x0e, 0x1e, 0x00, 0x00, 0x00, 0x40, 0x30, 0x00, + 0x00, 0x02, 0x00, 0xa0, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x60, 0x10, 0x00, 0x20, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xae, 0x01, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x40, 0x42, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x52, 0x14, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x93, 0x14, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x30, 0x14, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x10, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xae, 0x01, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x02, 0x00, 0x00, 0x26, 0x00, + 0xe0, 0x04, 0x00, 0xa0, 0x10, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xae, 0x01, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x52, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x30, 0x14, 0x00, 0x00, 0x00, 0x10, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x10, 0x00, 0x20, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xae, 0x01, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0b, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfd, 0x1f, 0x00, 0x20, 0x50, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x82, 0x14, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x11, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0c, 0x14, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x20, 0x00, 0x00, 0x98, 0x1a, 0x00, 0x00, + 0x00, 0x10, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x0d, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x50, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x10, 0x00, 0x00, 0x98, 0x18, 0x00, 0x00, + 0x00, 0x08, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x0c, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfc, 0x1f, 0x00, 0x20, 0x50, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x08, 0x00, 0x00, 0x40, 0x16, 0x00, 0x00, + 0x00, 0x00, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x14, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x08, 0x00, 0x00, 0x40, 0x16, 0x00, 0x00, + 0x00, 0x10, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x1b, 0x14, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x08, 0x00, 0x00, 0x40, 0x16, 0x00, 0x00, 0x00, 0x08, 0x30, 0x00, + 0x00, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x8c, 0x14, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0xa0, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x20, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x30, 0x08, 0x00, 0x00, 0x00, 0xd0, 0xea, 0xdd, 0xea, 0xdd, + 0xea, 0xdd, 0xea, 0x9d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x80, 0x4d, 0x00, + 0x2e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0xea, 0x3f, 0x00, 0x82, 0x01, 0xa0, + 0x00, 0x00, 0x0d, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x02, + 0x00, 0x80, 0x01, 0xa0, 0x00, 0x20, 0xcd, 0x81, 0x40, 0x1a, 0x00, 0x00, + 0x00, 0x00, 0x68, 0x03, 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x04, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x02, 0x00, 0x80, 0x01, 0xa0, + 0x80, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x07, 0x00, 0x00, 0x78, 0x02, + 0x00, 0x84, 0x01, 0xa3, 0x10, 0x00, 0x8d, 0x03, 0x00, 0x00, 0xa7, 0x04, + 0x00, 0x00, 0x6e, 0x02, 0xe0, 0x84, 0x01, 0xa0, 0x02, 0x00, 0x20, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x5c, 0x04, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, + 0x0c, 0x00, 0x0d, 0x01, 0x0a, 0x06, 0x00, 0x00, 0x10, 0x01, 0x79, 0x01, + 0x00, 0x82, 0x01, 0xa0, 0x40, 0x02, 0x00, 0x80, 0x40, 0x12, 0x20, 0x06, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x69, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x20, 0x50, + 0x00, 0x40, 0x00, 0x80, 0x40, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x10, 0x00, 0x00, 0x40, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x04, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xc0, 0x0c, 0xad, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x60, + 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xea, 0x0d, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x60, 0x18, 0x20, 0x20, 0x04, 0x40, 0x09, 0x04, 0x04, + 0x06, 0x08, 0x08, 0x02, 0x50, 0x02, 0x01, 0x81, 0x18, 0x20, 0x20, 0x0c, + 0x40, 0x09, 0x04, 0x04, 0x06, 0x08, 0x08, 0x04, 0x50, 0x02, 0x01, 0x81, + 0x18, 0x20, 0x20, 0x14, 0x40, 0x09, 0x04, 0x84, 0x06, 0x08, 0x08, 0x06, + 0x10, 0x02, 0x01, 0x81, 0x18, 0x20, 0x20, 0x1c, 0x00, 0x0b, 0x04, 0x84, + 0x06, 0x08, 0x08, 0x08, 0x38, 0x02, 0x01, 0x81, 0x18, 0x20, 0x20, 0x24, + 0x60, 0x0b, 0x04, 0x84, 0x06, 0x08, 0x08, 0x0a, 0x58, 0x02, 0x01, 0x81, + 0x00, 0x10, 0xc5, 0x02, 0x40, 0x18, 0x00, 0x00, 0x00, 0xc0, 0x6a, 0x00, + 0x00, 0x82, 0x01, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x8c, 0x01, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0xc1, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x80, 0x01, 0xa0, + 0x08, 0x00, 0x00, 0x00, 0x4c, 0x07, 0x00, 0x00, 0x00, 0x00, 0x26, 0x00, + 0xe0, 0x02, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe8, 0x11, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x12, 0x02, 0x16, 0x04, 0x00, 0x00, 0x00, 0x60, + 0x08, 0x00, 0x00, 0x00, 0x40, 0x07, 0x00, 0x00, 0x00, 0x00, 0x26, 0x00, + 0xe0, 0x02, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe8, 0x11, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x40, 0x12, 0x02, 0x16, 0x04, 0x00, 0x00, 0x00, 0x60, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x03, + 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x8c, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x02, 0x00, 0x80, 0x01, 0xa0, + 0x00, 0x00, 0x80, 0x02, 0x00, 0x0f, 0x03, 0x04, 0x00, 0x00, 0xc0, 0x00, + 0xb8, 0xc3, 0x00, 0x81, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x80, 0x00, 0x00, + 0x0e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x02, 0x00, 0xa0, + 0x00, 0x80, 0x4d, 0x00, 0x2e, 0x1e, 0x00, 0x00, 0x00, 0xc0, 0xf9, 0x3f, + 0x00, 0x82, 0x01, 0xa0, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xe8, 0x04, 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0xcd, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x01, 0x00, 0x80, 0x01, 0xa0, + 0x00, 0x00, 0x80, 0x02, 0xe0, 0x0e, 0x07, 0x84, 0x0b, 0x08, 0x60, 0x00, + 0xa0, 0xc3, 0x01, 0x81, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0x14, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x0c, 0x00, 0x0d, 0x01, + 0x40, 0x04, 0x1a, 0x03, 0x00, 0x10, 0x78, 0x02, 0x00, 0x82, 0x01, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4c, 0x14, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x02, 0x00, 0x00, 0xc0, 0x41, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0xcc, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x02, 0x00, 0x80, 0x01, 0xa0, + 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x80, 0x00, 0x00, 0x0e, 0x1e, 0x00, 0x00, + 0x00, 0xc0, 0x31, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x00, 0x80, 0x4d, 0x00, + 0x2e, 0x1e, 0x00, 0x00, 0x00, 0xc0, 0xea, 0x3f, 0x00, 0x82, 0x01, 0xa0, + 0x00, 0x00, 0xcd, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x04, + 0x00, 0x80, 0x01, 0xa0, 0x00, 0x40, 0x8d, 0x83, 0x40, 0x1c, 0x00, 0x00, + 0x00, 0x00, 0xe8, 0x03, 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x80, 0x02, + 0xa0, 0x0c, 0x03, 0x04, 0x00, 0x00, 0x00, 0x01, 0xc0, 0xc3, 0x01, 0x81, + 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0x11, 0x7c, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x4d, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x68, 0x03, 0x00, 0x80, 0x01, 0xa0, 0x00, 0x02, 0x00, 0x80, + 0x40, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x09, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x05, + 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa1, 0x01, 0x7c, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, + 0x13, 0x02, 0x16, 0x04, 0x00, 0x00, 0x00, 0x60, 0x00, 0x08, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x50, 0xa5, 0x4a, 0x84, 0x08, 0x00, 0x00, 0x00, 0x60, + 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, + 0x20, 0x01, 0x40, 0x21, 0x00, 0x04, 0x00, 0x00, 0x40, 0x14, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x04, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x40, 0x81, 0xa0, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x7c, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x8d, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xe8, 0x02, 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x0d, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xf8, 0x02, 0x00, 0x80, 0x01, 0xa0, + 0x00, 0x00, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x03, + 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x20, 0x00, 0x00, + 0x40, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x3d, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x12, + 0x00, 0x00, 0x20, 0x50, 0x00, 0x01, 0x00, 0x00, 0x40, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x00, 0x00, + 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, + 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x20, 0x02, 0x00, 0x00, 0x0c, 0x12, 0x84, 0x05, + 0x00, 0x80, 0x35, 0x00, 0x20, 0x06, 0x00, 0xa0, 0x38, 0x05, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x58, 0xc2, 0x00, 0x81, + 0x00, 0x00, 0x80, 0x00, 0xc0, 0x08, 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x0c, 0x00, 0x00, 0x20, 0x50, 0x0c, 0x00, 0x00, 0x00, + 0x36, 0xc6, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00, + 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x20, 0x00, 0x00, 0x94, 0x1a, 0x00, 0x00, 0x00, 0x08, 0x30, 0x00, + 0x00, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x40, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x01, 0x00, 0x80, 0x01, 0xa0, + 0x00, 0x00, 0x4c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x02, + 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x09, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, + 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0d, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x01, 0x00, 0x80, 0x01, 0xa0, + 0x08, 0x00, 0x00, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0xf8, 0x27, 0x00, + 0x20, 0x02, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xef, 0x01, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x0c, 0x00, 0x00, 0x40, + 0x41, 0x04, 0x4b, 0x03, 0x00, 0x00, 0x20, 0x00, 0xc0, 0x05, 0x00, 0xa3, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x33, 0x02, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x10, 0x00, 0x00, 0x40, 0x18, 0x00, 0x00, + 0x00, 0x08, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x40, 0x00, 0x4d, 0x01, + 0x08, 0x0d, 0x00, 0x00, 0x00, 0x78, 0x78, 0x01, 0x00, 0x82, 0x01, 0xa0, + 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x04, 0x7c, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x8d, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xe8, 0x01, 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x4c, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x03, 0x00, 0x80, 0x01, 0xa0, + 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x08, 0x30, 0x00, + 0x00, 0x02, 0x00, 0xa0, 0x00, 0x01, 0x00, 0x00, 0x30, 0x11, 0x00, 0x00, + 0x00, 0x00, 0x26, 0x00, 0xe0, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x18, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xef, 0x1f, 0x00, 0x20, 0x50, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x8c, 0x01, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x68, 0x05, 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x8c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x03, + 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0f, 0x03, 0x04, + 0x00, 0x00, 0x20, 0x01, 0xb8, 0xc3, 0x00, 0x81, 0x00, 0x00, 0x11, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, + 0x00, 0x80, 0x00, 0x00, 0x0e, 0x1e, 0x00, 0x00, 0x00, 0xc0, 0x22, 0x00, + 0x00, 0x02, 0x00, 0xa0, 0x00, 0x80, 0x4d, 0x00, 0x2e, 0x1e, 0x00, 0x00, + 0x00, 0x40, 0xf9, 0x3f, 0x00, 0x82, 0x01, 0xa0, 0x00, 0x00, 0x0c, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x80, 0x01, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, + 0x02, 0x41, 0x68, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x4d, 0x06, 0x00, 0x00, 0x30, 0x00, 0xc0, 0x05, 0x00, 0xa3, + 0x80, 0x02, 0xcd, 0x41, 0x40, 0x0e, 0xa6, 0x09, 0x00, 0x00, 0xee, 0x01, + 0xe0, 0x84, 0x01, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x89, 0x12, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x4d, 0x02, + 0x00, 0x00, 0xa2, 0x02, 0x00, 0x00, 0x6e, 0x01, 0xe0, 0x84, 0x01, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x8c, 0x01, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x02, 0x00, 0x00, 0xc0, 0x41, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0xcc, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x01, 0x00, 0x80, 0x01, 0xa0, + 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x80, 0x00, 0x00, 0x0e, 0x1e, 0x00, 0x00, + 0x00, 0x40, 0x31, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x00, 0x80, 0x4d, 0x00, + 0x2e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x3f, 0x00, 0x82, 0x01, 0xa0, + 0x88, 0x00, 0xcd, 0x41, 0x40, 0x0e, 0x00, 0x00, 0x90, 0x01, 0x68, 0x01, + 0x00, 0x80, 0x01, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe8, 0x11, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x16, 0x04, 0x00, 0x00, 0x00, 0x60, + 0x08, 0x00, 0x00, 0x00, 0x40, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe8, 0x11, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x40, 0x00, 0x02, 0x16, 0x04, 0x00, 0x00, 0x00, 0x60, + 0x08, 0x00, 0x00, 0x00, 0x40, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe8, 0x11, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x02, 0x16, 0x04, 0x00, 0x00, 0x00, 0x60, + 0x08, 0x00, 0x00, 0x00, 0x40, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe8, 0x11, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xc0, 0x00, 0x02, 0x16, 0x04, 0x00, 0x00, 0x00, 0x60, + 0x08, 0x00, 0x00, 0x00, 0x40, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe8, 0x11, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x0d, 0x07, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x60, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x1c, 0x12, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, + 0x40, 0x04, 0x00, 0x00, 0x00, 0x40, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x1c, 0x12, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, + 0x40, 0x04, 0x00, 0x00, 0x00, 0x48, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x1c, 0x12, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, + 0x40, 0x04, 0x00, 0x00, 0x00, 0x50, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x1c, 0x12, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, + 0x40, 0x04, 0x00, 0x00, 0x00, 0x58, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x1c, 0x12, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, + 0x40, 0x04, 0x00, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x1c, 0x12, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, + 0x40, 0x04, 0x00, 0x00, 0x00, 0x20, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, + 0x02, 0x00, 0x00, 0xc0, 0x41, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0xcc, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x01, 0x00, 0x80, 0x01, 0xa0, + 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x80, 0x00, 0x00, 0x0e, 0x1e, 0x00, 0x00, + 0x00, 0x00, 0x31, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x00, 0x10, 0x00, 0x80, + 0x40, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x02, + 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x82, 0x20, 0x48, 0x00, 0x00, 0x00, 0x00, 0x80, + 0x4a, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0x68, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x0a, 0x07, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x20, 0x50, 0x00, 0x38, 0x00, 0x00, + 0x40, 0x16, 0x06, 0x0d, 0x01, 0x86, 0x31, 0x00, 0x00, 0x0d, 0x00, 0xa1, + 0x00, 0x00, 0x40, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00, + 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x02, 0x00, 0x00, 0x92, 0x12, 0x00, 0x00, 0x00, 0x08, 0x30, 0x00, + 0x00, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x09, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x01, + 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x20, 0x00, 0x40, 0x0b, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x40, 0x08, 0x00, 0x00, 0x06, 0x56, 0x20, 0x06, + 0x00, 0x08, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x6b, 0x06, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfa, 0x1f, 0x00, 0x20, 0x50, + 0x00, 0x10, 0x00, 0x00, 0x08, 0x18, 0x00, 0x00, 0x00, 0x40, 0x31, 0x00, + 0x00, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x11, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, + 0x04, 0x00, 0x00, 0x00, 0x3a, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x80, 0x4d, 0x00, 0x2e, 0x1e, 0x00, 0x00, + 0x00, 0xc0, 0xf9, 0x3f, 0x00, 0x82, 0x01, 0xa0, 0x00, 0x00, 0x8d, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x01, 0x00, 0x80, 0x01, 0xa0, + 0x00, 0x00, 0xcd, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x02, + 0x00, 0x80, 0x01, 0xa0, 0x80, 0x40, 0x0d, 0x82, 0x40, 0x0e, 0x1b, 0x0e, + 0x00, 0x00, 0x68, 0x02, 0x00, 0x80, 0x01, 0xa0, 0x04, 0x00, 0x00, 0x00, + 0x40, 0x04, 0x00, 0x00, 0x00, 0x10, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, + 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x12, 0x7c, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x48, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x02, 0x00, 0x80, + 0x40, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x09, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, + 0x1f, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x01, 0x00, 0x00, + 0x40, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x06, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x61, 0x12, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x0c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x9e, 0x02, 0x00, 0x80, 0x01, 0xe0, 0x63, 0x04, 0x20, 0xa0, + 0x08, 0x00, 0x00, 0x00, 0x40, 0x06, 0x00, 0x00, 0x00, 0xd8, 0x22, 0x00, + 0x00, 0x02, 0x00, 0xa0, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x20, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x38, 0x06, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfd, 0x1f, 0x00, 0x20, 0x50, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xe8, 0x02, 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x16, 0x80, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, + 0xc6, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x1a, 0x84, 0xa0, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x41, 0x01, 0x68, 0x06, 0x00, 0x00, 0x00, 0x80, + 0x02, 0x02, 0x00, 0x80, 0x40, 0x12, 0x20, 0x01, 0x00, 0xe0, 0x22, 0x00, + 0x00, 0x04, 0x00, 0xa0, 0x00, 0x00, 0x19, 0x07, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x20, 0x50, 0x00, 0x01, 0x8d, 0x00, + 0x40, 0x10, 0x00, 0x00, 0x00, 0xe0, 0x6a, 0x01, 0x00, 0x82, 0x01, 0xa0, + 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x61, 0x12, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, 0x0c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x9c, 0x02, 0x00, 0x80, 0x01, 0xe0, 0x63, 0x04, 0x20, 0xa0, + 0x00, 0x00, 0x4c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x01, + 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x01, 0x00, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, + 0x00, 0x00, 0x58, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, + 0x1f, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x12, 0x7c, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x04, 0x00, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, + 0x00, 0x10, 0x30, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x00, 0x00, 0x4c, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x03, 0x00, 0x80, 0x01, 0xa0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x8c, 0x03, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xe8, 0x01, 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x00, 0x02, + 0x00, 0x0f, 0x03, 0x04, 0x00, 0x00, 0xa0, 0x00, 0xb8, 0xc3, 0x00, 0x81, + 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x00, 0x80, 0x00, 0x00, 0x0e, 0x1e, 0x00, 0x00, + 0x00, 0xc0, 0x31, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x00, 0x80, 0x00, 0x00, + 0x2e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x02, 0x00, 0xa0, + 0x00, 0x00, 0x8c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x05, + 0x00, 0x80, 0x01, 0xa0, 0x00, 0x00, 0x4c, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xe8, 0x05, 0x00, 0x80, 0x01, 0xa0, 0x40, 0x00, 0x0c, 0xc1, + 0x40, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x68, 0x0c, 0x00, 0xe0, 0x01, 0xa0, + 0x00, 0x00, 0x4b, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x00, 0x0b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfe, + 0x1f, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x89, 0x04, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x09, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x20, 0x50, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x83, 0x0a, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, + 0x00, 0x10, 0x00, 0x00, 0x40, 0x18, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, + 0xe0, 0x02, 0x00, 0xa0, 0x00, 0x08, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x20, + 0x08, 0x42, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xbe, 0x02, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x70, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xa0, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x95, 0x85, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Tue Jun 23 22:40:23 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 981609A7; Tue, 23 Jun 2015 22:40:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 85BD45F3; Tue, 23 Jun 2015 22:40:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NMeNJa019495; Tue, 23 Jun 2015 22:40:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5NMeN4w019491; Tue, 23 Jun 2015 22:40:23 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201506232240.t5NMeN4w019491@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 23 Jun 2015 22:40:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284743 - head/sys/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 22:40:23 -0000 Author: hselasky Date: Tue Jun 23 22:40:22 2015 New Revision: 284743 URL: https://svnweb.freebsd.org/changeset/base/284743 Log: Rename __weak to __weak_symbol to avoid language conflict with objective-C. PR: 200972 (exp-run) Suggested by: theraven@ MFC after: 3 days Modified: head/sys/sys/cdefs.h head/sys/sys/linker_set.h Modified: head/sys/sys/cdefs.h ============================================================================== --- head/sys/sys/cdefs.h Tue Jun 23 22:31:04 2015 (r284742) +++ head/sys/sys/cdefs.h Tue Jun 23 22:40:22 2015 (r284743) @@ -213,9 +213,9 @@ #define __packed #define __aligned(x) #define __section(x) -#define __weak +#define __weak_symbol #else -#define __weak __attribute__((__weak__)) +#define __weak_symbol __attribute__((__weak__)) #if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER) #define __dead2 #define __pure2 Modified: head/sys/sys/linker_set.h ============================================================================== --- head/sys/sys/linker_set.h Tue Jun 23 22:31:04 2015 (r284742) +++ head/sys/sys/linker_set.h Tue Jun 23 22:40:22 2015 (r284743) @@ -80,8 +80,8 @@ * Initialize before referring to a given linker set. */ #define SET_DECLARE(set, ptype) \ - extern ptype __weak *__CONCAT(__start_set_,set); \ - extern ptype __weak *__CONCAT(__stop_set_,set) + extern ptype __weak_symbol *__CONCAT(__start_set_,set); \ + extern ptype __weak_symbol *__CONCAT(__stop_set_,set) #define SET_BEGIN(set) \ (&__CONCAT(__start_set_,set)) From owner-svn-src-head@FreeBSD.ORG Wed Jun 24 01:34:36 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87601F53; Wed, 24 Jun 2015 01:34:36 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 756193C9; Wed, 24 Jun 2015 01:34:36 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5O1YaHJ012851; Wed, 24 Jun 2015 01:34:36 GMT (envelope-from araujo@FreeBSD.org) Received: (from araujo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5O1YaC4012849; Wed, 24 Jun 2015 01:34:36 GMT (envelope-from araujo@FreeBSD.org) Message-Id: <201506240134.t5O1YaC4012849@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: araujo set sender to araujo@FreeBSD.org using -f From: Marcelo Araujo Date: Wed, 24 Jun 2015 01:34:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284744 - head/lib/libusb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 01:34:36 -0000 Author: araujo (ports committer) Date: Wed Jun 24 01:34:35 2015 New Revision: 284744 URL: https://svnweb.freebsd.org/changeset/base/284744 Log: Remove unused variables to silence CLANG warnings. Remove some BLANK lines and unnecessary TABS. Differential Revision: D2687 Reviewed by: rodrigc, hselasky Modified: head/lib/libusb/libusb10.c head/lib/libusb/libusb20_desc.c Modified: head/lib/libusb/libusb10.c ============================================================================== --- head/lib/libusb/libusb10.c Tue Jun 23 22:40:22 2015 (r284743) +++ head/lib/libusb/libusb10.c Wed Jun 24 01:34:35 2015 (r284744) @@ -1008,7 +1008,6 @@ libusb10_isoc_proxy(struct libusb20_tran uint16_t iso_packets; uint16_t i; uint8_t status; - uint8_t flags; status = libusb20_tr_get_status(pxfer); sxfer = libusb20_tr_get_priv_sc1(pxfer); @@ -1016,7 +1015,7 @@ libusb10_isoc_proxy(struct libusb20_tran iso_packets = libusb20_tr_get_max_frames(pxfer); if (sxfer == NULL) - return; /* cancelled - nothing to do */ + return; /* cancelled - nothing to do */ uxfer = (struct libusb_transfer *)( ((uint8_t *)sxfer) + sizeof(*sxfer)); @@ -1025,16 +1024,13 @@ libusb10_isoc_proxy(struct libusb20_tran iso_packets = uxfer->num_iso_packets; if (iso_packets == 0) - return; /* nothing to do */ + return; /* nothing to do */ /* make sure that the number of ISOCHRONOUS packets is valid */ uxfer->num_iso_packets = iso_packets; - flags = uxfer->flags; - switch (status) { case LIBUSB20_TRANSFER_COMPLETED: - /* update actual length */ uxfer->actual_length = actlen; for (i = 0; i != iso_packets; i++) { @@ -1043,9 +1039,7 @@ libusb10_isoc_proxy(struct libusb20_tran } libusb10_complete_transfer(pxfer, sxfer, LIBUSB_TRANSFER_COMPLETED); break; - case LIBUSB20_TRANSFER_START: - /* setup length(s) */ actlen = 0; for (i = 0; i != iso_packets; i++) { @@ -1064,7 +1058,6 @@ libusb10_isoc_proxy(struct libusb20_tran /* fork another USB transfer, if any */ libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; - default: libusb10_complete_transfer(pxfer, sxfer, libusb10_convert_error(status)); break; Modified: head/lib/libusb/libusb20_desc.c ============================================================================== --- head/lib/libusb/libusb20_desc.c Tue Jun 23 22:40:22 2015 (r284743) +++ head/lib/libusb/libusb20_desc.c Wed Jun 24 01:34:35 2015 (r284744) @@ -517,9 +517,7 @@ libusb20_me_encode(void *ptr, uint16_t l * room for the * complete structure: */ - uint16_t dummy; - - dummy = libusb20_me_encode(buf, + (void) libusb20_me_encode(buf, 0xFFFF - 3, ps->ptr); } else { bcopy(src_ptr, buf, src_len); @@ -673,7 +671,6 @@ libusb20_me_decode(const void *ptr, uint ~(LIBUSB20_ME_STRUCT_ALIGN - 1)); /* align */ while (pd_count--) { uint16_t temp; - uint16_t dummy; struct libusb20_me_struct *ps; ps = LIBUSB20_ADD_BYTES(pd, pd_offset); @@ -763,7 +760,7 @@ libusb20_me_decode(const void *ptr, uint * Recursivly decode * the next structure */ - dummy = libusb20_me_decode(buf, + (void) libusb20_me_decode(buf, temp, ps->ptr); } else { /* update type */ From owner-svn-src-head@FreeBSD.ORG Wed Jun 24 01:48:46 2015 Return-Path: Delivered-To: svn-src-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7DF40FD0; Wed, 24 Jun 2015 01:48:46 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F5A8AE8; Wed, 24 Jun 2015 01:48:46 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5O1mkqA004061; Wed, 24 Jun 2015 01:48:46 GMT (envelope-from araujo@FreeBSD.org) Received: (from araujo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5O1mjCp004060; Wed, 24 Jun 2015 01:48:46 GMT (envelope-from araujo@FreeBSD.org) Message-Id: <201506240148.t5O1mjCp004060@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: araujo set sender to araujo@FreeBSD.org using -f From: Marcelo Araujo Date: Wed, 24 Jun 2015 01:48:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284745 - head/lib/libugidfw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 01:48:46 -0000 Author: araujo (ports committer) Date: Wed Jun 24 01:48:44 2015 New Revision: 284745 URL: https://svnweb.freebsd.org/changeset/base/284745 Log: Set some internal helpers as static and initialize few variables to silence CLANG WARNINGS. BUMP SHLIB_MAJOR version as the ABI potentially changed. Also run an 'exp run' to double check if any external project are using those functions. Thanks antoine@. PR: 200807 Differential Revision: D2775 Reviewed by: kib, ngie Modified: head/lib/libugidfw/Makefile head/lib/libugidfw/ugidfw.c Modified: head/lib/libugidfw/Makefile ============================================================================== --- head/lib/libugidfw/Makefile Wed Jun 24 01:34:35 2015 (r284744) +++ head/lib/libugidfw/Makefile Wed Jun 24 01:48:44 2015 (r284745) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= ugidfw -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 SRCS= ugidfw.c INCS= ugidfw.h Modified: head/lib/libugidfw/ugidfw.c ============================================================================== --- head/lib/libugidfw/ugidfw.c Wed Jun 24 01:34:35 2015 (r284744) +++ head/lib/libugidfw/ugidfw.c Wed Jun 24 01:48:44 2015 (r284745) @@ -505,7 +505,7 @@ truncated: return (-1); } -int +static int bsde_parse_uidrange(char *spec, uid_t *min, uid_t *max, size_t buflen, char *errstr){ struct passwd *pwd; @@ -554,7 +554,7 @@ bsde_parse_uidrange(char *spec, uid_t *m return (0); } -int +static int bsde_parse_gidrange(char *spec, gid_t *min, gid_t *max, size_t buflen, char *errstr){ struct group *grp; @@ -603,7 +603,7 @@ bsde_parse_gidrange(char *spec, gid_t *m return (0); } -int +static int bsde_parse_subject(int argc, char *argv[], struct mac_bsdextended_subject *subject, size_t buflen, char *errstr) { @@ -612,7 +612,7 @@ bsde_parse_subject(int argc, char *argv[ char *endp; uid_t uid_min, uid_max; gid_t gid_min, gid_max; - int jid; + int jid = 0; size_t len; long value; @@ -720,7 +720,7 @@ bsde_parse_subject(int argc, char *argv[ return (0); } -int +static int bsde_parse_type(char *spec, int *type, size_t buflen, char *errstr) { size_t len; @@ -764,7 +764,7 @@ bsde_parse_type(char *spec, int *type, s return (0); } -int +static int bsde_parse_fsid(char *spec, struct fsid *fsid, size_t buflen, char *errstr) { size_t len; @@ -781,15 +781,15 @@ bsde_parse_fsid(char *spec, struct fsid return (0); } -int +static int bsde_parse_object(int argc, char *argv[], struct mac_bsdextended_object *object, size_t buflen, char *errstr) { int not_seen, flags; int current, neg, nextnot; + int type; uid_t uid_min, uid_max; gid_t gid_min, gid_max; - int type; struct fsid fsid; size_t len; @@ -797,6 +797,7 @@ bsde_parse_object(int argc, char *argv[] flags = 0; neg = 0; nextnot = 0; + type = 0; if (strcmp("not", argv[current]) == 0) { not_seen = 1; @@ -1101,7 +1102,7 @@ bsde_get_mib(const char *string, int *na return (0); } -int +static int bsde_check_version(size_t buflen, char *errstr) { size_t len; From owner-svn-src-head@freebsd.org Wed Jun 24 06:01:31 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 55934141EF8D; Wed, 24 Jun 2015 06:01:31 +0000 (UTC) (envelope-from whu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 461BE119; Wed, 24 Jun 2015 06:01:31 +0000 (UTC) (envelope-from whu@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5O61V8F033546; Wed, 24 Jun 2015 06:01:31 GMT (envelope-from whu@FreeBSD.org) Received: (from whu@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5O61U7r033541; Wed, 24 Jun 2015 06:01:30 GMT (envelope-from whu@FreeBSD.org) Message-Id: <201506240601.t5O61U7r033541@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: whu set sender to whu@FreeBSD.org using -f From: Wei Hu Date: Wed, 24 Jun 2015 06:01:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284746 - in head/sys/dev/hyperv: include netvsc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 06:01:31 -0000 Author: whu Date: Wed Jun 24 06:01:29 2015 New Revision: 284746 URL: https://svnweb.freebsd.org/changeset/base/284746 Log: TSO and checksum offloading support for Netvsc driver on Hyper-V. Submitted by: whu Reviewed by: royger Approved by: royger MFC after: 1 week Relnotes: yes Sponsored by: Microsoft OSTC Differential Revision: https://reviews.freebsd.org/D2517 Modified: head/sys/dev/hyperv/include/hyperv.h head/sys/dev/hyperv/netvsc/hv_net_vsc.c head/sys/dev/hyperv/netvsc/hv_net_vsc.h head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c head/sys/dev/hyperv/netvsc/hv_rndis.h head/sys/dev/hyperv/netvsc/hv_rndis_filter.c head/sys/dev/hyperv/netvsc/hv_rndis_filter.h Modified: head/sys/dev/hyperv/include/hyperv.h ============================================================================== --- head/sys/dev/hyperv/include/hyperv.h Wed Jun 24 01:48:44 2015 (r284745) +++ head/sys/dev/hyperv/include/hyperv.h Wed Jun 24 06:01:29 2015 (r284746) @@ -107,7 +107,7 @@ typedef uint8_t hv_bool_uint8_t; #define HV_MAX_PIPE_USER_DEFINED_BYTES 116 -#define HV_MAX_PAGE_BUFFER_COUNT 16 +#define HV_MAX_PAGE_BUFFER_COUNT 32 #define HV_MAX_MULTIPAGE_BUFFER_COUNT 32 #define HV_ALIGN_UP(value, align) \ Modified: head/sys/dev/hyperv/netvsc/hv_net_vsc.c ============================================================================== --- head/sys/dev/hyperv/netvsc/hv_net_vsc.c Wed Jun 24 01:48:44 2015 (r284745) +++ head/sys/dev/hyperv/netvsc/hv_net_vsc.c Wed Jun 24 06:01:29 2015 (r284746) @@ -49,6 +49,7 @@ #include "hv_rndis.h" #include "hv_rndis_filter.h" +MALLOC_DEFINE(M_NETVSC, "netvsc", "Hyper-V netvsc driver"); /* * Forward declarations @@ -59,13 +60,10 @@ static int hv_nv_init_rx_buffer_with_ne static int hv_nv_destroy_send_buffer(netvsc_dev *net_dev); static int hv_nv_destroy_rx_buffer(netvsc_dev *net_dev); static int hv_nv_connect_to_vsp(struct hv_device *device); -static void hv_nv_on_send_completion(struct hv_device *device, - hv_vm_packet_descriptor *pkt); -static void hv_nv_on_receive(struct hv_device *device, - hv_vm_packet_descriptor *pkt); -static void hv_nv_send_receive_completion(struct hv_device *device, - uint64_t tid); - +static void hv_nv_on_send_completion(netvsc_dev *net_dev, + struct hv_device *device, hv_vm_packet_descriptor *pkt); +static void hv_nv_on_receive(netvsc_dev *net_dev, + struct hv_device *device, hv_vm_packet_descriptor *pkt); /* * @@ -76,7 +74,7 @@ hv_nv_alloc_net_device(struct hv_device netvsc_dev *net_dev; hn_softc_t *sc = device_get_softc(device->device); - net_dev = malloc(sizeof(netvsc_dev), M_DEVBUF, M_NOWAIT | M_ZERO); + net_dev = malloc(sizeof(netvsc_dev), M_NETVSC, M_NOWAIT | M_ZERO); if (net_dev == NULL) { return (NULL); } @@ -128,6 +126,34 @@ hv_nv_get_inbound_net_device(struct hv_d return (net_dev); } +int +hv_nv_get_next_send_section(netvsc_dev *net_dev) +{ + unsigned long bitsmap_words = net_dev->bitsmap_words; + unsigned long *bitsmap = net_dev->send_section_bitsmap; + unsigned long idx; + int ret = NVSP_1_CHIMNEY_SEND_INVALID_SECTION_INDEX; + int i; + + for (i = 0; i < bitsmap_words; i++) { + idx = ffs(~bitsmap[i]); + if (0 == idx) + continue; + + idx--; + if (i * BITS_PER_LONG + idx >= net_dev->send_section_count) + return (ret); + + if (synch_test_and_set_bit(idx, &bitsmap[i])) + continue; + + ret = i * BITS_PER_LONG + idx; + break; + } + + return (ret); +} + /* * Net VSC initialize receive buffer with net VSP * @@ -146,12 +172,8 @@ hv_nv_init_rx_buffer_with_net_vsp(struct return (ENODEV); } - net_dev->rx_buf = contigmalloc(net_dev->rx_buf_size, M_DEVBUF, + net_dev->rx_buf = contigmalloc(net_dev->rx_buf_size, M_NETVSC, M_ZERO, 0UL, BUS_SPACE_MAXADDR, PAGE_SIZE, 0); - if (net_dev->rx_buf == NULL) { - ret = ENOMEM; - goto cleanup; - } /* * Establish the GPADL handle for this buffer on this channel. @@ -202,7 +224,7 @@ hv_nv_init_rx_buffer_with_net_vsp(struct init_pkt->msgs.vers_1_msgs.send_rx_buf_complete.num_sections; net_dev->rx_sections = malloc(net_dev->rx_section_count * - sizeof(nvsp_1_rx_buf_section), M_DEVBUF, M_NOWAIT); + sizeof(nvsp_1_rx_buf_section), M_NETVSC, M_NOWAIT); if (net_dev->rx_sections == NULL) { ret = EINVAL; goto cleanup; @@ -246,7 +268,7 @@ hv_nv_init_send_buffer_with_net_vsp(stru return (ENODEV); } - net_dev->send_buf = contigmalloc(net_dev->send_buf_size, M_DEVBUF, + net_dev->send_buf = contigmalloc(net_dev->send_buf_size, M_NETVSC, M_ZERO, 0UL, BUS_SPACE_MAXADDR, PAGE_SIZE, 0); if (net_dev->send_buf == NULL) { ret = ENOMEM; @@ -259,7 +281,7 @@ hv_nv_init_send_buffer_with_net_vsp(stru * channel to establish the gpadl handle. */ ret = hv_vmbus_channel_establish_gpadl(device->channel, - net_dev->send_buf, net_dev->send_buf_size, + net_dev->send_buf, net_dev->send_buf_size, &net_dev->send_buf_gpadl_handle); if (ret != 0) { goto cleanup; @@ -280,7 +302,7 @@ hv_nv_init_send_buffer_with_net_vsp(stru /* Send the gpadl notification request */ ret = hv_vmbus_channel_send_packet(device->channel, init_pkt, - sizeof(nvsp_msg), (uint64_t)(uintptr_t)init_pkt, + sizeof(nvsp_msg), (uint64_t)init_pkt, HV_VMBUS_PACKET_TYPE_DATA_IN_BAND, HV_VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); if (ret != 0) { @@ -298,6 +320,17 @@ hv_nv_init_send_buffer_with_net_vsp(stru net_dev->send_section_size = init_pkt->msgs.vers_1_msgs.send_send_buf_complete.section_size; + net_dev->send_section_count = + net_dev->send_buf_size / net_dev->send_section_size; + net_dev->bitsmap_words = howmany(net_dev->send_section_count, + BITS_PER_LONG); + net_dev->send_section_bitsmap = + malloc(net_dev->bitsmap_words * sizeof(long), M_NETVSC, + M_NOWAIT | M_ZERO); + if (NULL == net_dev->send_section_bitsmap) { + ret = ENOMEM; + goto cleanup; + } goto exit; @@ -362,12 +395,12 @@ hv_nv_destroy_rx_buffer(netvsc_dev *net_ if (net_dev->rx_buf) { /* Free up the receive buffer */ - contigfree(net_dev->rx_buf, net_dev->rx_buf_size, M_DEVBUF); + contigfree(net_dev->rx_buf, net_dev->rx_buf_size, M_NETVSC); net_dev->rx_buf = NULL; } if (net_dev->rx_sections) { - free(net_dev->rx_sections, M_DEVBUF); + free(net_dev->rx_sections, M_NETVSC); net_dev->rx_sections = NULL; net_dev->rx_section_count = 0; } @@ -430,10 +463,14 @@ hv_nv_destroy_send_buffer(netvsc_dev *ne if (net_dev->send_buf) { /* Free up the receive buffer */ - contigfree(net_dev->send_buf, net_dev->send_buf_size, M_DEVBUF); + contigfree(net_dev->send_buf, net_dev->send_buf_size, M_NETVSC); net_dev->send_buf = NULL; } + if (net_dev->send_section_bitsmap) { + free(net_dev->send_section_bitsmap, M_NETVSC); + } + return (ret); } @@ -447,7 +484,7 @@ hv_nv_destroy_send_buffer(netvsc_dev *ne */ static int hv_nv_negotiate_nvsp_protocol(struct hv_device *device, netvsc_dev *net_dev, - uint32_t nvsp_ver) + uint32_t nvsp_ver) { nvsp_msg *init_pkt; int ret; @@ -524,8 +561,13 @@ hv_nv_connect_to_vsp(struct hv_device *d { netvsc_dev *net_dev; nvsp_msg *init_pkt; - uint32_t nvsp_vers; uint32_t ndis_version; + uint32_t protocol_list[] = { NVSP_PROTOCOL_VERSION_1, + NVSP_PROTOCOL_VERSION_2, + NVSP_PROTOCOL_VERSION_4, + NVSP_PROTOCOL_VERSION_5 }; + int i; + int protocol_number = nitems(protocol_list); int ret = 0; device_t dev = device->device; hn_softc_t *sc = device_get_softc(dev); @@ -537,26 +579,31 @@ hv_nv_connect_to_vsp(struct hv_device *d } /* - * Negotiate the NVSP version. Try NVSP v2 first. + * Negotiate the NVSP version. Try the latest NVSP first. */ - nvsp_vers = NVSP_PROTOCOL_VERSION_2; - ret = hv_nv_negotiate_nvsp_protocol(device, net_dev, nvsp_vers); - if (ret != 0) { - /* NVSP v2 failed, try NVSP v1 */ - nvsp_vers = NVSP_PROTOCOL_VERSION_1; - ret = hv_nv_negotiate_nvsp_protocol(device, net_dev, nvsp_vers); - if (ret != 0) { - /* NVSP v1 failed, return bad status */ - return (ret); + for (i = protocol_number - 1; i >= 0; i--) { + if (hv_nv_negotiate_nvsp_protocol(device, net_dev, + protocol_list[i]) == 0) { + net_dev->nvsp_version = protocol_list[i]; + if (bootverbose) + device_printf(dev, "Netvsc: got version 0x%x\n", + net_dev->nvsp_version); + break; } } - net_dev->nvsp_version = nvsp_vers; + + if (i < 0) { + if (bootverbose) + device_printf(dev, "failed to negotiate a valid " + "protocol.\n"); + return (EPROTO); + } /* * Set the MTU if supported by this NVSP protocol version * This needs to be right after the NVSP init message per Haiyang */ - if (nvsp_vers >= NVSP_PROTOCOL_VERSION_2) + if (net_dev->nvsp_version >= NVSP_PROTOCOL_VERSION_2) ret = hv_nv_send_ndis_config(device, ifp->if_mtu); /* @@ -566,10 +613,11 @@ hv_nv_connect_to_vsp(struct hv_device *d memset(init_pkt, 0, sizeof(nvsp_msg)); - /* - * Updated to version 5.1, minimum, for VLAN per Haiyang - */ - ndis_version = NDIS_VERSION; + if (net_dev->nvsp_version <= NVSP_PROTOCOL_VERSION_4) { + ndis_version = NDIS_VERSION_6_1; + } else { + ndis_version = NDIS_VERSION_6_30; + } init_pkt->hdr.msg_type = nvsp_msg_1_type_send_ndis_vers; init_pkt->msgs.vers_1_msgs.send_ndis_vers.ndis_major_vers = @@ -621,9 +669,7 @@ netvsc_dev * hv_nv_on_device_add(struct hv_device *device, void *additional_info) { netvsc_dev *net_dev; - netvsc_packet *packet; - netvsc_packet *next_packet; - int i, ret = 0; + int ret = 0; net_dev = hv_nv_alloc_net_device(device); if (!net_dev) @@ -631,29 +677,9 @@ hv_nv_on_device_add(struct hv_device *de /* Initialize the NetVSC channel extension */ net_dev->rx_buf_size = NETVSC_RECEIVE_BUFFER_SIZE; - mtx_init(&net_dev->rx_pkt_list_lock, "HV-RPL", NULL, - MTX_SPIN | MTX_RECURSE); net_dev->send_buf_size = NETVSC_SEND_BUFFER_SIZE; - /* Same effect as STAILQ_HEAD_INITIALIZER() static initializer */ - STAILQ_INIT(&net_dev->myrx_packet_list); - - /* - * malloc a sufficient number of netvsc_packet buffers to hold - * a packet list. Add them to the netvsc device packet queue. - */ - for (i=0; i < NETVSC_RECEIVE_PACKETLIST_COUNT; i++) { - packet = malloc(sizeof(netvsc_packet) + - (NETVSC_RECEIVE_SG_COUNT * sizeof(hv_vmbus_page_buffer)), - M_DEVBUF, M_NOWAIT | M_ZERO); - if (!packet) { - break; - } - STAILQ_INSERT_TAIL(&net_dev->myrx_packet_list, packet, - mylist_entry); - } - sema_init(&net_dev->channel_init_sema, 0, "netdev_sema"); /* @@ -686,19 +712,7 @@ cleanup: */ if (net_dev) { sema_destroy(&net_dev->channel_init_sema); - - packet = STAILQ_FIRST(&net_dev->myrx_packet_list); - while (packet != NULL) { - next_packet = STAILQ_NEXT(packet, mylist_entry); - free(packet, M_DEVBUF); - packet = next_packet; - } - /* Reset the list to initial state */ - STAILQ_INIT(&net_dev->myrx_packet_list); - - mtx_destroy(&net_dev->rx_pkt_list_lock); - - free(net_dev, M_DEVBUF); + free(net_dev, M_NETVSC); } return (NULL); @@ -710,8 +724,6 @@ cleanup: int hv_nv_on_device_remove(struct hv_device *device, boolean_t destroy_channel) { - netvsc_packet *net_vsc_pkt; - netvsc_packet *next_net_vsc_pkt; hn_softc_t *sc = device_get_softc(device->device); netvsc_dev *net_dev = sc->net_dev;; @@ -738,20 +750,8 @@ hv_nv_on_device_remove(struct hv_device hv_vmbus_channel_close(device->channel); - /* Release all resources */ - net_vsc_pkt = STAILQ_FIRST(&net_dev->myrx_packet_list); - while (net_vsc_pkt != NULL) { - next_net_vsc_pkt = STAILQ_NEXT(net_vsc_pkt, mylist_entry); - free(net_vsc_pkt, M_DEVBUF); - net_vsc_pkt = next_net_vsc_pkt; - } - - /* Reset the list to initial state */ - STAILQ_INIT(&net_dev->myrx_packet_list); - - mtx_destroy(&net_dev->rx_pkt_list_lock); sema_destroy(&net_dev->channel_init_sema); - free(net_dev, M_DEVBUF); + free(net_dev, M_NETVSC); return (0); } @@ -759,18 +759,13 @@ hv_nv_on_device_remove(struct hv_device /* * Net VSC on send completion */ -static void -hv_nv_on_send_completion(struct hv_device *device, hv_vm_packet_descriptor *pkt) +static void +hv_nv_on_send_completion(netvsc_dev *net_dev, + struct hv_device *device, hv_vm_packet_descriptor *pkt) { - netvsc_dev *net_dev; nvsp_msg *nvsp_msg_pkt; netvsc_packet *net_vsc_pkt; - net_dev = hv_nv_get_inbound_net_device(device); - if (!net_dev) { - return; - } - nvsp_msg_pkt = (nvsp_msg *)((unsigned long)pkt + (pkt->data_offset8 << 3)); @@ -781,17 +776,25 @@ hv_nv_on_send_completion(struct hv_devic == nvsp_msg_1_type_send_send_buf_complete) { /* Copy the response back */ memcpy(&net_dev->channel_init_packet, nvsp_msg_pkt, - sizeof(nvsp_msg)); + sizeof(nvsp_msg)); sema_post(&net_dev->channel_init_sema); } else if (nvsp_msg_pkt->hdr.msg_type == - nvsp_msg_1_type_send_rndis_pkt_complete) { + nvsp_msg_1_type_send_rndis_pkt_complete) { /* Get the send context */ net_vsc_pkt = (netvsc_packet *)(unsigned long)pkt->transaction_id; + if (NULL != net_vsc_pkt) { + if (net_vsc_pkt->send_buf_section_idx != + NVSP_1_CHIMNEY_SEND_INVALID_SECTION_INDEX) { + synch_change_bit(net_vsc_pkt->send_buf_section_idx, + net_dev->send_section_bitsmap); + } + + /* Notify the layer above us */ + net_vsc_pkt->compl.send.on_send_completion( + net_vsc_pkt->compl.send.send_completion_context); - /* Notify the layer above us */ - net_vsc_pkt->compl.send.on_send_completion( - net_vsc_pkt->compl.send.send_completion_context); + } atomic_subtract_int(&net_dev->num_outstanding_sends, 1); } @@ -822,10 +825,10 @@ hv_nv_on_send(struct hv_device *device, send_msg.msgs.vers_1_msgs.send_rndis_pkt.chan_type = 1; } - /* Not using send buffer section */ send_msg.msgs.vers_1_msgs.send_rndis_pkt.send_buf_section_idx = - 0xFFFFFFFF; - send_msg.msgs.vers_1_msgs.send_rndis_pkt.send_buf_section_size = 0; + pkt->send_buf_section_idx; + send_msg.msgs.vers_1_msgs.send_rndis_pkt.send_buf_section_size = + pkt->send_buf_section_size; if (pkt->page_buf_count) { ret = hv_vmbus_channel_send_packet_pagebuffer(device->channel, @@ -851,157 +854,81 @@ hv_nv_on_send(struct hv_device *device, * In the FreeBSD Hyper-V virtual world, this function deals exclusively * with virtual addresses. */ -static void -hv_nv_on_receive(struct hv_device *device, hv_vm_packet_descriptor *pkt) +static void +hv_nv_on_receive(netvsc_dev *net_dev, struct hv_device *device, + hv_vm_packet_descriptor *pkt) { - netvsc_dev *net_dev; hv_vm_transfer_page_packet_header *vm_xfer_page_pkt; nvsp_msg *nvsp_msg_pkt; - netvsc_packet *net_vsc_pkt = NULL; - unsigned long start; - xfer_page_packet *xfer_page_pkt = NULL; - STAILQ_HEAD(PKT_LIST, netvsc_packet_) mylist_head = - STAILQ_HEAD_INITIALIZER(mylist_head); + netvsc_packet vsc_pkt; + netvsc_packet *net_vsc_pkt = &vsc_pkt; + device_t dev = device->device; int count = 0; int i = 0; - - net_dev = hv_nv_get_inbound_net_device(device); - if (!net_dev) - return; + int status = nvsp_status_success; /* * All inbound packets other than send completion should be * xfer page packet. */ - if (pkt->type != HV_VMBUS_PACKET_TYPE_DATA_USING_TRANSFER_PAGES) + if (pkt->type != HV_VMBUS_PACKET_TYPE_DATA_USING_TRANSFER_PAGES) { + device_printf(dev, "packet type %d is invalid!\n", pkt->type); return; + } nvsp_msg_pkt = (nvsp_msg *)((unsigned long)pkt + (pkt->data_offset8 << 3)); /* Make sure this is a valid nvsp packet */ - if (nvsp_msg_pkt->hdr.msg_type != nvsp_msg_1_type_send_rndis_pkt) + if (nvsp_msg_pkt->hdr.msg_type != nvsp_msg_1_type_send_rndis_pkt) { + device_printf(dev, "packet hdr type %d is invalid!\n", + pkt->type); return; + } vm_xfer_page_pkt = (hv_vm_transfer_page_packet_header *)pkt; - if (vm_xfer_page_pkt->transfer_page_set_id - != NETVSC_RECEIVE_BUFFER_ID) { + if (vm_xfer_page_pkt->transfer_page_set_id != + NETVSC_RECEIVE_BUFFER_ID) { + device_printf(dev, "transfer_page_set_id %d is invalid!\n", + vm_xfer_page_pkt->transfer_page_set_id); return; } - STAILQ_INIT(&mylist_head); - - /* - * Grab free packets (range count + 1) to represent this xfer page - * packet. +1 to represent the xfer page packet itself. We grab it - * here so that we know exactly how many we can fulfill. - */ - mtx_lock_spin(&net_dev->rx_pkt_list_lock); - while (!STAILQ_EMPTY(&net_dev->myrx_packet_list)) { - net_vsc_pkt = STAILQ_FIRST(&net_dev->myrx_packet_list); - STAILQ_REMOVE_HEAD(&net_dev->myrx_packet_list, mylist_entry); - - STAILQ_INSERT_TAIL(&mylist_head, net_vsc_pkt, mylist_entry); - - if (++count == vm_xfer_page_pkt->range_count + 1) - break; - } - - mtx_unlock_spin(&net_dev->rx_pkt_list_lock); - - /* - * We need at least 2 netvsc pkts (1 to represent the xfer page - * and at least 1 for the range) i.e. we can handle some of the - * xfer page packet ranges... - */ - if (count < 2) { - /* Return netvsc packet to the freelist */ - mtx_lock_spin(&net_dev->rx_pkt_list_lock); - for (i=count; i != 0; i--) { - net_vsc_pkt = STAILQ_FIRST(&mylist_head); - STAILQ_REMOVE_HEAD(&mylist_head, mylist_entry); - - STAILQ_INSERT_TAIL(&net_dev->myrx_packet_list, - net_vsc_pkt, mylist_entry); - } - mtx_unlock_spin(&net_dev->rx_pkt_list_lock); - - hv_nv_send_receive_completion(device, - vm_xfer_page_pkt->d.transaction_id); - - return; - } - - /* Take the first packet in the list */ - xfer_page_pkt = (xfer_page_packet *)STAILQ_FIRST(&mylist_head); - STAILQ_REMOVE_HEAD(&mylist_head, mylist_entry); - - /* This is how many data packets we can supply */ - xfer_page_pkt->count = count - 1; + count = vm_xfer_page_pkt->range_count; + net_vsc_pkt->device = device; /* Each range represents 1 RNDIS pkt that contains 1 Ethernet frame */ - for (i=0; i < (count - 1); i++) { - net_vsc_pkt = STAILQ_FIRST(&mylist_head); - STAILQ_REMOVE_HEAD(&mylist_head, mylist_entry); - - /* - * Initialize the netvsc packet - */ - net_vsc_pkt->xfer_page_pkt = xfer_page_pkt; - net_vsc_pkt->compl.rx.rx_completion_context = net_vsc_pkt; - net_vsc_pkt->device = device; - /* Save this so that we can send it back */ - net_vsc_pkt->compl.rx.rx_completion_tid = - vm_xfer_page_pkt->d.transaction_id; - - net_vsc_pkt->tot_data_buf_len = - vm_xfer_page_pkt->ranges[i].byte_count; - net_vsc_pkt->page_buf_count = 1; - - net_vsc_pkt->page_buffers[0].length = - vm_xfer_page_pkt->ranges[i].byte_count; - - /* The virtual address of the packet in the receive buffer */ - start = ((unsigned long)net_dev->rx_buf + + for (i = 0; i < count; i++) { + net_vsc_pkt->status = nvsp_status_success; + net_vsc_pkt->data = (void *)((unsigned long)net_dev->rx_buf + vm_xfer_page_pkt->ranges[i].byte_offset); - start = ((unsigned long)start) & ~(PAGE_SIZE - 1); - - /* Page number of the virtual page containing packet start */ - net_vsc_pkt->page_buffers[0].pfn = start >> PAGE_SHIFT; - - /* Calculate the page relative offset */ - net_vsc_pkt->page_buffers[0].offset = - vm_xfer_page_pkt->ranges[i].byte_offset & (PAGE_SIZE - 1); - - /* - * In this implementation, we are dealing with virtual - * addresses exclusively. Since we aren't using physical - * addresses at all, we don't care if a packet crosses a - * page boundary. For this reason, the original code to - * check for and handle page crossings has been removed. - */ - - /* - * Pass it to the upper layer. The receive completion call - * has been moved into this function. - */ - hv_rf_on_receive(device, net_vsc_pkt); + net_vsc_pkt->tot_data_buf_len = + vm_xfer_page_pkt->ranges[i].byte_count; - /* - * Moved completion call back here so that all received - * messages (not just data messages) will trigger a response - * message back to the host. - */ - hv_nv_on_receive_completion(net_vsc_pkt); + hv_rf_on_receive(net_dev, device, net_vsc_pkt); + if (net_vsc_pkt->status != nvsp_status_success) { + status = nvsp_status_failure; + } } + + /* + * Moved completion call back here so that all received + * messages (not just data messages) will trigger a response + * message back to the host. + */ + hv_nv_on_receive_completion(device, vm_xfer_page_pkt->d.transaction_id, + status); } /* - * Net VSC send receive completion + * Net VSC on receive completion + * + * Send a receive completion packet to RNDIS device (ie NetVsp) */ -static void -hv_nv_send_receive_completion(struct hv_device *device, uint64_t tid) +void +hv_nv_on_receive_completion(struct hv_device *device, uint64_t tid, + uint32_t status) { nvsp_msg rx_comp_msg; int retries = 0; @@ -1011,7 +938,7 @@ hv_nv_send_receive_completion(struct hv_ /* Pass in the status */ rx_comp_msg.msgs.vers_1_msgs.send_rndis_pkt_complete.status = - nvsp_status_success; + status; retry_send_cmplt: /* Send the completion */ @@ -1032,81 +959,26 @@ retry_send_cmplt: } /* - * Net VSC on receive completion - * - * Send a receive completion packet to RNDIS device (ie NetVsp) - */ -void -hv_nv_on_receive_completion(void *context) -{ - netvsc_packet *packet = (netvsc_packet *)context; - struct hv_device *device = (struct hv_device *)packet->device; - netvsc_dev *net_dev; - uint64_t tid = 0; - boolean_t send_rx_completion = FALSE; - - /* - * Even though it seems logical to do a hv_nv_get_outbound_net_device() - * here to send out receive completion, we are using - * hv_nv_get_inbound_net_device() since we may have disabled - * outbound traffic already. - */ - net_dev = hv_nv_get_inbound_net_device(device); - if (net_dev == NULL) - return; - - /* Overloading use of the lock. */ - mtx_lock_spin(&net_dev->rx_pkt_list_lock); - - packet->xfer_page_pkt->count--; - - /* - * Last one in the line that represent 1 xfer page packet. - * Return the xfer page packet itself to the free list. - */ - if (packet->xfer_page_pkt->count == 0) { - send_rx_completion = TRUE; - tid = packet->compl.rx.rx_completion_tid; - STAILQ_INSERT_TAIL(&net_dev->myrx_packet_list, - (netvsc_packet *)(packet->xfer_page_pkt), mylist_entry); - } - - /* Put the packet back on the free list */ - STAILQ_INSERT_TAIL(&net_dev->myrx_packet_list, packet, mylist_entry); - mtx_unlock_spin(&net_dev->rx_pkt_list_lock); - - /* Send a receive completion for the xfer page packet */ - if (send_rx_completion) - hv_nv_send_receive_completion(device, tid); -} - -/* * Net VSC on channel callback */ static void hv_nv_on_channel_callback(void *context) { - /* Fixme: Magic number */ - const int net_pkt_size = 2048; struct hv_device *device = (struct hv_device *)context; netvsc_dev *net_dev; + device_t dev = device->device; uint32_t bytes_rxed; uint64_t request_id; - uint8_t *packet; - hv_vm_packet_descriptor *desc; + hv_vm_packet_descriptor *desc; uint8_t *buffer; - int bufferlen = net_pkt_size; - int ret = 0; - - packet = malloc(net_pkt_size * sizeof(uint8_t), M_DEVBUF, M_NOWAIT); - if (!packet) - return; - - buffer = packet; + int bufferlen = NETVSC_PACKET_SIZE; + int ret = 0; net_dev = hv_nv_get_inbound_net_device(device); if (net_dev == NULL) - goto out; + return; + + buffer = net_dev->callback_buf; do { ret = hv_vmbus_channel_recv_packet_raw(device->channel, @@ -1116,12 +988,15 @@ hv_nv_on_channel_callback(void *context) desc = (hv_vm_packet_descriptor *)buffer; switch (desc->type) { case HV_VMBUS_PACKET_TYPE_COMPLETION: - hv_nv_on_send_completion(device, desc); + hv_nv_on_send_completion(net_dev, device, desc); break; case HV_VMBUS_PACKET_TYPE_DATA_USING_TRANSFER_PAGES: - hv_nv_on_receive(device, desc); + hv_nv_on_receive(net_dev, device, desc); break; default: + device_printf(dev, + "hv_cb recv unknow type %d " + " packet\n", desc->type); break; } } else { @@ -1129,16 +1004,24 @@ hv_nv_on_channel_callback(void *context) } } else if (ret == ENOBUFS) { /* Handle large packet */ - free(buffer, M_DEVBUF); - buffer = malloc(bytes_rxed, M_DEVBUF, M_NOWAIT); + if (bufferlen > NETVSC_PACKET_SIZE) { + free(buffer, M_NETVSC); + buffer = NULL; + } + + /* alloc new buffer */ + buffer = malloc(bytes_rxed, M_NETVSC, M_NOWAIT); if (buffer == NULL) { + device_printf(dev, + "hv_cb malloc buffer failed, len=%u\n", + bytes_rxed); + bufferlen = 0; break; } bufferlen = bytes_rxed; } } while (1); -out: - free(buffer, M_DEVBUF); + if (bufferlen > NETVSC_PACKET_SIZE) + free(buffer, M_NETVSC); } - Modified: head/sys/dev/hyperv/netvsc/hv_net_vsc.h ============================================================================== --- head/sys/dev/hyperv/netvsc/hv_net_vsc.h Wed Jun 24 01:48:44 2015 (r284745) +++ head/sys/dev/hyperv/netvsc/hv_net_vsc.h Wed Jun 24 06:01:29 2015 (r284746) @@ -41,20 +41,26 @@ #include #include #include +#include #include #include +MALLOC_DECLARE(M_NETVSC); #define NVSP_INVALID_PROTOCOL_VERSION (0xFFFFFFFF) #define NVSP_PROTOCOL_VERSION_1 2 #define NVSP_PROTOCOL_VERSION_2 0x30002 +#define NVSP_PROTOCOL_VERSION_4 0x40000 +#define NVSP_PROTOCOL_VERSION_5 0x50000 #define NVSP_MIN_PROTOCOL_VERSION (NVSP_PROTOCOL_VERSION_1) #define NVSP_MAX_PROTOCOL_VERSION (NVSP_PROTOCOL_VERSION_2) #define NVSP_PROTOCOL_VERSION_CURRENT NVSP_PROTOCOL_VERSION_2 +#define VERSION_4_OFFLOAD_SIZE 22 + #define NVSP_OPERATIONAL_STATUS_OK (0x00000000) #define NVSP_OPERATIONAL_STATUS_DEGRADED (0x00000001) #define NVSP_OPERATIONAL_STATUS_NONRECOVERABLE (0x00000002) @@ -544,7 +550,7 @@ typedef struct nvsp_2_msg_indicate_chimn #define NVSP_1_CHIMNEY_SEND_INVALID_OOB_INDEX 0xffffu -#define NVSP_1_CHIMNEY_SEND_INVALID_SECTION_INDEX 0xffffu +#define NVSP_1_CHIMNEY_SEND_INVALID_SECTION_INDEX 0xffffffff /* * NvspMessage2TypeSendChimneyPacket @@ -842,11 +848,11 @@ typedef struct nvsp_msg_ { * Defines */ -#define NETVSC_SEND_BUFFER_SIZE (64*1024) /* 64K */ +#define NETVSC_SEND_BUFFER_SIZE (1024*1024*15) /* 15M */ #define NETVSC_SEND_BUFFER_ID 0xface -#define NETVSC_RECEIVE_BUFFER_SIZE (1024*1024) /* 1MB */ +#define NETVSC_RECEIVE_BUFFER_SIZE (1024*1024*16) /* 16MB */ #define NETVSC_RECEIVE_BUFFER_ID 0xcafe @@ -862,6 +868,8 @@ typedef struct nvsp_msg_ { */ #define NETVSC_MAX_CONFIGURABLE_MTU (9 * 1024) +#define NETVSC_PACKET_SIZE PAGE_SIZE + /* * Data types */ @@ -873,15 +881,14 @@ typedef struct netvsc_dev_ { struct hv_device *dev; int num_outstanding_sends; - /* List of free preallocated NETVSC_PACKET to represent RX packet */ - STAILQ_HEAD(PQ, netvsc_packet_) myrx_packet_list; - struct mtx rx_pkt_list_lock; - /* Send buffer allocated by us but manages by NetVSP */ void *send_buf; uint32_t send_buf_size; uint32_t send_buf_gpadl_handle; uint32_t send_section_size; + uint32_t send_section_count; + unsigned long bitsmap_words; + unsigned long *send_section_bitsmap; /* Receive buffer allocated by us but managed by NetVSP */ void *rx_buf; @@ -903,35 +910,43 @@ typedef struct netvsc_dev_ { hv_bool_uint8_t destroy; /* Negotiated NVSP version */ uint32_t nvsp_version; + + uint8_t callback_buf[NETVSC_PACKET_SIZE]; } netvsc_dev; typedef void (*pfn_on_send_rx_completion)(void *); -#define NETVSC_DEVICE_RING_BUFFER_SIZE (64 * PAGE_SIZE) -#define NETVSC_PACKET_MAXPAGE 16 - +#define NETVSC_DEVICE_RING_BUFFER_SIZE (128 * PAGE_SIZE) +#define NETVSC_PACKET_MAXPAGE 32 -typedef struct xfer_page_packet_ { - /* - * This needs to be here because the network RX code casts - * an instantiation of this structure to a netvsc_packet. - */ - STAILQ_ENTRY(netvsc_packet_) mylist_entry; - uint32_t count; -} xfer_page_packet; +#define NETVSC_VLAN_PRIO_MASK 0xe000 +#define NETVSC_VLAN_PRIO_SHIFT 13 +#define NETVSC_VLAN_VID_MASK 0x0fff + +#define TYPE_IPV4 2 +#define TYPE_IPV6 4 +#define TYPE_TCP 2 +#define TYPE_UDP 4 + +#define TRANSPORT_TYPE_NOT_IP 0 +#define TRANSPORT_TYPE_IPV4_TCP ((TYPE_IPV4 << 16) | TYPE_TCP) +#define TRANSPORT_TYPE_IPV4_UDP ((TYPE_IPV4 << 16) | TYPE_UDP) +#define TRANSPORT_TYPE_IPV6_TCP ((TYPE_IPV6 << 16) | TYPE_TCP) +#define TRANSPORT_TYPE_IPV6_UDP ((TYPE_IPV6 << 16) | TYPE_UDP) + +#ifdef __LP64__ +#define BITS_PER_LONG 64 +#else +#define BITS_PER_LONG 32 +#endif typedef struct netvsc_packet_ { - /* - * List used when enqueued on &net_dev->rx_packet_list, - * and when enqueued within the netvsc code - */ - STAILQ_ENTRY(netvsc_packet_) mylist_entry; struct hv_device *device; hv_bool_uint8_t is_data_pkt; /* One byte */ uint16_t vlan_tci; - xfer_page_packet *xfer_page_pkt; + uint32_t status; /* Completion */ union { @@ -948,9 +963,12 @@ typedef struct netvsc_packet_ { pfn_on_send_rx_completion on_send_completion; } send; } compl; + uint32_t send_buf_section_idx; + uint32_t send_buf_section_size; - void *extension; + void *rndis_mesg; uint32_t tot_data_buf_len; + void *data; uint32_t page_buf_count; hv_vmbus_page_buffer page_buffers[NETVSC_PACKET_MAXPAGE]; } netvsc_packet; @@ -983,16 +1001,16 @@ typedef struct hn_softc { */ extern int hv_promisc_mode; -extern void netvsc_linkstatus_callback(struct hv_device *device_obj, - uint32_t status); -extern int netvsc_recv(struct hv_device *device_obj, netvsc_packet *packet); -extern void netvsc_xmit_completion(void *context); - -extern void hv_nv_on_receive_completion(void *context); -extern netvsc_dev *hv_nv_on_device_add(struct hv_device *device, void *additional_info); -extern int hv_nv_on_device_remove(struct hv_device *device, - boolean_t destroy_channel); -extern int hv_nv_on_send(struct hv_device *device, netvsc_packet *pkt); +void netvsc_linkstatus_callback(struct hv_device *device_obj, uint32_t status); +void netvsc_xmit_completion(void *context); +void hv_nv_on_receive_completion(struct hv_device *device, + uint64_t tid, uint32_t status); +netvsc_dev *hv_nv_on_device_add(struct hv_device *device, + void *additional_info); +int hv_nv_on_device_remove(struct hv_device *device, + boolean_t destroy_channel); +int hv_nv_on_send(struct hv_device *device, netvsc_packet *pkt); +int hv_nv_get_next_send_section(netvsc_dev *net_dev); #endif /* __HV_NET_VSC_H__ */ Modified: head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c ============================================================================== --- head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Wed Jun 24 01:48:44 2015 (r284745) +++ head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Wed Jun 24 06:01:29 2015 (r284746) @@ -83,6 +83,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include +#include #include #include @@ -103,6 +106,8 @@ __FBSDID("$FreeBSD$"); #include +#include + #include #include "hv_net_vsc.h" #include "hv_rndis.h" @@ -165,6 +170,53 @@ static int hn_ioctl(struct ifnet *ifp, static int hn_start_locked(struct ifnet *ifp); static void hn_start(struct ifnet *ifp); +/* + * NetVsc get message transport protocol type + */ +static uint32_t get_transport_proto_type(struct mbuf *m_head) +{ + uint32_t ret_val = TRANSPORT_TYPE_NOT_IP; + uint16_t ether_type = 0; + int ether_len = 0; + struct ether_vlan_header *eh; + struct ip *iph; + struct ip6_hdr *ip6; + + eh = mtod(m_head, struct ether_vlan_header*); + if (eh->evl_encap_proto == htons(ETHERTYPE_VLAN)) { + ether_len = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN; + ether_type = eh->evl_proto; + } else { + ether_len = ETHER_HDR_LEN; + ether_type = eh->evl_encap_proto; + } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Wed Jun 24 06:25:21 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0100E141E70D; Wed, 24 Jun 2015 06:25:21 +0000 (UTC) (envelope-from arybchik@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E5E31D67; Wed, 24 Jun 2015 06:25:20 +0000 (UTC) (envelope-from arybchik@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5O6PKPP044028; Wed, 24 Jun 2015 06:25:20 GMT (envelope-from arybchik@FreeBSD.org) Received: (from arybchik@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5O6PKx9044027; Wed, 24 Jun 2015 06:25:20 GMT (envelope-from arybchik@FreeBSD.org) Message-Id: <201506240625.t5O6PKx9044027@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: arybchik set sender to arybchik@FreeBSD.org using -f From: Andrew Rybchenko Date: Wed, 24 Jun 2015 06:25:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284747 - head/sys/dev/sfxge X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 06:25:21 -0000 Author: arybchik Date: Wed Jun 24 06:25:20 2015 New Revision: 284747 URL: https://svnweb.freebsd.org/changeset/base/284747 Log: sfxge: skip VPD info population if access is denied The patch allows to run on unprivileged PF (PFIOV) passed to a virtual machine. Reviewed by: gnn Sponsored by: Solarflare Communications, Inc. MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D2891 Modified: head/sys/dev/sfxge/sfxge.c Modified: head/sys/dev/sfxge/sfxge.c ============================================================================== --- head/sys/dev/sfxge/sfxge.c Wed Jun 24 06:01:29 2015 (r284746) +++ head/sys/dev/sfxge/sfxge.c Wed Jun 24 06:25:20 2015 (r284747) @@ -905,8 +905,15 @@ sfxge_vpd_init(struct sfxge_softc *sc) efx_vpd_value_t value; int rc; - if ((rc = efx_vpd_size(sc->enp, &sc->vpd_size)) != 0) + if ((rc = efx_vpd_size(sc->enp, &sc->vpd_size)) != 0) { + /* + * Unpriviledged functions deny VPD access. + * Simply skip VPD in this case. + */ + if (rc == EACCES) + goto done; goto fail; + } sc->vpd_data = malloc(sc->vpd_size, M_SFXGE, M_WAITOK); if ((rc = efx_vpd_read(sc->enp, sc->vpd_data, sc->vpd_size)) != 0) goto fail2; @@ -935,6 +942,7 @@ sfxge_vpd_init(struct sfxge_softc *sc) for (keyword[1] = 'A'; keyword[1] <= 'Z'; keyword[1]++) sfxge_vpd_try_add(sc, vpd_list, EFX_VPD_RO, keyword); +done: return (0); fail2: From owner-svn-src-head@freebsd.org Wed Jun 24 09:06:13 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C5D09151D1; Wed, 24 Jun 2015 09:06:13 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7D46F1023; Wed, 24 Jun 2015 09:06:13 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5O96DUk021752; Wed, 24 Jun 2015 09:06:13 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5O96Dk2021751; Wed, 24 Jun 2015 09:06:13 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506240906.t5O96Dk2021751@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Wed, 24 Jun 2015 09:06:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284748 - head/sys/dev/isp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 09:06:13 -0000 Author: mav Date: Wed Jun 24 09:06:12 2015 New Revision: 284748 URL: https://svnweb.freebsd.org/changeset/base/284748 Log: Fix reported_gone setting, missed in some cases. This makes driver better track reported CAM_SEL_TIMEOUTs to properly report device reappearance later. This fixes target 0 not reappearing after initiator mode disabled and then reenabled. MFC after: 3 days Modified: head/sys/dev/isp/isp_freebsd.c Modified: head/sys/dev/isp/isp_freebsd.c ============================================================================== --- head/sys/dev/isp/isp_freebsd.c Wed Jun 24 06:25:20 2015 (r284747) +++ head/sys/dev/isp/isp_freebsd.c Wed Jun 24 09:06:12 2015 (r284748) @@ -4943,6 +4943,8 @@ isp_action(struct cam_sim *sim, union cc isp = (ispsoftc_t *)cam_sim_softc(sim); mtx_assert(&isp->isp_lock, MA_OWNED); + isp_prt(isp, ISP_LOGDEBUG2, "isp_action code %x", ccb->ccb_h.func_code); + ISP_PCMD(ccb) = NULL; if (isp->isp_state != ISP_RUNSTATE && ccb->ccb_h.func_code == XPT_SCSI_IO) { isp_init(isp); @@ -4950,15 +4952,12 @@ isp_action(struct cam_sim *sim, union cc /* * Lie. Say it was a selection timeout. */ - ccb->ccb_h.status = CAM_SEL_TIMEOUT | CAM_DEV_QFRZN; - xpt_freeze_devq(ccb->ccb_h.path, 1); - xpt_done(ccb); + ccb->ccb_h.status = CAM_SEL_TIMEOUT; + isp_done((struct ccb_scsiio *) ccb); return; } isp->isp_state = ISP_RUNSTATE; } - isp_prt(isp, ISP_LOGDEBUG2, "isp_action code %x", ccb->ccb_h.func_code); - ISP_PCMD(ccb) = NULL; switch (ccb->ccb_h.func_code) { case XPT_SCSI_IO: /* Execute the requested I/O operation */ @@ -4969,7 +4968,7 @@ isp_action(struct cam_sim *sim, union cc if ((ccb->ccb_h.flags & CAM_CDB_POINTER) != 0) { if ((ccb->ccb_h.flags & CAM_CDB_PHYS) != 0) { ccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(ccb); + isp_done((struct ccb_scsiio *) ccb); break; } } @@ -4992,6 +4991,7 @@ isp_action(struct cam_sim *sim, union cc isp_prt(isp, ISP_LOGWARN, "out of PCMDs"); cam_freeze_devq(ccb->ccb_h.path); cam_release_devq(ccb->ccb_h.path, RELSIM_RELEASE_AFTER_TIMEOUT, 0, 250, 0); + ccb->ccb_h.status = CAM_REQUEUE_REQ; xpt_done(ccb); break; } @@ -5024,10 +5024,8 @@ isp_action(struct cam_sim *sim, union cc } else { isp_prt(isp, ISP_LOGDEBUG0, "%d.%d downtime (%d) > lim (%d)", XS_TGT(ccb), XS_LUN(ccb), ISP_FC_PC(isp, bus)->loop_down_time, lim); } - ccb->ccb_h.status = CAM_SEL_TIMEOUT|CAM_DEV_QFRZN; - xpt_freeze_devq(ccb->ccb_h.path, 1); - isp_free_pcmd(isp, ccb); - xpt_done(ccb); + ccb->ccb_h.status = CAM_SEL_TIMEOUT; + isp_done((struct ccb_scsiio *) ccb); break; } isp_prt(isp, ISP_LOGDEBUG0, "%d.%d retry later", XS_TGT(ccb), XS_LUN(ccb)); @@ -5646,7 +5644,7 @@ isp_done(XS_T *sccb) * gone. If it reappears, we'll need to issue a * rescan. */ - if (hdlidx > 0 && hdlidx < MAX_FC_TARG) + if (hdlidx >= 0 && hdlidx < MAX_FC_TARG) fcp->portdb[hdlidx].reported_gone = 1; } if ((sccb->ccb_h.status & CAM_DEV_QFRZN) == 0) { @@ -5659,9 +5657,11 @@ isp_done(XS_T *sccb) xpt_print(sccb->ccb_h.path, "cam completion status 0x%x\n", sccb->ccb_h.status); } - if (callout_active(&PISP_PCMD(sccb)->wdog)) - callout_stop(&PISP_PCMD(sccb)->wdog); - isp_free_pcmd(isp, (union ccb *) sccb); + if (ISP_PCMD(sccb)) { + if (callout_active(&PISP_PCMD(sccb)->wdog)) + callout_stop(&PISP_PCMD(sccb)->wdog); + isp_free_pcmd(isp, (union ccb *) sccb); + } xpt_done((union ccb *) sccb); } From owner-svn-src-head@freebsd.org Wed Jun 24 09:28:44 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 872DE915B5D; Wed, 24 Jun 2015 09:28:44 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7538A1DB5; Wed, 24 Jun 2015 09:28:44 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5O9SilG031639; Wed, 24 Jun 2015 09:28:44 GMT (envelope-from kevlo@FreeBSD.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5O9SiPp031638; Wed, 24 Jun 2015 09:28:44 GMT (envelope-from kevlo@FreeBSD.org) Message-Id: <201506240928.t5O9SiPp031638@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kevlo set sender to kevlo@FreeBSD.org using -f From: Kevin Lo Date: Wed, 24 Jun 2015 09:28:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284749 - head/share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 09:28:44 -0000 Author: kevlo Date: Wed Jun 24 09:28:43 2015 New Revision: 284749 URL: https://svnweb.freebsd.org/changeset/base/284749 Log: Mention that using ports/net/malo-firmware-kmod to install the firmware. Modified: head/share/man/man4/malo.4 Modified: head/share/man/man4/malo.4 ============================================================================== --- head/share/man/man4/malo.4 Wed Jun 24 09:06:12 2015 (r284748) +++ head/share/man/man4/malo.4 Wed Jun 24 09:28:43 2015 (r284749) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\"/ -.Dd September 20, 2014 +.Dd June 24, 2015 .Dt MALO 4 .Os .Sh NAME @@ -69,30 +69,12 @@ Only one virtual interface may be config For more information on configuring this device, see .Xr ifconfig 8 . .Pp -This driver requires the -.Nm malofw -firmware kernel module be installed before it will work. -The firmware files are not publicly available. -A port of the firmware can be found at: -.Bd -literal -offset indent -http://weongyo.org/project/malo/malo-firmware-1.4.tar.gz -.Ed -.Pp -The firmware kernel module can be installed by extracting -the archive and running -.Ql make install clean -in the -.Pa malo-firmware-1.4 -directory. -.Pp -To load the -.Nm malofw -firmware kernel module at boot time, place the following -line in -.Xr loader.conf 5 : -.Bd -literal -offset indent -malofw_load="YES" -.Ed +This driver requires firmware to be loaded before it will work. +The +.Pa ports/net/malo-firmware-kmod +port needs to be installed before +.Xr ifconfig 8 +will work. .Sh HARDWARE The following cards are among those supported by the .Nm From owner-svn-src-head@freebsd.org Wed Jun 24 12:19:50 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C4D35915797; Wed, 24 Jun 2015 12:19:50 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B5CBB1009; Wed, 24 Jun 2015 12:19:50 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OCJoGZ013446; Wed, 24 Jun 2015 12:19:50 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OCJoZj013445; Wed, 24 Jun 2015 12:19:50 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506241219.t5OCJoZj013445@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Wed, 24 Jun 2015 12:19:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284751 - head/sys/arm64/include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 12:19:50 -0000 Author: andrew Date: Wed Jun 24 12:19:49 2015 New Revision: 284751 URL: https://svnweb.freebsd.org/changeset/base/284751 Log: Fix the floating-point exception values to line up with the hardware register bits. Nothing in base uses these as they are deprecated, however third-party applications, such as perl, expect some of these functions to exist. Obtained from: ABT Systems Ltd Sponsored by: The FreeBSD Foundation Modified: head/sys/arm64/include/ieeefp.h Modified: head/sys/arm64/include/ieeefp.h ============================================================================== --- head/sys/arm64/include/ieeefp.h Wed Jun 24 12:19:11 2015 (r284750) +++ head/sys/arm64/include/ieeefp.h Wed Jun 24 12:19:49 2015 (r284751) @@ -10,12 +10,12 @@ /* Deprecated FPU control interface */ /* FP exception codes */ -#define FP_EXCEPT_INV 0 -#define FP_EXCEPT_DZ 1 -#define FP_EXCEPT_OFL 2 -#define FP_EXCEPT_UFL 3 -#define FP_EXCEPT_IMP 4 -#define FP_EXCEPT_DNML 7 +#define FP_EXCEPT_INV 8 +#define FP_EXCEPT_DZ 9 +#define FP_EXCEPT_OFL 10 +#define FP_EXCEPT_UFL 11 +#define FP_EXCEPT_IMP 12 +#define FP_EXCEPT_DNML 15 typedef int fp_except_t; From owner-svn-src-head@freebsd.org Wed Jun 24 14:51:54 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 30F3A91545E; Wed, 24 Jun 2015 14:51:54 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1E2A31D5B; Wed, 24 Jun 2015 14:51:54 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OEprsT091150; Wed, 24 Jun 2015 14:51:53 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OEprZO091149; Wed, 24 Jun 2015 14:51:53 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201506241451.t5OEprZO091149@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 24 Jun 2015 14:51:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284764 - head/sys/arm64/include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 14:51:54 -0000 Author: emaste Date: Wed Jun 24 14:51:53 2015 New Revision: 284764 URL: https://svnweb.freebsd.org/changeset/base/284764 Log: add floatingpoint.h for arm64 On other architectures floatingpoint.h is a symlink to machine/floatingpoint.h which in turn includes machine/ieeefp.h. Do this on arm64 as well for now. Sponsored by: The FreeBSD Foundation Added: head/sys/arm64/include/floatingpoint.h (contents, props changed) Added: head/sys/arm64/include/floatingpoint.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm64/include/floatingpoint.h Wed Jun 24 14:51:53 2015 (r284764) @@ -0,0 +1,3 @@ +/* $FreeBSD$ */ + +#include From owner-svn-src-head@freebsd.org Wed Jun 24 15:13:28 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 64EF1915A47; Wed, 24 Jun 2015 15:13:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 562ED1D22; Wed, 24 Jun 2015 15:13:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OFDS6S001696; Wed, 24 Jun 2015 15:13:28 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OFDRH2001694; Wed, 24 Jun 2015 15:13:27 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506241513.t5OFDRH2001694@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Wed, 24 Jun 2015 15:13:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284765 - head/usr.sbin/ctld X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 15:13:28 -0000 Author: mav Date: Wed Jun 24 15:13:27 2015 New Revision: 284765 URL: https://svnweb.freebsd.org/changeset/base/284765 Log: Teach ctld about CTL's physical_port and virtual_port fields. This allows ctld to work with isp(4) virtual ports, specifying them as isp0/1, isp0/2, etc. There are still problems on isp(4) layer with disabling those ports after enabling, but hopefully they can be fixed. MFC after: 3 days Sponsored by: iXsystems, Inc. Modified: head/usr.sbin/ctld/ctl.conf.5 head/usr.sbin/ctld/kernel.c Modified: head/usr.sbin/ctld/ctl.conf.5 ============================================================================== --- head/usr.sbin/ctld/ctl.conf.5 Wed Jun 24 14:51:53 2015 (r284764) +++ head/usr.sbin/ctld/ctl.conf.5 Wed Jun 24 15:13:27 2015 (r284765) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 19, 2015 +.Dd June 24, 2015 .Dt CTL.CONF 5 .Os .Sh NAME @@ -324,7 +324,9 @@ Optional second argument specifies auth to this specific portal group. If second argument is not specified, target auth group is used. .It Ic port Ar name -Assign specified CTL port (such as "isp0") to the target. +.It Ic port Ar name/pp +.It Ic port Ar name/pp/vp +Assign specified CTL port (such as "isp0" or "isp2/1") to the target. On startup ctld configures LUN mapping and enables all assigned ports. Each port can be assigned to only one target. .It Ic redirect Ar address Modified: head/usr.sbin/ctld/kernel.c ============================================================================== --- head/usr.sbin/ctld/kernel.c Wed Jun 24 14:51:53 2015 (r284764) +++ head/usr.sbin/ctld/kernel.c Wed Jun 24 15:13:27 2015 (r284765) @@ -122,6 +122,8 @@ struct cctl_lun { struct cctl_port { uint32_t port_id; char *port_name; + int pp; + int vp; int cfiscsi_state; char *cfiscsi_target; uint16_t cfiscsi_portal_group_tag; @@ -334,6 +336,10 @@ cctl_end_pelement(void *user_data, const if (strcmp(name, "port_name") == 0) { cur_port->port_name = str; str = NULL; + } else if (strcmp(name, "physical_port") == 0) { + cur_port->pp = strtoul(str, NULL, 0); + } else if (strcmp(name, "virtual_port") == 0) { + cur_port->vp = strtoul(str, NULL, 0); } else if (strcmp(name, "cfiscsi_target") == 0) { cur_port->cfiscsi_target = str; str = NULL; @@ -391,7 +397,7 @@ conf_new_from_kernel(void) struct cctl_lun *lun; struct cctl_port *port; XML_Parser parser; - char *str; + char *str, *name; int len, retval; bzero(&devlist, sizeof(devlist)); @@ -500,18 +506,26 @@ retry_port: conf = conf_new(); + name = NULL; STAILQ_FOREACH(port, &devlist.port_list, links) { + if (port->pp == 0 && port->vp == 0) + name = checked_strdup(port->port_name); + else if (port->vp == 0) + asprintf(&name, "%s/%d", port->port_name, port->pp); + else + asprintf(&name, "%s/%d/%d", port->port_name, port->pp, + port->vp); if (port->cfiscsi_target == NULL) { log_debugx("CTL port %u \"%s\" wasn't managed by ctld; ", - port->port_id, port->port_name); - pp = pport_find(conf, port->port_name); + port->port_id, name); + pp = pport_find(conf, name); if (pp == NULL) { #if 0 log_debugx("found new kernel port %u \"%s\"", - port->port_id, port->port_name); + port->port_id, name); #endif - pp = pport_new(conf, port->port_name, port->port_id); + pp = pport_new(conf, name, port->port_id); if (pp == NULL) { log_warnx("pport_new failed"); continue; @@ -560,6 +574,8 @@ retry_port: } cp->p_ctl_port = port->port_id; } + if (name) + free(name); STAILQ_FOREACH(lun, &devlist.lun_list, links) { struct cctl_lun_nv *nv; From owner-svn-src-head@freebsd.org Wed Jun 24 15:52:27 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 926D491609C; Wed, 24 Jun 2015 15:52:27 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 83C3A2666; Wed, 24 Jun 2015 15:52:27 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OFqReM023688; Wed, 24 Jun 2015 15:52:27 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OFqREr023687; Wed, 24 Jun 2015 15:52:27 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201506241552.t5OFqREr023687@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Wed, 24 Jun 2015 15:52:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284766 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 15:52:27 -0000 Author: sbruno Date: Wed Jun 24 15:52:26 2015 New Revision: 284766 URL: https://svnweb.freebsd.org/changeset/base/284766 Log: At the suggestion of jhb, replace atomic_set/clear calls with use of exclusive locks in the enable/disable interpreter path. Tested with WITNESS/INVARIANTS on and off. Reviewed by: sson davide Modified: head/sys/kern/imgact_binmisc.c Modified: head/sys/kern/imgact_binmisc.c ============================================================================== --- head/sys/kern/imgact_binmisc.c Wed Jun 24 15:13:27 2015 (r284765) +++ head/sys/kern/imgact_binmisc.c Wed Jun 24 15:52:26 2015 (r284766) @@ -308,14 +308,14 @@ imgact_binmisc_disable_entry(char *name) { imgact_binmisc_entry_t *ibe; - sx_slock(&interp_list_sx); + sx_xlock(&interp_list_sx); if ((ibe = imgact_binmisc_find_entry(name)) == NULL) { - sx_sunlock(&interp_list_sx); + sx_xunlock(&interp_list_sx); return (ENOENT); } - atomic_clear_32(&ibe->ibe_flags, IBF_ENABLED); - sx_sunlock(&interp_list_sx); + ibe->ibe_flags &= ~IBF_ENABLED; + sx_xunlock(&interp_list_sx); return (0); } @@ -329,14 +329,14 @@ imgact_binmisc_enable_entry(char *name) { imgact_binmisc_entry_t *ibe; - sx_slock(&interp_list_sx); + sx_xlock(&interp_list_sx); if ((ibe = imgact_binmisc_find_entry(name)) == NULL) { - sx_sunlock(&interp_list_sx); + sx_xunlock(&interp_list_sx); return (ENOENT); } - atomic_set_32(&ibe->ibe_flags, IBF_ENABLED); - sx_sunlock(&interp_list_sx); + ibe->ibe_flags |= IBF_ENABLED; + sx_xunlock(&interp_list_sx); return (0); } From owner-svn-src-head@freebsd.org Wed Jun 24 15:53:53 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B41ED91619B; Wed, 24 Jun 2015 15:53:53 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A4D6F28B7; Wed, 24 Jun 2015 15:53:53 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OFrrc4023902; Wed, 24 Jun 2015 15:53:53 GMT (envelope-from erj@FreeBSD.org) Received: (from erj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OFrqis023899; Wed, 24 Jun 2015 15:53:52 GMT (envelope-from erj@FreeBSD.org) Message-Id: <201506241553.t5OFrqis023899@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: erj set sender to erj@FreeBSD.org using -f From: Eric Joyner Date: Wed, 24 Jun 2015 15:53:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284767 - in head/sys: conf modules modules/ixv X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 15:53:53 -0000 Author: erj Date: Wed Jun 24 15:53:52 2015 New Revision: 284767 URL: https://svnweb.freebsd.org/changeset/base/284767 Log: Several build changes for ix and ixv: - Allow ix and ixv to be built seperately. - Re-enable building ix for i386 and amd64 archs - Fix ixv Makefile. Approved by: jfv (mentor) Modified: head/sys/conf/files head/sys/modules/Makefile head/sys/modules/ixv/Makefile Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Wed Jun 24 15:52:26 2015 (r284766) +++ head/sys/conf/files Wed Jun 24 15:53:52 2015 (r284767) @@ -1774,31 +1774,31 @@ dev/ixgbe/if_ix.c optional ix inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP" dev/ixgbe/if_ixv.c optional ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP" -dev/ixgbe/ix_txrx.c optional ix ixv inet \ - compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP" -dev/ixgbe/ixgbe_phy.c optional ix ixv inet \ +dev/ixgbe/ix_txrx.c optional ix inet | ixv inet \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_phy.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_api.c optional ix ixv inet \ +dev/ixgbe/ixgbe_api.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_common.c optional ix ixv inet \ +dev/ixgbe/ixgbe_common.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_mbx.c optional ix ixv inet \ +dev/ixgbe/ixgbe_mbx.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_vf.c optional ix ixv inet \ +dev/ixgbe/ixgbe_vf.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_82598.c optional ix ixv inet \ +dev/ixgbe/ixgbe_82598.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_82599.c optional ix ixv inet \ +dev/ixgbe/ixgbe_82599.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_x540.c optional ix ixv inet \ +dev/ixgbe/ixgbe_x540.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_x550.c optional ix ixv inet \ +dev/ixgbe/ixgbe_x550.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_dcb.c optional ix ixv inet \ +dev/ixgbe/ixgbe_dcb.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_dcb_82598.c optional ix ixv inet \ +dev/ixgbe/ixgbe_dcb_82598.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_dcb_82599.c optional ix ixv inet \ +dev/ixgbe/ixgbe_dcb_82599.c optional ix inet | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/jme/if_jme.c optional jme pci dev/joy/joy.c optional joy Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Wed Jun 24 15:52:26 2015 (r284766) +++ head/sys/modules/Makefile Wed Jun 24 15:53:52 2015 (r284767) @@ -174,9 +174,9 @@ SUBDIR= \ ${_iwifw} \ ${_iwn} \ ${_iwnfw} \ - ${_ixgb} \ ${_ix} \ ${_ixv} \ + ${_ixgb} \ ${_ixl} \ ${_ixlv} \ jme \ @@ -512,6 +512,7 @@ _io= io .if ${MK_OFED} != "no" || defined(ALL_MODULES) _ipoib= ipoib .endif +_ix= ix _ixv= ixv _linprocfs= linprocfs _linsysfs= linsysfs Modified: head/sys/modules/ixv/Makefile ============================================================================== --- head/sys/modules/ixv/Makefile Wed Jun 24 15:52:26 2015 (r284766) +++ head/sys/modules/ixv/Makefile Wed Jun 24 15:53:52 2015 (r284767) @@ -7,8 +7,9 @@ SRCS = device_if.h bus_if.h pci_if.h SRCS += opt_inet.h opt_inet6.h opt_rss.h SRCS += if_ixv.c ix_txrx.c # Shared source -SRCS += ixgbe_common.c ixgbe_api.c ixgbe_phy.c -SRCS += ixgbe_dcb.c ixgbe_mbx.c ixgbe_vf.c +SRCS += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c +SRCS += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c +SRCS += ixgbe_82598.c ixgbe_82599.c ixgbe_x540.c ixgbe_x550.c CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP .include From owner-svn-src-head@freebsd.org Wed Jun 24 16:15:34 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1673C916970; Wed, 24 Jun 2015 16:15:34 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 072791A50; Wed, 24 Jun 2015 16:15:34 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OGFXA0034628; Wed, 24 Jun 2015 16:15:33 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OGFXTp034625; Wed, 24 Jun 2015 16:15:33 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506241615.t5OGFXTp034625@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Wed, 24 Jun 2015 16:15:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284768 - head/lib/libc/aarch64/gen X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 16:15:34 -0000 Author: andrew Date: Wed Jun 24 16:15:32 2015 New Revision: 284768 URL: https://svnweb.freebsd.org/changeset/base/284768 Log: Set the alignment of the setjmp magic values correctly. The alignment needs to be before the lavel, otherwise an extra word may be added between the label and the data. Obtained from: ABT Systems Ltd Sponsored by: The FReeBSD Foundation Modified: head/lib/libc/aarch64/gen/_setjmp.S head/lib/libc/aarch64/gen/setjmp.S head/lib/libc/aarch64/gen/sigsetjmp.S Modified: head/lib/libc/aarch64/gen/_setjmp.S ============================================================================== --- head/lib/libc/aarch64/gen/_setjmp.S Wed Jun 24 15:53:52 2015 (r284767) +++ head/lib/libc/aarch64/gen/_setjmp.S Wed Jun 24 16:15:32 2015 (r284768) @@ -59,8 +59,8 @@ ENTRY(_setjmp) /* Return value */ mov x0, #0 ret -.Lmagic: .align 3 +.Lmagic: .quad _JB_MAGIC__SETJMP END(_setjmp) Modified: head/lib/libc/aarch64/gen/setjmp.S ============================================================================== --- head/lib/libc/aarch64/gen/setjmp.S Wed Jun 24 15:53:52 2015 (r284767) +++ head/lib/libc/aarch64/gen/setjmp.S Wed Jun 24 16:15:32 2015 (r284768) @@ -69,8 +69,8 @@ ENTRY(setjmp) /* Return value */ mov x0, #0 ret -.Lmagic: .align 3 +.Lmagic: .quad _JB_MAGIC_SETJMP END(setjmp) Modified: head/lib/libc/aarch64/gen/sigsetjmp.S ============================================================================== --- head/lib/libc/aarch64/gen/sigsetjmp.S Wed Jun 24 15:53:52 2015 (r284767) +++ head/lib/libc/aarch64/gen/sigsetjmp.S Wed Jun 24 16:15:32 2015 (r284768) @@ -47,7 +47,7 @@ ENTRY(siglongjmp) cmp x2, x3 b.eq _C_LABEL(_longjmp) b _C_LABEL(longjmp) -.Lmagic: .align 3 +.Lmagic: .quad _JB_MAGIC__SETJMP END(siglongjmp) From owner-svn-src-head@freebsd.org Wed Jun 24 16:18:59 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6EA039169EE; Wed, 24 Jun 2015 16:18:59 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F43F1C58; Wed, 24 Jun 2015 16:18:59 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OGIx5b035092; Wed, 24 Jun 2015 16:18:59 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OGIwg1035087; Wed, 24 Jun 2015 16:18:58 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506241618.t5OGIwg1035087@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Wed, 24 Jun 2015 16:18:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284769 - in head/lib/libc/aarch64: . gen X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 16:18:59 -0000 Author: andrew Date: Wed Jun 24 16:18:58 2015 New Revision: 284769 URL: https://svnweb.freebsd.org/changeset/base/284769 Log: Implement fpsetmask. Some third-party software makes use of it, for example perl. Obtained from: ABT Systems Ltd Sponsored by: The FreeBSD Foundation Added: head/lib/libc/aarch64/gen/fpsetmask.c (contents, props changed) Modified: head/lib/libc/aarch64/Symbol.map head/lib/libc/aarch64/gen/Makefile.inc Modified: head/lib/libc/aarch64/Symbol.map ============================================================================== --- head/lib/libc/aarch64/Symbol.map Wed Jun 24 16:15:32 2015 (r284768) +++ head/lib/libc/aarch64/Symbol.map Wed Jun 24 16:18:58 2015 (r284769) @@ -14,6 +14,7 @@ FBSD_1.0 { _setjmp; _longjmp; fabs; + fpsetmask; setjmp; longjmp; sigsetjmp; Modified: head/lib/libc/aarch64/gen/Makefile.inc ============================================================================== --- head/lib/libc/aarch64/gen/Makefile.inc Wed Jun 24 16:15:32 2015 (r284768) +++ head/lib/libc/aarch64/gen/Makefile.inc Wed Jun 24 16:18:58 2015 (r284769) @@ -2,6 +2,7 @@ SRCS+= fabs.S \ flt_rounds.c \ + fpsetmask.c \ ldexp.c \ _setjmp.S \ _set_tp.c \ Added: head/lib/libc/aarch64/gen/fpsetmask.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/aarch64/gen/fpsetmask.c Wed Jun 24 16:18:58 2015 (r284769) @@ -0,0 +1,52 @@ +/*- + * Copyright (c) 2015 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Andrew Turner under + * sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include + +#define FP_X_MASK (FP_X_INV | FP_X_DZ | FP_X_OFL | FP_X_UFL | FP_X_IMP) + +fp_except_t +fpsetmask(fp_except_t mask) +{ + uint64_t old, new; + + mask &= FP_X_MASK; + + /* Read the current mask */ + __asm __volatile("mrs %0, fpcr" : "=&r"(old)); + new = old & ~FP_X_MASK; + new |= mask; + __asm __volatile("msr fpcr, %0" :: "r"(new)); + + return ((fp_except_t)old); +} From owner-svn-src-head@freebsd.org Wed Jun 24 18:26:04 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC8AC9166B9; Wed, 24 Jun 2015 18:26:04 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CE0671517; Wed, 24 Jun 2015 18:26:04 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OIQ4Bj000829; Wed, 24 Jun 2015 18:26:04 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OIQ4pL000828; Wed, 24 Jun 2015 18:26:04 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201506241826.t5OIQ4pL000828@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 24 Jun 2015 18:26:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284771 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 18:26:05 -0000 Author: ian Date: Wed Jun 24 18:26:04 2015 New Revision: 284771 URL: https://svnweb.freebsd.org/changeset/base/284771 Log: Fix a misplaced #endif (maybe a mismerge?). Emitting the symbol for CURPMAP is not dependent on whether VFP (hardware floating point) is enabled. Modified: head/sys/arm/arm/genassym.c Modified: head/sys/arm/arm/genassym.c ============================================================================== --- head/sys/arm/arm/genassym.c Wed Jun 24 16:19:21 2015 (r284770) +++ head/sys/arm/arm/genassym.c Wed Jun 24 18:26:04 2015 (r284771) @@ -134,9 +134,9 @@ ASSYM(ARM_RAS_END, ARM_RAS_END); #ifdef VFP ASSYM(PCB_VFPSTATE, offsetof(struct pcb, pcb_vfpstate)); +#endif ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); -#endif ASSYM(PAGE_SIZE, PAGE_SIZE); ASSYM(PMAP_DOMAIN_KERNEL, PMAP_DOMAIN_KERNEL); From owner-svn-src-head@freebsd.org Wed Jun 24 18:29:35 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40AF6916726; Wed, 24 Jun 2015 18:29:35 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 32471186F; Wed, 24 Jun 2015 18:29:35 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OITZ4I001319; Wed, 24 Jun 2015 18:29:35 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OITZrT001318; Wed, 24 Jun 2015 18:29:35 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201506241829.t5OITZrT001318@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 24 Jun 2015 18:29:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284772 - head/lib/msun/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 18:29:35 -0000 Author: ian Date: Wed Jun 24 18:29:34 2015 New Revision: 284772 URL: https://svnweb.freebsd.org/changeset/base/284772 Log: Fix compilation when the armv6 world is being compiled without hw floating point support. The fenv-vfp.c file overrides -mfloat-abi so it can use floating point instructions if it detects support at runtime. Make it also override -mfpu in case the user has set -mfpu=none. Modified: head/lib/msun/arm/Makefile.inc Modified: head/lib/msun/arm/Makefile.inc ============================================================================== --- head/lib/msun/arm/Makefile.inc Wed Jun 24 18:26:04 2015 (r284771) +++ head/lib/msun/arm/Makefile.inc Wed Jun 24 18:29:34 2015 (r284772) @@ -7,6 +7,6 @@ SYM_MAPS += ${.CURDIR}/arm/Symbol.map ARCH_SRCS = fenv-softfp.c fenv-vfp.c .endif -CFLAGS.fenv-vfp.c= -mfloat-abi=softfp +CFLAGS.fenv-vfp.c= -mfpu=vfp -mfloat-abi=softfp CFLAGS+= ${CFLAGS.${.IMPSRC:T}} From owner-svn-src-head@freebsd.org Wed Jun 24 19:16:44 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96C0991630D; Wed, 24 Jun 2015 19:16:44 +0000 (UTC) (envelope-from eri@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 867CD1B40; Wed, 24 Jun 2015 19:16:44 +0000 (UTC) (envelope-from eri@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OJGi9G025931; Wed, 24 Jun 2015 19:16:44 GMT (envelope-from eri@FreeBSD.org) Received: (from eri@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OJGfEm025914; Wed, 24 Jun 2015 19:16:41 GMT (envelope-from eri@FreeBSD.org) Message-Id: <201506241916.t5OJGfEm025914@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: eri set sender to eri@FreeBSD.org using -f From: Ermal Luçi Date: Wed, 24 Jun 2015 19:16:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284777 - in head: sbin/pfctl share/man/man4 sys/conf sys/net/altq sys/netpfil/pf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 19:16:44 -0000 Author: eri Date: Wed Jun 24 19:16:41 2015 New Revision: 284777 URL: https://svnweb.freebsd.org/changeset/base/284777 Log: ALTQ FAIRQ discipline import from DragonFLY Differential Revision: https://reviews.freebsd.org/D2847 Reviewed by: glebius, wblock(manpage) Approved by: gnn(mentor) Obtained from: pfSense Sponsored by: Netgate Added: head/sys/net/altq/altq_fairq.c (contents, props changed) head/sys/net/altq/altq_fairq.h (contents, props changed) Modified: head/sbin/pfctl/parse.y head/sbin/pfctl/pfctl_altq.c head/sbin/pfctl/pfctl_parser.h head/sbin/pfctl/pfctl_qstats.c head/share/man/man4/altq.4 head/sys/conf/NOTES head/sys/conf/files head/sys/conf/options head/sys/net/altq/altq.h head/sys/net/altq/altq_subr.c head/sys/net/altq/altq_var.h head/sys/netpfil/pf/pf.c head/sys/netpfil/pf/pf_altq.h head/sys/netpfil/pf/pf_mtag.h Modified: head/sbin/pfctl/parse.y ============================================================================== --- head/sbin/pfctl/parse.y Wed Jun 24 19:06:54 2015 (r284776) +++ head/sbin/pfctl/parse.y Wed Jun 24 19:16:41 2015 (r284777) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -300,6 +301,7 @@ struct pool_opts { struct node_hfsc_opts hfsc_opts; +struct node_fairq_opts fairq_opts; struct node_state_opt *keep_state_defaults = NULL; int disallow_table(struct node_host *, const char *); @@ -422,6 +424,7 @@ typedef struct { struct table_opts table_opts; struct pool_opts pool_opts; struct node_hfsc_opts hfsc_opts; + struct node_fairq_opts fairq_opts; } v; int lineno; } YYSTYPE; @@ -446,8 +449,8 @@ int parseport(char *, struct range *r, i %token REQUIREORDER SYNPROXY FINGERPRINTS NOSYNC DEBUG SKIP HOSTID %token ANTISPOOF FOR INCLUDE %token BITMASK RANDOM SOURCEHASH ROUNDROBIN STATICPORT PROBABILITY -%token ALTQ CBQ PRIQ HFSC BANDWIDTH TBRSIZE LINKSHARE REALTIME UPPERLIMIT -%token QUEUE PRIORITY QLIMIT RTABLE +%token ALTQ CBQ PRIQ HFSC FAIRQ BANDWIDTH TBRSIZE LINKSHARE REALTIME UPPERLIMIT +%token QUEUE PRIORITY QLIMIT HOGS BUCKETS RTABLE %token LOAD RULESET_OPTIMIZATION %token STICKYADDRESS MAXSRCSTATES MAXSRCNODES SOURCETRACK GLOBAL RULE %token MAXSRCCONN MAXSRCCONNRATE OVERLOAD FLUSH SLOPPY @@ -495,6 +498,7 @@ int parseport(char *, struct range *r, i %type cbqflags_list cbqflags_item %type priqflags_list priqflags_item %type hfscopts_list hfscopts_item hfsc_opts +%type fairqopts_list fairqopts_item fairq_opts %type bandwidth %type filter_opts filter_opt filter_opts_l %type antispoof_opts antispoof_opt antispoof_opts_l @@ -1659,6 +1663,15 @@ scheduler : CBQ { $$.qtype = ALTQT_HFSC; $$.data.hfsc_opts = $3; } + | FAIRQ { + $$.qtype = ALTQT_FAIRQ; + bzero(&$$.data.fairq_opts, + sizeof(struct node_fairq_opts)); + } + | FAIRQ '(' fairq_opts ')' { + $$.qtype = ALTQT_FAIRQ; + $$.data.fairq_opts = $3; + } ; cbqflags_list : cbqflags_item { $$ |= $1; } @@ -1807,6 +1820,61 @@ hfscopts_item : LINKSHARE bandwidth { } ; +fairq_opts : { + bzero(&fairq_opts, + sizeof(struct node_fairq_opts)); + } + fairqopts_list { + $$ = fairq_opts; + } + ; + +fairqopts_list : fairqopts_item + | fairqopts_list comma fairqopts_item + ; + +fairqopts_item : LINKSHARE bandwidth { + if (fairq_opts.linkshare.used) { + yyerror("linkshare already specified"); + YYERROR; + } + fairq_opts.linkshare.m2 = $2; + fairq_opts.linkshare.used = 1; + } + | LINKSHARE '(' bandwidth number bandwidth ')' { + if (fairq_opts.linkshare.used) { + yyerror("linkshare already specified"); + YYERROR; + } + fairq_opts.linkshare.m1 = $3; + fairq_opts.linkshare.d = $4; + fairq_opts.linkshare.m2 = $5; + fairq_opts.linkshare.used = 1; + } + | HOGS bandwidth { + fairq_opts.hogs_bw = $2; + } + | BUCKETS number { + fairq_opts.nbuckets = $2; + } + | STRING { + if (!strcmp($1, "default")) + fairq_opts.flags |= FARF_DEFAULTCLASS; + else if (!strcmp($1, "red")) + fairq_opts.flags |= FARF_RED; + else if (!strcmp($1, "ecn")) + fairq_opts.flags |= FARF_RED|FARF_ECN; + else if (!strcmp($1, "rio")) + fairq_opts.flags |= FARF_RIO; + else { + yyerror("unknown fairq flag \"%s\"", $1); + free($1); + YYERROR; + } + free($1); + } + ; + qassign : /* empty */ { $$ = NULL; } | qassign_item { $$ = $1; } | '{' optnl qassign_list '}' { $$ = $3; } @@ -5226,6 +5294,7 @@ lookup(char *s) { "bitmask", BITMASK}, { "block", BLOCK}, { "block-policy", BLOCKPOLICY}, + { "buckets", BUCKETS}, { "cbq", CBQ}, { "code", CODE}, { "crop", FRAGCROP}, @@ -5235,6 +5304,7 @@ lookup(char *s) { "drop", DROP}, { "drop-ovl", FRAGDROP}, { "dup-to", DUPTO}, + { "fairq", FAIRQ}, { "fastroute", FASTROUTE}, { "file", FILENAME}, { "fingerprints", FINGERPRINTS}, @@ -5247,6 +5317,7 @@ lookup(char *s) { "global", GLOBAL}, { "group", GROUP}, { "hfsc", HFSC}, + { "hogs", HOGS}, { "hostid", HOSTID}, { "icmp-type", ICMPTYPE}, { "icmp6-type", ICMP6TYPE}, Modified: head/sbin/pfctl/pfctl_altq.c ============================================================================== --- head/sbin/pfctl/pfctl_altq.c Wed Jun 24 19:06:54 2015 (r284776) +++ head/sbin/pfctl/pfctl_altq.c Wed Jun 24 19:16:41 2015 (r284777) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "pfctl_parser.h" #include "pfctl.h" @@ -68,6 +69,11 @@ static int check_commit_hfsc(int, int, s static int print_hfsc_opts(const struct pf_altq *, const struct node_queue_opt *); +static int eval_pfqueue_fairq(struct pfctl *, struct pf_altq *); +static int print_fairq_opts(const struct pf_altq *, + const struct node_queue_opt *); +static int check_commit_fairq(int, int, struct pf_altq *); + static void gsc_add_sc(struct gen_sc *, struct service_curve *); static int is_gsc_under_sc(struct gen_sc *, struct service_curve *); @@ -88,6 +94,8 @@ int eval_queue_opts(struct pf_altq *, u_int32_t eval_bwspec(struct node_queue_bw *, u_int32_t); void print_hfsc_sc(const char *, u_int, u_int, u_int, const struct node_hfsc_sc *); +void print_fairq_sc(const char *, u_int, u_int, u_int, + const struct node_fairq_sc *); void pfaltq_store(struct pf_altq *a) @@ -173,6 +181,10 @@ print_altq(const struct pf_altq *a, unsi if (!print_hfsc_opts(a, qopts)) printf("hfsc "); break; + case ALTQT_FAIRQ: + if (!print_fairq_opts(a, qopts)) + printf("fairq "); + break; } if (bw != NULL && bw->bw_percent > 0) { @@ -203,7 +215,8 @@ print_queue(const struct pf_altq *a, uns printf("%s ", a->qname); if (print_interface) printf("on %s ", a->ifname); - if (a->scheduler == ALTQT_CBQ || a->scheduler == ALTQT_HFSC) { + if (a->scheduler == ALTQT_CBQ || a->scheduler == ALTQT_HFSC || + a->scheduler == ALTQT_FAIRQ) { if (bw != NULL && bw->bw_percent > 0) { if (bw->bw_percent < 100) printf("bandwidth %u%% ", bw->bw_percent); @@ -224,6 +237,9 @@ print_queue(const struct pf_altq *a, uns case ALTQT_HFSC: print_hfsc_opts(a, qopts); break; + case ALTQT_FAIRQ: + print_fairq_opts(a, qopts); + break; } } @@ -294,6 +310,9 @@ check_commit_altq(int dev, int opts) case ALTQT_HFSC: error = check_commit_hfsc(dev, opts, altq); break; + case ALTQT_FAIRQ: + error = check_commit_fairq(dev, opts, altq); + break; default: break; } @@ -342,7 +361,8 @@ eval_pfqueue(struct pfctl *pf, struct pf if (pa->qlimit == 0) pa->qlimit = DEFAULT_QLIMIT; - if (pa->scheduler == ALTQT_CBQ || pa->scheduler == ALTQT_HFSC) { + if (pa->scheduler == ALTQT_CBQ || pa->scheduler == ALTQT_HFSC || + pa->scheduler == ALTQT_FAIRQ) { pa->bandwidth = eval_bwspec(bw, parent == NULL ? 0 : parent->bandwidth); @@ -388,6 +408,9 @@ eval_pfqueue(struct pfctl *pf, struct pf case ALTQT_HFSC: error = eval_pfqueue_hfsc(pf, pa); break; + case ALTQT_FAIRQ: + error = eval_pfqueue_fairq(pf, pa); + break; default: break; } @@ -807,6 +830,85 @@ err_ret: return (-1); } +/* + * FAIRQ support functions + */ +static int +eval_pfqueue_fairq(struct pfctl *pf __unused, struct pf_altq *pa) +{ + struct pf_altq *altq, *parent; + struct fairq_opts *opts; + struct service_curve sc; + + opts = &pa->pq_u.fairq_opts; + + if (pa->parent[0] == 0) { + /* root queue */ + opts->lssc_m1 = pa->ifbandwidth; + opts->lssc_m2 = pa->ifbandwidth; + opts->lssc_d = 0; + return (0); + } + + LIST_INIT(&lssc); + + /* if link_share is not specified, use bandwidth */ + if (opts->lssc_m2 == 0) + opts->lssc_m2 = pa->bandwidth; + + /* + * admission control: + * for the real-time service curve, the sum of the service curves + * should not exceed 80% of the interface bandwidth. 20% is reserved + * not to over-commit the actual interface bandwidth. + * for the link-sharing service curve, the sum of the child service + * curve should not exceed the parent service curve. + * for the upper-limit service curve, the assigned bandwidth should + * be smaller than the interface bandwidth, and the upper-limit should + * be larger than the real-time service curve when both are defined. + */ + parent = qname_to_pfaltq(pa->parent, pa->ifname); + if (parent == NULL) + errx(1, "parent %s not found for %s", pa->parent, pa->qname); + + TAILQ_FOREACH(altq, &altqs, entries) { + if (strncmp(altq->ifname, pa->ifname, IFNAMSIZ) != 0) + continue; + if (altq->qname[0] == 0) /* this is for interface */ + continue; + + if (strncmp(altq->parent, pa->parent, PF_QNAME_SIZE) != 0) + continue; + + /* if the class has a link-sharing service curve, add it. */ + if (opts->lssc_m2 != 0 && altq->pq_u.fairq_opts.lssc_m2 != 0) { + sc.m1 = altq->pq_u.fairq_opts.lssc_m1; + sc.d = altq->pq_u.fairq_opts.lssc_d; + sc.m2 = altq->pq_u.fairq_opts.lssc_m2; + gsc_add_sc(&lssc, &sc); + } + } + + /* check the link-sharing service curve. */ + if (opts->lssc_m2 != 0) { + sc.m1 = parent->pq_u.fairq_opts.lssc_m1; + sc.d = parent->pq_u.fairq_opts.lssc_d; + sc.m2 = parent->pq_u.fairq_opts.lssc_m2; + if (!is_gsc_under_sc(&lssc, &sc)) { + warnx("link-sharing sc exceeds parent's sc"); + goto err_ret; + } + } + + gsc_destroy(&lssc); + + return (0); + +err_ret: + gsc_destroy(&lssc); + return (-1); +} + static int check_commit_hfsc(int dev, int opts, struct pf_altq *pa) { @@ -847,6 +949,43 @@ check_commit_hfsc(int dev, int opts, str } static int +check_commit_fairq(int dev __unused, int opts __unused, struct pf_altq *pa) +{ + struct pf_altq *altq, *def = NULL; + int default_class; + int error = 0; + + /* check if fairq has one default queue for this interface */ + default_class = 0; + TAILQ_FOREACH(altq, &altqs, entries) { + if (strncmp(altq->ifname, pa->ifname, IFNAMSIZ) != 0) + continue; + if (altq->qname[0] == 0) /* this is for interface */ + continue; + if (altq->pq_u.fairq_opts.flags & FARF_DEFAULTCLASS) { + default_class++; + def = altq; + } + } + if (default_class != 1) { + warnx("should have one default queue on %s", pa->ifname); + return (1); + } + /* make sure the default queue is a leaf */ + TAILQ_FOREACH(altq, &altqs, entries) { + if (strncmp(altq->ifname, pa->ifname, IFNAMSIZ) != 0) + continue; + if (altq->qname[0] == 0) /* this is for interface */ + continue; + if (strncmp(altq->parent, def->qname, PF_QNAME_SIZE) == 0) { + warnx("default queue is not a leaf"); + error++; + } + } + return (error); +} + +static int print_hfsc_opts(const struct pf_altq *a, const struct node_queue_opt *qopts) { const struct hfsc_opts *opts; @@ -892,6 +1031,43 @@ print_hfsc_opts(const struct pf_altq *a, return (0); } +static int +print_fairq_opts(const struct pf_altq *a, const struct node_queue_opt *qopts) +{ + const struct fairq_opts *opts; + const struct node_fairq_sc *loc_lssc; + + opts = &a->pq_u.fairq_opts; + if (qopts == NULL) + loc_lssc = NULL; + else + loc_lssc = &qopts->data.fairq_opts.linkshare; + + if (opts->flags || + (opts->lssc_m2 != 0 && (opts->lssc_m2 != a->bandwidth || + opts->lssc_d != 0))) { + printf("fairq("); + if (opts->flags & FARF_RED) + printf(" red"); + if (opts->flags & FARF_ECN) + printf(" ecn"); + if (opts->flags & FARF_RIO) + printf(" rio"); + if (opts->flags & FARF_CLEARDSCP) + printf(" cleardscp"); + if (opts->flags & FARF_DEFAULTCLASS) + printf(" default"); + if (opts->lssc_m2 != 0 && (opts->lssc_m2 != a->bandwidth || + opts->lssc_d != 0)) + print_fairq_sc("linkshare", opts->lssc_m1, opts->lssc_d, + opts->lssc_m2, loc_lssc); + printf(" ) "); + + return (1); + } else + return (0); +} + /* * admission control using generalized service curve */ @@ -1211,6 +1387,23 @@ eval_queue_opts(struct pf_altq *pa, stru opts->data.hfsc_opts.upperlimit.d; } break; + case ALTQT_FAIRQ: + pa->pq_u.fairq_opts.flags = opts->data.fairq_opts.flags; + pa->pq_u.fairq_opts.nbuckets = opts->data.fairq_opts.nbuckets; + pa->pq_u.fairq_opts.hogs_m1 = + eval_bwspec(&opts->data.fairq_opts.hogs_bw, ref_bw); + + if (opts->data.fairq_opts.linkshare.used) { + pa->pq_u.fairq_opts.lssc_m1 = + eval_bwspec(&opts->data.fairq_opts.linkshare.m1, + ref_bw); + pa->pq_u.fairq_opts.lssc_m2 = + eval_bwspec(&opts->data.fairq_opts.linkshare.m2, + ref_bw); + pa->pq_u.fairq_opts.lssc_d = + opts->data.fairq_opts.linkshare.d; + } + break; default: warnx("eval_queue_opts: unknown scheduler type %u", opts->qtype); @@ -1256,3 +1449,27 @@ print_hfsc_sc(const char *scname, u_int if (d != 0) printf(")"); } + +void +print_fairq_sc(const char *scname, u_int m1, u_int d, u_int m2, + const struct node_fairq_sc *sc) +{ + printf(" %s", scname); + + if (d != 0) { + printf("("); + if (sc != NULL && sc->m1.bw_percent > 0) + printf("%u%%", sc->m1.bw_percent); + else + printf("%s", rate2str((double)m1)); + printf(" %u", d); + } + + if (sc != NULL && sc->m2.bw_percent > 0) + printf(" %u%%", sc->m2.bw_percent); + else + printf(" %s", rate2str((double)m2)); + + if (d != 0) + printf(")"); +} Modified: head/sbin/pfctl/pfctl_parser.h ============================================================================== --- head/sbin/pfctl/pfctl_parser.h Wed Jun 24 19:06:54 2015 (r284776) +++ head/sbin/pfctl/pfctl_parser.h Wed Jun 24 19:16:41 2015 (r284777) @@ -150,12 +150,27 @@ struct node_hfsc_opts { int flags; }; +struct node_fairq_sc { + struct node_queue_bw m1; /* slope of 1st segment; bps */ + u_int d; /* x-projection of m1; msec */ + struct node_queue_bw m2; /* slope of 2nd segment; bps */ + u_int8_t used; +}; + +struct node_fairq_opts { + struct node_fairq_sc linkshare; + struct node_queue_bw hogs_bw; + u_int nbuckets; + int flags; +}; + struct node_queue_opt { int qtype; union { struct cbq_opts cbq_opts; struct priq_opts priq_opts; struct node_hfsc_opts hfsc_opts; + struct node_fairq_opts fairq_opts; } data; }; Modified: head/sbin/pfctl/pfctl_qstats.c ============================================================================== --- head/sbin/pfctl/pfctl_qstats.c Wed Jun 24 19:06:54 2015 (r284776) +++ head/sbin/pfctl/pfctl_qstats.c Wed Jun 24 19:16:41 2015 (r284777) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "pfctl.h" #include "pfctl_parser.h" @@ -46,6 +47,7 @@ union class_stats { class_stats_t cbq_stats; struct priq_classstats priq_stats; struct hfsc_classstats hfsc_stats; + struct fairq_classstats fairq_stats; }; #define AVGN_MAX 8 @@ -77,6 +79,7 @@ void pfctl_print_altq_node(int, const void print_cbqstats(struct queue_stats); void print_priqstats(struct queue_stats); void print_hfscstats(struct queue_stats); +void print_fairqstats(struct queue_stats); void pfctl_free_altq_node(struct pf_altq_node *); void pfctl_print_altq_nodestat(int, const struct pf_altq_node *); @@ -317,6 +320,9 @@ pfctl_print_altq_nodestat(int dev, const case ALTQT_HFSC: print_hfscstats(a->qstats); break; + case ALTQT_FAIRQ: + print_fairqstats(a->qstats); + break; } } @@ -382,6 +388,26 @@ print_hfscstats(struct queue_stats cur) } void +print_fairqstats(struct queue_stats cur) +{ + printf(" [ pkts: %10llu bytes: %10llu " + "dropped pkts: %6llu bytes: %6llu ]\n", + (unsigned long long)cur.data.fairq_stats.xmit_cnt.packets, + (unsigned long long)cur.data.fairq_stats.xmit_cnt.bytes, + (unsigned long long)cur.data.fairq_stats.drop_cnt.packets, + (unsigned long long)cur.data.fairq_stats.drop_cnt.bytes); + printf(" [ qlength: %3d/%3d ]\n", + cur.data.fairq_stats.qlength, cur.data.fairq_stats.qlimit); + + if (cur.avgn < 2) + return; + + printf(" [ measured: %7.1f packets/s, %s/s ]\n", + cur.avg_packets / STAT_INTERVAL, + rate2str((8 * cur.avg_bytes) / STAT_INTERVAL)); +} + +void pfctl_free_altq_node(struct pf_altq_node *node) { while (node != NULL) { @@ -421,6 +447,10 @@ update_avg(struct pf_altq_node *a) b = qs->data.hfsc_stats.xmit_cnt.bytes; p = qs->data.hfsc_stats.xmit_cnt.packets; break; + case ALTQT_FAIRQ: + b = qs->data.fairq_stats.xmit_cnt.bytes; + p = qs->data.fairq_stats.xmit_cnt.packets; + break; default: b = 0; p = 0; Modified: head/share/man/man4/altq.4 ============================================================================== --- head/share/man/man4/altq.4 Wed Jun 24 19:06:54 2015 (r284776) +++ head/share/man/man4/altq.4 Wed Jun 24 19:16:41 2015 (r284777) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 9, 2011 +.Dd June 24, 2015 .Dt ALTQ 4 .Os .Sh NAME @@ -40,6 +40,7 @@ .Cd options ALTQ_HFSC .Cd options ALTQ_CDNR .Cd options ALTQ_PRIQ +.Cd options ALTQ_FAIRQ .Sh DESCRIPTION The .Nm @@ -93,6 +94,10 @@ any of the available disciplines or cons Build the .Dq "Priority Queuing" discipline. +.It Dv ALTQ_FAIRQ +Build the +.Dq "Fair Queuing" +discipline. .It Dv ALTQ_NOPCC Required if the TSC is unusable. .It Dv ALTQ_DEBUG Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Wed Jun 24 19:06:54 2015 (r284776) +++ head/sys/conf/NOTES Wed Jun 24 19:16:41 2015 (r284777) @@ -709,6 +709,7 @@ options ALTQ_CBQ # Class Based Queueing options ALTQ_RED # Random Early Detection options ALTQ_RIO # RED In/Out options ALTQ_HFSC # Hierarchical Packet Scheduler +options ALTQ_FAIRQ # Fair Packet Scheduler options ALTQ_CDNR # Traffic conditioner options ALTQ_PRIQ # Priority Queueing options ALTQ_NOPCC # Required if the TSC is unusable Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Wed Jun 24 19:06:54 2015 (r284776) +++ head/sys/conf/files Wed Jun 24 19:16:41 2015 (r284777) @@ -3254,6 +3254,7 @@ libkern/zlib.c optional crypto | geom_ net/altq/altq_cbq.c optional altq net/altq/altq_cdnr.c optional altq net/altq/altq_hfsc.c optional altq +net/altq/altq_fairq.c optional altq net/altq/altq_priq.c optional altq net/altq/altq_red.c optional altq net/altq/altq_rio.c optional altq Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Wed Jun 24 19:06:54 2015 (r284776) +++ head/sys/conf/options Wed Jun 24 19:16:41 2015 (r284777) @@ -389,6 +389,7 @@ ALTQ_CBQ opt_altq.h ALTQ_CDNR opt_altq.h ALTQ_DEBUG opt_altq.h ALTQ_HFSC opt_altq.h +ALTQ_FAIRQ opt_altq.h ALTQ_NOPCC opt_altq.h ALTQ_PRIQ opt_altq.h ALTQ_RED opt_altq.h Modified: head/sys/net/altq/altq.h ============================================================================== --- head/sys/net/altq/altq.h Wed Jun 24 19:06:54 2015 (r284776) +++ head/sys/net/altq/altq.h Wed Jun 24 19:16:41 2015 (r284777) @@ -63,7 +63,8 @@ #define ALTQT_BLUE 10 /* blue */ #define ALTQT_PRIQ 11 /* priority queue */ #define ALTQT_JOBS 12 /* JoBS */ -#define ALTQT_MAX 13 /* should be max discipline type + 1 */ +#define ALTQT_FAIRQ 13 /* fairq */ +#define ALTQT_MAX 14 /* should be max discipline type + 1 */ #ifdef ALTQ3_COMPAT struct altqreq { Added: head/sys/net/altq/altq_fairq.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/net/altq/altq_fairq.c Wed Jun 24 19:16:41 2015 (r284777) @@ -0,0 +1,889 @@ +/* + * Copyright (c) 2008 The DragonFly Project. All rights reserved. + * + * This code is derived from software contributed to The DragonFly Project + * by Matthew Dillon + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name of The DragonFly Project nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific, prior 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 HOLDERS 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. + * + * $DragonFly: src/sys/net/altq/altq_fairq.c,v 1.1 2008/04/06 18:58:15 dillon Exp $ + * $FreeBSD$ + */ +/* + * Matt: I gutted altq_priq.c and used it as a skeleton on which to build + * fairq. The fairq algorithm is completely different then priq, of course, + * but because I used priq's skeleton I believe I should include priq's + * copyright. + * + * Copyright (C) 2000-2003 + * Sony Computer Science Laboratories 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: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY SONY CSL 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 SONY CSL 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. + */ + +/* + * FAIRQ - take traffic classified by keep state (hashed into + * mbuf->m_pkthdr.altq_state_hash) and bucketize it. Fairly extract + * the first packet from each bucket in a round-robin fashion. + * + * TODO - better overall qlimit support (right now it is per-bucket). + * - NOTE: red etc is per bucket, not overall. + * - better service curve support. + * + * EXAMPLE: + * + * altq on em0 fairq bandwidth 650Kb queue { std, bulk } + * queue std priority 3 bandwidth 400Kb \ + * fairq (buckets 64, default, hogs 1Kb) qlimit 50 + * queue bulk priority 2 bandwidth 100Kb \ + * fairq (buckets 64, hogs 1Kb) qlimit 50 + * + * pass out on em0 from any to any keep state queue std + * pass out on em0 inet proto tcp ..... port ... keep state queue bulk + */ +#include "opt_altq.h" +#include "opt_inet.h" +#include "opt_inet6.h" + +#ifdef ALTQ_FAIRQ /* fairq is enabled in the kernel conf */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +/* + * function prototypes + */ +static int fairq_clear_interface(struct fairq_if *); +static int fairq_request(struct ifaltq *, int, void *); +static void fairq_purge(struct fairq_if *); +static struct fairq_class *fairq_class_create(struct fairq_if *, int, int, u_int, struct fairq_opts *, int); +static int fairq_class_destroy(struct fairq_class *); +static int fairq_enqueue(struct ifaltq *, struct mbuf *, struct altq_pktattr *); +static struct mbuf *fairq_dequeue(struct ifaltq *, int); + +static int fairq_addq(struct fairq_class *, struct mbuf *, u_int32_t); +static struct mbuf *fairq_getq(struct fairq_class *, uint64_t); +static struct mbuf *fairq_pollq(struct fairq_class *, uint64_t, int *); +static fairq_bucket_t *fairq_selectq(struct fairq_class *, int); +static void fairq_purgeq(struct fairq_class *); + +static void get_class_stats(struct fairq_classstats *, struct fairq_class *); +static struct fairq_class *clh_to_clp(struct fairq_if *, uint32_t); + +int +fairq_pfattach(struct pf_altq *a) +{ + struct ifnet *ifp; + int error; + + if ((ifp = ifunit(a->ifname)) == NULL || a->altq_disc == NULL) + return (EINVAL); + + error = altq_attach(&ifp->if_snd, ALTQT_FAIRQ, a->altq_disc, + fairq_enqueue, fairq_dequeue, fairq_request, NULL, NULL); + + return (error); +} + +int +fairq_add_altq(struct pf_altq *a) +{ + struct fairq_if *pif; + struct ifnet *ifp; + + if ((ifp = ifunit(a->ifname)) == NULL) + return (EINVAL); + if (!ALTQ_IS_READY(&ifp->if_snd)) + return (ENODEV); + + + pif = malloc(sizeof(struct fairq_if), + M_DEVBUF, M_WAITOK | M_ZERO); + pif->pif_bandwidth = a->ifbandwidth; + pif->pif_maxpri = -1; + pif->pif_ifq = &ifp->if_snd; + + /* keep the state in pf_altq */ + a->altq_disc = pif; + + return (0); +} + +int +fairq_remove_altq(struct pf_altq *a) +{ + struct fairq_if *pif; + + if ((pif = a->altq_disc) == NULL) + return (EINVAL); + a->altq_disc = NULL; + + fairq_clear_interface(pif); + + free(pif, M_DEVBUF); + return (0); +} + +int +fairq_add_queue(struct pf_altq *a) +{ + struct fairq_if *pif; + struct fairq_class *cl; + + if ((pif = a->altq_disc) == NULL) + return (EINVAL); + + /* check parameters */ + if (a->priority >= FAIRQ_MAXPRI) + return (EINVAL); + if (a->qid == 0) + return (EINVAL); + if (pif->pif_classes[a->priority] != NULL) + return (EBUSY); + if (clh_to_clp(pif, a->qid) != NULL) + return (EBUSY); + + cl = fairq_class_create(pif, a->priority, a->qlimit, a->bandwidth, + &a->pq_u.fairq_opts, a->qid); + if (cl == NULL) + return (ENOMEM); + + return (0); +} + +int +fairq_remove_queue(struct pf_altq *a) +{ + struct fairq_if *pif; + struct fairq_class *cl; + + if ((pif = a->altq_disc) == NULL) + return (EINVAL); + + if ((cl = clh_to_clp(pif, a->qid)) == NULL) + return (EINVAL); + + return (fairq_class_destroy(cl)); +} + +int +fairq_getqstats(struct pf_altq *a, void *ubuf, int *nbytes) +{ + struct fairq_if *pif; + struct fairq_class *cl; + struct fairq_classstats stats; + int error = 0; + + if ((pif = altq_lookup(a->ifname, ALTQT_FAIRQ)) == NULL) + return (EBADF); + + if ((cl = clh_to_clp(pif, a->qid)) == NULL) + return (EINVAL); + + if (*nbytes < sizeof(stats)) + return (EINVAL); + + get_class_stats(&stats, cl); + + if ((error = copyout((caddr_t)&stats, ubuf, sizeof(stats))) != 0) + return (error); + *nbytes = sizeof(stats); + return (0); +} + +/* + * bring the interface back to the initial state by discarding + * all the filters and classes. + */ +static int +fairq_clear_interface(struct fairq_if *pif) +{ + struct fairq_class *cl; + int pri; + + /* clear out the classes */ + for (pri = 0; pri <= pif->pif_maxpri; pri++) { + if ((cl = pif->pif_classes[pri]) != NULL) + fairq_class_destroy(cl); + } + + return (0); +} + +static int +fairq_request(struct ifaltq *ifq, int req, void *arg) +{ + struct fairq_if *pif = (struct fairq_if *)ifq->altq_disc; + + IFQ_LOCK_ASSERT(ifq); + + switch (req) { + case ALTRQ_PURGE: + fairq_purge(pif); + break; + } + return (0); +} + +/* discard all the queued packets on the interface */ +static void +fairq_purge(struct fairq_if *pif) +{ + struct fairq_class *cl; + int pri; + + for (pri = 0; pri <= pif->pif_maxpri; pri++) { + if ((cl = pif->pif_classes[pri]) != NULL && cl->cl_head) + fairq_purgeq(cl); + } + if (ALTQ_IS_ENABLED(pif->pif_ifq)) + pif->pif_ifq->ifq_len = 0; +} + +static struct fairq_class * +fairq_class_create(struct fairq_if *pif, int pri, int qlimit, + u_int bandwidth, struct fairq_opts *opts, int qid) +{ + struct fairq_class *cl; + int flags = opts->flags; + u_int nbuckets = opts->nbuckets; + int i; + +#ifndef ALTQ_RED + if (flags & FARF_RED) { +#ifdef ALTQ_DEBUG + printf("fairq_class_create: RED not configured for FAIRQ!\n"); +#endif + return (NULL); + } +#endif + if (nbuckets == 0) + nbuckets = 256; + if (nbuckets > FAIRQ_MAX_BUCKETS) + nbuckets = FAIRQ_MAX_BUCKETS; + /* enforce power-of-2 size */ + while ((nbuckets ^ (nbuckets - 1)) != ((nbuckets << 1) - 1)) + ++nbuckets; + + if ((cl = pif->pif_classes[pri]) != NULL) { + /* modify the class instead of creating a new one */ + IFQ_LOCK(cl->cl_pif->pif_ifq); + if (cl->cl_head) + fairq_purgeq(cl); + IFQ_UNLOCK(cl->cl_pif->pif_ifq); +#ifdef ALTQ_RIO + if (cl->cl_qtype == Q_RIO) + rio_destroy((rio_t *)cl->cl_red); +#endif +#ifdef ALTQ_RED + if (cl->cl_qtype == Q_RED) + red_destroy(cl->cl_red); +#endif + } else { + cl = malloc(sizeof(struct fairq_class), + M_DEVBUF, M_WAITOK | M_ZERO); + cl->cl_nbuckets = nbuckets; + cl->cl_nbucket_mask = nbuckets - 1; + + cl->cl_buckets = malloc( + sizeof(struct fairq_bucket) * cl->cl_nbuckets, + M_DEVBUF, M_WAITOK | M_ZERO); + cl->cl_head = NULL; + } + + pif->pif_classes[pri] = cl; + if (flags & FARF_DEFAULTCLASS) + pif->pif_default = cl; + if (qlimit == 0) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Wed Jun 24 20:51:49 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7A5F1915ED7; Wed, 24 Jun 2015 20:51:49 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6C09F1142; Wed, 24 Jun 2015 20:51:49 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OKpn2H075256; Wed, 24 Jun 2015 20:51:49 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OKpnhx074912; Wed, 24 Jun 2015 20:51:49 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <201506242051.t5OKpnhx074912@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker Date: Wed, 24 Jun 2015 20:51:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284779 - head/bin/sh X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 20:51:49 -0000 Author: jilles Date: Wed Jun 24 20:51:48 2015 New Revision: 284779 URL: https://svnweb.freebsd.org/changeset/base/284779 Log: sh: Fix some arithmetic undefined behaviour. Fix shifts of possibly negative numbers found with ubsan and avoid signed integer overflow when hashing an extremely long command name. MFC after: 1 week Modified: head/bin/sh/alias.c head/bin/sh/exec.c Modified: head/bin/sh/alias.c ============================================================================== --- head/bin/sh/alias.c Wed Jun 24 19:58:14 2015 (r284778) +++ head/bin/sh/alias.c Wed Jun 24 20:51:48 2015 (r284779) @@ -248,7 +248,7 @@ hashalias(const char *p) { unsigned int hashval; - hashval = *p << 4; + hashval = (unsigned char)*p << 4; while (*p) hashval+= *p++; return &atab[hashval % ATABSIZE]; Modified: head/bin/sh/exec.c ============================================================================== --- head/bin/sh/exec.c Wed Jun 24 19:58:14 2015 (r284778) +++ head/bin/sh/exec.c Wed Jun 24 20:51:48 2015 (r284779) @@ -522,17 +522,16 @@ static struct tblentry **lastcmdentry; static struct tblentry * cmdlookup(const char *name, int add) { - int hashval; + unsigned int hashval; const char *p; struct tblentry *cmdp; struct tblentry **pp; size_t len; p = name; - hashval = *p << 4; + hashval = (unsigned char)*p << 4; while (*p) hashval += *p++; - hashval &= 0x7FFF; pp = &cmdtable[hashval % CMDTABLESIZE]; for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) { if (equal(cmdp->cmdname, name)) From owner-svn-src-head@freebsd.org Wed Jun 24 21:30:36 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2BA29916617; Wed, 24 Jun 2015 21:30:36 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B4141678; Wed, 24 Jun 2015 21:30:36 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OLUZRL095841; Wed, 24 Jun 2015 21:30:35 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OLUZBE095839; Wed, 24 Jun 2015 21:30:35 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506242130.t5OLUZBE095839@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 24 Jun 2015 21:30:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284780 - head/release/tools X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 21:30:36 -0000 Author: gjb Date: Wed Jun 24 21:30:35 2015 New Revision: 284780 URL: https://svnweb.freebsd.org/changeset/base/284780 Log: Ensure ASSUME_ALWAYS_YES is set when deleting pkg(8) from the DESTDIR, otherwise it can get stuck in ttyin. This means no 10-STABLE EC2 images this week. MFC after: 3 days Sponsored by: The FreeBSD Foundation Modified: head/release/tools/ec2.conf Modified: head/release/tools/ec2.conf ============================================================================== --- head/release/tools/ec2.conf Wed Jun 24 20:51:48 2015 (r284779) +++ head/release/tools/ec2.conf Wed Jun 24 21:30:35 2015 (r284780) @@ -32,7 +32,7 @@ vm_extra_pre_umount() { # catalogue and install or update pkg when the instance first # launches, so these files would just be replaced anyway; removing # them from the image allows it to boot faster. - pkg -c ${DESTDIR} delete -f -y pkg + env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg rm ${DESTDIR}/var/db/pkg/repo-*.sqlite # The size of the EC2 root disk can be configured at instance launch From owner-svn-src-head@freebsd.org Wed Jun 24 23:40:01 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B0BD91662B; Wed, 24 Jun 2015 23:40:01 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id EC1891985; Wed, 24 Jun 2015 23:40:00 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 0102325D3A42; Wed, 24 Jun 2015 23:39:57 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id A5FF4C77033; Wed, 24 Jun 2015 23:39:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id WyH21jENjH94; Wed, 24 Jun 2015 23:39:55 +0000 (UTC) Received: from [IPv6:fde9:577b:c1a9:4410:f8f1:aa44:4e42:e15] (unknown [IPv6:fde9:577b:c1a9:4410:f8f1:aa44:4e42:e15]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 854A8C76FD8; Wed, 24 Jun 2015 23:39:54 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Subject: Re: svn commit: r284746 - in head/sys/dev/hyperv: include netvsc From: "Bjoern A. Zeeb" In-Reply-To: <201506240601.t5O61U7r033541@svn.freebsd.org> Date: Wed, 24 Jun 2015 23:39:21 +0000 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <201506240601.t5O61U7r033541@svn.freebsd.org> To: Wei Hu X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 23:40:01 -0000 > On 24 Jun 2015, at 06:01 , Wei Hu wrote: >=20 > Author: whu > Date: Wed Jun 24 06:01:29 2015 > New Revision: 284746 > URL: https://svnweb.freebsd.org/changeset/base/284746 >=20 > Log: > TSO and checksum offloading support for Netvsc driver on Hyper-V. >=20 > Submitted by: whu > Reviewed by: royger > Approved by: royger > MFC after: 1 week > Relnotes: yes > Sponsored by: Microsoft OSTC > Differential Revision: https://reviews.freebsd.org/D2517 This breaks LINT-NOIP and LINT-NOINET6 kernels. I started looking at adding appropriate #ifdefs and #including = opt_inet.h and opt_inet6.h but properly untangling this in the middle = of the night isn=E2=80=99t possible anymore for me (and I can=E2=80=99t = test it). Can you please have a look and fix this? make -j16 tinderbox = TARGETS=3D=E2=80=9Camd64=E2=80=9D (or i386) should do the trick and = leave you with log files; one error is: = /scratch/tmp/bz/head.svn/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c:(.t= ext+0x13cd): undefined reference to `in6_cksum_pseudo=E2=80=99 Thanks, /bz= From owner-svn-src-head@freebsd.org Thu Jun 25 00:15:38 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 524D1916D5D; Thu, 25 Jun 2015 00:15:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 438BD1C68; Thu, 25 Jun 2015 00:15:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5P0FcQj084431; Thu, 25 Jun 2015 00:15:38 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5P0FcjG084430; Thu, 25 Jun 2015 00:15:38 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201506250015.t5P0FcjG084430@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Thu, 25 Jun 2015 00:15:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284783 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 00:15:38 -0000 Author: mjg Date: Thu Jun 25 00:15:37 2015 New Revision: 284783 URL: https://svnweb.freebsd.org/changeset/base/284783 Log: rlimit: deduplicate code in chg* functions Modified: head/sys/kern/kern_resource.c Modified: head/sys/kern/kern_resource.c ============================================================================== --- head/sys/kern/kern_resource.c Wed Jun 24 23:05:17 2015 (r284782) +++ head/sys/kern/kern_resource.c Thu Jun 25 00:15:37 2015 (r284783) @@ -1371,49 +1371,52 @@ ui_racct_foreach(void (*callback)(struct } #endif -/* - * Change the count associated with number of processes - * a given user is using. When 'max' is 0, don't enforce a limit - */ -int -chgproccnt(struct uidinfo *uip, int diff, rlim_t max) +static inline int +chglimit(struct uidinfo *uip, long *limit, int diff, rlim_t max, const char *name) { /* Don't allow them to exceed max, but allow subtraction. */ if (diff > 0 && max != 0) { - if (atomic_fetchadd_long(&uip->ui_proccnt, (long)diff) + diff > max) { - atomic_subtract_long(&uip->ui_proccnt, (long)diff); + if (atomic_fetchadd_long(limit, (long)diff) + diff > max) { + atomic_subtract_long(limit, (long)diff); return (0); } } else { - atomic_add_long(&uip->ui_proccnt, (long)diff); - if (uip->ui_proccnt < 0) - printf("negative proccnt for uid = %d\n", uip->ui_uid); + atomic_add_long(limit, (long)diff); + if (*limit < 0) + printf("negative %s for uid = %d\n", name, uip->ui_uid); } return (1); } /* + * Change the count associated with number of processes + * a given user is using. When 'max' is 0, don't enforce a limit + */ +int +chgproccnt(struct uidinfo *uip, int diff, rlim_t max) +{ + + return (chglimit(uip, &uip->ui_proccnt, diff, max, "proccnt")); +} + +/* * Change the total socket buffer size a user has used. */ int chgsbsize(struct uidinfo *uip, u_int *hiwat, u_int to, rlim_t max) { - int diff; + int diff, rv; diff = to - *hiwat; - if (diff > 0) { - if (atomic_fetchadd_long(&uip->ui_sbsize, (long)diff) + diff > max) { - atomic_subtract_long(&uip->ui_sbsize, (long)diff); - return (0); - } + if (diff > 0 && max == 0) { + rv = 0; } else { - atomic_add_long(&uip->ui_sbsize, (long)diff); - if (uip->ui_sbsize < 0) - printf("negative sbsize for uid = %d\n", uip->ui_uid); + rv = chglimit(uip, &uip->ui_sbsize, diff, max, "sbsize"); + if (rv != 0) + *hiwat = to; } - *hiwat = to; - return (1); + return (rv); } /* @@ -1424,36 +1427,14 @@ int chgptscnt(struct uidinfo *uip, int diff, rlim_t max) { - /* Don't allow them to exceed max, but allow subtraction. */ - if (diff > 0 && max != 0) { - if (atomic_fetchadd_long(&uip->ui_ptscnt, (long)diff) + diff > max) { - atomic_subtract_long(&uip->ui_ptscnt, (long)diff); - return (0); - } - } else { - atomic_add_long(&uip->ui_ptscnt, (long)diff); - if (uip->ui_ptscnt < 0) - printf("negative ptscnt for uid = %d\n", uip->ui_uid); - } - return (1); + return (chglimit(uip, &uip->ui_ptscnt, diff, max, "ptscnt")); } int chgkqcnt(struct uidinfo *uip, int diff, rlim_t max) { - if (diff > 0 && max != 0) { - if (atomic_fetchadd_long(&uip->ui_kqcnt, (long)diff) + - diff > max) { - atomic_subtract_long(&uip->ui_kqcnt, (long)diff); - return (0); - } - } else { - atomic_add_long(&uip->ui_kqcnt, (long)diff); - if (uip->ui_kqcnt < 0) - printf("negative kqcnt for uid = %d\n", uip->ui_uid); - } - return (1); + return (chglimit(uip, &uip->ui_kqcnt, diff, max, "kqcnt")); } void From owner-svn-src-head@freebsd.org Thu Jun 25 01:24:37 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8FB109157E9; Thu, 25 Jun 2015 01:24:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 788651C5B; Thu, 25 Jun 2015 01:24:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5P1Obbk018851; Thu, 25 Jun 2015 01:24:37 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5P1Obe5018850; Thu, 25 Jun 2015 01:24:37 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201506250124.t5P1Obe5018850@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Thu, 25 Jun 2015 01:24:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284784 - head/sys/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 01:24:37 -0000 Author: mjg Date: Thu Jun 25 01:24:36 2015 New Revision: 284784 URL: https://svnweb.freebsd.org/changeset/base/284784 Log: rlimit: fix a an old name in a comment: uihashtbl_mtx -> uihashtbl_lock Modified: head/sys/sys/resourcevar.h Modified: head/sys/sys/resourcevar.h ============================================================================== --- head/sys/sys/resourcevar.h Thu Jun 25 00:15:37 2015 (r284783) +++ head/sys/sys/resourcevar.h Thu Jun 25 01:24:36 2015 (r284784) @@ -90,7 +90,7 @@ struct racct; * Locking guide: * (a) Constant from inception * (b) Lockless, updated using atomics - * (c) Locked by global uihashtbl_mtx + * (c) Locked by global uihashtbl_lock * (d) Locked by the ui_vmsize_mtx */ struct uidinfo { From owner-svn-src-head@freebsd.org Thu Jun 25 01:42:59 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD09F915A89; Thu, 25 Jun 2015 01:42:59 +0000 (UTC) (envelope-from gshapiro@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BE2DC1493; Thu, 25 Jun 2015 01:42:59 +0000 (UTC) (envelope-from gshapiro@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5P1gxLg028533; Thu, 25 Jun 2015 01:42:59 GMT (envelope-from gshapiro@FreeBSD.org) Received: (from gshapiro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5P1gxdu028532; Thu, 25 Jun 2015 01:42:59 GMT (envelope-from gshapiro@FreeBSD.org) Message-Id: <201506250142.t5P1gxdu028532@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gshapiro set sender to gshapiro@FreeBSD.org using -f From: Gregory Neil Shapiro Date: Thu, 25 Jun 2015 01:42:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284785 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 01:42:59 -0000 Author: gshapiro Date: Thu Jun 25 01:42:59 2015 New Revision: 284785 URL: https://svnweb.freebsd.org/changeset/base/284785 Log: Add a note on the second sendmail fix for WeakDH interoperability. Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Jun 25 01:24:36 2015 (r284784) +++ head/UPDATING Thu Jun 25 01:42:59 2015 (r284785) @@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150623: + An additional fix for the issue described in the 20150614 sendmail + entry below has been been committed in revision 284717. + 20150616: FreeBSD's old make (fmake) has been removed from the system. It is available as the devel/fmake port or via pkg install fmake. From owner-svn-src-head@freebsd.org Thu Jun 25 03:24:14 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2024A98BEC8; Thu, 25 Jun 2015 03:24:14 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 06BA62CB9; Thu, 25 Jun 2015 03:24:14 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id EF80D1BC8; Thu, 25 Jun 2015 03:24:13 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 8A4EDA54F; Thu, 25 Jun 2015 03:24:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id oKARoaKsBlcF; Thu, 25 Jun 2015 03:24:10 +0000 (UTC) Subject: Re: svn commit: r284163 - head/bin/cp DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com E9727A549 To: Bruce Evans References: <201506081924.t58JOJQw095752@svn.freebsd.org> <20150609152946.Y935@besplex.bde.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc X-Enigmail-Draft-Status: N1110 Organization: FreeBSD Message-ID: <558B745C.8040305@FreeBSD.org> Date: Wed, 24 Jun 2015 22:24:12 -0500 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.0.1 MIME-Version: 1.0 In-Reply-To: <20150609152946.Y935@besplex.bde.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="5TnR9hbiIaAbEsS7FB5tPK1o5mXoQammU" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 03:24:14 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --5TnR9hbiIaAbEsS7FB5tPK1o5mXoQammU Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 6/9/2015 1:28 AM, Bruce Evans wrote: > On Mon, 8 Jun 2015, Bryan Drewery wrote: >=20 >> Log: >> Cleanup some style(9) issues. >> >> - Whitespace. >> - Comments. >> - Wrap long lines. >=20 > cp's style had a remarlable amount of bitrot. >=20 > This change unimproves it in some places. I have been traveling and packing. I'm replying now but won't have time to address the issues until next week. I was trying to avoid doing any of this but touched code which was horrendously misstyled and chained into reindenting the whole file and doing it wrong :). At this point I don't want to tweak this much more. >> --- head/bin/cp/cp.c Mon Jun 8 19:13:04 2015 (r284162) >> +++ head/bin/cp/cp.c Mon Jun 8 19:24:18 2015 (r284163) >> @@ -75,8 +75,8 @@ __FBSDID("$FreeBSD$"); >> #include "extern.h" >> >> #define STRIP_TRAILING_SLASH(p) { \ >> - while ((p).p_end > (p).p_path + 1 && (p).p_end[-1] =3D=3D '/'= ) \ >> - *--(p).p_end =3D 0; \ >> + while ((p).p_end > (p).p_path + 1 && (p).p_end[-1] =3D=3D '/') = \ >> + *--(p).p_end =3D 0; \ >=20 Woops. >=20 >> @@ -245,10 +245,10 @@ main(int argc, char *argv[]) >> type =3D FILE_TO_FILE; >> >> if (have_trailing_slash && type =3D=3D FILE_TO_FILE) { >> - if (r =3D=3D -1) >> + if (r =3D=3D -1) { >=20 > This adds excessive braces. >=20 >> errx(1, "directory %s does not exist", >> - to.p_path); >> - else >> + to.p_path); >> + } else It is a multi-line statement due to the hard 80-width wrap. I feel it is fine in this case. >> errx(1, "%s is not a directory", to.p_path); >> } >> } else >> ... >> @@ -379,7 +379,8 @@ copy(char *argv[], enum op type, int fts >> mode =3D curr->fts_statp->st_mode; >> if ((mode & (S_ISUID | S_ISGID | S_ISTXT)) || >> ((mode | S_IRWXU) & mask) !=3D (mode & mask)) >> - if (chmod(to.p_path, mode & mask) !=3D 0){ >> + if (chmod(to.p_path, mode & mask) !=3D >> + 0) { >> warn("chmod: %s", to.p_path); >> rval =3D 1; >> } >=20 > This changes from a minor misformatting to avoid a long line to even ug= lier > formatting with a split line. I agree 100%. I did it because of our hard 80-width cut-off. What would the proper style be? My inclination would be to wrap at the first comma but then it is even more odd. I find our 80-width cut-off to be strange when editors/tmux/window manager/etc can resize and wrap long lines alrea= dy. Actually I don't see a width restriction in style(9) at all but surely we have this rule documented somewhere. My guess is that it is inherited by KNF. > It is necessary to make such changes if you > use indent(1) to generate and check the changes -- otherwise, indent ke= eps Do you have an indent configuration I can use? > reporting the misformatting -- but since cp rarely went near indent it > may be better to keep its minor misformattings. >=20 >> Modified: head/bin/cp/utils.c >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> >> --- head/bin/cp/utils.c Mon Jun 8 19:13:04 2015 (r284162) >> +++ head/bin/cp/utils.c Mon Jun 8 19:24:18 2015 (r284163) >> ... >> -/* Small (default) buffer size in bytes. It's inefficient for this to= be >> - * smaller than MAXPHYS */ >> +/* >> + * Small (default) buffer size in bytes. It's inefficient for this to= be >> + * smaller than MAXPHYS. >> + */ >=20 > Still has unusual sentence break of 1 space. cp uses normal sentence > breaks I did a minimal effort on comments and didn't clean up grammar or breaks. I have not adopted 2 space breaks into my style(9) conformation y= et. >> @@ -345,7 +352,7 @@ setfile(struct stat *fs, int fd) >> fdval =3D fd !=3D -1; >> islink =3D !fdval && S_ISLNK(fs->st_mode); >> fs->st_mode &=3D S_ISUID | S_ISGID | S_ISVTX | >> - S_IRWXU | S_IRWXG | S_IRWXO; >> + S_IRWXU | S_IRWXG | S_IRWXO; >=20 > Here the formatting was reasonable, but it was in gnu style and was har= d to > maintain since it is not supported by indent(1). It is still hard to > maintain, > since it has fancy splitting earlier than necessary to put the S_IS* an= d > S_IR* parts of the expressions on separate lines. indent(1) cannot > reproduce > this splitting. Also, with the normal indentation of the condinuation > line, > the fancy splitting is not so readable. I'm do not see how this was proper before or how it is worse now. The indentation is tabs and then 4 spaces. I don't see exceptions to this in style(9) or in other code. >=20 >> @@ -543,8 +550,10 @@ usage(void) >> { >> >> (void)fprintf(stderr, "%s\n%s\n", >> -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpsvx] source_file >> target_file", >> -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpsvx] source_file >> ... " >> -"target_directory"); >> + "usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpsvx] " >> + "source_file target_file", >> + " cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpsvx] " >> + "source_file ... " >> + "target_directory"); >> exit(EX_USAGE); >> } >=20 > This breaks the careful outdentation and obfuscates the strings. The Again, this broke the 80-width limit. I preferred the old way but was going on down the 80-width line on my screen fixing violations. I suggest we update our styles to not require this awful wrapping. It makes `grep -r` very difficult when strings are split up. Perhaps I am mistaken on the rule but we have a lot of code that needlessly wraps earl= y. Regards, Bryan Drewery --5TnR9hbiIaAbEsS7FB5tPK1o5mXoQammU Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJVi3RcAAoJEDXXcbtuRpfPpcEIAJuqfa0rdLGVUG0UlN5mlm22 Z5nUUisEI0sGA2Y3glks+d7vU8qktNVahzQPkqXh4ESb1MX/k1kKWEJyhCbCVmpB 3zazlkyjFEQxULWM24zaQvf+YCDtoDCFsnn3ka3j5ueLzFk72uVguKU5Ss6niUyU PCUbF4Z6RXed5K7HI0WUSbFsLtJWPYewZZc/7X65j1HAAKXAOlMCennXqLoFSFzE Y5LqVh7syrVbhgoc+7eD8J2+8M/QUsTtOBe3FBWaMS3mQSs+Sqe/xXwkcFBUSWTw V2jfHY9XKttQAJRivRkI+iUiUYMxPocoAireOxu29kXuaPEa8McjIIiyDgqgLeM= =yF7A -----END PGP SIGNATURE----- --5TnR9hbiIaAbEsS7FB5tPK1o5mXoQammU-- From owner-svn-src-head@freebsd.org Thu Jun 25 06:15:09 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B098298C59C; Thu, 25 Jun 2015 06:15:09 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9DBBD10B4; Thu, 25 Jun 2015 06:15:09 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5P6F9AF061848; Thu, 25 Jun 2015 06:15:09 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5P6F9d8061843; Thu, 25 Jun 2015 06:15:09 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506250615.t5P6F9d8061843@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 25 Jun 2015 06:15:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284792 - head/sys/dev/hptnr X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 06:15:09 -0000 Author: delphij Date: Thu Jun 25 06:15:08 2015 New Revision: 284792 URL: https://svnweb.freebsd.org/changeset/base/284792 Log: Merge changes from vendor driver 1.1.4: v1.1.4 2015-06-09 * Fix a bug that FailLED was not initialized properly. v1.1.3 2015-05-19 * Support Report Luns command. v1.1.2 2015-05-05 * Fix a bug that report wrong physical sector size for 512e HDD. Many thanks to HighPoint for continued support of FreeBSD! This driver update is intended for 10.2-RELEASE. Submitted by: Steve Chang MFC after: 3 days Modified: head/sys/dev/hptnr/README head/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu head/sys/dev/hptnr/him.h head/sys/dev/hptnr/hptnr_config.c head/sys/dev/hptnr/hptnr_osm_bsd.c head/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu head/sys/dev/hptnr/ldm.h head/sys/dev/hptnr/osm.h Modified: head/sys/dev/hptnr/README ============================================================================== --- head/sys/dev/hptnr/README Thu Jun 25 01:57:47 2015 (r284791) +++ head/sys/dev/hptnr/README Thu Jun 25 06:15:08 2015 (r284792) @@ -3,6 +3,16 @@ Copyright (C) 2015 HighPoint Technologie ############################################################################# Revision History: + + v1.1.4 2015-06-09 + * Fix a bug that FailLED was not initialized properly. + + v1.1.3 2015-05-19 + * Support Report Luns command. + + v1.1.2 2015-05-05 + * Fix a bug that report wrong physical sector size for 512e HDD. + v1.1.1 2015-03-26 * Support 4Kn drive. * Change the SCSI target ID of the disk to be the index of physical connetion to the HBA. @@ -57,7 +67,7 @@ Revision History: 2) Extract the driver files under the kernel source tree: # cd /usr/src/sys/ - # tar xvzf /your/path/to/hptnr-freebsd-src-v1.0-130701.tgz + # tar xvzf /your/path/to/HPTNR_FreeBSD_Src_1.x.x_xx_xx_xx.tgz 3) Update the kernel configuration file to include the HighPoint source. Assume the configure file is GENERIC, and new kernel configure file is @@ -79,8 +89,8 @@ Revision History: compile-with "uudecode < $S/dev/hptnr/i386-elf.hptnr_lib.o.uu" \ no-implicit-rule - dev/hptnr/os_bsd.c optional hptnr - dev/hptnr/osm_bsd.c optional hptnr + dev/hptnr/hptnr_os_bsd.c optional hptnr + dev/hptnr/hptnr_osm_bsd.c optional hptnr dev/hptnr/hptnr_config.c optional hptnr For amd64 system, edit /usr/src/sys/conf/files.amd64 and append the lines @@ -91,13 +101,13 @@ Revision History: compile-with "uudecode < $S/dev/hptnr/amd64-elf.hptnr_lib.o.uu" \ no-implicit-rule - dev/hptnr/os_bsd.c optional hptnr - dev/hptnr/osm_bsd.c optional hptnr + dev/hptnr/hptnr_os_bsd.c optional hptnr + dev/hptnr/hptnr_osm_bsd.c optional hptnr dev/hptnr/hptnr_config.c optional hptnr 6) Rebuild and install the kernel: - a) for FreeBSD 5.x-i386/6.x-i386/7.x-i386/8.x-i386/9.x-i386: + a) for FreeBSD 5.x-i386/6.x-i386/7.x-i386/8.x-i386/9.x-i386/10.x-i386: # cd /usr/src/sys/i386/conf/ # /usr/sbin/config MYKERNEL @@ -106,7 +116,7 @@ Revision History: # make # make install - b) for FreeBSD 5.x-amd64/6.x-amd64/7.x-amd64/8.x-amd64/9.x-amd64: + b) for FreeBSD 5.x-amd64/6.x-amd64/7.x-amd64/8.x-amd64/9.x-amd64/10.x-amd64: # cd /usr/src/sys/amd64/conf/ # /usr/sbin/config MYKERNEL @@ -139,7 +149,7 @@ Revision History: 2) Extract the driver files under the kernel source tree: # cd /usr/src/sys/ - # tar xvzf /your/path/to/hptnr-freebsd-src-v1.0-111213.tgz + # tar xvzf /your/path/to/HPTNR_FreeBSD_Src_1.x.x_xx_xx_xx.tgz 4) Build the driver module: @@ -153,7 +163,7 @@ Revision History: # cp hptnr.ko /modules/ - For FreeBSD 5.x/6.x/7.x/8.x/9.x: + For FreeBSD 5.x/6.x/7.x/8.x/9.x/10.x: # cp hptnr.ko /boot/kernel/ @@ -179,7 +189,7 @@ Revision History: /modules/hptnr.ko text=0xf571 data=0x2c8+0x254 ok boot - For FreeBSD 5.x/6.x/7.x/8.x/9.x, you can select 6 on the boot menu to get a loader + For FreeBSD 5.x/6.x/7.x/8.x/9.x/10.x, you can select 6 on the boot menu to get a loader prompt. 7) You can add a below line into /boot/defaults/loader.conf to load the Modified: head/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu ============================================================================== --- head/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu Thu Jun 25 01:57:47 2015 (r284791) +++ head/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu Thu Jun 25 06:15:08 2015 (r284792) @@ -1,5 +1,5 @@ begin 644 hptnr_lib.o -M?T5,1@(!`0D```````````$`/@`!`````````````````````````$#S!``` +M?T5,1@(!`0D```````````$`/@`!`````````````````````````.#T!``` M`````````$```````$``$``-`(GP9HEW",9'#@!FQT<,``!FA?9T'XU0_[D` M````9F:02(L'9HD4"$B#P0*#Z@%F@_K_=>SSPV9F9I!F9I!F9I!!B?!FB7<( MQD<.`6;'1PP``&:%]G0>N@````"Y`````$B+!V:)%`B#P@%(@\$"9D0YPG7L @@ -226,8 +226,8 @@ M,$B)WDB)[^@`````D.LN2(V5L````$B+A;````! M``#K/4B)WDB)[^@`````D$PYI;`````/A>;^___K(DB+M4@(``"-0?\\`7:# M#[;"2(T4P$B-%)!(C036Z5C___];74%?`0`` +M`746#[9&.H/H`3P!#Y;`#[;89F9FD&9FD`^VA<0````\!'0-/`8/A24"``#I +MR`$``,:%Q@````!(BTU`2(7)=1L/MI4A`0``C4(!B(4A`0``@/H"#X>?`0`` MZQ*+402-0@&)002#^B@/AXL!``!)BX6P````2(EP"$B)!DF-A;````!(B48( M28FUL````,9&)(!(B>J^(0```$R)Y^@`````A=L/A:D(`="'V0DH"#X2"`0``#[9-<;@!````T^`)0E"`34P0 @@ -245,12 +245,12 @@ M#[?`#[:$!W@'``!(C13`2(T4D$C!X@-,C2013(G M`````$$/MW?H`````+@!```` +MB0-,B7,(2(F=L````$TY;"0@=;%!QH0DQ`````1,B?Y,B>?H`````+@!```` M2(/$"%M=05Q!74%>05_#9F:09F:02(/L:$B)7"0X2(EL)$!,B60D2$R);"10 M3(ET)%A,B7PD8$B)5"0H3(LG#[?V2,'F`TD#M"28"```2(LN9H%]..$!=2X/ MMD4Z@^@1/`%W(TB+5RA$#[9Z3$&^`````$B#?"0H`'5AQD)-`$&^`````.M5 M28N,)$@(``"XV"8!`&:!?2"#`'<=#[=%($$/MH0$>`<``$B-%,!(C1202(T$ -MU0````!,C30!10^V?F:Z`````$B#?"0H`'4-0<:&P`````"Z`````(!])(%U +MU0````!,C30!10^V?F:Z`````$B#?"0H`'4-0<:&Q`````"Z`````(!])(%U M!(!G"_=(@WPD*``/A7,!``#&120`@ST``````7479H%]..$!=0\/MD4Z@^@1 M/`%W!,9%)"'VA98````@#X1"!```2(M%:$B%P`^$-00``$B)P_:`L0````)T M'4B+N*````!(A?]T$4B+=4A(A?9T"(M5-.@`````28N4)"`+``!(@<)`"``` @@ -352,7 +352,7 @@ MD&9FD&9FD$%6055!5%5308GU2(G]1`^V]DECQDB M!^`,``!-A>0/A`@!``!(Q\#^____1(GQ2-/`081$)`P/A?````!!@'PD#0`/ MA.@!``!!O0````!)C5PD0$B)W^@`````2(G"2(M#"$B)4PA(B1I(B4((2(D0 M@'I)``^%G@````^W0CA(@[S%>`,```!U!TB#>D``=',/MT(X2(N$Q7@#``!( -M@[B``````'1&QH+```````^V2DA(B_H`````$B#Q!A; +M`70EJ`1T(4'&A<0````$28L728M'"$B)0@A(B1!,B?Y,B>_H`````$B#Q!A; M74%<05U!7D%?PV9F9I!!5T%6055!5%532(/L:$B)^\9'2P#&1TH`QH>A#@`` M`$B-E]`,``"X`````&9F9I#&!!``2(/``4@]P`$``'7P2(V#L````$B)@[`` M``!(B8.X````2(V#P````$B)@\````!(B8/(````3(VCT````$R)H]````!, @@ -612,7 +612,7 @@ MPV:02(/L&$B)'"1,B60D"$R);"0028G]B?-(BX> MB<;&0#CAQD`Y`<9`.A+&0#L/QD`\H,9`/0,/ML>(1CZ)V,'H$(A&/XG8P>@8 MB$9`B%Y!00^W14!FB48@3(EF*,=&-`````!(QT9(`````$C'AJ`````````` M3(GGZ`````!(BQPD3(MD)`A,BVPD$$B#Q!C#D$B#["A(B5PD"$B);"003(ED -M)!A,B6PD($B)]4&)U$&)S4B+'TB)W^@`````2(G"2(7`=1#&A<$````!QD5* +M)!A,B6PD($B)]4&)U$&)S4B+'TB)W^@`````2(G"2(7`=1#&A<4````!QD5* M`^F,````QD`XX<9`.0%!@/P!&<#WT(/``HA".D6$[75)N`````!(@WU8`'0$ M#[9%<8A".P^W13AFB4(@2(E:*,="-`````!(QT)(`````$C'P`````!(B8*@ M````2(G62(G?Z`````#K*,9".P\/MT4X9HE"($B)6BC'0C0`````2,="2``` @@ -623,7 +623,7 @@ ME,"#P!&(0CJX#P```$6$_W4$#[9%18A".T2(8CQ MB>D/ML6(0CY$B>C!Z!"(0C]$B>C!Z!B(0D!$B&I!#[=%0&:)0B!(B5HH2(L$ M)$B)@J````!(B=9(B=_H`````$B+7"0(2(ML)!!,BV0D&$R+;"0@3(MT)"A, MBWPD,$B#Q#C#9F9FD$B#["A(B1PD2(EL)`A,B60D$$R);"083(ET)"!(B?5- -MB<9!B=1!B`000^WE>H````!T(T4`(F5O``` -M`$B#;6@!QD5D`D'V16H"=!I!#[>%@````*@/=`YF@_@"&<"#P`2(161FD,9% -M9?]!]D5J!'0?N0````!!#[>%L````$C3^*@!=`.(366#P0&#^0=UYL:%(`$` -M``!!]H:F````('0900^WAJP```"#X""#^`$9P(/``HB%(`$``+@!````6UU! -M7$%=05[#9F9FD&9F9I!F9I!F9I!!5T%6055!5%532(/L.(GU28G42(L/C13M -M`````(U"X(G`2(V<""`"``!(B1PD2(V$""0"``!(B40D"(G23(V\"@`"``!, -MC:P*!`(``+L`````3(UT)!"#_0-V)8V#'`$``$B+%"2)`K\0)P``Z`````!( -MBU0D"(L"B04`````ZQV-@QP!``!!B0>_$"<``.@`````08M%`(D%`````$*) -M!#-(@\,$2(/[''6K2(M$)!!)B00D2(M$)!A)B40D"$B+1"0@28E$)!"+1"0H -M08E$)!A(@\0X6UU!7$%=05Y!7\-F9F:09F9FD&9F9I!F9I!!5T%6055!5%53 -M2(/L.(GU28G42(L/C13M`````(U"X(G`2(V<""`"``!(B1PD2(V$""0"``!( -MB40D"(G23(V\"@`"``!,C:P*!`(``+L`````3(UT)!"#_0-V)8V#``$``$B+ -M%"2)`K\0)P``Z`````!(BU0D"(L"B04`````ZQV-@P`!``!!B0>_$"<``.@` -M````08M%`(D%`````$*)!#-(@\,$2(/[''6K2(M$)!!)B00D2(M$)!A)B40D -M"$B+1"0@28E$)!"+1"0H08E$)!A(@\0X6UU!7$%=05Y!7\-F9F:09F9FD&9F -M9I!F9I!!5D%505154TB#["!(B?U!B?9,BR]$#[;F26/$2(G"2,'B!$C!X`=( -M*=!(`?A(C9#0#```0(AR"$B)N-`,``#&0@H`1(GFZ`````!(B>!(B>+&``!( -M@\`!2(G32(U,)"!(.)(B>_H`````$B)Y^@`````26/42(G1 -M2,'A!$C!X@=(*($ -M2,'@!T@IT(F,!0`-``!"C03E`````$B828V$!8`!``"+"(D-`````$ECQ$B) -MPDC!X@1(P>`'2"G02`'HB8@$#0``]H`"#0``$`^$X````/:`V0P```)U"L>` -M]`P```$``@!!@/X#=C5"C1SE`````$ACVTJ-A"LP`@``QP`8````OQ`G``#H -M`````$J-G"LT`@``BS.)-0````#K,T*-'.4`````2&/;2HV$*U`"``#'`!@` -M``"_$"<``.@`````2HV<*U0"``"+,XDU`````$ECQ$B)PDC!X@1(P>`'2"G0 -MB?&!X?___]^)\H'*````(/>$!0`-``````,`#T3108#^`W860HT$Y0````!( -MF$F-A`4T`@``B1#K%$*-!.4`````2)A)C80%5`(``(D02(/$(%M=05Q!74%> -MPV9F9I!F9F:09F:005=!5D%505154TB#[!A)B?Y,BS])BP?&1DD`QD9(!<9& -M2P9(B7Y0N0````"]`````$B-D``"``!(B50D$$@%!`(``$B)1"0(ZQ9F9I!F -M9I!!#[9&#$C3^*@!=0J#P0&003I/0W+J@/D#=GI(C1S-`````('C^`<``$R+ -M;"0020'=0<=%`"P```"_$"<``.@`````2`-<)`A$BR-$B24`````0<=%`"0` -M``"_$"<``.@`````BP.)!0````#!X`A!@>3_````00G$0<=%`"````"_$"<` -M`.@`````BQN)'0````#K>$B-',T`````@>/X!P``3(ML)!!)`=U!QT4`+``` -M`+\0)P``Z`````!(`UPD"$2+(T2))0````!!QT4`)````+\0)P``Z`````"+ -M`XD%`````,'@"$&!Y/\```!!"<1!QT4`(````+\0)P``Z`````"+&XD=```` -M`$&!_`$!:99U&D&`3@L&B=C!Z!`\4`^4P`^VV.M>9F:09F:008'\`0$``'4/ -MB=C!Z!`\4`^4P`^VV.M`OX@3``#H`````(/%`4"`_01W"KD`````Z:O^__^) -MV,'H$#Q0#Y3`#[;8B=I$B>9(Q\<`````N`````#H`````(G82(/$&%M=05Q! -M74%>05_#9F9FD&9FD$%7059!54%455-(@^Q(28G]2(L'@']#``^$/P,``,=$ -M)$0`````2(V0``(``$B)5"002`4$`@``2(E$)`AF9I`/MDPD1(A,)$,/ML&) -M1"0T2)A(B<)(P>($2,'@!T@IT$J--"CVA@(-```0#X35`@``2(V6T`P``+@! -M````#[9,)#1(T^`(0@I(B[;@#```2(ET)#CV0@D"#X0@`0``#[9$)$.-:`%! -M.&U##X8.`0``2&-$)#1(B<)(P>($2,'@!T@IT$B)1"0H28V4!?@,``!(B50D -M($F-C`7L#```2(E,)!A$#[;U26/&2(G"2,'B!$C!X`=(B<-(*=-.C20K0?:$ -M)`(-```0#X2D````3(M\)"A-`>]!]X?T#``````.``^$BP```$F-M!WX#``` -MN@@```!(BWPD(.@`````A,!T<$F-M!WL#```N@@```!(BWPD&.@`````A,!T -M5;@!````1(GQ2-/@28V7T`P```I""HA""D&(A"3:#```2(-\)#@`=0]-BZ0D -MX`P``$R)9"0XZQY)8\9(B<)(P>($2,'@!T@IT$B+5"0X28F4!>`,``"#Q0%! -M.&U##XI(BTPD.$B)BN`,```/MD0D0TB)P4C!X01( -MP>`'2"G(28V$!=`,``!(BTPD.$B)02`/MH+9#```B$$*QD$)`$R)*<9!#0`/ -MMD0D0XUP`4$X=4-V=TAC1"0T2(G"2,'B!$C!X`=(*=!)C;P%T`P``$`/MLX/ -MMD<*2-/XJ`%T'DACP4B)PDC!X@1(P>`'2"G02(M4)#A)B90%X`P``(/&`4$X -M=4-V)NO(9F9FD$AC1"0T2(G"2,'B!$C!X`=(*=!(BTPD.$F)C`7@#```2&-$ -M)#1(B<)(P>($2,'@!T@IT$F-E`70#```#[9""DB+3"0XB$$,#[9J"H!\)$,# -M=BN+7"0TP>,#2&/;2(M$)!!(`=C'`#@```"_$"<``.@`````2`-<)`B)*^LI -MBUPD-,'C`TACVTB+1"002`'8QP`X````OQ`G``#H`````$@#7"0(B2N#1"1$ -M`0^V1"1#@\`!03A%0P^'X_S__TB#Q$A;74%<05U!7D%?PV9F9I!!5T%6055! -M5%532(/L:$F)_DB+#\9$)%!0QD0D40'&1"12D\9$)%/`QD0D5!'&1"15`\9$ -M)%8`QD0D5P!(.[\`"```#X63````2(V7P`X``$B+1"102(F'(`@``(L%```` -M``"'(P@``(/``8D%``````^VAR`(``"(@B`(```/MH`!`$```````!)BP;'@!@!````````28L& -MQX`<`0```````+^0T`,`Z`````!!QX=P`0``&`$``$&+AW0!``")!0````"` -MY/V`S`2)1"1<0<>'<`$``!@!``"+1"1<08F'=`$``$''AW`!```H`0``0<>' -M=`$``']_``!!QX=P`0``)`$``$&+AW0!``")!0````!FN```#?\_``")1"1< -M0<>'<`$``"0!``"+1"1<08F'=`$``$''AW`!```\`0``0<>'=`$`````>@!! -MQX=P`0``I`$``$''AW0!``!]O^__0<>'<`$``+@!``!!BX=T`0``B04````` -M)?__```-``#Z`(E$)%Q!QX=P`0``N`$``(M$)%Q!B8=T`0``0<>'G````/\` -M``!!QX>0`@``1`$``$''AY0"```&$``(0<>'D`(``+0!``!!QX>4`@``7W`` -M`$''AY`"```P````08N'E`(``(D%`````##D@,PSB40D7$&)AY0"``!!@'Y# -M``^$@P(``,=$)$@`````28V'4`(``$B)1"0X28V75`(``$B)5"0P28V&(`@` -M`$B)1"0H28V7@`$``$B)5"0@28V'A`$``$B)1"0828V7,`(``$B)5"0028V' -M-`(``$B)1"0(9F:0#[94)$B(5"1/@/H##X;U````#[;JC1SM`````$ACVTR+ -M;"0020'=0<=%``@```"_$"<``.@`````2(M$)`A,C20#08L$)(D%`````(E$ -M)%P-``"``$&)!"1(BU0D*(GN3(GWZ`````")[DR)]^@`````0<=%`$0!``"_ -M$"<``.@`````0<<$)`80``A!QT4`M`$``+\0)P``Z`````!!QP0D7W```$'' -M10`(````OQ`G``#H`````,=$)%S_5(``0<<$)/]4``"Z`0```(GN3(GWZ``` -M``!(BT0D($B-%`.+`HD%`````"7___[_B0+'1"15H@$``(G0)0#````]`$`` +M`'4>9H'B_S]T%V:X`0#3X&8IT&:)A<(```!F9F:09F:02(-M:`'&160"0?9% +M:@)T&$$/MX6`````J`]T#&:#^`(9P(/`!(A%9,9%9?]!]D5J!'0?N0````!! +M#[>%L````$C3^*@!=`.(366#P0&#^0=UYL:%(`$```!!]H:F````('0900^W +MAJP```"#X""#^`$9P(/``HB%(`$``+@!````6UU!7$%=05[#9F:09F:005=! +M5D%505154TB#[#B)]4F)U$B+#XT4[0````"-0N")P$B-G`@@`@``2(D<)$B- +MA`@D`@``2(E$)`B)TDR-O`H``@``3(VL"@0"``"[`````$R-="00@_T#=B6- +M@QP!``!(BQ0DB0*_$"<``.@`````2(M4)`B+`HD%`````.L=C8,<`0``08D' +MOQ`G``#H`````$&+10")!0````!"B00S2(/#!$B#^QQUJTB+1"0028D$)$B+ +M1"0828E$)`A(BT0D($F)1"00BT0D*$&)1"082(/$.%M=05Q!74%>05_#9F9F +MD&9F9I!F9F:09F:005=!5D%505154TB#[#B)]4F)U$B+#XT4[0````"-0N") +MP$B-G`@@`@``2(D<)$B-A`@D`@``2(E$)`B)TDR-O`H``@``3(VL"@0"``"[ +M`````$R-="00@_T#=B6-@P`!``!(BQ0DB0*_$"<``.@`````2(M4)`B+`HD% +M`````.L=C8,``0``08D'OQ`G``#H`````$&+10")!0````!"B00S2(/#!$B# +M^QQUJTB+1"0028D$)$B+1"0828E$)`A(BT0D($F)1"00BT0D*$&)1"082(/$ +M.%M=05Q!74%>05_#9F9FD&9F9I!F9F:09F:0059!54%455-(@^P@2(G]08GV +M3(LO1`^VYDECQ$B)PDC!X@1(P>`'2"G02`'X2(V0T`P``$"(<@A(B;C0#``` +MQD(*`$2)YN@`````2(G@2(GBQ@``2(/``4B)TTB-3"0@2#G(=>Q!#[;V2(GB +M2(GOZ`````!(B>?H`````$ECU$B)T4C!X01(P>('2"G*2(T,*HF!Z`P``$B+ +M0PQ(B805[`P``$&`_@-V/$*-!*4`````2)A)C80%T`$``(L`B04`````B8$` +M#0``0HT$Y0````!(F$F-A`6``0``BPB)#0````#K3$*-!*4`````2)A)C80% +MT`$``(L(B0T`````26/$2(G"2,'B!$C!X`=(*=")C`4`#0``0HT$Y0````!( +MF$F-A`6``0``BPB)#0````!)8\1(B<)(P>($2,'@!T@IT$@!Z(F(!`T``/:` +M`@T``!`/A.````#V@-D,```"=0K'@/0,```!``(`08#^`W8U0HT($2,'@!T@IT(GQ@>'____?B?*!R@```"#WA`4`#0`` +M```#``]$T4&`_@-V%D*-!.4`````2)A)C80%-`(``(D0ZQ1"C03E`````$B8 +M28V$!50"``")$$B#Q"!;74%<05U!7L-F9F:09F9FD&9FD$%7059!54%455-( +M@^P828G^3(L_28L'QD9)`,9&2`7&1DL&2(E^4+D`````O0````!(C9```@`` +M2(E4)!!(!00"``!(B40D".L69F:09F:000^V1@Q(T_BH`74*@\$!D$$Z3T-R +MZH#Y`W9Z2(T`( +M08'D_P```$$)Q$''10`@````OQ`G``#H`````(L;B1T`````ZWA(C1S-```` +M`('C^`<``$R+;"0020'=0<=%`"P```"_$"<``.@`````2`-<)`A$BR-$B24` +M````0<=%`"0```"_$"<``.@`````BP.)!0````#!X`A!@>3_````00G$0<=% +M`"````"_$"<``.@`````BQN)'0````!!@?P!`6F6=1I!@$X+!HG8P>@0/%`/ +ME,`/MMCK7F9FD&9FD$&!_`$!``!U#XG8P>@0/%`/E,`/MMCK0+^($P``Z``` +M``"#Q0%`@/T$=PJY`````.FK_O__B=C!Z!`\4`^4P`^VV(G:1(GF2,?'```` +M`+@`````Z`````")V$B#Q!A;74%<05U!7D%?PV9F9I!F9I!!5T%6055!5%53 +M2(/L2$F)_4B+!X!_0P`/A#\#``#'1"1$`````$B-D``"``!(B50D$$@%!`(` +M`$B)1"0(9F:0#[9,)$2(3"1##[;!B40D-$B82(G"2,'B!$C!X`=(*=!*C30H +M]H8"#0``$`^$U0(``$B-EM`,``"X`0````^V3"0T2-/@"$(*2(NVX`P``$B) +M="0X]D()`@^$(`$```^V1"1#C6@!03AM0P^&#@$``$AC1"0T2(G"2,'B!$C! +MX`=(*=!(B40D*$F-E`7X#```2(E4)"!)C8P%[`P``$B)3"081`^V]4ECQDB) +MPDC!X@1(P>`'2(G#2"G33HTD*T'VA"0"#0``$`^$I````$R+?"0H30'O0?>' +M]`P`````#@`/A(L```!)C;0=^`P``+H(````2(M\)"#H`````(3`='!)C;0= +M[`P``+H(````2(M\)!CH`````(3`=%6X`0```$2)\4C3X$F-E]`,```*0@J( +M0@I!B(0DV@P``$B#?"0X`'4/38ND).`,``!,B60D..L>26/&2(G"2,'B!$C! +MX`=(*=!(BU0D.$F)E`7@#```@\4!03AM0P^')/___TB#?"0X``^%U@```$R) +M[^@`````2(E$)#A(A<`/A'T!``!(8U0D-$B)T$C!X`1(P>('2"G"3`'J2(M, +M)#A(B8K@#```#[9$)$-(B<%(P>$$2,'@!T@IR$F-A`70#```2(M,)#A(B4$@ +M#[:"V0P``(A!"L9!"0!,B2G&00T`#[9$)$.-<`%!.'5#=G=(8T0D-$B)PDC! +MX@1(P>`'2"G028V\!=`,``!`#[;.#[9'"DC3^*@!=!Y(8\%(B<)(P>($2,'@ +M!T@IT$B+5"0X28F4!>`,``"#Q@%!.'5#=B;KR&9F9I!(8T0D-$B)PDC!X@1( +MP>`'2"G02(M,)#A)B8P%X`P``$AC1"0T2(G"2,'B!$C!X`=(*=!)C90%T`P` +M``^V0@I(BTPD.(A!#`^V:@J`?"1#`W8KBUPD-,'C`TACVTB+1"002`'8QP`X +M````OQ`G``#H`````$@#7"0(B2OK*8M<)#3!XP-(8]M(BT0D$$@!V,<`.``` +M`+\0)P``Z`````!(`UPD"(DK@T0D1`$/MD0D0X/``4$X14,/A^/\__](@\1( +M6UU!7$%=05Y!7\-F9F:005=!5D%505154TB#[&A)B?Y(BP_&1"104,9$)%$! +MQD0D4I/&1"13P,9$)%01QD0D50/&1"16`,9$)%<`2#N_``@```^%DP```$B- +ME\`.``!(BT0D4$B)AR`(``"+!0``````AR,(``"#P`&)!0`````/MH<@"``` +MB((@"```#[:'(0@``(B"(0@```^VAR((``"(@B((```/MH`'`$```````"_D-`#`.@`````0<>' +M<`$``!@!``!!BX=T`0``B04`````@.3]@,P$B40D7$''AW`!```8`0``BT0D +M7$&)AW0!``!!QX=P`0``*`$``$''AW0!``!_?P``0<>'<`$``"0!``!!BX=T +M`0``B04`````9K@```W_/P``B40D7$''AW`!```D`0``BT0D7$&)AW0!``!! +MQX=P`0``/`$``$''AW0!`````'H`0<>'<`$``*0!``!!QX=T`0``?;_O_T'' +MAW`!``"X`0``08N'=`$``(D%`````"7__P``#0``^@")1"1<0<>'<`$``+@! +M``"+1"1<08F'=`$``$''AYP```#_````0<>'D`(``$0!``!!QX>4`@``!A`` +M"$''AY`"``"T`0``0<>'E`(``%]P``!!QX>0`@``,````$&+AY0"``")!0`` +M```PY(#,,XE$)%Q!B8>4`@``08!^0P`/A(,"``#'1"1(`````$F-AU`"``!( +MB40D.$F-EU0"``!(B50D,$F-AB`(``!(B40D*$F-EX`!``!(B50D($F-AX0! +M``!(B40D&$F-ES`"``!(B50D$$F-AS0"``!(B40D"&9FD`^V5"1(B%0D3X#Z +M`P^&]0````^VZHT<[0````!(8]M,BVPD$$D!W4''10`(````OQ`G``#H```` +M`$B+1"0(3(TD`T&+!"2)!0````")1"1<#0``@`!!B00D2(M4)"B)[DR)]^@` M````B>Y,B??H`````$''10!$`0``OQ`G``#H`````$''!"0&$``(0<=%`+0! M``"_$"<``.@`````0<<$)%]P``!!QT4`"````+\0)P``Z`````#'1"1<_U2` M`$''!"3_5```N@$```")[DR)]^@`````2(M$)"!(C10#BP*)!0`````E___^ -M_XD"QT0D7`4!R`!(`UPD&,<#!0'(`+^@A@$`Z`````")[DR)]^@`````@T0D -M2`$/MD0D3X/``4$X1D,/A]S]__],B??H`````$&+AP0!``")!0````"#R`*) -M1"1<08F'!`$``$B+5"1`BP*)!0`````E\/___0T-```"B40D7(D"BP*)!0`` -M``!)BX;X"@``08F'"`$``$&+AOP*``!!B8<,`0``28N&*`L``$&)AQ`!``!! -MBX8L"P``08F'%`$``$''AR`!````````00^WALP,```E_P\```T```$`08F' -M(`$``$F+AH@+``!!B8'-`$```````!!#[>&S@P``"7_#P``#0```0!!B8$AJ`(````````@\(!@_H0 -M=>EF0<>&R`P``/\/9D''ALH,``#_#[@!````2(/$:%M=05Q!74%>05_#D$%7 -M059!54%455-(@^P(28G^28GT3(LO3(GOZ`````!(B<-(AFQ````3(GOZ`````!(B<5(A05_#9F9FD&9F9I!F9I!!5T%6055!5%532(/L*$F) -M_$B)\TB%]G07#[9&"83`=`\\_P^%'0<``.E'`0``9I"Y`````$(/MH0A_`<` -M`#S_=!('2(V$PE`!``!)C5P$"$B#P0%(@_D$==*]`````$(/ -MMH0E_`<``#S_="L/ML!(B<)(P>('2(T$PDF-G`18`0``0?:$!&(!```"=0I( -MB=_H`````&:02(/%`4B#_01UOD$/MD0D/F9!.80DR`H```^%AP8``$B%VP^% -MF````$&`?"1+``^%<@8``$'&1"1+`69FD&9FD$F+M-QX`P``2(7V=&-(BX:` -M````2(7`="=(QX:``````````$G'A-QX`P```````$B+OI````"Z_______0 -MZS!(BX:(````2(7`="1(QX:(`````````$G'A-QX`P```````$B+OI````#_ -MT&9F9I!(@\,!2(/[%`^$Z`4``.N`QD,)_TB)WDR)Y^@`````D.G1!0``N0`` -M``!F9I!F9I!"#[:$(?P'```\_P^$@P````^VT$B)T$C!X`=(C03028V$!%`! -M``"`>!'_=&>`>!4`#X2/!0``O0````!(B=!(P>`'2(T$T$V-K`28`0``2HT< -M($R-HU`!``!,B>_H`````$B+DZ`!``!(B8.@`0``3(DH2(E0"$B)`H!X2O\/ -MA4(%``"#Q0%!.&PD%0^&-`4``.O&2(/!`4B#^00/A5[___](QT0D$`````!! -M@'PD2P`/A:H```"[`````&9F9I!)B[3<>`,``$(/MH0C>`<``$B%]G1R2(N. -M@````$B%R71F2(-^:`!U7SS_=#8/MO@/M\=(C13`2(T4D$C!X@-(B=!)`X0D -M2`@``/9`2P1T$X!X20!U#0^WUTR)Y^@`````ZR5)QX3<>`,```````!(QX:` -M`````````$B+OI````"Z_______12(/#`4B#^Q0/A6K___]!QD0D2P'I900` -M`$B+5"000@^VA"+\!P``//\/A#T$```/MM!(B=!(P>`'2(T$T$F-C`18`0`` -M2(E,)"!!@+P$90$````/A!,$``#&1"0?`$B)T$C!X`=(C03028V4!)@!``!( -MB10D3HTT($V-OE`!``!(BSPDZ`````!(B<-)BX:@`0``28F>H`$``$B+#"1( -MB0M(B4,(2(D8@'M*_P^%I@,``$0/MVLX26/%00^VE`1X!P``9HE4)`Y)BZS$ -M>`,``/9#3`1TY,B>?H`````.M`2(N%@````$ECU4G'A-1X`P```````$C'A8`````` -M````2,=#0`````!(B[V0````NO____](B>[_T&9FD&9FD/9#2P0/A&8!``#& -M@\``````08!G$^?V0TP!#X3W````@&-,_DB+4T!(A=)T2X![20!U+O9#2P1T -M*$$/ME0D08T4DD&-5)4`2&/228NT)``(``"_!P```.@`````Z>,```!)B[0D -M``@``+\!````Z`````#IS````$B%[71B2(N-@````$B%R716@'M)`'4;]D-+ -M!'05#[=4)`Y(B>Y,B>?H`````.F:````26/%2<>$Q'@#````````2,>%@``` -M``````!(QT-``````$B+O9````"Z_____TB)[O_1ZV6`>TD`=5_V0TL$9F9F -MD&9FD'1200^V5"1!C12208U4E0!(8]))B[0D``@``+\"````Z`````#K+4B+ -M0T!(AE_`0``9F:02(M# -M0$B%P`^$;P$``$B#N(@`````#X1A`0``QD-+`<9#2@!(B=J^!@```$B+?"0@ -MZ`````"`>W,`=!UF9I!FD$R)Y^@`````OP$```#H`````(![T/A.,```#V0TP$=4Y,B>?H`````$B+`,```````!(QX6(`````````$B+ -MO9````#_TO9#3`)T&DB+4T!)B[0D``@``+\&````Z`````"`8TS]2,=#0``` -M``!(QT5H`````$B+4UA(A=)T#0^V0W%(QT3"6`````!(BQ-(BT,(2(E""$B) -M$$&`;Q4!2(G>3(GGZ`````#V0TP"=!Y(BU-`28NT)``(``"_!@```.@````` -M@&-,_69F9I"`1"0?`0^V3"0?03A/%0^'%/S__TB#1"00`4B#?"00!`^%F_O_ -M_[@!````2(/$*%M=05Q!74%>05_#9F:09F:02(/L.$B)7"0(2(EL)!!,B60D -M&$R);"0@3(ET)"A,B7PD,$F)_4B)\TR+9E`/MT8XN@````"`O`=X!P``_P^$ -MH@<```^V1DH\"0^$H04``#P)=TT\!0^$F@```#P%9F:0=QX\`P^$K@```#P$ -M9F9FD`^%6@<``.G0````9F:09I`\!P^$]`0``#P'9F:09F:0#X=O!```Z7P" -M``!F9I!FD#P6#X34`P``/!9F9I!F9I!W(SP4#X0A!@``/!1F9F:0#X<'`P`` -M/`H/A0('``!FD.F+!0``/!H/A"0"```\_Y`/A/D%```\%P^%X@8``&:0Z9D# -M```/MG=#0(3V9F9FD`^$@0```$$/ME0D#+T`````]L(!=&?K;TF+1"0@@6`T -M___^_TB+?E"Y`````+H!````Z`````"_!0```.@`````N@$```#IF@8``+D` -M````N@````!,B>?H`````+]0PP``Z`````"Z`0```.ET!@``2(G0B>E(T_BH -M`74/@\4!0#CU=>SK!;T`````#[932$B)T(/@!DB#^`9U"?;"`0^%S@```$F+ -M5"0@BT(TJ0```0!T#27___[_B4(TZ;(```!(C03M`````$F)QT&!Y_@'``!! -MOA`G``!F9F:09F:028M5`$"`_0-V%TF-A!>``0``BP")!0`````E```!`.L5 -M28V$%X`!``"+`(D%`````"4```$`A``0``QP````$` -MZ:0%``!)C807@`$``,<````!`.F1!0``O^@#``#H`````$&#[@%UBL9#2P+& -M0TK_2(G>3(GOZ`````"Z`0```.ER!0``0?9$)`H!=#1(B=Y,B>?H`````(3` -M=25!OOH```!(B=Y,B>?H`````(3`=1"_Z`,``.@`````08/N`77A0(#]`W8G -M28M%`$@%@`$``$B-%.T`````@>+X!P``2`'0BQ")%0````")$.LE28M%`$@% -M@`$``$B-%.T`````@>+X!P``2`'0BQ")%0````")$$B+>U!(B=[HD_3__[H! -M````Z?H`````$B)P4B% -MP'41QH/!`````;H!````Z;0#``#&0#CAQD`Y`<9`.A@/MT,X9HE!($B+10!( -MB4$HQT$T`````$C'04@`````2,>!H`````````!(B?H`````+H!```` -MZ6D#``!,B>?H'//__[H!````Z5<#``!)BRPD2(GOZ`````!(B<$/MD-D2(7) -M=1'&@\$````!N@$```#I+@,``,9!..'&03D!QD$Z!8A!.P^W0SAFB4$@28L$ -M)$B)02C'030`````2,=!2`````!(QX&@`````````$B)SDB)[^@`````N@$` -M``#IX`(``$F++"1(B>_H`````$B)P0^V0V5(AY,B??H`````(GN3(GWZ`````!!QT4`1`$``+\0 +M)P``Z`````!!QP0D!A``"$''10"T`0``OQ`G``#H`````$''!"1?<```0<=% +M``@```"_$"<``.@`````QT0D7/]4@`!!QP0D_U0``+H!````B>Y,B??H```` +M`$B+1"0@2(T4`XL"B04`````)?___O^)`L=$)%P%`<@`2`-<)!C'`P4!R`"_ +MH(8!`.@`````B>Y,B??H`````(-$)$@!#[9$)$^#P`%!.$9##X?<_?__3(GW +MZ`````!!BX<$`0``B04`````@\@"B40D7$&)AP0!``!(BU0D0(L"B04````` +M)?#___T-#0```HE$)%R)`HL"B04`````28N&^`H``$&)AP@!``!!BX;\"@`` +M08F'#`$``$F+AB@+``!!B8<0`0``08N&+`L``$&)AQ0!``!!QX<@`0`````` +M`$$/MX;,#```)?\/```-```!`$&)AR`!``!)BX:("P``08F')`$``$&+AHP+ +M``!!B8'3`$````!``!!BX<$`0``B04`````@\A908F' +M!`$``,=$)%S[_P`,0<>'5`$``/O_``Q!QX=<`0``__\``+H`````9F9FD&9F +MD$ACPD''A(:@"````````(/"`8/Z$'7I9D''AL@,``#_#V9!QX;*#```_P^X +M`0```$B#Q&A;74%<05U!7D%?PY!!5T%6055!5%532(/L"$F)_DF)]$R++TR) +M[^@`````2(G#2(7`=0Y!QH0DQ0````'IL0```$R)[^@`````2(G%2(7`=1E! +MQH0DQ0````%(B=Y,B>_H`````.F(````3(U[6,9#..'&0SD!QD,Z`T$/MT0D +M.&:)0R#&@Y@````/28L&2(E#*,=#-``"``!(BU402(E32+@`````9F:09F:0 +MQ@00`$B#P`%(/0`"``!U\$B):W!(QX.@`````````+X`````3(G_Z`````"+ +M4S1(BW483(G_Z`````!(B=Y,B>_H`````$B#Q`A;74%<05U!7D%?PV9F9I!F +M9F:09F:005=!5D%505154TB#["A)B?Q(B?-(A?9T%P^V1@F$P'0///\/A1T' +M``#I1P$``&:0N0````!"#[:$(?P'```\_W07#[;`2(G"2,'B!TB-A,)0`0`` +M28U`,``$B%]G1C2(N&@````$B%P'0G2,>&@`````````!)QX3< +M>`,```````!(B[Z0````NO______T.LP2(N&B````$B%P'0D2,>&B``````` +M``!)QX3<>`,```````!(B[Z0````_]!F9F:02(/#`4B#^Q0/A.@%``#K@,9# +M"?](B=Y,B>?H`````)#IT04``+D`````9F:09F:00@^VA"'\!P``//\/A(,` +M```/MM!(B=!(P>`'2(T$T$F-A`10`0``@'@1_W1G@'@5``^$CP4``+T````` +M2(G02,'@!TB-!-!-C:P$F`$``$J-'"!,C:-0`0``3(GOZ`````!(BY.@`0`` +M2(F#H`$``$R)*$B)4`A(B0*`>$K_#X5"!0``@\4!03AL)!4/AC0%``#KQDB# +MP0%(@_D$#X5>____2,=$)!``````08!\)$L`#X6J````NP````!F9F:028NT +MW'@#``!"#[:$(W@'``!(A?9T(#2(G020.$)$@(``#V0$L$=!.`>$D`=0T/M]=,B>?H +M`````.LE2<>$W'@#````````2,>&@`````````!(B[Z0````NO______T4B# +MPP%(@_L4#X5J____0<9$)$L!Z64$``!(BU0D$$(/MH0B_`<``#S_#X0]!``` +M#[;02(G02,'@!TB-!-!)C8P$6`$``$B)3"0@08"\!&4!````#X03!```QD0D +M'P!(B=!(P>`'2(T$T$F-E`28`0``2(D4)$Z--"!-C;Y0`0``2(L\).@````` +M2(G#28N&H`$``$F)GJ`!``!(BPPD2(D+2(E#"$B)&(![2O\/A:8#``!$#[=K +M.$ECQ4$/MI0$>`<``&:)5"0.28NLQ'@#``#V0TP$=')(A>UT;4B#O8`````` +M=&-(@WUH`'5<@&-,^_9#2P1T$@^W5"0.2(GN3(GGZ`````#K0$B+A8````!) +M8]5)QX34>`,```````!(QX6``````````$C'0T``````2(N]D````+K_____ +M2(GN_]!F9I!F9I#V0TL$#X1F`0``QH/$`````$&`9Q/G]D-,`0^$]P```(!C +M3/Y(BU-`2(72=$N`>TD`=2[V0TL$="A!#[94)$&-%))!C525`$ACTDF+M"0` +M"```OP<```#H`````.GC````28NT)``(``"_`0```.@`````ZUT +M8DB+C8````!(A[_T>ME@'M)`'5?]D-+!&9F9I!F9I!T4D$/ME0D08T4DD&-5)4`2&/2 +M28NT)``(``"_`@```.@`````ZRU(BT-`2(7`="1(BY"(````2(72=!A(QX"( +M`````````$B+0T!(B[B0````_]+V0TP"#X3"`0``2(M30$F+M"0`"```OP8` +M``#H`````(!C3/WI?P$``&9FD$B+0T!(A<`/A&\!``!(@[B(``````^$80$` +M`,9#2P'&0TH`2(G:O@8```!(BWPD(.@`````@'MS`'0=9F:09I!,B>?H```` +M`+\!````Z`````"`>W,`=>A(BVM`2(7M#X3C````]D-,!'5.3(GGZ`````!( +MBW-`N@$```!,B>?H`````$B+0T`/ME`"#[9P`4C'QP````"X`````.@````` +M2(M30$F+M"0`"```OP$```#H`````.LO#[95`@^V=0%(Q\<`````N`````#H +M`````$B+4T!)B[0D``@``+\!````Z`````!(BY6(````2(72="0/MT,X2<>$ +MQ'@#````````2,>%B`````````!(B[V0````_]+V0TP"=!I(BU-`28NT)``( +M``"_!@```.@`````@&-,_4C'0T``````2,=%:`````!(BU-82(72=`T/MD-Q +M2,=$PE@`````2(L32(M#"$B)0@A(B1!!@&\5`4B)WDR)Y^@`````]D-,`G0> +M2(M30$F+M"0`"```OP8```#H`````(!C3/UF9F:0@$0D'P$/MDPD'T$X3Q4/ +MAQ3\__](@T0D$`%(@WPD$`0/A9O[__^X`0```$B#Q"A;74%<05U!7D%?PV9F +MD&9FD$B#[#A(B5PD"$B);"003(ED)!A,B6PD($R)="0H3(E\)#!)B?U(B?-, +MBV90#[=&.+H`````@+P'>`<``/\/A*('```/MD9*/`D/A*$%```\"7=-/`4/ +MA)H````\!69FD'<>/`,/A*X````\!&9F9I`/A5H'``#IT````&9FD&:0/`(&``!FD.F9`P``#[9W0T"$]F9F9I`/A($```!!#[94 +M)`R]`````/;"`71GZV])BT0D((%@-/___O](BWY0N0````"Z`0```.@````` +MOP4```#H`````+H!````Z9H&``"Y`````+H`````3(GGZ`````"_4,,``.@` +M````N@$```#I=`8``$B)T(GI2-/XJ`%U#X/%`4`X]77LZP6]``````^V4TA( +MB="#X`9(@_@&=0GVP@$/A?X!P``0;X0)P``9F9FD&9FD$F+50!`@/T#=A=) +MC807@`$``(L`B04`````)0```0#K%4F-A!>``0``BP")!0`````E```!`(7` +M="Q`@/T#=A-)C807@`$``,<````!`.FD!0``28V$%X`!``#'`````0#ID04` +M`+_H`P``Z`````!!@^X!=8K&0TL"QD-*_TB)WDR)[^@`````N@$```#I<@4` +M`$'V1"0*`70T2(G>3(GGZ`````"$P'4E0;[Z````2(G>3(GGZ`````"$P'40 +MO^@#``#H`````$&#[@%UX4"`_0-V)TF+10!(!8`!``!(C13M`````('B^`<` +M`$@!T(L0B14`````B1#K)4F+10!(!8`!``!(C13M`````('B^`<``$@!T(L0 +MB14`````B1!(BWM02(G>Z)/T__^Z`0```.G.!```#[9'04F+5"0@#[92"(T$ +M@HT$@`^V5G$!T$B8#[:(``````^V5SH/MG!H`````````!(B?H`````+H!````Z1@$```/MD=!28M4)"`/ME(( +MC02"C02`#[96<0'02)@/MH@`````#[97.@^V=SE(Q\<`````N`````#H```` +M`$B+:U!,BV4`3(GGZ`````!(B<%(A! +MH`````````!(B_H`````+H!````Z>`"``!)BRPD2(GOZ`````!(B<$/ +MMD-E2(7)=1'&@\4````!N@$```#IMP(``,9!..'&03D!QD$Z!(A!.P^W0SAF MB4$@28L$)$B)02C'030`````2,=!2`````!(QX&@`````````$B)SDB)[^@` -M````N@$```#I^0$``&9F9I!)BRPD2(GOZ`````!(B<%(A_H`````&9FD$'V1"0+`G47NP````!)C6PD0$&`?"0-`'4F -MZ9,```!)BW0D*(!&10%,B>_H`````+H!````Z:L```!F9I!F9I!(B>_H```` -M`$B)PDF+1"1(28E4)$A(B2I(B4((2(D0@'I*_W1#@'I)`'4V@+K!`````'1< -M#[9*2$B)R(/@!DB#^`9T3$B#^`1U1O;!`71!2(G63(GOZ`````"Z`0```.M$ -MQH+!`````(/#`4$X7"0-=XY!QD0D"?],B>9,B>_H`````+H!````ZQMF9I!F -M9I"Z`0```.L.187V#X1V^O__Z8[Z__^)T$B+7"0(2(ML)!!,BV0D&$R+;"0@ -M3(MT)"A,BWPD,$B#Q#C#9F:09F:02(/L*$B)7"002(EL)!A,B60D($B)^TB) -M]4B+=DA$#[9%.@^W32!F@?F#``^'B@,```^WP0^VO`=X!P``0(#__P^$=0,` -M`&:#^7]W)$`/MM=(BXM("```2(T$TDB-!()(BT3!4`^V0`CK(69FD&9FD$`/ -MML=(BY-P"```2,'@"$B+A!"`````#[9`"#S_#X0H`P``#[;`#[:$`_P'```\ -M_W010(#__W0+1`^V321!@/D&=3X\_P^$``,``$"`__^0#X3U`@``0`^VQTB- -M%,!(C1202,'B`TF)U$P#HT@(``!!QD0D2P)!QD0D2O_IOP(``$`/ML=(C13` -M2(T4D$C!X@-)B=1,`Z-("```183)#X2N````08#X!@^$I````$&`^`P/A-@! -M``!%#[9$)$H/MD-!28M4)%!(BU(@#[92"(T$@HT$@$$/ME0D<0'02)@/MH@` -M````#[93.@^V$)+@```")!"1%#[;)2,?'`````+@`````Z`````!! -M#[>4)+@```"-0@%F08F$)+@```!F@_H!=AE!@'PD2@9T$4'&1"1+`D'&1"1* -M_^G]`0``O^@#``#H`````.GN`0``08#X`74-0<9$)$H$9I#IVP$``$&`^`)U -M"T'&1"1*!>G*`0``08#X`P^%$`$``$&`?"1*&G4@9H%^!,@W9I!U%F9!QX0D -MN```````0<9$)$H&Z9@!``!,B>?H`````$F-O"2(````OB@```#HOM3__X3` -M=4I)C7PD=+X4````Z*O4__^$P'4W28V\)+````"^"````.B5U/__A,!U(4F# -M?"1H`'099D''A"2X``````!!QD0D2A?I,P$``&9FD`^V0T%)BU0D4$B+4B`/ -MME((C02"C02`00^V5"1Q`=!(F`^VB``````/ME,Z#[9S.44/MX0DN````$C' -MQP````"X`````.@`````9D&#O"2X````'7810<9$)$L"0<9$)$K_ZFP````08#X%W469D''A"2X``````!!QD0D -M2A7IE````$&`^!AU$V9!QX0DN```````0<9$)$H6ZWM!@/@$=1-F0<>$)+@` -M`````$'&1"1*!^MB08#X!7439D''A"2X``````!!QD0D2@CK24&`^`9U$V9! -MQX0DN```````0<9$)$H)ZS!!@/@,=1-F0<>$)+@``````$'&1"1*"NL708#X -M%G419D''A"2X``````!!QD0D2A1,B>9(B=_H`````$B#?7``=`Q(C75P2(G? -MZ`````!(B>Y(B=_H`````$B+7"002(ML)!A,BV0D($B#Q"C#9F:02(/L&$B) -M'"1(B6PD"$R)9"0028G\2(GU2(N^@`````^W3DKVP2!(Q\(`````2,?````` -M`$@/1="`?D(:#X>^!```#[9&0O\DQ0`````/ME9%#[9&.CC"#X-5!```#[;" -M2(MTQEA(A?8/A#8$``#I&@0``,9&0@'&144`2_H`````+@`````Z2X$``!)Q\$`````0;@`````N0$` -M``"Z`0```+X`````2(GOZ`````"X`````.D`!```2_H`````+@`````Z7<#``!)Q\$`````0;@!```` -MN0(```"Z`````+X!````2(GOZ`````"X`````.E)`P``2Z`````"X`0```.FZ`0``]D5*('1L@WU0`'17QD5"$@^V -M?3I`A/]T=HMU4+H`````N0````!`]L8!=1;K)F9F9I!F9I`/MLI(B?!(T_BH -M`707B%5%2,?`_O___TC3P"%%4.L[N@````"#P@%`./IUU.LLQD5%`,9%0AEF -M@V5*W^L=#[9%18/``8A%13I%.G(*QD5%`,9%0AGK!,9%0@M(B>Y,B>?H```` -M`+@!````Z18!``!)Q\$`````0;@`````N2````"Z`0```+X`````2(GOZ``` -M``"X`````.GH````2_H -M`````+@`````Z8P```!F9F:09F:0#[;"2(MTQ5A(A?9T%\9&2AK&1DL&3(GG -MZ`````"X`0```.MA@\(!B%5%#[9%.CC0=\XXPG5*QD5%`,9%0A%(B>Y,B>?H -M`````+@!````ZS6)R(/(`F:)1DK&1D(`2(N&@````,9`"?](B[:`````3(GG -MZ`````"X`0```.L'9I"X`0```$B+'"1(BVPD"$R+9"002(/$&,-F9F:09F9F -MD$B#[!A(B1PD2(EL)`A,B60D$$B)_4R+)TB+AX````!(BU`@]T(T```)`'5+ -M#[:'^@```#P*=EE$#[9/140/MD((00^V1"1!08T$@(T$@$0!R$B8#[:(```` -M`$$/ME0D.D$/MG0D.4C'QP````"X`````.@`````QD5"$$B)[DB+?0#H```` -M`.M-9F9FD&9FD(/``8B'^@```$B-G[@```!)BWPD*$B)WN@`````QX6X```` -M0$(/`$C'A<@`````````2(FMT````$F+?"0H2(G>Z`````!(BQPD2(ML)`A, -MBV0D$$B#Q!C#9F9FD&9FD$%6055!5%532(/L$$F)_$F)]0^W5B!F@?J#`'=9 -M#[?"#[:$!W@'```\_W1*9H/Z?W<@#[;`2(T4P$B-%)!(P>(#2`.72`@``$B+ -M0E`/ME`(ZRD/MT8@#[:$!W@'``!(P>`(2`.'<`@``$B+@(`````/ME`(ZP6Z -M_____[G_____9D&!?2"#`'<.00^W12!!#[:,!'@'```/ML)!#[:$!/P'``!( -MB<)(P>('2(V$PE`!``!-C70$"`^VP4C!X`A)BZPD<`@``$@!Q4&`?20`#X2R -M````#[9]140/MD5"28M&($0/MD@(00^V3"1!08T,B4$/ME0D.D$/MG0D.8D\ -M)$C'QP````"X`````.@`````@'TZ`'0JNP````!F9I!FD`^VPTB+5,582(72 -M=`M,B?9,B>?H`````(/#`3A=.G?@28-]<`!T#$F-=7!,B>?H`````$R)[DR) -MY^@`````9H--2@+&14(`2(N%@````,9`"?](B[6`````3(GGZ`````#IM0$` -M`$F+E"0@"P``2('"0`@```^V14S!X`A(F$@!PHL"B04`````28N4)"`+``!( -M@<)$"```#[9%3,'@"$B82`'"BPJ)#0````!)BY0D(`L``$B!PD@(```/MD5, -MP>`(2)A(`<*+`HD%`````$F+E"0@"P``2('"3`@```^V14S!X`A(F$@!PHL2 -MB14`````#[9%0CP1="L\$7<-/`L/A?\```#IIP```#P29F:0='X\$P^%ZP`` -M`&9FD&9FD.F#````BY,B>?H`````$B)[DR)Y^@`````2(/$$%M=05Q!74%> -MPV9F9I!F9F:02(/L"$B)_DB+/^@`````2(/$",-F9F:09F9FD&9F9I!(@^P( -MQD=""$B)_DB+/^@`````2(/$",-F9F:09F9FD$B#[`C&1T(.2(G^2(L_Z``` -M``!(@\0(PV9F9I!F9F:055-(@^P(2(G[2(LOZ`````"$P'09#[9U0T"$]G0T -M#[93#+D`````]L(!=![K),9#"?](B=Y(B>_H`````.M?D$B)T$C3^*@!=0B# -MP0%`./%U[DB)[^@`````2(G&2(7`=#Q(BU-(2(E#2$B-0T!(B09(B58(2(DR -M@$,-`4B)7E#&1D@%QD9)`,9&<0^Y`0```+H!````2(G?Z`````!(@\0(6UW# -M9F9FD&9F9I!F9I!!54%455-(@^P(2(G]28GT3(LONPH```!,B>9(B>_H```` -M`(3`=0^_Z`,``.@`````@^L!=>)!#[9U0T"$]G0B#[95#+D`````]L(!=`SK -M$DB)T$C3^*@!=0B#P0%`./%U[DF+%"1)BT0D"$B)0@A(B1"`;0T!3(GF3(GO -MZ`````#V10L"=$9(BW4H2(7V=1A,B>_H`````$B)QDB%P`^$4`$``$B)12A, -MB2Y(B:Z`````QD9%`,9&0@!FQT9*`0!,B>_H`````.DG`0``2(M%*$B%P`^$ -MN0```$B-L+@```!)BWTHZ`````!(BW4H3(GOZ`````!,C65`3#EE0`^$AP`` -M`$R)Y^@`````2(G#2(M`0$B%P'1:2,=`:`````#V0TP$=1I,B>_H`````$B+ -M?__ -M_TC'12@`````@'T-`'022(U]0.@`````2(G!@&T-`>L+3(GOZ`````!(B<%( -MA_H`````$B#Q`A;74%<05W#D$B#["A(B5PD"$B);"003(ED -M)!A,B6PD($B)_4B)\P^W3B!F@?F#`'=?#[?!#[:T!W@'``!`@/[_=$YF@_E_ -M=QY`#[;62(N/2`@``$B-!-)(C02"2(M$P5`/MD`(ZQM`#[;&2(N7<`@``$C! -MX`A(BX00@`````^V0`A`#[;6//]T!V:!^O\`=1!(B=Y(B>_H`````.E.`0`` -M#[;`#[:,!?P'```/M\)(C13`2(T4D$C!X@-)B=5,`ZU("```@'LD``^$N@`` -M`$B)R$C!X`=(C03(3(VD!5`!``!!#[9,)!0/ME,[#[9S.D4/MD0D%4C'QP`` -M``"X`````.@`````28M5`$F+10A(B4((2(D008!L)!4!3(GN2(GOZ`````!( -MB=Y(B>_H``````^V?4-`A/\/A+````!!#[9T)!2Y`````$#VQ@%U%NL@9F9F -MD&9FD`^VRDB)\$C3^*@!=!.)SDB)[^@`````ZWVZ`````&:0@\(!0#CZ==CK -M;&9FD&9FD$B)R$C!X`=(C83(4`$``$R-9`4(@'LZ`74LOQ`G``#H`````$B) -MWDB)[^@`````N0$```"Z`````$R)[DR)Y^@`````ZR"_4,,``.@`````2(G> -M2(GOZ`````!,B>Y,B>?H`````$B+7"0(2(ML)!!,BV0D&$R+;"0@2(/$*,.0 -M059!54%455-(@^P028G\28GU#[=6(&:!^H,`=UD/M\(/MH0'>`<``#S_=$IF -M@_I_=R`/ML!(C13`2(T4D$C!X@-(`Y=("```2(M"4`^V4`CK*0^W1B`/MH0' -M>`<``$C!X`A(`X=P"```2(N`@`````^V4`CK!;K_____N?____]F08%]((,` -M=PY!#[=%($$/MHP$>`<```^VPD$/MH0$_`<``$B)PDC!X@=(C83"4`$``$V- -M=`0(00^V13J#Z`&[`````#P!=QH/ML%(C13`2(T4D$C!X@-)BYPD2`@``$@! -MTTF+;BA!@'TD``^$+P$``$F#?7``=`Q)C75P3(GGZ`````!,B>Y,B>?H```` -M`$$/ME4ZC4+_/`%W=(#Z`4`/E,=`#[;_28M&($0/MD`(1`^V345!#[9$)$%! -MC02`C02`1`'(2)@/MH@`````00^V5"0Z00^V="0YB3PD2,?'`````+@````` -MZ`````!(B=I,B?9,B>?H`````,9%0A!(B>Y,B>?H`````.E1!```#[9]140/ -MMD5"28M&($0/MD@(00^V3"1!08T,B4$/ME0D.D$/MG0D.8D\)$C'QP````"X -M`````.@`````@'TZ`'0ENP`````/ML-(BU3%6$B%TG0+3(GV3(GGZ`````"# -MPP$X73IWX&:#34H"QD5"`$B+A8````#&0`G_2(NU@````$R)Y^@`````Z<(# -M``!FD`^V14*#Z`VZ`````+D`````/`$/AHP```!)BY0D(`L``$B!PD`(```/ -MMD5,P>`(2)A(`<*+`HD%`````$F+E"0@"P``2('"1`@```^V14S!X`A(F$@! -MPHL*B0T`````28N4)"`+``!(@<)("```#[9%3,'@"$B82`'"BP*)!0````!) -MBY0D(`L``$B!PDP(```/MD5,P>`(2)A(`<*+$HD5``````^V14(\#@^'#P,` -M``^VP/\DQ0````"#^@6X!0````]&PHA%.L9%0@+IP`(``(G(P>`(#[;2"=!F -MB44\B%R`````````!(B:W0```` -M2(VUN````$F+?"0HZ`````#I&0(``,9%10!(C9VX````28M\)"A(B=[H```` -M`$R)[DR)Y^@`````QX6X````0$(/`$C'A<@`````````2(FMT````$F+?"0H -M2(G>Z`````#IR`$```^V146#P`&(144Z13H/A8D"`0``#[9%14B+1,582(7`=!Q( -MB<&`8$SO2(L02(M`"$B)0@A(B1!!@&X-`>LV3(GGZ`````!(B<%(AY,B>?H`````.G3````9F:0QD5"#0^V145( -MB4S%6$R)<5!(B6E8#[9%18A!<<9!20"`24@%08!�%)C49`2(M0"$B)2`A( -MB0%(B5$(2(D*ZV%(C9VX````28M\)"A(B=[H`````,>%N````%##``!(QX7( -M`````````$B)K=````!)BWPD*$B)WN@`````28-]<`!T#$F-=7!,B>?H```` -M`$R)[DR)Y^@`````ZS+&14(/28-]<`!T#$F-=7!,B>?H`````$R)[DR)Y^@` -M````2(GN3(GGZ`````!F9I!FD$B#Q!!;74%<05U!7L.0D)"#X@?!X@B`SB!( +M````N@$```#I:0(``$F++"1(B>_H`````$B)P4B%P'41QH/%`````;H!```` +MZ40"``#&0#CAQD`Y`<9`.@8/MT,X9HE!($F+!"1(B4$HQT$T`````$C'04@` +M````2,>!H`````````!(B_H`````+H!````Z?D!``!F9F:028LL)$B) +M[^@`````2(G!2(7`=1'&@\4````!N@$```#IT`$``,9`..'&0#D!QD`Z#`^W +M0SAFB4$@28L$)$B)02C'030`````2,=!2`````!(QX&@`````````$B)SDB) +M[^@`````N@$```#IA0$``$F++"1(B>_H`````$B)P4B%P'41QH/%`````;H! +M````Z6`!``#&0#CAQD`Y`<9`.A;&0#P!#[=#.&:)02#&@9@````/28L$)$B) +M02C'030`````2,=!2`````!(QX&@`````````$B)SDB)[^@`````N@$```#I +M"@$``,9&2O]FQX.X``````"`>TL"=1)(BW-02(G:3(GOZ`````!F9I!!]D0D +M"P)U%[L`````28UL)$!!@'PD#0!U)NF3````28MT)"B`1D4!3(GOZ`````"Z +M`0```.FK````9F:09F:02(GOZ`````!(B<))BT0D2$F)5"1(2(DJ2(E""$B) +M$(!Z2O]T0X!Z20!U-H"ZQ0````!T7`^V2DA(B.0<9$)`G_ +M3(GF3(GOZ`````"Z`0```.L;9F:09F:0N@$```#K#D6%]@^$=OK__^F.^O__ +MB=!(BUPD"$B+;"003(MD)!A,BVPD($R+="0H3(M\)#!(@\0XPV9FD&9FD$B# +M["A(B5PD$$B);"083(ED)"!(B?M(B?5(BW9(1`^V13H/MTT@9H'Y@P`/AXH# +M```/M\$/MKP'>`<``$"`__\/A'4#``!F@_E_=R1`#[;72(N+2`@``$B-!-)( +MC02"2(M$P5`/MD`(ZR%F9I!F9I!`#[;'2(N3<`@``$C!X`A(BX00@`````^V +M0`@\_P^$*`,```^VP`^VA`/\!P``//]T$4"`__]T"T0/MDTD08#Y!G4^//\/ +MA``#``!`@/__D`^$]0(``$`/ML=(C13`2(T4D$C!X@-)B=1,`Z-("```0<9$ +M)$L"0<9$)$K_Z;\"``!`#[;'2(T4P$B-%)!(P>(#28G43`.C2`@``$6$R0^$ +MK@```$&`^`8/A*0```!!@/@,#X38`0``10^V1"1*#[9#04F+5"102(M2(`^V +M4@B-!(*-!(!!#[94)'$!T$B8#[:(``````^V4SH/MG,Y00^WA"2X````B00D +M10^VR4C'QP````"X`````.@`````00^WE"2X````C4(!9D&)A"2X````9H/Z +M`78908!\)$H&=!%!QD0D2P)!QD0D2O_I_0$``+_H`P``Z`````#I[@$``$&` +M^`%U#4'&1"1*!&:0Z=L!``!!@/@"=0M!QD0D2@7IR@$``$&`^`,/A1`!``!! +M@'PD2AIU(&:!?@3(-V:0=19F0<>$)+@``````$'&1"1*!NF8`0``3(GGZ``` +M``!)C;PDB````+XH````Z$[4__^$P'5*28U\)'2^%````.@[U/__A,!U-TF- +MO"2P````O@@```#H)=3__X3`=2%)@WPD:`!T&69!QX0DN```````0<9$)$H7 +MZ3,!``!F9I`/MD-!28M4)%!(BU(@#[92"(T$@HT$@$$/ME0D<0'02)@/MH@` +M````#[93.@^V$)+@```!(Q\<`````N`````#H`````&9!@[PDN``` +M`!UV$4'&1"1+`D'&1"1*_^G)````O^@#``#H`````&9!@X0DN`````'IL``` +M`$&`^!=U%F9!QX0DN```````0<9$)$H5Z90```!!@/@8=1-F0<>$)+@````` +M`$'&1"1*%NM[08#X!'439D''A"2X``````!!QD0D2@?K8D&`^`5U$V9!QX0D +MN```````0<9$)$H(ZTE!@/@&=1-F0<>$)+@``````$'&1"1*">LP08#X#'43 +M9D''A"2X``````!!QD0D2@KK%T&`^!9U$69!QX0DN```````0<9$)$H43(GF +M2(G?Z`````!(@WUP`'0,2(UU<$B)W^@`````2(GN2(G?Z`````!(BUPD$$B+ +M;"083(MD)"!(@\0HPV9FD$B#[!A(B1PD2(EL)`A,B60D$$F)_$B)]4B+OH`` +M```/MTY*]L$@2,?"`````$C'P`````!(#T70@'Y"&@^'/@4```^V1D+_),4` +M````#[9610^V1CHXP@^#U00```^VPDB+=,982(7V#X2V!```Z9H$``#&1D(! +MQD5%`$G'P0````!!N`````"Y`@```+H!````O@````!(B>_H`````+@````` +MZ=P$``!)Q\$`````0;@`````N0````"Z`0```+X`````2(GOZ`````"X```` +M`.FN!```2_H`````+@` +M````Z5($``!)Q\$`````0;CDJ`8!N<0#``"Z`0```+X!````2(GOZ`````"X +M`````.DD!```2_H```` +M`+@`````Z<@#``!)Q\$`````1`^V1D:Y8````+H!````O@$```!(B>_H```` +M`+@`````Z9L#``!)Q\$`````0;@```$$N2$```"Z`0```+X!````2(GOZ``` +M``"X`````.EM`P``2_H +M`````+@`````Z1$#``!)B=%!N`````"Y`````+H`````O@````!(B>_H```` +M`+@`````Z><"``!(BT<@@6`T___V_TG'P0````!!N/____^Y`0```+H````` +MO@$```!(B>_H`````+@`````Z:X"``!$#[9.14B+1R!$#[9`"$$/MD0D04&- +M!("-!(!$`%N````$!"#P!(QX7(`````````$B)K=````!)BWPD*$B)WN@`````N`$` +M``#IL`$``/9%2B!T9H-]4`"0=%#&14(2#[9].D"$_W1OBW50N@````"Y```` +M`$#VQ@%U#^L?#[;*2(GP2-/XJ`%T%XA514C'P/[___](T\`A15#K.[H````` +M@\(!0#CZ==3K+,9%10#&14(99H-E2M_K'0^V146#P`&(144Z13IR"L9%10#& +M14(9ZP3&14(+2(GN3(GGZ`````"X`0```.D2`0``2_H`````+@`````Z;8```!)Q\$`````0;C_____ +MN0$```"Z`````+X!````2(GOZ`````"X`````.F(````9F:0#[;"2(MTQ5A( +MA?9T%\9&2AK&1DL&3(GGZ`````"X`0```.MA@\(!B%5%#[9%.CC0=\XXPG5* +MQD5%`,9%0A%(B>Y,B>?H`````+@!````ZS6)R(/(`F:)1DK&1D(`2(N&@``` +M`,9`"?](B[:`````3(GGZ`````"X`0```.L'9I"X`0```$B+'"1(BVPD"$R+ +M9"002(/$&,-F9F:09F9FD$B#[!A(B1PD2(EL)`A,B60D$$B)_4R+)TB+AX`` +M``!(BU`@]T(T```)`'5+#[:'^@```#P*=EE$#[9/140/MD((00^V1"1!08T$ +M@(T$@$0!R$B8#[:(`````$$/ME0D.D$/MG0D.4C'QP````"X`````.@````` +MQD5"$$B)[DB+?0#H`````.M-9F9FD&9FD(/``8B'^@```$B-G[@```!)BWPD +M*$B)WN@`````QX6X````0$(/`$C'A<@`````````2(FMT````$F+?"0H2(G> +MZ`````!(BQPD2(ML)`A,BV0D$$B#Q!C#9F9FD&9FD$%6055!5%532(/L$$F) +M_$F)]0^W5B!F@?J#`'=9#[?"#[:$!W@'```\_W1*9H/Z?W<@#[;`2(T4P$B- +M%)!(P>(#2`.72`@``$B+0E`/ME`(ZRD/MT8@#[:$!W@'``!(P>`(2`.'<`@` +M`$B+@(`````/ME`(ZP6Z_____[G_____9D&!?2"#`'<.00^W12!!#[:,!'@' +M```/ML)!#[:$!/P'``!(B<)(P>('2(V$PE`!``!-C70$"`^VP4C!X`A)BZPD +M<`@``$@!Q4&`?20`#X2R````#[9]140/MD5"28M&($0/MD@(00^V3"1!08T, +MB4$/ME0D.D$/MG0D.8D\)$C'QP````"X`````.@`````@'TZ`'0JNP````!F +M9I!FD`^VPTB+5,582(72=`M,B?9,B>?H`````(/#`3A=.G?@28-]<`!T#$F- +M=7!,B>?H`````$R)[DR)Y^@`````9H--2@+&14(`2(N%@````,9`"?](B[6` +M````3(GGZ`````#IM0$``$F+E"0@"P``2('"0`@```^V14S!X`A(F$@!PHL" +MB04`````28N4)"`+``!(@<)$"```#[9%3,'@"$B82`'"BPJ)#0````!)BY0D +M(`L``$B!PD@(```/MD5,P>`(2)A(`<*+`HD%`````$F+E"0@"P``2('"3`@` +M``^V14S!X`A(F$@!PHL2B14`````#[9%0CP1="L\$7<-/`L/A?\```#IIP`` +M`#P29F:0='X\$P^%ZP```&9FD&9FD.F#````BY,B>?H`````$B)[DR)Y^@` +M````2(/$$%M=05Q!74%>PV9F9I!F9F:02(/L"$B)_DB+/^@`````2(/$",-F +M9F:09F9FD&9F9I!(@^P(QD=""$B)_DB+/^@`````2(/$",-F9F:09F9FD$B# +M[`C&1T(.2(G^2(L_Z`````!(@\0(PV9F9I!F9F:055-(@^P(2(G[2(LOZ``` +M``"$P'09#[9U0T"$]G0T#[93#+D`````]L(!=![K),9#"?](B=Y(B>_H```` +M`.M?D$B)T$C3^*@!=0B#P0%`./%U[DB)[^@`````2(G&2(7`=#Q(BU-(2(E# +M2$B-0T!(B09(B58(2(DR@$,-`4B)7E#&1D@%QD9)`,9&<0^Y`0```+H!```` +M2(G?Z`````!(@\0(6UW#9F9FD&9F9I!F9I!!54%455-(@^P(2(G]28GT3(LO +MNPH```!,B>9(B>_H`````(3`=0^_Z`,``.@`````@^L!=>)!#[9U0T"$]G0B +M#[95#+D`````]L(!=`SK$DB)T$C3^*@!=0B#P0%`./%U[DF+%"1)BT0D"$B) +M0@A(B1"`;0T!3(GF3(GOZ`````#V10L"=$9(BW4H2(7V=1A,B>_H`````$B) +MQDB%P`^$4`$``$B)12A,B2Y(B:Z`````QD9%`,9&0@!FQT9*`0!,B>_H```` +M`.DG`0``2(M%*$B%P`^$N0```$B-L+@```!)BWTHZ`````!(BW4H3(GOZ``` +M``!,C65`3#EE0`^$AP```$R)Y^@`````2(G#2(M`0$B%P'1:2,=`:`````#V +M0TP$=1I,B>_H`````$B+?___TC'12@`````@'T-`'022(U]0.@`````2(G!@&T- +M`>L+3(GOZ`````!(B<%(A_H`````$B#Q`A;74%<05W#D$B# +M["A(B5PD"$B);"003(ED)!A,B6PD($B)_4B)\P^W3B!F@?F#`'=?#[?!#[:T +M!W@'``!`@/[_=$YF@_E_=QY`#[;62(N/2`@``$B-!-)(C02"2(M$P5`/MD`( +MZQM`#[;&2(N7<`@``$C!X`A(BX00@`````^V0`A`#[;6//]T!V:!^O\`=1!( +MB=Y(B>_H`````.E.`0``#[;`#[:,!?P'```/M\)(C13`2(T4D$C!X@-)B=5, +M`ZU("```@'LD``^$N@```$B)R$C!X`=(C03(3(VD!5`!``!!#[9,)!0/ME,[ +M#[9S.D4/MD0D%4C'QP````"X`````.@`````28M5`$F+10A(B4((2(D008!L +M)!4!3(GN2(GOZ`````!(B=Y(B>_H``````^V?4-`A/\/A+````!!#[9T)!2Y +M`````$#VQ@%U%NL@9F9FD&9FD`^VRDB)\$C3^*@!=!.)SDB)[^@`````ZWVZ +M`````&:0@\(!0#CZ==CK;&9FD&9FD$B)R$C!X`=(C83(4`$``$R-9`4(@'LZ +M`74LOQ`G``#H`````$B)WDB)[^@`````N0$```"Z`````$R)[DR)Y^@````` +MZR"_4,,``.@`````2(G>2(GOZ`````!,B>Y,B>?H`````$B+7"0(2(ML)!!, +MBV0D&$R+;"0@2(/$*,.0059!54%455-(@^P028G\28GU#[=6(&:!^H,`=UD/ +MM\(/MH0'>`<``#S_=$IF@_I_=R`/ML!(C13`2(T4D$C!X@-(`Y=("```2(M" +M4`^V4`CK*0^W1B`/MH0'>`<``$C!X`A(`X=P"```2(N`@`````^V4`CK!;K_ +M____N?____]F08%]((,`=PY!#[=%($$/MHP$>`<```^VPD$/MH0$_`<``$B) +MPDC!X@=(C83"4`$``$V-=`0(00^V13J#Z`&[`````#P!=QH/ML%(C13`2(T4 +MD$C!X@-)BYPD2`@``$@!TTF+;BA!@'TD``^$+P$``$F#?7``=`Q)C75P3(GG +MZ`````!,B>Y,B>?H`````$$/ME4ZC4+_/`%W=(#Z`4`/E,=`#[;_28M&($0/ +MMD`(1`^V345!#[9$)$%!C02`C02`1`'(2)@/MH@`````00^V5"0Z00^V="0Y +MB3PD2,?'`````+@`````Z`````!(B=I,B?9,B>?H`````,9%0A!(B>Y,B>?H +M`````.F0!```#[9]140/MD5"28M&($0/MD@(00^V3"1!08T,B4$/ME0D.D$/ +MMG0D.8D\)$C'QP````"X`````.@`````@'TZ`'0ENP`````/ML-(BU3%6$B% +MTG0+3(GV3(GGZ`````"#PP$X73IWX&:#34H"QD5"`$B+A8````#&0`G_2(NU +M@````$R)Y^@`````Z0$$``!FD`^V14*#Z`VZ`````+D`````/`$/AHP```!) +MBY0D(`L``$B!PD`(```/MD5,P>`(2)A(`<*+`HD%`````$F+E"0@"P``2('" +M1`@```^V14S!X`A(F$@!PHL*B0T`````28N4)"`+``!(@<)("```#[9%3,'@ +M"$B82`'"BP*)!0````!)BY0D(`L``$B!PDP(```/MD5,P>`(2)A(`<*+$HD5 +M``````^V14(\%@^'3@,```^VP/\DQ0````"#^@6X!0````]&PHA%.L9%0@+I +M!`,``(G(P>`(#[;2"=!FB44\BY,B>?H`````,>%N````("$'@!(QX7(`````````$B)K=````!(C;6X +M````28M\)"CH`````.D1`@``QD5%`$B-G;@```!)BWPD*$B)WN@`````3(GN +M3(GGZ`````#'A;@```!`0@\`2,>%R`````````!(B:W0````28M\)"A(B=[H +M`````.G``0``#[9%18/``8A%13I%.@^%A`$``,9%10#&14=DQD5""^ES`0`` +MQD5""NEJ`0``QD5""^EA`0``2(N%@````$B+0""!8#3___?_B="#X`^#^`-U +M"<9%0@SI/`$```^V14>$P'05@^@!B$5'O^@#``#H`````.D?`0``#[9%18/` +M`8A%13I%.@^"#`$``,9%10#&14(9Z?\````/MD5%2(M$Q5A(A?H`````$B)P4B%P'4C28-]<`!T +M#$F-=7!,B>?H`````$R)[DR)Y^@`````ZZ`````!)@WUP`'0,28UU<$R)Y^@`````3(GN3(GG +MZ`````#K+<9%0@])@WUP`'0,28UU<$R)Y^@`````3(GN3(GGZ`````!(B>Y, +MB>?H`````$B#Q!!;74%<05U!7L.0D)"0@^('P>((@,X@2(M'"$@MY#P``$C! +MY@B!Y@#_``!(`?")$`^W`&:)!0`````/ML##@^('P>((B,J`SA!(BT<(2"WD +M/```2,'F"('F`/\``$@!\(D0PV9F9I!F9F:09F:055.]`````+L`````0;G_ +M____0;L`````18G:08/#`;@!````08G`1(G90=/@1(G!O@````"XP.'D`+H` +M````]_$Y^'<1B?HIPD0YRG,(1(G5B?-!B=&#Q@%$`<&#_A!UU$&#^PAUL8T$ +MW0`````)Z`^VP%M=PV9F9I!F9I!F9I!(@^P02(D<)$R)9"0(28G\0`^VWKD` +M````N@<```")WN@K____00^VC"11#```N@,```")WDR)Y^@3____2(L<)$R+ +M9"0(2(/$$,-F9I!FD%.)\P^V\KH#````Z,#^__\XV`^4P`^VP%O#9F:09F:0 +M2(7_=#6Z`````&9FD&9FD`^VA#KX!P``#[;(//]T$0^WP4C!X`A(`X=P"``` +MPV:02(/"`4B#^@1UUK@`````PU532(N?"`@``$B%VT@/1-^]`````+D````` +MN@<```")[DB)W^AW_O__N40```"Z`@```(GN2(G?Z&/^__^YT````+H````` +MB>Y(B=_H3_[__[D`````N@0```")[DB)W^@[_O__@\4!@_T"=:B_H(8!`.A9 +M_O__B(-1#```#[;(N@,```"^`````$B)W^@._O__6UW#9F9FD&9F9I!F9I!3 +M2(G[9L>'\`````$`#[?VP>8-Z`````"^%````$B)W^@`````6\-F9I!F9I!F +M9I!(@^P(B?&$TG46N/[____3P&8AA^@```#K%&9FD&9FD+@!````T^!F"8?H +M````#[>WZ````.@`````2(/$",.02(/L*$B)7"0(2(EL)!!,B60D&$R);"0@ +M28G]08G4#[:NRP````^V7@)(BWYP2(7_=`L/MM(/MO/H`````(#[`W<0C12K +MC42K!$"`_0,/1L+K#8U5$(U%($"`_0,/1L)!#[;4#[;P3(GOZ`````!(BUPD +M"$B+;"003(MD)!A,BVPD($B#Q"C#9F:09F:09F:005154TF)_+L`````0`^V +M[KH"````B>Y,B>?HL?S__Z@(=`VX`````.L@9F:09F:0OP$```#H`````(/# +M`8'[$"<``'7+N/\```!;74%B=[HA/___X7`=3!!#[;TB=I(B>_H2(GOZ"_\__]!B$4`N`````#K"69F9I"X_____TB+7"0(2(ML)!!,BV0D +M&$R+;"0@2(/$*,-FD$B#["A(B5PD"$B);"003(ED)!A,B6PD($B)_4&)S40/ +MMN)`#[;>1(GAN@$```")WNC[^___N4````"Z`@```(G>2(GOZ.?[__^)WDB) +M[^C=_O__AL>9F9FD(G:OB@```!(B>_HD?S__X7`=0>X_P`` +M`.L&N`````"02(M<)`A(BVPD$$R+9"083(ML)"!(@\0HPV9F9I!F9I!!5T%6 +M055!5%532(/L"$F)_4B)#"1%B<:)\XG5A-(/A/$```!$#[;^N60```"Z`@`` +M`$2)_N@F^___1(G^3(GOZ!O^__^%P'40N@,```!$B?Y,B>_HU_K__T`/MM6Y +M`0```$2)_DR)[^C#_O__0;S_____A,`/A8,!``!!O`````!%A?8/CG0!``!( +MBQPD0;P`````08UN_T0YY74UN4````"Z`@```$2)_DR)[^BN^O__26/,2`,, +M)+I8````1(G^3(GOZ.?]__^%P'0UZ2P!``"Y1````+H"````1(G^3(GOZ'GZ +M__](B=FZ4````$2)_DR)[^BV_?__A<`/A?P```!!@\0!2(/#`44Y]`^$ZP`` +M`.N#OZ"&`0#HY,B>_H+/K__XGN3(GOZ"+]__^% +MP'0B00^VC5$,``"Z`P```(GN3(GOZ`?Z__]!O/_____IF@```(GJOF````!, +MB>_H[?K__X7`=`U!O`````!%A?9^9>L?00^VC5$,``"Z`P```(GN3(GOZ,7Y +M__]!O/_____K6TB+'"1!O`````!F9I"Y1````+H"````B>Y,B>_HG/G__TB) +MV;J`````B>Y,B>_HVOS__X7`=0U!@\0!2(/#`44Y]'7)00^VC5$,``"Z`P`` +M`(GN3(GOZ&+Y__]$B>!(@\0(6UU!7$%=05Y!7\-(@^P82(E<)`A,B60D$$F) +M_$B)T$`/MM9!B?H +M#_G__XG82(M<)`A,BV0D$$B#Q!C#9F9FD&9F9I!F9I!F9I!(@^P82(E<)`A, +MB60D$$F)_$B)T$`/MM9!B?HK_C__XG82(M<)`A,BV0D$$B#Q!C#9F9FD&9F9I!F9I!F9I!!5D%5 +M05154TF)_4B)S46)QHG31`^VYKED````N@(```!$B>;H9_C__T2)YDR)[^A< +M^___A9,B>_HW?O__X3`=0Z#Q0%( +M@\,!1#GU=`GKV[C_____ZP6X`````%M=05Q!74%>PV9FD&9FD$B#[!A(B5PD +M"$R)9"0028G\2(G00`^VUD&)R$B)P;X`````Z"C___^)P[E4````N@(```"^ +M`````$R)Y^B?]___B=A(BUPD"$R+9"002(/$&,-F9F:09F9FD&9FD&9FD$B# +M[`A(BX<("```2(7`2`]$QT"(-0````"Y(````$C'P@````"^#@```$B)Q^@` +M````2(/$",-F9I!F9I!F9I!(@^P(B?&$TG06N`$```#3X&8)AYP.``#K%&9F +MD&9FD+C^____T\!F(8><#@``#[:WG`X``.@`````2(/$",.005=!5D%50515 +M4TB#[!A(B?M)B?9(BTXH2(/!`8M6'(/J`4B+1C!(B40D$`^V00$\`744QT90 +M`````,=$)`P`````Z7("```\`G58@'D"`9!U/4B+AP@(``!(A'0``QT90`````,=$)`P`````Z2H"``#' +M1E#^____QT0D#`````#I%@(``#P##X6Q````@'D"`9`/A9(````/MD<^C30` +M#[9Y`XGZB?C!^A_W_HG5.=9^8TR-:01$#[;B#[91!$2)YDB)W^@`````C47\ +M@_@#=AB-1?2#^`-V$(U%[(/X`W8(C47D@_@#=P=(@9( +MB=_H`````$''1E``````QT0D#`````#IA@$``$''1E#^____QT0D#`````#I +M<0$``,=&4/[____'1"0,`````.E=`0``3(NO"`@``$V%[4P/1.](B(`^'Z0```(G!2`-,)!!!B>B^`````$R)[^C8^?__.>@/ +MAA,B>&^`````$R)[^AF_/__A<`/A8@```"`.P!U"X![`0!F9I!FD'0.OQ`G +M``#H`````&9F9I!(C5,!#[9#`83`#X50____BVPD#`^V`X3`=%_HF_3__T&+1B`K1"0,.<,/1]B)Z4@#3"0008G8N@`` +M``"^`````$R)[^@2^?__A_H1_3__TF+1CA(A?#@``A,!T#8/H +M`8B'GPX``(3`=1W&!0``````N2````!(Q\(`````O@X```#H`````$B#Q`C# +M9F9FD&9FD&9FD&9FD$B#[`A(BX<("```2(7`2`]$QTB+N``(``"`OYX.```` +M=22`AY\.```!Q@4``````;D@````2,?"`````+X.````Z`````!(@\0(PV9F +MD&:02(/L&$B)7"0(3(ED)!!)B?Q(B=!`#[;608G(2(G!O@````#HN/K__XG# +MN50```"Z`@```+X`````3(GGZ"_S__^)V$B+7"0(3(MD)!!(@\08PY"0D)"0 +MD)"0D)"0D)"0B?9(BT<(2"T``@$`2`'&BP:)!0````##9F9FD&9F9I")]DB+ +M1PA(+0`"`0!(`<:)%L-F9F:09F9FD&9FD&9FD%-(B?M(BU<(2('J``(!`,>" +M@``!``````"+@@0!`0")!0````"`S`&)@@0!`0"Z"````+X,P@``Z`````"Z +MN`L``+X(P@``2(G?Z`````"Z`0``/+X`P@``2(G?Z`````"Z"````+X,PP`` +M2(G?Z`````"ZN`L``+X(PP``2(G?Z`````"Z`0``/+X`PP``2(G?Z`````"Z +M@("`@+XXP@``2(G?Z`````"Z"!@H.+X@P@``2(G?Z`````"Z@("`@+X\P@`` +M2(G?Z`````"Z"1DI.;XDP@``2(G?Z`````"Z@("`@+Y`P@``2(G?Z`````"Z +M"AHJ.KXHP@``2(G?Z`````"Z@("`@+Y$P@``2(G?Z`````"Z"QLK.[XLP@`` +M2(G?Z`````"Z@("`@+Y(P@``2(G?Z`````"Z2$E*2[XPP@``2(G?Z`````"Z +M@("`@+XXPP``2(G?Z`````"Z#!PL/+X@PP``2(G?Z`````"Z@("`@+X\PP`` +M2(G?Z`````"Z#1TM/;XDPP``2(G?Z`````"Z@("`@+Y`PP``2(G?Z`````"Z +M#AXN/KXHPP``2(G?Z`````"Z@("`@+Y$PP``2(G?Z`````"Z#Q\O/[XLPP`` +M2(G?Z`````"Z@("`@+Y(PP``2(G?Z`````"Z3$U.3[XPPP``2(G?Z`````#' +M0U"`@("`QT-4@("`@,=#6("`@(#'0UR`@("`QT-@@("`@$B-@\`.``#'0%"` +M@("`QT!4@("`@,=`6("`@(#'0%R`@("`QT!@@("`@%O#9I!(BU<(2('J``(! +M`(N";``!`(D%`````(F";``!`,-FD$B+5PA(@>H``@$`BX)H``$`B04````` +M"?")@F@``0##55-(B?N)\4@YOP`(```/A;P```")\,#H`D&X`````)`/MO") +MR/?0@^`#C3S%`````+@'````B?G3X/?01(M,LU!!(<%$B4RS4(32=`ZX`0`` +M`-/@1`G(B42S4$$/ML")Q<'E"(M34(VU.,(``$B+NP`(``#H`````(M35(VU +M/,(``$B+NP`(``#H`````(M36(VU0,(``$B+NP`(``#H`````(M37(VU1,(` +M`$B+NP`(``#H`````(M38(VU2,(``$B+NP`(``#H`````%M=PXGPP.@"@^@% +M0;@!````Z3W___^0D)"0D)"0D)"0D)"028G13(N72`@```^W1B"ZV"8!`&8] +M@P!W%P^WP`^VA`=X!P``2(T4P$B-%)!(P>(#38V!(`0``$'&@2`$```G9H%^ +M..$!=2E$#[9..D&-0?\\`7<,0;D/````1")..^LK08U![T&Y#P```#P!=AUF +MD$F-!!)!N0````!(@WA8`'0*0;D/````1")(<4$/MD`!@^#P1`G(08A``;@! +M````9H%^..$!=0\/MD8Z@^@!/`$/E\`/ML")PL'B!T$/MD`!@^!_"=!!B$`! +M#[9!!D&(0`(/M@%!B$`##[9!!4&(0`,```#&00;D00^V +M0#R(`4$/MD`]B$$(00^V0#N(007'1"0$`0```.F[````00^V0#N(009!#[9` +M/(@!00^V0#V(00)!#[9`/HA!`T$/MD`_B$$$00^V0$&(00I!#[9`0(A!`<=$ +M)`0!````ZWK&00;H00^V0#R(`4$/MD`]B$$(00^V0#N(005!#[9`/HA!`D$/ +MMD`_B$$#00^V0$"(001!#[9`08A!`<=$)`0!````ZS7'1"0$`0```$'V0#P! +M=";&009PQD$$`,9!`P#&00(`QD$%0,=$)`0!````ZPC'1"0$`````(M$)`1( +M@\0(PV9F9I!F9F:09F:09F:04TB#["!(B?-(BTY(2,<$)`````!(QT0D"``` +M``!(QT0D$`````!(QT0D&`````#V@:<````$=`U(BY'(````2(/J`>L&BU%X +M@^H!@'LX)75A2(G02,'H&(@$)$B)T$C!Z!"(1"0!2(G02,'H"(A$)`*(5"0# +M]H'5````$'44QD0D!@+&1"0'`+@(````Z:X```!(C7PD!$B-L>H```"Z!``` +M`.@`````N`@```#IC@```$B)T$C!Z#B(!"1(B=!(P>@PB$0D`4B)T$C!Z"B( +M1"0"2(G02,'H((A$)`-(B=!(P>@8B$0D!$B)T$C!Z!"(1"0%2(G02,'H"(A$ +M)`:(5"0']H'5````$'45QD0D"@+&1"0+`+@@````ZR1F9F:02(U\)`A(C;'J +M````N@0```#H`````+@@````9F:09I!(BWM(2&/02(GFZ`````!(@\0@6\-F +M9F:09F9FD&9FD$B#[`@/MD8X/#4/A)4````\-7X```` +M`.L%N/____];74%@#@````^V%0````!(C70D%$&Y`````$&X`@```+D!````Z.+^__^+="04 +M2(G?Z";___^^H(8!`$B)W^@Y____A#D`X``!]C``#'@Y0.``````0`QX.8#@`````!`$C'@Z@. +M````````9K@``.E7`@``9F:09I#'1"04`````$B+:PC&@Z`.```!#[85```` +M`$B-="040;G_____0;@"````N0$```!(B=_H./[__XMT)!1(B=_H?/[__[X0 +M)P``2(G?Z(_^__^%P'5N2(V%`/[^_XN`#,@``(D%`````(E$)!0]'T,``'0M +M/1]$``!U2<>#D`X``!]$``#'@Y0.``````<`QX.8#@`````!`.F3`0``9F:0 +MQX.0#@``'T,``,>#E`X`````!`#'@Y@.``````$`Z6T!``#'1"04`````$B+ +M:PC&@Z`.````#[85`````$B-="040;D`````0;@"````N0$```!(B=_H=?W_ +M_XMT)!1(B=_HN?W__[X0)P``2(G?Z,S]__^%P'502(V%`/[^_XN`#,@``(D% +M`````(E$)!0]OT,``'4RQX.0#@``OT,``,>#E`X`````(`#'@Y@.````$``` +M2,>#J`X```````!FN```Z>H```#'1"04`````$B+:PC&@Z`.````#[85```` *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Thu Jun 25 07:52:52 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8BDA198DBFA; Thu, 25 Jun 2015 07:52:52 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7650B13E1; Thu, 25 Jun 2015 07:52:52 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5P7qqCE011570; Thu, 25 Jun 2015 07:52:52 GMT (envelope-from grembo@FreeBSD.org) Received: (from grembo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5P7qpYD011567; Thu, 25 Jun 2015 07:52:51 GMT (envelope-from grembo@FreeBSD.org) Message-Id: <201506250752.t5P7qpYD011567@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: grembo set sender to grembo@FreeBSD.org using -f From: Michael Gmelin Date: Thu, 25 Jun 2015 07:52:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284803 - head/sys/dev/ichiic X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 07:52:52 -0000 Author: grembo (ports committer) Date: Thu Jun 25 07:52:51 2015 New Revision: 284803 URL: https://svnweb.freebsd.org/changeset/base/284803 Log: Protect smbus ioctls in ig4 driver using a shared lock. Document locking semantics. Differential Revision: https://reviews.freebsd.org/D2744 Reviewed by: jah, kib Approved by: kib Modified: head/sys/dev/ichiic/ig4_iic.c head/sys/dev/ichiic/ig4_pci.c head/sys/dev/ichiic/ig4_var.h Modified: head/sys/dev/ichiic/ig4_iic.c ============================================================================== --- head/sys/dev/ichiic/ig4_iic.c Thu Jun 25 07:25:40 2015 (r284802) +++ head/sys/dev/ichiic/ig4_iic.c Thu Jun 25 07:52:51 2015 (r284803) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); * Intel fourth generation mobile cpus integrated I2C device, smbus driver. * * See ig4_reg.h for datasheet reference and notes. + * See ig4_var.h for locking semantics. */ #include @@ -49,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -115,7 +117,7 @@ set_controller(ig4iic_softc_t *sc, uint3 error = 0; break; } - mtx_sleep(sc, &sc->mutex, 0, "i2cslv", 1); + mtx_sleep(sc, &sc->io_lock, 0, "i2cslv", 1); } return (error); } @@ -179,7 +181,7 @@ wait_status(ig4iic_softc_t *sc, uint32_t * work, otherwise poll with the lock held. */ if (status & IG4_STATUS_RX_NOTEMPTY) { - mtx_sleep(sc, &sc->mutex, PZERO, "i2cwait", + mtx_sleep(sc, &sc->io_lock, 0, "i2cwait", (hz + 99) / 100); /* sleep up to 10ms */ count_us += 10000; } else { @@ -522,6 +524,8 @@ ig4iic_attach(ig4iic_softc_t *sc) * Use a threshold of 1 so we get interrupted on each character, * allowing us to use mtx_sleep() in our poll code. Not perfect * but this is better than using DELAY() for receiving data. + * + * See ig4_var.h for details on interrupt handler synchronization. */ reg_write(sc, IG4_REG_RX_TL, 1); @@ -551,12 +555,12 @@ ig4iic_attach(ig4iic_softc_t *sc) */ reg_write(sc, IG4_REG_INTR_MASK, IG4_INTR_STOP_DET | IG4_INTR_RX_FULL); - mtx_lock(&sc->mutex); + mtx_lock(&sc->io_lock); if (set_controller(sc, 0)) device_printf(sc->dev, "controller error during attach-1\n"); if (set_controller(sc, IG4_I2C_ENABLE)) device_printf(sc->dev, "controller error during attach-2\n"); - mtx_unlock(&sc->mutex); + mtx_unlock(&sc->io_lock); error = bus_setup_intr(sc->dev, sc->intr_res, INTR_TYPE_MISC | INTR_MPSAFE, NULL, ig4iic_intr, sc, &sc->intr_handle); if (error) { @@ -615,7 +619,8 @@ ig4iic_detach(ig4iic_softc_t *sc) if (sc->intr_handle) bus_teardown_intr(sc->dev, sc->intr_res, sc->intr_handle); - mtx_lock(&sc->mutex); + sx_xlock(&sc->call_lock); + mtx_lock(&sc->io_lock); sc->smb = NULL; sc->intr_handle = NULL; @@ -623,18 +628,16 @@ ig4iic_detach(ig4iic_softc_t *sc) reg_read(sc, IG4_REG_CLR_INTR); set_controller(sc, 0); - mtx_unlock(&sc->mutex); + mtx_unlock(&sc->io_lock); + sx_xunlock(&sc->call_lock); return (0); } int ig4iic_smb_callback(device_t dev, int index, void *data) { - ig4iic_softc_t *sc = device_get_softc(dev); int error; - mtx_lock(&sc->mutex); - switch (index) { case SMB_REQUEST_BUS: error = 0; @@ -647,8 +650,6 @@ ig4iic_smb_callback(device_t dev, int in break; } - mtx_unlock(&sc->mutex); - return (error); } @@ -660,25 +661,8 @@ ig4iic_smb_callback(device_t dev, int in int ig4iic_smb_quick(device_t dev, u_char slave, int how) { - ig4iic_softc_t *sc = device_get_softc(dev); - int error; - - mtx_lock(&sc->mutex); - switch (how) { - case SMB_QREAD: - error = SMB_ENOTSUPP; - break; - case SMB_QWRITE: - error = SMB_ENOTSUPP; - break; - default: - error = SMB_ENOTSUPP; - break; - } - mtx_unlock(&sc->mutex); - - return (error); + return (SMB_ENOTSUPP); } /* @@ -695,7 +679,8 @@ ig4iic_smb_sendb(device_t dev, u_char sl uint32_t cmd; int error; - mtx_lock(&sc->mutex); + sx_xlock(&sc->call_lock); + mtx_lock(&sc->io_lock); set_slave_addr(sc, slave, 0); cmd = byte; @@ -706,7 +691,8 @@ ig4iic_smb_sendb(device_t dev, u_char sl error = SMB_ETIMEOUT; } - mtx_unlock(&sc->mutex); + mtx_unlock(&sc->io_lock); + sx_xunlock(&sc->call_lock); return (error); } @@ -721,7 +707,8 @@ ig4iic_smb_recvb(device_t dev, u_char sl ig4iic_softc_t *sc = device_get_softc(dev); int error; - mtx_lock(&sc->mutex); + sx_xlock(&sc->call_lock); + mtx_lock(&sc->io_lock); set_slave_addr(sc, slave, 0); reg_write(sc, IG4_REG_DATA_CMD, IG4_DATA_COMMAND_RD); @@ -733,7 +720,8 @@ ig4iic_smb_recvb(device_t dev, u_char sl error = SMB_ETIMEOUT; } - mtx_unlock(&sc->mutex); + mtx_unlock(&sc->io_lock); + sx_xunlock(&sc->call_lock); return (error); } @@ -746,13 +734,15 @@ ig4iic_smb_writeb(device_t dev, u_char s ig4iic_softc_t *sc = device_get_softc(dev); int error; - mtx_lock(&sc->mutex); + sx_xlock(&sc->call_lock); + mtx_lock(&sc->io_lock); set_slave_addr(sc, slave, 0); error = smb_transaction(sc, cmd, SMB_TRANS_NOCNT, &byte, 1, NULL, 0, NULL); - mtx_unlock(&sc->mutex); + mtx_unlock(&sc->io_lock); + sx_xunlock(&sc->call_lock); return (error); } @@ -766,7 +756,8 @@ ig4iic_smb_writew(device_t dev, u_char s char buf[2]; int error; - mtx_lock(&sc->mutex); + sx_xlock(&sc->call_lock); + mtx_lock(&sc->io_lock); set_slave_addr(sc, slave, 0); buf[0] = word & 0xFF; @@ -774,7 +765,8 @@ ig4iic_smb_writew(device_t dev, u_char s error = smb_transaction(sc, cmd, SMB_TRANS_NOCNT, buf, 2, NULL, 0, NULL); - mtx_unlock(&sc->mutex); + mtx_unlock(&sc->io_lock); + sx_xunlock(&sc->call_lock); return (error); } @@ -787,13 +779,15 @@ ig4iic_smb_readb(device_t dev, u_char sl ig4iic_softc_t *sc = device_get_softc(dev); int error; - mtx_lock(&sc->mutex); + sx_xlock(&sc->call_lock); + mtx_lock(&sc->io_lock); set_slave_addr(sc, slave, 0); error = smb_transaction(sc, cmd, SMB_TRANS_NOCNT, NULL, 0, byte, 1, NULL); - mtx_unlock(&sc->mutex); + mtx_unlock(&sc->io_lock); + sx_xunlock(&sc->call_lock); return (error); } @@ -807,7 +801,8 @@ ig4iic_smb_readw(device_t dev, u_char sl char buf[2]; int error; - mtx_lock(&sc->mutex); + sx_xlock(&sc->call_lock); + mtx_lock(&sc->io_lock); set_slave_addr(sc, slave, 0); if ((error = smb_transaction(sc, cmd, SMB_TRANS_NOCNT, @@ -815,7 +810,8 @@ ig4iic_smb_readw(device_t dev, u_char sl *word = (u_char)buf[0] | ((u_char)buf[1] << 8); } - mtx_unlock(&sc->mutex); + mtx_unlock(&sc->io_lock); + sx_xunlock(&sc->call_lock); return (error); } @@ -831,7 +827,8 @@ ig4iic_smb_pcall(device_t dev, u_char sl char wbuf[2]; int error; - mtx_lock(&sc->mutex); + sx_xlock(&sc->call_lock); + mtx_lock(&sc->io_lock); set_slave_addr(sc, slave, 0); wbuf[0] = sdata & 0xFF; @@ -841,7 +838,8 @@ ig4iic_smb_pcall(device_t dev, u_char sl *rdata = (u_char)rbuf[0] | ((u_char)rbuf[1] << 8); } - mtx_unlock(&sc->mutex); + mtx_unlock(&sc->io_lock); + sx_xunlock(&sc->call_lock); return (error); } @@ -852,13 +850,15 @@ ig4iic_smb_bwrite(device_t dev, u_char s ig4iic_softc_t *sc = device_get_softc(dev); int error; - mtx_lock(&sc->mutex); + sx_xlock(&sc->call_lock); + mtx_lock(&sc->io_lock); set_slave_addr(sc, slave, 0); error = smb_transaction(sc, cmd, 0, buf, wcount, NULL, 0, NULL); - mtx_unlock(&sc->mutex); + mtx_unlock(&sc->io_lock); + sx_xunlock(&sc->call_lock); return (error); } @@ -870,14 +870,16 @@ ig4iic_smb_bread(device_t dev, u_char sl int rcount = *countp_char; int error; - mtx_lock(&sc->mutex); + sx_xlock(&sc->call_lock); + mtx_lock(&sc->io_lock); set_slave_addr(sc, slave, 0); error = smb_transaction(sc, cmd, 0, NULL, 0, buf, rcount, &rcount); *countp_char = rcount; - mtx_unlock(&sc->mutex); + mtx_unlock(&sc->io_lock); + sx_xunlock(&sc->call_lock); return (error); } @@ -889,18 +891,20 @@ ig4iic_smb_trans(device_t dev, int slave ig4iic_softc_t *sc = device_get_softc(dev); int error; - mtx_lock(&sc->mutex); + sx_xlock(&sc->call_lock); + mtx_lock(&sc->io_lock); set_slave_addr(sc, slave, op); error = smb_transaction(sc, cmd, op, wbuf, wcount, rbuf, rcount, actualp); - mtx_unlock(&sc->mutex); + mtx_unlock(&sc->io_lock); + sx_xunlock(&sc->call_lock); return (error); } /* - * Interrupt Operation + * Interrupt Operation, see ig4_var.h for locking semantics. */ static void ig4iic_intr(void *cookie) @@ -908,7 +912,7 @@ ig4iic_intr(void *cookie) ig4iic_softc_t *sc = cookie; uint32_t status; - mtx_lock(&sc->mutex); + mtx_lock(&sc->io_lock); /* reg_write(sc, IG4_REG_INTR_MASK, IG4_INTR_STOP_DET);*/ status = reg_read(sc, IG4_REG_I2C_STA); while (status & IG4_STATUS_RX_NOTEMPTY) { @@ -919,7 +923,7 @@ ig4iic_intr(void *cookie) } reg_read(sc, IG4_REG_CLR_INTR); wakeup(sc); - mtx_unlock(&sc->mutex); + mtx_unlock(&sc->io_lock); } #define REGDUMP(sc, reg) \ Modified: head/sys/dev/ichiic/ig4_pci.c ============================================================================== --- head/sys/dev/ichiic/ig4_pci.c Thu Jun 25 07:25:40 2015 (r284802) +++ head/sys/dev/ichiic/ig4_pci.c Thu Jun 25 07:52:51 2015 (r284803) @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -94,7 +95,8 @@ ig4iic_pci_attach(device_t dev) bzero(sc, sizeof(*sc)); - mtx_init(&sc->mutex, device_get_nameunit(dev), "ig4iic", MTX_DEF); + mtx_init(&sc->io_lock, "IG4 I/O lock", NULL, MTX_DEF); + sx_init(&sc->call_lock, "IG4 call lock"); sc->dev = dev; sc->regs_rid = PCIR_BAR(0); @@ -150,7 +152,10 @@ ig4iic_pci_detach(device_t dev) sc->regs_rid, sc->regs_res); sc->regs_res = NULL; } - mtx_destroy(&sc->mutex); + if (mtx_initialized(&sc->io_lock)) { + mtx_destroy(&sc->io_lock); + sx_destroy(&sc->call_lock); + } return (0); } @@ -179,9 +184,9 @@ static device_method_t ig4iic_pci_method }; static driver_t ig4iic_pci_driver = { - "ig4iic", - ig4iic_pci_methods, - sizeof(struct ig4iic_softc) + "ig4iic", + ig4iic_pci_methods, + sizeof(struct ig4iic_softc) }; static devclass_t ig4iic_pci_devclass; Modified: head/sys/dev/ichiic/ig4_var.h ============================================================================== --- head/sys/dev/ichiic/ig4_var.h Thu Jun 25 07:25:40 2015 (r284802) +++ head/sys/dev/ichiic/ig4_var.h Thu Jun 25 07:52:51 2015 (r284803) @@ -70,7 +70,30 @@ struct ig4iic_softc { int slave_valid : 1; int read_started : 1; int write_started : 1; - struct mtx mutex; + + /* + * Locking semantics: + * + * Functions implementing the smbus interface that interact + * with the controller acquire an exclusive lock on call_lock + * to prevent interleaving of calls to the interface and a lock on + * io_lock right afterwards, to synchronize controller I/O activity. + * + * The interrupt handler can only read data while no ig4iic_smb_* call + * is in progress or while io_lock is dropped during mtx_sleep in + * wait_status and set_controller. It is safe to drop io_lock in those + * places, because the interrupt handler only accesses those registers: + * + * - IG4_REG_I2C_STA (I2C Status) + * - IG4_REG_DATA_CMD (Data Buffer and Command) + * - IG4_REG_CLR_INTR (Clear Interrupt) + * + * Locking outside of those places is required to make the content + * of rpos/rnext predictable (e.g. whenever data_read is called and in + * smb_transaction). + */ + struct sx call_lock; + struct mtx io_lock; }; typedef struct ig4iic_softc ig4iic_softc_t; From owner-svn-src-head@freebsd.org Thu Jun 25 08:15:48 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 51AA798CD0E; Thu, 25 Jun 2015 08:15:48 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4308E122F; Thu, 25 Jun 2015 08:15:48 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5P8FmJM022198; Thu, 25 Jun 2015 08:15:48 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5P8Fmjt022197; Thu, 25 Jun 2015 08:15:48 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506250815.t5P8Fmjt022197@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Thu, 25 Jun 2015 08:15:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284806 - head/lib/libc/aarch64 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 08:15:48 -0000 Author: andrew Date: Thu Jun 25 08:15:47 2015 New Revision: 284806 URL: https://svnweb.freebsd.org/changeset/base/284806 Log: Export __flt_rounds from the arm64 libc.so Modified: head/lib/libc/aarch64/Symbol.map Modified: head/lib/libc/aarch64/Symbol.map ============================================================================== --- head/lib/libc/aarch64/Symbol.map Thu Jun 25 08:11:39 2015 (r284805) +++ head/lib/libc/aarch64/Symbol.map Thu Jun 25 08:15:47 2015 (r284806) @@ -14,6 +14,7 @@ FBSD_1.0 { _setjmp; _longjmp; fabs; + __flt_rounds; fpsetmask; setjmp; longjmp; From owner-svn-src-head@freebsd.org Thu Jun 25 08:22:27 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E852098CE4A; Thu, 25 Jun 2015 08:22:26 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C7F2E187C; Thu, 25 Jun 2015 08:22:26 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5P8MQiH026655; Thu, 25 Jun 2015 08:22:26 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5P8MQ4C026649; Thu, 25 Jun 2015 08:22:26 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506250822.t5P8MQ4C026649@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Thu, 25 Jun 2015 08:22:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284807 - in head/lib/libc/aarch64: . gen X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 08:22:27 -0000 Author: andrew Date: Thu Jun 25 08:22:25 2015 New Revision: 284807 URL: https://svnweb.freebsd.org/changeset/base/284807 Log: Implement fpgetmask, it's needed by Python. Approved by: ABT Systems Ltd Sponsored by: The FreeBSD Foundation Added: head/lib/libc/aarch64/gen/fpgetmask.c (contents, props changed) Modified: head/lib/libc/aarch64/Symbol.map head/lib/libc/aarch64/gen/Makefile.inc Modified: head/lib/libc/aarch64/Symbol.map ============================================================================== --- head/lib/libc/aarch64/Symbol.map Thu Jun 25 08:15:47 2015 (r284806) +++ head/lib/libc/aarch64/Symbol.map Thu Jun 25 08:22:25 2015 (r284807) @@ -15,6 +15,7 @@ FBSD_1.0 { _longjmp; fabs; __flt_rounds; + fpgetmask; fpsetmask; setjmp; longjmp; Modified: head/lib/libc/aarch64/gen/Makefile.inc ============================================================================== --- head/lib/libc/aarch64/gen/Makefile.inc Thu Jun 25 08:15:47 2015 (r284806) +++ head/lib/libc/aarch64/gen/Makefile.inc Thu Jun 25 08:22:25 2015 (r284807) @@ -2,6 +2,7 @@ SRCS+= fabs.S \ flt_rounds.c \ + fpgetmask.c \ fpsetmask.c \ ldexp.c \ _setjmp.S \ Added: head/lib/libc/aarch64/gen/fpgetmask.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/aarch64/gen/fpgetmask.c Thu Jun 25 08:22:25 2015 (r284807) @@ -0,0 +1,47 @@ +/*- + * Copyright (c) 2015 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Andrew Turner under + * sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include + +#define FP_X_MASK (FP_X_INV | FP_X_DZ | FP_X_OFL | FP_X_UFL | FP_X_IMP) + +fp_except_t +fpgetmask(void) +{ + uint64_t mask; + + /* Read the current mask */ + __asm __volatile("mrs %0, fpcr" : "=&r"(mask)); + + return (mask & FP_X_MASK); +} From owner-svn-src-head@freebsd.org Thu Jun 25 08:42:20 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC08B98DB7B; Thu, 25 Jun 2015 08:42:20 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx1.sbone.de (bird.sbone.de [46.4.1.90]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 249A11F9F; Thu, 25 Jun 2015 08:42:19 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id BD65925D3892; Thu, 25 Jun 2015 08:42:09 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 0F05AC7703A; Thu, 25 Jun 2015 08:42:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id 1a7uIJ6_XaLN; Thu, 25 Jun 2015 08:42:05 +0000 (UTC) Received: from [IPv6:fde9:577b:c1a9:4420:cabc:c8ff:fe8b:4fe6] (orange-tun0-ula.sbone.de [IPv6:fde9:577b:c1a9:4420:cabc:c8ff:fe8b:4fe6]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id C7750C76FE2; Thu, 25 Jun 2015 08:42:04 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Subject: Re: svn commit: r284777 - in head: sbin/pfctl share/man/man4 sys/conf sys/net/altq sys/netpfil/pf From: "Bjoern A. Zeeb" In-Reply-To: <201506241916.t5OJGfEm025914@svn.freebsd.org> Date: Thu, 25 Jun 2015 08:42:03 +0000 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <76B695F2-AEDE-4BF3-8BE3-97CA8A98780D@FreeBSD.org> References: <201506241916.t5OJGfEm025914@svn.freebsd.org> To: =?utf-8?Q?Ermal_Lu=C3=A7i?= X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 08:42:20 -0000 > On 24 Jun 2015, at 19:16 , Ermal Lu=C3=A7i wrote: >=20 > Author: eri > Date: Wed Jun 24 19:16:41 2015 > New Revision: 284777 > URL: https://svnweb.freebsd.org/changeset/base/284777 >=20 > Log: > ALTQ FAIRQ discipline import from DragonFLY >=20 > Differential Revision: https://reviews.freebsd.org/D2847 > Reviewed by: glebius, wblock(manpage) > Approved by: gnn(mentor) > Obtained from: pfSense > Sponsored by: Netgate I see a lot of kernel configurations failing to build dring a universe; = here=E2=80=99s some errors: /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: expected = declaration specifiers or '...' before 'pf_keyhash' cc1: warnings being treated as errors /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1461: error: expected = declaration specifiers or '...' before 'pf_idhash' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1461: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1464: error: expected = declaration specifiers or '...' before 'pf_srchash' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1464: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1469: error: expected = declaration specifiers or '...' before 'pf_swi_cookie' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1469: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1472: error: expected = declaration specifiers or '...' before 'pf_stateid' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1472: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1476: error: expected = declaration specifiers or '...' before 'pf_altqs' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1476: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1478: error: expected = declaration specifiers or '...' before 'pf_pabuf' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1478: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1481: error: expected = declaration specifiers or '...' before 'ticket_altqs_active' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1481: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1483: error: expected = declaration specifiers or '...' before 'ticket_altqs_inactive' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1483: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1485: error: expected = declaration specifiers or '...' before 'altqs_inactive_open' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1485: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1487: error: expected = declaration specifiers or '...' before 'ticket_pabuf' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1487: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1489: error: expected = declaration specifiers or '...' before 'pf_altqs_active' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1489: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1491: error: expected = declaration specifiers or '...' before 'pf_altqs_inactive' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1491: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1494: error: expected = declaration specifiers or '...' before 'pf_unlinked_rules' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1494: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1508: error: expected = declaration specifiers or '...' before 'pf_state_z' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1508: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1510: error: expected = declaration specifiers or '...' before 'pf_state_key_z' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1510: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1512: error: expected = declaration specifiers or '...' before 'pf_state_scrub_z' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1512: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1558: error: expected = declaration specifiers or '...' before 'sync_ifp' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1558: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1560: error: expected = declaration specifiers or '...' before 'pf_default_rule' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1560: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1648: error: expected = declaration specifiers or '...' before 'pfi_all' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1648: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1675: error: expected = declaration specifiers or '...' before 'pf_status' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1675: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1682: error: expected = declaration specifiers or '...' before 'pf_limits' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1682: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1688: error: expected = declaration specifiers or '...' before 'pf_anchors' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1688: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1690: error: expected = declaration specifiers or '...' before 'pf_main_anchor' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1690: error: conflicting types = for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous = declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function = 'fairq_pfattach': /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:141: error: = dereferencing pointer to incomplete type /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function = 'fairq_add_altq': /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:155: error: = dereferencing pointer to incomplete type /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:163: error: = dereferencing pointer to incomplete type /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function = 'fairq_request': /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:275: error: = dereferencing pointer to incomplete type /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:280: error: = 'ALTRQ_PURGE' undeclared (first use in this function) /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:280: error: (Each = undeclared identifier is reported only once /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:280: error: for each = function it appears in.) /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function = 'fairq_purge': /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:299: error: = dereferencing pointer to incomplete type /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function = 'fairq_class_create': /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:387: error: = dereferencing pointer to incomplete type /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function = 'fairq_enqueue': /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:478: error: = dereferencing pointer to incomplete type /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:490: error: = dereferencing pointer to incomplete type /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function = 'fairq_dequeue': /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:531: error: = dereferencing pointer to incomplete type /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:546: error: = 'ALTDQ_REMOVE' undeclared (first use in this function) /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:587: error: = 'ALTDQ_POLL' undeclared (first use in this function) /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function = 'fairq_addq': /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function = 'fairq_pollq': --- altq_fairq.o --- =E2=80=94=20 Bjoern A. Zeeb Charles Haddon Spurgeon: "Friendship is one of the sweetest joys of life. Many might have failed beneath the bitterness of their trial had they not found a friend." From owner-svn-src-head@freebsd.org Thu Jun 25 09:00:40 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31C2198D7A5; Thu, 25 Jun 2015 09:00:40 +0000 (UTC) (envelope-from ermal.luci@gmail.com) Received: from mail-yk0-x235.google.com (mail-yk0-x235.google.com [IPv6:2607:f8b0:4002:c07::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DFFC219A0; Thu, 25 Jun 2015 09:00:39 +0000 (UTC) (envelope-from ermal.luci@gmail.com) Received: by ykdt186 with SMTP id t186so37330444ykd.0; Thu, 25 Jun 2015 02:00:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=WQtrd+P2SiW0Ip8eTyJCITTqRa7Bg5FSXTklDUK0w0c=; b=rnWQilDKhcDi7NeWp8KmNGuwpisYynWgXfUzlZEyVKMZQqlEkR8QS/HM2vMOo9evG5 nM75OkNs1MsOMlHucLHkSQ6S0/1a/kIhWUQ6d+LGKXMh3n/ZaGcO2EV1AhT3h7woKg8Q QJQ+/PlESuneh76JtXzCCyRwuw+hY2HmoLjjS/7Uo4tF0B7WLkyuxEypyIo9iTIb2m7D YcYdbGR0DxCA5rAgXzpbiaL2w1DtBrBY9nlt/1gIxrGzWoc3uVquWndItgoaGRDd+FUB 7Q5fShSClHIKaMYNra5E1eB3hF5+Z6c87sB7WaCRmjoMXI84lhmALAJ+ZPz3IpyKRij+ SYcw== MIME-Version: 1.0 X-Received: by 10.13.240.67 with SMTP id z64mr54450814ywe.69.1435222838336; Thu, 25 Jun 2015 02:00:38 -0700 (PDT) Sender: ermal.luci@gmail.com Received: by 10.129.83.139 with HTTP; Thu, 25 Jun 2015 02:00:38 -0700 (PDT) In-Reply-To: <76B695F2-AEDE-4BF3-8BE3-97CA8A98780D@FreeBSD.org> References: <201506241916.t5OJGfEm025914@svn.freebsd.org> <76B695F2-AEDE-4BF3-8BE3-97CA8A98780D@FreeBSD.org> Date: Thu, 25 Jun 2015 11:00:38 +0200 X-Google-Sender-Auth: RrOUgruAFuUPxNw34G9C8OuZkEU Message-ID: Subject: Re: svn commit: r284777 - in head: sbin/pfctl share/man/man4 sys/conf sys/net/altq sys/netpfil/pf From: =?UTF-8?Q?Ermal_Lu=C3=A7i?= To: "Bjoern A. Zeeb" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 09:00:40 -0000 On Thu, Jun 25, 2015 at 10:42 AM, Bjoern A. Zeeb wrote: > > > On 24 Jun 2015, at 19:16 , Ermal Lu=C3=A7i wrote: > > > > Author: eri > > Date: Wed Jun 24 19:16:41 2015 > > New Revision: 284777 > > URL: https://svnweb.freebsd.org/changeset/base/284777 > > > > Log: > > ALTQ FAIRQ discipline import from DragonFLY > > > > Differential Revision: https://reviews.freebsd.org/D2847 > > Reviewed by: glebius, wblock(manpage) > > Approved by: gnn(mentor) > > Obtained from: pfSense > > Sponsored by: Netgate > > I see a lot of kernel configurations failing to build dring a universe; > here=E2=80=99s some errors: > > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: expected declaratio= n > specifiers or '...' before 'pf_keyhash' > cc1: warnings being treated as errors > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1461: error: expected declaratio= n > specifiers or '...' before 'pf_idhash' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1461: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1464: error: expected declaratio= n > specifiers or '...' before 'pf_srchash' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1464: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1469: error: expected declaratio= n > specifiers or '...' before 'pf_swi_cookie' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1469: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1472: error: expected declaratio= n > specifiers or '...' before 'pf_stateid' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1472: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1476: error: expected declaratio= n > specifiers or '...' before 'pf_altqs' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1476: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1478: error: expected declaratio= n > specifiers or '...' before 'pf_pabuf' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1478: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1481: error: expected declaratio= n > specifiers or '...' before 'ticket_altqs_active' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1481: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1483: error: expected declaratio= n > specifiers or '...' before 'ticket_altqs_inactive' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1483: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1485: error: expected declaratio= n > specifiers or '...' before 'altqs_inactive_open' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1485: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1487: error: expected declaratio= n > specifiers or '...' before 'ticket_pabuf' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1487: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1489: error: expected declaratio= n > specifiers or '...' before 'pf_altqs_active' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1489: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1491: error: expected declaratio= n > specifiers or '...' before 'pf_altqs_inactive' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1491: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1494: error: expected declaratio= n > specifiers or '...' before 'pf_unlinked_rules' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1494: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1508: error: expected declaratio= n > specifiers or '...' before 'pf_state_z' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1508: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1510: error: expected declaratio= n > specifiers or '...' before 'pf_state_key_z' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1510: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1512: error: expected declaratio= n > specifiers or '...' before 'pf_state_scrub_z' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1512: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1558: error: expected declaratio= n > specifiers or '...' before 'sync_ifp' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1558: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1560: error: expected declaratio= n > specifiers or '...' before 'pf_default_rule' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1560: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1648: error: expected declaratio= n > specifiers or '...' before 'pfi_all' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1648: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1675: error: expected declaratio= n > specifiers or '...' before 'pf_status' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1675: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1682: error: expected declaratio= n > specifiers or '...' before 'pf_limits' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1682: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1688: error: expected declaratio= n > specifiers or '...' before 'pf_anchors' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1688: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1690: error: expected declaratio= n > specifiers or '...' before 'pf_main_anchor' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1690: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaratio= n > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function > 'fairq_pfattach': > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:141: error: > dereferencing pointer to incomplete type > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function > 'fairq_add_altq': > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:155: error: > dereferencing pointer to incomplete type > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:163: error: > dereferencing pointer to incomplete type > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function > 'fairq_request': > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:275: error: > dereferencing pointer to incomplete type > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:280: error: > 'ALTRQ_PURGE' undeclared (first use in this function) > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:280: error: (Each > undeclared identifier is reported only once > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:280: error: for each > function it appears in.) > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function > 'fairq_purge': > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:299: error: > dereferencing pointer to incomplete type > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function > 'fairq_class_create': > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:387: error: > dereferencing pointer to incomplete type > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function > 'fairq_enqueue': > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:478: error: > dereferencing pointer to incomplete type > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:490: error: > dereferencing pointer to incomplete type > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function > 'fairq_dequeue': > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:531: error: > dereferencing pointer to incomplete type > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:546: error: > 'ALTDQ_REMOVE' undeclared (first use in this function) > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:587: error: > 'ALTDQ_POLL' undeclared (first use in this function) > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function > 'fairq_addq': > /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function > 'fairq_pollq': > --- altq_fairq.o --- > > Let me check this and fix quickly though i could not run 'make universe' i have not seen such issues before since this a patch being used for more than 3 years in production. > > =E2=80=94 > Bjoern A. Zeeb Charles Haddon Spurgeon: > "Friendship is one of the sweetest joys of life. Many might have failed > beneath the bitterness of their trial had they not found a friend." > > --=20 Ermal From owner-svn-src-head@freebsd.org Thu Jun 25 10:03:39 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5EC2998D4ED; Thu, 25 Jun 2015 10:03:39 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5004F199F; Thu, 25 Jun 2015 10:03:39 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PA3dN8076807; Thu, 25 Jun 2015 10:03:39 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PA3diX076806; Thu, 25 Jun 2015 10:03:39 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506251003.t5PA3diX076806@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Thu, 25 Jun 2015 10:03:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284808 - head/sys/dev/isp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 10:03:39 -0000 Author: mav Date: Thu Jun 25 10:03:38 2015 New Revision: 284808 URL: https://svnweb.freebsd.org/changeset/base/284808 Log: Remove limitations on setting WWNNs starting from 2. It is odd that driver first tries to generate synthetic WWNN based on WWPN starting from 2, but then refuses to use it. If we don't trust generated WWNN, we should probably not generate it. Same time this limitation prevents potentially valid WWNN setting by user. Modified: head/sys/dev/isp/isp.c Modified: head/sys/dev/isp/isp.c ============================================================================== --- head/sys/dev/isp/isp.c Thu Jun 25 08:22:25 2015 (r284807) +++ head/sys/dev/isp/isp.c Thu Jun 25 10:03:38 2015 (r284808) @@ -1848,7 +1848,7 @@ isp_fibre_init(ispsoftc_t *isp) icbp->icb_lunetimeout = ICB_LUN_ENABLE_TOV; } #endif - if (fcp->isp_wwnn && fcp->isp_wwpn && (fcp->isp_wwnn >> 60) != 2) { + if (fcp->isp_wwnn && fcp->isp_wwpn) { icbp->icb_fwoptions |= ICBOPT_BOTH_WWNS; MAKE_NODE_NAME_FROM_WWN(icbp->icb_nodename, fcp->isp_wwnn); MAKE_NODE_NAME_FROM_WWN(icbp->icb_portname, fcp->isp_wwpn); @@ -2075,7 +2075,7 @@ isp_fibre_init_2400(ispsoftc_t *isp) } icbp->icb_logintime = ICB_LOGIN_TOV; - if (fcp->isp_wwnn && fcp->isp_wwpn && (fcp->isp_wwnn >> 60) != 2) { + if (fcp->isp_wwnn && fcp->isp_wwpn) { icbp->icb_fwoptions1 |= ICB2400_OPT1_BOTH_WWNS; MAKE_NODE_NAME_FROM_WWN(icbp->icb_portname, fcp->isp_wwpn); MAKE_NODE_NAME_FROM_WWN(icbp->icb_nodename, fcp->isp_wwnn); From owner-svn-src-head@freebsd.org Thu Jun 25 12:07:54 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E522B98D491; Thu, 25 Jun 2015 12:07:54 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail108.syd.optusnet.com.au (mail108.syd.optusnet.com.au [211.29.132.59]) by mx1.freebsd.org (Postfix) with ESMTP id 928211901; Thu, 25 Jun 2015 12:07:54 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au (c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197]) by mail108.syd.optusnet.com.au (Postfix) with ESMTPS id 6CCDD1A50AD; Thu, 25 Jun 2015 22:07:44 +1000 (AEST) Date: Thu, 25 Jun 2015 22:07:44 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Bryan Drewery cc: Bruce Evans , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284163 - head/bin/cp In-Reply-To: <558B745C.8040305@FreeBSD.org> Message-ID: <20150625203730.F937@besplex.bde.org> References: <201506081924.t58JOJQw095752@svn.freebsd.org> <20150609152946.Y935@besplex.bde.org> <558B745C.8040305@FreeBSD.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=XMDNMlVE c=1 sm=1 tr=0 a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=PO7r1zJSAAAA:8 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=PLlN6-q0pNDeQg5w_scA:9 a=5Z_-POF5Cg6TRMZp:21 a=loHo1uOnaBBYlrnk:21 a=CjuIK1q_8ugA:10 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 12:07:55 -0000 On Wed, 24 Jun 2015, Bryan Drewery wrote: > On 6/9/2015 1:28 AM, Bruce Evans wrote: >> On Mon, 8 Jun 2015, Bryan Drewery wrote: >> >>> Log: >>> Cleanup some style(9) issues. >>> >>> - Whitespace. >>> - Comments. >>> - Wrap long lines. >> >> cp's style had a remarlable amount of bitrot. >> >> This change unimproves it in some places. > > I have been traveling and packing. I'm replying now but won't have time > to address the issues until next week. I was trying to avoid doing any > of this but touched code which was horrendously misstyled and chained > into reindenting the whole file and doing it wrong :). At this point I > don't want to tweak this much more. Thanks for replying. >>> @@ -245,10 +245,10 @@ main(int argc, char *argv[]) >>> type = FILE_TO_FILE; >>> >>> if (have_trailing_slash && type == FILE_TO_FILE) { >>> - if (r == -1) >>> + if (r == -1) { >> >> This adds excessive braces. >> >>> errx(1, "directory %s does not exist", >>> - to.p_path); >>> - else >>> + to.p_path); >>> + } else > > It is a multi-line statement due to the hard 80-width wrap. I feel it is > fine in this case. OK. The mail mangled all the tabs so this is hard to see now. >>> @@ -379,7 +379,8 @@ copy(char *argv[], enum op type, int fts >>> mode = curr->fts_statp->st_mode; >>> if ((mode & (S_ISUID | S_ISGID | S_ISTXT)) || >>> ((mode | S_IRWXU) & mask) != (mode & mask)) >>> - if (chmod(to.p_path, mode & mask) != 0){ >>> + if (chmod(to.p_path, mode & mask) != >>> + 0) { >>> warn("chmod: %s", to.p_path); >>> rval = 1; >>> } >> >> This changes from a minor misformatting to avoid a long line to even uglier >> formatting with a split line. > > I agree 100%. I did it because of our hard 80-width cut-off. What would > the proper style be? My inclination would be to wrap at the first comma > but then it is even more odd. I find our 80-width cut-off to be strange > when editors/tmux/window manager/etc can resize and wrap long lines already. I don't mind the hack of omitting the space before the final parentheses. This gives a line length of exactly 80, which is a little too long. The main problem with this is that automatic formatting programs will want to "fix" it. I like to wrap at the last possible comma, except for printf()s I usually wrap after the format string. Here the last comma is also the first comma. It is a little too early. Editors/tmux/window manager/etc cannot wrap long lines already. Even indent(1) is clueless about wrapping long lines. It mostly doesn't do it. Otherwise it would want to change more than it does, and make more messes by getting the wrapping slightly wronger than the original. How could a mere editor/window manager know: - C syntax, so as to pick wrapping points like commas - the project and programmer's preference for wrapping early or late in a context-dependent way - special cases like the above? Formatting away from the project or current source style to the programmer's preferred style is relatively easy, but is very difficult to format back to the original style so as to not change everything for a 1-line real change. > Actually I don't see a width restriction in style(9) at all but surely > we have this rule documented somewhere. My guess is that it is inherited > by KNF. cp.c (like most utilities in bin) used to be in KNF. I think CSRG release engineers (mainly Bostic?) enforced them a common style (perhaps the single release engineer's style and not quite KNF). From the above hack alone in cp.c, we can infer that the line length limit is 80. The default line length limit in indent(1) is 79, but indent(1) doesn't actually understand line lengths. Fuller references for the line length limit are: expand 4.4BD-Lite2/usr/src/admin/style/style | grep ... (79+ dots) This finds 1 line of length 80, and that line is broken (it has garbage trailing tabs), and a couple of lines of length 79, and none longer. This files gives KNF rules by example. Whitespace in it was broken by converting it to a man page. similar greps in kern and pure BSD utilities >> It is necessary to make such changes if you >> use indent(1) to generate and check the changes -- otherwise, indent keeps > > Do you have an indent configuration I can use? I use this .indent.pro. %%% -TFILE -Tfd_mask -Tfd_set -Tu_char -Tu_int -Tu_long -Tu_short -ta -bad -bap -nbbb -nbc -br -nbs -c41 -cd41 -cdb -ce -ci4 -cli0 -d0 -di8 -ndj -ei -nfc1 -nfcb -i8 -ip8 -l79 -lc77 -ldi0 -nlp -npcs -psl -sc -nsob -nv %%% The T directives in this are very incomplete. The -ta directive is supposed to handle all typedefs that spelled with a _t suffix. It replaces a much longer but even more incomplete list of T directives, and mostly works (it obviously makes messes if you have some non-typedefs spelled with a _t suffix). >>> Modified: head/bin/cp/utils.c >>> ============================================================================== >>> >>> --- head/bin/cp/utils.c Mon Jun 8 19:13:04 2015 (r284162) >>> +++ head/bin/cp/utils.c Mon Jun 8 19:24:18 2015 (r284163) >>> ... >>> -/* Small (default) buffer size in bytes. It's inefficient for this to be >>> - * smaller than MAXPHYS */ >>> +/* >>> + * Small (default) buffer size in bytes. It's inefficient for this to be >>> + * smaller than MAXPHYS. >>> + */ >> >> Still has unusual sentence break of 1 space. cp uses normal sentence >> breaks > > I did a minimal effort on comments and didn't clean up grammar or > breaks. I have not adopted 2 space breaks into my style(9) conformation yet. The above .indent.pro intentionally turns off most comment formatting, using directives that I added many years ago. Otherwise, almost every large comment gets rewrapped. I miss these directives the most in gnu indent. gnu indent is also missing a couple of other critical directives, probably including the relatively new -ta. Otherwise, it is a bit smarter than FreeBSD indent. It actually understands the line length limit, but without directives to control the details it tends to make messes enforcing it. >>> @@ -345,7 +352,7 @@ setfile(struct stat *fs, int fd) >>> fdval = fd != -1; >>> islink = !fdval && S_ISLNK(fs->st_mode); >>> fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX | >>> - S_IRWXU | S_IRWXG | S_IRWXO; >>> + S_IRWXU | S_IRWXG | S_IRWXO; >> >> Here the formatting was reasonable, but it was in gnu style and was hard to >> maintain since it is not supported by indent(1). It is still hard to >> maintain, >> since it has fancy splitting earlier than necessary to put the S_IS* and >> S_IR* parts of the expressions on separate lines. indent(1) cannot >> reproduce >> this splitting. Also, with the normal indentation of the condinuation >> line, >> the fancy splitting is not so readable. > > I'm do not see how this was proper before or how it is worse now. The > indentation is tabs and then 4 spaces. I don't see exceptions to this in > style(9) or in other code. I said is was improper but more readable before. It is improper because of the strict indentation rules. These often prevent lining things up. Gnu has different strict indentation rules which often give lining up. In the above, they give something like: fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO; Here the first difference from the rules is that the `|' operator goes on a new line. The next difference is that the continuation indent is to line up this operator under '&='. Perhaps it is supposed to be left justified, but I right justified it to line up the terms. More usually, the assignment operator is just '=', and there is no choice for the justifcation of any 1-letter operator under it. All these examples split the line earlier than necessary, so as to get 3 terms from the RHS on each line. Except in the strict KNF version, this also gives lining up of 3 S_IS's with 3 S_IR's. I was thinking that there was a bit more lining up than that, but there isn't except possibly when the macros are expanded to octal. More lining up would occur for similar expressions with S_I{R,W,X}{USR,GRP,OTH} -- there are 9 terms, and you might want to arrange them in a 3x3 matrix. >>> @@ -543,8 +550,10 @@ usage(void) >>> { >>> >>> (void)fprintf(stderr, "%s\n%s\n", >>> -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpsvx] source_file >>> target_file", >>> -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpsvx] source_file >>> ... " >>> -"target_directory"); >>> + "usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpsvx] " >>> + "source_file target_file", >>> + " cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpsvx] " >>> + "source_file ... " >>> + "target_directory"); >>> exit(EX_USAGE); >>> } >> >> This breaks the careful outdentation and obfuscates the strings. The > > Again, this broke the 80-width limit. I preferred the old way but was > going on down the 80-width line on my screen fixing violations. > > I suggest we update our styles to not require this awful wrapping. It > makes `grep -r` very difficult when strings are split up. Perhaps I am > mistaken on the rule but we have a lot of code that needlessly wraps early. I like outdenting long strings in printfs to column 0. After all, they will start in column 0 in the output. Unfortunately, just the quotes around them make them start in column 1 and sometimes be longer than the source line length limit even if they are shorter than the output line length limit. This only works well for literal strong. Complicated formatting directives tend to be longer in the source than the output, and simple formatting directives tend to be longer in the output than the source (%jd" may expand to 20 decimal digits even with only 64-bit intmax_t). But strings in usage messages are mostly literal. Note that the string splitting also bogotifies the very standard style in usage messages, of starting with (void)fprintf(stderr, "%s\n%s\n", where there is 1 "%s\n" per line. With literal strings and even without C90 string concatenation, there is no need for a separate format string. This style mainly reduces the source line lengths by 2 characters for \n, and makes the line structure clearer. Then any use of string concatenation makes it unclearer again. Bruce From owner-svn-src-head@freebsd.org Thu Jun 25 13:40:01 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C21A398C817; Thu, 25 Jun 2015 13:40:01 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 94D9816F2; Thu, 25 Jun 2015 13:40:01 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PDe1aM083525; Thu, 25 Jun 2015 13:40:01 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PDe0wu083508; Thu, 25 Jun 2015 13:40:00 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251340.t5PDe0wu083508@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 13:40:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284811 - head/release X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 13:40:01 -0000 Author: gjb Date: Thu Jun 25 13:40:00 2015 New Revision: 284811 URL: https://svnweb.freebsd.org/changeset/base/284811 Log: Consider PRERELEASE builds snapshots, in addition to CURRENT and STABLE. MFC after: 3 days Sponsored by: The FreeBSD Foundation Modified: head/release/Makefile.azure head/release/Makefile.ec2 head/release/Makefile.mirrors Modified: head/release/Makefile.azure ============================================================================== --- head/release/Makefile.azure Thu Jun 25 13:01:10 2015 (r284810) +++ head/release/Makefile.azure Thu Jun 25 13:40:00 2015 (r284811) @@ -16,7 +16,7 @@ AZURE${VAR}!= grep -E ^AZURE${VAR} ${AZU . endfor .endif -.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" +.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" SNAPSHOT_DATE!= date +-%Y-%m-%d-%H:%M .endif Modified: head/release/Makefile.ec2 ============================================================================== --- head/release/Makefile.ec2 Thu Jun 25 13:01:10 2015 (r284810) +++ head/release/Makefile.ec2 Thu Jun 25 13:40:00 2015 (r284811) @@ -5,7 +5,7 @@ # Makefile for creating an EC2 AMI from a disk image. # -.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" +.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE" AMINAMESUFFIX!= date +-%Y-%m-%d-%H:%M .endif .if defined(EC2PUBLIC) Modified: head/release/Makefile.mirrors ============================================================================== --- head/release/Makefile.mirrors Thu Jun 25 13:01:10 2015 (r284810) +++ head/release/Makefile.mirrors Thu Jun 25 13:40:00 2015 (r284811) @@ -27,7 +27,7 @@ EMBEDDED= 1 .endif # snapshot -.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" +.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" SNAPSHOT= 1 TLD?= ${FTPDIR}/snapshots . if !defined(SVNREVISION) || empty(SVNREVISION) @@ -63,7 +63,7 @@ BOARDNAME:= ${KERNCONF} . else OLDNAME:= ${KERNCONF} . endif -. if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" +. if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" SNAPSHOT= 1 . endif IMAGES:= img From owner-svn-src-head@freebsd.org Thu Jun 25 14:24:07 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2BB098DB37; Thu, 25 Jun 2015 14:24:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A47BA2F09; Thu, 25 Jun 2015 14:24:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PEO7gB007400; Thu, 25 Jun 2015 14:24:07 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PEO7EV007395; Thu, 25 Jun 2015 14:24:07 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251424.t5PEO7EV007395@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 14:24:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284812 - head/release X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 14:24:07 -0000 Author: gjb Date: Thu Jun 25 14:24:06 2015 New Revision: 284812 URL: https://svnweb.freebsd.org/changeset/base/284812 Log: Change the hour:minute delimiter from ':' to '-', since the former is an invalid character in EC2 images. MFC after: 3 days Sponsored by: The FreeBSD Foundation Modified: head/release/Makefile.azure head/release/Makefile.ec2 Modified: head/release/Makefile.azure ============================================================================== --- head/release/Makefile.azure Thu Jun 25 13:40:00 2015 (r284811) +++ head/release/Makefile.azure Thu Jun 25 14:24:06 2015 (r284812) @@ -17,7 +17,7 @@ AZURE${VAR}!= grep -E ^AZURE${VAR} ${AZU .endif .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" -SNAPSHOT_DATE!= date +-%Y-%m-%d-%H:%M +SNAPSHOT_DATE!= date +-%Y-%m-%d-%H-%M .endif AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.vhd Modified: head/release/Makefile.ec2 ============================================================================== --- head/release/Makefile.ec2 Thu Jun 25 13:40:00 2015 (r284811) +++ head/release/Makefile.ec2 Thu Jun 25 14:24:06 2015 (r284812) @@ -6,7 +6,7 @@ # .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE" -AMINAMESUFFIX!= date +-%Y-%m-%d-%H:%M +AMINAMESUFFIX!= date +-%Y-%m-%d-%H-%M .endif .if defined(EC2PUBLIC) PUBLISH= --public From owner-svn-src-head@freebsd.org Thu Jun 25 15:05:59 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6747A98DF6A; Thu, 25 Jun 2015 15:05:59 +0000 (UTC) (envelope-from eri@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 580DA16AC; Thu, 25 Jun 2015 15:05:59 +0000 (UTC) (envelope-from eri@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PF5xwd028120; Thu, 25 Jun 2015 15:05:59 GMT (envelope-from eri@FreeBSD.org) Received: (from eri@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PF5xFp028119; Thu, 25 Jun 2015 15:05:59 GMT (envelope-from eri@FreeBSD.org) Message-Id: <201506251505.t5PF5xFp028119@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: eri set sender to eri@FreeBSD.org using -f From: Ermal Luçi Date: Thu, 25 Jun 2015 15:05:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284814 - head/sys/net/altq X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 15:05:59 -0000 Author: eri Date: Thu Jun 25 15:05:58 2015 New Revision: 284814 URL: https://svnweb.freebsd.org/changeset/base/284814 Log: Correct r284777 to use proper includes and remove dead code to unbreak kernel builds. Differential Revision: https://reviews.freebsd.org/D2847 Modified: head/sys/net/altq/altq_fairq.c Modified: head/sys/net/altq/altq_fairq.c ============================================================================== --- head/sys/net/altq/altq_fairq.c Thu Jun 25 14:58:50 2015 (r284813) +++ head/sys/net/altq/altq_fairq.c Thu Jun 25 15:05:58 2015 (r284814) @@ -103,9 +103,12 @@ #include #include +#include #include -#include +#include +#include +#include #include #include @@ -406,24 +409,6 @@ fairq_class_create(struct fairq_if *pif, #endif /* ALTQ_RED */ return (cl); - -err_buckets: - if (cl->cl_buckets != NULL) - free(cl->cl_buckets, M_DEVBUF); -err_ret: - if (cl->cl_red != NULL) { -#ifdef ALTQ_RIO - if (cl->cl_qtype == Q_RIO) - rio_destroy((rio_t *)cl->cl_red); -#endif -#ifdef ALTQ_RED - if (cl->cl_qtype == Q_RED) - red_destroy(cl->cl_red); -#endif - } - if (cl != NULL) - free(cl, M_DEVBUF); - return (NULL); } static int From owner-svn-src-head@freebsd.org Thu Jun 25 15:07:13 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7503B98DFAC; Thu, 25 Jun 2015 15:07:13 +0000 (UTC) (envelope-from ermal.luci@gmail.com) Received: from mail-yh0-x233.google.com (mail-yh0-x233.google.com [IPv6:2607:f8b0:4002:c01::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3032E194E; Thu, 25 Jun 2015 15:07:13 +0000 (UTC) (envelope-from ermal.luci@gmail.com) Received: by yhfk64 with SMTP id k64so13651560yhf.2; Thu, 25 Jun 2015 08:07:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=LexhXaI3V7d+9cn0tTKrFh14HE+1Df0CD85s3RCSVdg=; b=vquUu+JL8s184Fvgj8w2UGqSPkFDEE3pGbtz9eq85JCYI1n6iRLqwsya5gT+N6Mq7j m4nPZu+jVBgzSa8dhgp9vIn1QlFA63pwBwKdOfxWuqRRjQNXuM0mvw9YW54s3EYAFboL KjTRlfJLNo7A4Lmk0WraGxnWNqrjQg7EmUtiMIiDlHdO/Sb5IL15hUUoHvhJsrDtErrF EcyimU198ZLMkXHKs9wLvFWmMveMW5Hc+pE6o60XmIJX2RM2HQDvMqG2EtT+zdnYQ5c5 LDOVuSnM033tGhpbZt0UjyHlUj+rgDd5Bj0YUHSaweLgFeq/In2YvFEtCxu3phKo8RFT urNg== MIME-Version: 1.0 X-Received: by 10.170.114.199 with SMTP id g190mr349178ykb.128.1435244832205; Thu, 25 Jun 2015 08:07:12 -0700 (PDT) Sender: ermal.luci@gmail.com Received: by 10.129.83.139 with HTTP; Thu, 25 Jun 2015 08:07:12 -0700 (PDT) In-Reply-To: References: <201506241916.t5OJGfEm025914@svn.freebsd.org> <76B695F2-AEDE-4BF3-8BE3-97CA8A98780D@FreeBSD.org> Date: Thu, 25 Jun 2015 17:07:12 +0200 X-Google-Sender-Auth: Cw_i3KgcgbbO-g-I8sJr-wZ9zjY Message-ID: Subject: Re: svn commit: r284777 - in head: sbin/pfctl share/man/man4 sys/conf sys/net/altq sys/netpfil/pf From: =?UTF-8?Q?Ermal_Lu=C3=A7i?= To: "Bjoern A. Zeeb" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 15:07:13 -0000 Fixed. On Thu, Jun 25, 2015 at 11:00 AM, Ermal Lu=C3=A7i wrote: > > On Thu, Jun 25, 2015 at 10:42 AM, Bjoern A. Zeeb wrote: > >> >> > On 24 Jun 2015, at 19:16 , Ermal Lu=C3=A7i wrote: >> > >> > Author: eri >> > Date: Wed Jun 24 19:16:41 2015 >> > New Revision: 284777 >> > URL: https://svnweb.freebsd.org/changeset/base/284777 >> > >> > Log: >> > ALTQ FAIRQ discipline import from DragonFLY >> > >> > Differential Revision: https://reviews.freebsd.org/D2847 >> > Reviewed by: glebius, wblock(manpage) >> > Approved by: gnn(mentor) >> > Obtained from: pfSense >> > Sponsored by: Netgate >> >> I see a lot of kernel configurations failing to build dring a universe; >> here=E2=80=99s some errors: >> >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: expected >> declaration specifiers or '...' before 'pf_keyhash' >> cc1: warnings being treated as errors >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1461: error: expected >> declaration specifiers or '...' before 'pf_idhash' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1461: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1464: error: expected >> declaration specifiers or '...' before 'pf_srchash' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1464: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1469: error: expected >> declaration specifiers or '...' before 'pf_swi_cookie' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1469: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1472: error: expected >> declaration specifiers or '...' before 'pf_stateid' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1472: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1476: error: expected >> declaration specifiers or '...' before 'pf_altqs' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1476: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1478: error: expected >> declaration specifiers or '...' before 'pf_pabuf' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1478: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1481: error: expected >> declaration specifiers or '...' before 'ticket_altqs_active' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1481: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1483: error: expected >> declaration specifiers or '...' before 'ticket_altqs_inactive' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1483: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1485: error: expected >> declaration specifiers or '...' before 'altqs_inactive_open' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1485: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1487: error: expected >> declaration specifiers or '...' before 'ticket_pabuf' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1487: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1489: error: expected >> declaration specifiers or '...' before 'pf_altqs_active' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1489: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1491: error: expected >> declaration specifiers or '...' before 'pf_altqs_inactive' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1491: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1494: error: expected >> declaration specifiers or '...' before 'pf_unlinked_rules' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1494: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1508: error: expected >> declaration specifiers or '...' before 'pf_state_z' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1508: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1510: error: expected >> declaration specifiers or '...' before 'pf_state_key_z' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1510: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1512: error: expected >> declaration specifiers or '...' before 'pf_state_scrub_z' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1512: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1558: error: expected >> declaration specifiers or '...' before 'sync_ifp' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1558: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1560: error: expected >> declaration specifiers or '...' before 'pf_default_rule' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1560: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1648: error: expected >> declaration specifiers or '...' before 'pfi_all' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1648: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1675: error: expected >> declaration specifiers or '...' before 'pf_status' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1675: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1682: error: expected >> declaration specifiers or '...' before 'pf_limits' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1682: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1688: error: expected >> declaration specifiers or '...' before 'pf_anchors' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1688: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1690: error: expected >> declaration specifiers or '...' before 'pf_main_anchor' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1690: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function >> 'fairq_pfattach': >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:141: error: >> dereferencing pointer to incomplete type >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function >> 'fairq_add_altq': >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:155: error: >> dereferencing pointer to incomplete type >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:163: error: >> dereferencing pointer to incomplete type >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function >> 'fairq_request': >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:275: error: >> dereferencing pointer to incomplete type >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:280: error: >> 'ALTRQ_PURGE' undeclared (first use in this function) >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:280: error: (Each >> undeclared identifier is reported only once >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:280: error: for each >> function it appears in.) >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function >> 'fairq_purge': >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:299: error: >> dereferencing pointer to incomplete type >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function >> 'fairq_class_create': >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:387: error: >> dereferencing pointer to incomplete type >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function >> 'fairq_enqueue': >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:478: error: >> dereferencing pointer to incomplete type >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:490: error: >> dereferencing pointer to incomplete type >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function >> 'fairq_dequeue': >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:531: error: >> dereferencing pointer to incomplete type >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:546: error: >> 'ALTDQ_REMOVE' undeclared (first use in this function) >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:587: error: >> 'ALTDQ_POLL' undeclared (first use in this function) >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function >> 'fairq_addq': >> /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c: In function >> 'fairq_pollq': >> --- altq_fairq.o --- >> >> > Let me check this and fix quickly though i could not run 'make universe' = i > have not seen such issues before since this a patch being used for more > than 3 years in production. > >> >> =E2=80=94 >> Bjoern A. Zeeb Charles Haddon Spurgeon: >> "Friendship is one of the sweetest joys of life. Many might have failed >> beneath the bitterness of their trial had they not found a friend." >> >> > > > -- > Ermal > --=20 Ermal From owner-svn-src-head@freebsd.org Thu Jun 25 16:09:44 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73A6F98D8D3 for ; Thu, 25 Jun 2015 16:09:44 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: from mail-yh0-f44.google.com (mail-yh0-f44.google.com [209.85.213.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3A84A114B for ; Thu, 25 Jun 2015 16:09:44 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: by yhfk64 with SMTP id k64so14494815yhf.2 for ; Thu, 25 Jun 2015 09:09:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=/mu+j2ALylJey8G/zyR3ue8NDOlDo1e8PqlRX5LW77Y=; b=geu6fJABI5LXJjGaWwFTLGxNyo+9qim+S9V/mNdYDH/tzJd5wU2B+CQABtU/kVInGY fHhv79kq5PHvQmSjI9+r4zxI+jNZ+UEpvsv5Pei6djLqIW+CTnBtBZ6xXZr6QhLBba/8 yniFTrgzf3GT5dcOWH5tb40RWNpES6x/W8pcyXqJ3gkNO7+b8fzyoI6z4fW423pgmEjQ IhT1EJeIDs/i+4Vv3SKAQvDrMfefn5D2KVywRLbShWFboy5TUAA0bMawZHgyak4nPzml E6mzI7Fn0jPS6nUnklqNCkL4yWxoubLB90YH7Q8x+8k0d3WX7ESevNU7vEq2hCy662tF 0c9A== X-Gm-Message-State: ALoCoQmFDNnVKNZgACOWSA0UNZVgzKZuxgQ90MP4H/LIskgAJN5oM5upCBtU6M1PW6rLWEom4Kzk MIME-Version: 1.0 X-Received: by 10.170.135.77 with SMTP id b74mr56668789ykc.4.1435248183145; Thu, 25 Jun 2015 09:03:03 -0700 (PDT) Received: by 10.129.113.212 with HTTP; Thu, 25 Jun 2015 09:03:03 -0700 (PDT) X-Originating-IP: [84.27.222.46] In-Reply-To: <201506250822.t5P8MQ4C026649@svn.freebsd.org> References: <201506250822.t5P8MQ4C026649@svn.freebsd.org> Date: Thu, 25 Jun 2015 18:03:03 +0200 Message-ID: Subject: Re: svn commit: r284807 - in head/lib/libc/aarch64: . gen From: Ed Schouten To: Andrew Turner Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 16:09:44 -0000 Hi Andrew, 2015-06-25 10:22 GMT+02:00 Andrew Turner : > Log: > Implement fpgetmask, it's needed by Python. Interesting. Never heard of these functions before. Considering that this interface is essentially deprecated (they were replaced by C99 ), would it make sense to figure out what actually uses this? If it's just Python and a small number of other ports, maybe it would be worth porting these over? -- Ed Schouten Nuxi, 's-Hertogenbosch, the Netherlands KvK/VAT number: 62051717 From owner-svn-src-head@freebsd.org Thu Jun 25 16:13:42 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A720498D9F6 for ; Thu, 25 Jun 2015 16:13:42 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: from mail-yh0-f45.google.com (mail-yh0-f45.google.com [209.85.213.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7995715D5 for ; Thu, 25 Jun 2015 16:13:42 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: by yhjh26 with SMTP id h26so9262471yhj.3 for ; Thu, 25 Jun 2015 09:13:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=5nTxR2ysCqGrE8Xa6iXUj+uRJFqIhMaJ5QukjuxbwsA=; b=a31K3b4YMM3bLnK12fQQgZ1exrbVfUul18AXCe84bI8bouin3SNVl9Joh8oFfNz+P2 PbQW8qjYeuMtCSjG7/EtCYz9rJDdJ0R3N0dQT2rMUG70t9JAtRUvBnxDwClGbrp+6Z69 qP6Sd0q+f+1OJQJhxatnLHiSKE8o/C73IQCNqPjF/GzIr3gfzv0oLmLL04trr9S6QMTW Ifo2X3xu9T5bbOwIfgiq82mvStM9mdZ4rSEsbJYKnmTEsbCKqWX6vSWoMZlwsVWdak7f pZKTZBDFnf5SHfeCsmgPe6vSsS0SYcPy0c8mbnt8V0NdAJEmot9a/prpFQ+xIHMAxT/s QUFQ== X-Gm-Message-State: ALoCoQkyvYTk39WE3evnr04N5HnBdyUQR1q1PwRLTjkQqHiY6PIMbK+i/C/cRLoNvdbpYG00xZLX MIME-Version: 1.0 X-Received: by 10.129.138.2 with SMTP id a2mr54029742ywg.149.1435248815262; Thu, 25 Jun 2015 09:13:35 -0700 (PDT) Received: by 10.129.113.212 with HTTP; Thu, 25 Jun 2015 09:13:35 -0700 (PDT) X-Originating-IP: [84.27.222.46] In-Reply-To: References: <201506250822.t5P8MQ4C026649@svn.freebsd.org> Date: Thu, 25 Jun 2015 18:13:35 +0200 Message-ID: Subject: Re: svn commit: r284807 - in head/lib/libc/aarch64: . gen From: Ed Schouten To: Andrew Turner , das@freebsd.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 16:13:42 -0000 [ +das@ ] 2015-06-25 18:03 GMT+02:00 Ed Schouten : > Considering that this interface is essentially deprecated (they were > replaced by C99 ), would it make sense to figure out what > actually uses this? If it's just Python and a small number of other > ports, maybe it would be worth porting these over? Even more interesting, if I look at the Python code (Modules/python.c, in main()): /* 754 requires that FP exceptions run in "no stop" mode by default, * and until C vendors implement C99's ways to control FP exceptions, * Python requires non-stop mode. Alas, some platforms enable FP * exceptions by default. Here we disable them. */ This contradicts with what fenv(3) says: "Non-stop mode is the default, but it may be altered by feenableexcept() and fedisableexcept()." This line has already been in there since its first version (2004). My suspicion is that the code that Python has, is only there to deal with older versions of FreeBSD from 2004 that may have been non-conforming. -- Ed Schouten Nuxi, 's-Hertogenbosch, the Netherlands KvK/VAT number: 62051717 From owner-svn-src-head@freebsd.org Thu Jun 25 16:47:12 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3CED298CCAD; Thu, 25 Jun 2015 16:47:12 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 25E6616E8; Thu, 25 Jun 2015 16:47:12 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PGlCTA077685; Thu, 25 Jun 2015 16:47:12 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PGlCIO077684; Thu, 25 Jun 2015 16:47:12 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506251647.t5PGlCIO077684@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Thu, 25 Jun 2015 16:47:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284815 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 16:47:12 -0000 Author: andrew Date: Thu Jun 25 16:47:11 2015 New Revision: 284815 URL: https://svnweb.freebsd.org/changeset/base/284815 Log: Sort the cpu architectures by name rather than a combination of alphabetical order and appending new architectures to the end of the list. Obtained from: ABT Systems Ltd Sponsored by: The FreeBSD Foundation Modified: head/share/mk/bsd.cpu.mk Modified: head/share/mk/bsd.cpu.mk ============================================================================== --- head/share/mk/bsd.cpu.mk Thu Jun 25 15:05:58 2015 (r284814) +++ head/share/mk/bsd.cpu.mk Thu Jun 25 16:47:11 2015 (r284815) @@ -6,18 +6,18 @@ .if !defined(CPUTYPE) || empty(CPUTYPE) _CPUCFLAGS = -. if ${MACHINE_CPUARCH} == "i386" -MACHINE_CPU = i486 -. elif ${MACHINE_CPUARCH} == "amd64" +. if ${MACHINE_CPUARCH} == "amd64" MACHINE_CPU = amd64 sse2 sse mmx -. elif ${MACHINE_CPUARCH} == "powerpc" -MACHINE_CPU = aim -. elif ${MACHINE_CPUARCH} == "sparc64" -MACHINE_CPU = ultrasparc . elif ${MACHINE_CPUARCH} == "arm" MACHINE_CPU = arm +. elif ${MACHINE_CPUARCH} == "i386" +MACHINE_CPU = i486 . elif ${MACHINE_CPUARCH} == "mips" MACHINE_CPU = mips +. elif ${MACHINE_CPUARCH} == "powerpc" +MACHINE_CPU = aim +. elif ${MACHINE_CPUARCH} == "sparc64" +MACHINE_CPU = ultrasparc . endif .else From owner-svn-src-head@freebsd.org Thu Jun 25 18:38:59 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 513A798CA33; Thu, 25 Jun 2015 18:38:59 +0000 (UTC) (envelope-from gnn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4258D1B12; Thu, 25 Jun 2015 18:38:59 +0000 (UTC) (envelope-from gnn@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIcxVC041786; Thu, 25 Jun 2015 18:38:59 GMT (envelope-from gnn@FreeBSD.org) Received: (from gnn@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIcxHI041785; Thu, 25 Jun 2015 18:38:59 GMT (envelope-from gnn@FreeBSD.org) Message-Id: <201506251838.t5PIcxHI041785@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gnn set sender to gnn@FreeBSD.org using -f From: "George V. Neville-Neil" Date: Thu, 25 Jun 2015 18:38:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284816 - head/sbin/setkey X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:38:59 -0000 Author: gnn Date: Thu Jun 25 18:38:58 2015 New Revision: 284816 URL: https://svnweb.freebsd.org/changeset/base/284816 Log: Fix support for the null encryption algorithm which now requires a key. Sponsored by: Rubicon Communications (Netgate) Modified: head/sbin/setkey/token.l Modified: head/sbin/setkey/token.l ============================================================================== --- head/sbin/setkey/token.l Thu Jun 25 16:47:11 2015 (r284815) +++ head/sbin/setkey/token.l Thu Jun 25 18:38:58 2015 (r284816) @@ -159,7 +159,7 @@ tcp { yylval.num = 0; return(PR_TCP); } {hyphen}E { BEGIN S_ENCALG; return(F_ENC); } des-cbc { yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL; return(ALG_ENC); } 3des-cbc { yylval.num = SADB_EALG_3DESCBC; BEGIN INITIAL; return(ALG_ENC); } -null { yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC_NOKEY); } +null { yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC); } simple { yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC_OLD); } blowfish-cbc { yylval.num = SADB_X_EALG_BLOWFISHCBC; BEGIN INITIAL; return(ALG_ENC); } cast128-cbc { yylval.num = SADB_X_EALG_CAST128CBC; BEGIN INITIAL; return(ALG_ENC); } From owner-svn-src-head@freebsd.org Thu Jun 25 18:39:17 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0C63098CA58; Thu, 25 Jun 2015 18:39:17 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id BC2621C80; Thu, 25 Jun 2015 18:39:16 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 28B4325D3A42; Thu, 25 Jun 2015 18:39:14 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 6401FC7705C; Thu, 25 Jun 2015 18:39:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id DQIaTm0-SfGe; Thu, 25 Jun 2015 18:39:12 +0000 (UTC) Received: from [IPv6:fde9:577b:c1a9:4410:dd7c:f46e:daef:b795] (unknown [IPv6:fde9:577b:c1a9:4410:dd7c:f46e:daef:b795]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id E4931C7703A; Thu, 25 Jun 2015 18:39:11 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Subject: Re: svn commit: r284777 - in head: sbin/pfctl share/man/man4 sys/conf sys/net/altq sys/netpfil/pf From: "Bjoern A. Zeeb" In-Reply-To: Date: Thu, 25 Jun 2015 18:38:39 +0000 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <41DC96CB-5766-44A9-B95B-94276E663091@FreeBSD.org> References: <201506241916.t5OJGfEm025914@svn.freebsd.org> <76B695F2-AEDE-4BF3-8BE3-97CA8A98780D@FreeBSD.org> To: =?utf-8?Q?Ermal_Lu=C3=A7i?= X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:39:17 -0000 > On 25 Jun 2015, at 15:07 , Ermal Lu=C3=A7i wrote: >=20 > Fixed. I have a feeling it=E2=80=99s not; amd64.LINT: /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:746:4: error: format = specifies type 'long long' but the argument has type 'uint64_t' (aka = 'unsigned long') [-Werror,-Wformat] bw, cl->cl_bandwidth, *hit_limit, b); ^~ 1 error generated. --- altq_fairq.o --- *** [altq_fairq.o] Error code 1 From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:07 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1469498CC9F; Thu, 25 Jun 2015 18:44:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 058071173; Thu, 25 Jun 2015 18:44:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIi6cs046536; Thu, 25 Jun 2015 18:44:06 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIi6Fg046535; Thu, 25 Jun 2015 18:44:06 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIi6Fg046535@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284817 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:07 -0000 Author: gjb Date: Thu Jun 25 18:44:06 2015 New Revision: 284817 URL: https://svnweb.freebsd.org/changeset/base/284817 Log: Document r282779, Thumb-2 support for ARMv7 added. 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 Thu Jun 25 18:38:58 2015 (r284816) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:06 2015 (r284817) @@ -980,6 +980,9 @@ Initial support for the ARM AArch64 architecture has been added. + + Kernel support for Thumb-2 + has been added. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:09 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3197A98CCA5; Thu, 25 Jun 2015 18:44:09 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 22A641174; Thu, 25 Jun 2015 18:44:09 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIi9vk046582; Thu, 25 Jun 2015 18:44:09 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIi9vG046581; Thu, 25 Jun 2015 18:44:09 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIi9vG046581@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284818 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:09 -0000 Author: gjb Date: Thu Jun 25 18:44:08 2015 New Revision: 284818 URL: https://svnweb.freebsd.org/changeset/base/284818 Log: Document r282783, freescale PCI Root Complex support added. 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 Thu Jun 25 18:44:06 2015 (r284817) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:08 2015 (r284818) @@ -744,6 +744,10 @@ The drm code has been updated to match &linux; version 3.8.13. + + Support for the Freescale + PCI Root Complex device has been + added. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:11 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6323E98CCC8; Thu, 25 Jun 2015 18:44:11 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3B40211BC; Thu, 25 Jun 2015 18:44:11 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIiBkM046633; Thu, 25 Jun 2015 18:44:11 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIiBNF046632; Thu, 25 Jun 2015 18:44:11 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIiBNF046632@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284819 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:11 -0000 Author: gjb Date: Thu Jun 25 18:44:10 2015 New Revision: 284819 URL: https://svnweb.freebsd.org/changeset/base/284819 Log: Document r282827, BeagleBone Black power button support added. 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 Thu Jun 25 18:44:08 2015 (r284818) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:10 2015 (r284819) @@ -987,6 +987,9 @@ Kernel support for Thumb-2 has been added. + + Support for the hardware power button + on the BeagleBone Black system has been added. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:13 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72B6298CCE2; Thu, 25 Jun 2015 18:44:13 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 56B3A1290; Thu, 25 Jun 2015 18:44:13 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIiDA2046686; Thu, 25 Jun 2015 18:44:13 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIiDoq046685; Thu, 25 Jun 2015 18:44:13 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIiDoq046685@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284820 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:13 -0000 Author: gjb Date: Thu Jun 25 18:44:12 2015 New Revision: 284820 URL: https://svnweb.freebsd.org/changeset/base/284820 Log: Document r282901, RACCT/RCTL in GENERIC by default. 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 Thu Jun 25 18:44:10 2015 (r284819) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:12 2015 (r284820) @@ -703,6 +703,19 @@ &man.rctl.8; with the GENERIC kernel. A new kernel configuration option, RACCT_DISABLED has also been added. + + The + GENERIC kernel configuration now includes + RACCT and RCTL by + default. + + + To enable RACCT and + RCTL on a system using the + GENERIC kernel configuration, add + kern.racct.enable=1 to + &man.loader.conf.5;, and reboot the system. + From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:15 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C624898CD07; Thu, 25 Jun 2015 18:44:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8A7711473; Thu, 25 Jun 2015 18:44:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIiFBi046747; Thu, 25 Jun 2015 18:44:15 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIiFIj046745; Thu, 25 Jun 2015 18:44:15 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIiFIj046745@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284821 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:15 -0000 Author: gjb Date: Thu Jun 25 18:44:14 2015 New Revision: 284821 URL: https://svnweb.freebsd.org/changeset/base/284821 Log: Document r282973, libgomp no longer built by default, unless building the base system GCC. 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 Thu Jun 25 18:44:12 2015 (r284820) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:14 2015 (r284821) @@ -569,6 +569,13 @@ Support for file verification in MAC has been added. + + The + libgomp library is now only built when + building GCC from the base system. An + up-to-date version is available in the Ports Collection as + devel/libiomp5-devel. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:17 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 88A3198CD1E; Thu, 25 Jun 2015 18:44:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E97C150E; Thu, 25 Jun 2015 18:44:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIiH9x046815; Thu, 25 Jun 2015 18:44:17 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIiH7L046814; Thu, 25 Jun 2015 18:44:17 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIiH7L046814@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284822 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:17 -0000 Author: gjb Date: Thu Jun 25 18:44:16 2015 New Revision: 284822 URL: https://svnweb.freebsd.org/changeset/base/284822 Log: Document r282988, alloc_align() added to malloc.h and stdlib.h. 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 Thu Jun 25 18:44:14 2015 (r284821) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:16 2015 (r284822) @@ -576,6 +576,11 @@ up-to-date version is available in the Ports Collection as devel/libiomp5-devel. + + The stdlib.h and + malloc.h headers have been updated to + make use of the gcc + alloc_align() attribute. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:23 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E4B5D98CD7F; Thu, 25 Jun 2015 18:44:23 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B569B1892; Thu, 25 Jun 2015 18:44:23 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIiNKT046967; Thu, 25 Jun 2015 18:44:23 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIiNIY046966; Thu, 25 Jun 2015 18:44:23 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIiNIY046966@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284825 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:24 -0000 Author: gjb Date: Thu Jun 25 18:44:22 2015 New Revision: 284825 URL: https://svnweb.freebsd.org/changeset/base/284825 Log: Document r283766, improved hang detection in em(4). 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 Thu Jun 25 18:44:20 2015 (r284824) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:22 2015 (r284825) @@ -874,6 +874,10 @@ &man.gre.4; driver has been significantly overhauled, and has been split into two separate modules, &man.gre.4; and &man.me.4;. + + The &man.em.4; driver has been updated + with improved transmission queue hang detection. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:21 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DBCD298CD53; Thu, 25 Jun 2015 18:44:21 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B66851673; Thu, 25 Jun 2015 18:44:21 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIiLc5046918; Thu, 25 Jun 2015 18:44:21 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIiLZo046916; Thu, 25 Jun 2015 18:44:21 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIiLZo046916@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284824 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:22 -0000 Author: gjb Date: Thu Jun 25 18:44:20 2015 New Revision: 284824 URL: https://svnweb.freebsd.org/changeset/base/284824 Log: Document r283766, ig4(4) addition. 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 Thu Jun 25 18:44:18 2015 (r284823) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:20 2015 (r284824) @@ -919,6 +919,10 @@ updated to include AES-ICM and AES-GCM modes, both of which have also been added to the &man.aesni.4; driver. + + The &man.ig4.4; driver has been added, + providing support for the fourth generation &intel; + I2C SMBus. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:19 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1EA198CD36; Thu, 25 Jun 2015 18:44:19 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 781E915D3; Thu, 25 Jun 2015 18:44:19 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIiJOB046869; Thu, 25 Jun 2015 18:44:19 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIiJC3046868; Thu, 25 Jun 2015 18:44:19 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIiJC3046868@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284823 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:19 -0000 Author: gjb Date: Thu Jun 25 18:44:18 2015 New Revision: 284823 URL: https://svnweb.freebsd.org/changeset/base/284823 Log: Document r283136, net.inet.tcp.hostcache.purgenow addition. 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 Thu Jun 25 18:44:16 2015 (r284822) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:18 2015 (r284823) @@ -728,6 +728,13 @@ kern.racct.enable=1 to &man.loader.conf.5;, and reboot the system. + + A new &man.sysctl.8;, + net.inet.tcp.hostcache.purgenow, has + been added, which when set to 1 during + runtime will flush all + net.inet.tcp.hostcache entries. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:28 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5020498CDC7; Thu, 25 Jun 2015 18:44:28 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E688819BB; Thu, 25 Jun 2015 18:44:27 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIiRBw047065; Thu, 25 Jun 2015 18:44:27 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIiRWH047064; Thu, 25 Jun 2015 18:44:27 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIiRWH047064@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284827 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:28 -0000 Author: gjb Date: Thu Jun 25 18:44:27 2015 New Revision: 284827 URL: https://svnweb.freebsd.org/changeset/base/284827 Log: Document r284254, bmake updated to 20150606. 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 Thu Jun 25 18:44:25 2015 (r284826) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:27 2015 (r284827) @@ -437,15 +437,15 @@ &man.hostapd.8; utilities have been updated to version 2.4. - bmake has - been updated to version 20150418. - The &man.unbound.8; utility has been updated to version 1.5.3. The &man.resolvconf.8; utility has been updated to version 3.7.0. + + bmake has + been updated to version 20150606. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:30 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3EFD998CDE0; Thu, 25 Jun 2015 18:44:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0BA211A57; Thu, 25 Jun 2015 18:44:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIiTDA047122; Thu, 25 Jun 2015 18:44:29 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIiTNZ047121; Thu, 25 Jun 2015 18:44:29 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIiTNZ047121@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284828 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:30 -0000 Author: gjb Date: Thu Jun 25 18:44:29 2015 New Revision: 284828 URL: https://svnweb.freebsd.org/changeset/base/284828 Log: Document r284273, initial ACPI support for aarch64. 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 Thu Jun 25 18:44:27 2015 (r284827) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:29 2015 (r284828) @@ -1040,6 +1040,11 @@ Support for the hardware power button on the BeagleBone Black system has been added. + + Initial + ACPI support has been added for + &os;/&arch.arm64;. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:37 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1285F98CE4A; Thu, 25 Jun 2015 18:44:37 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D5DE51C95; Thu, 25 Jun 2015 18:44:36 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIiakl047342; Thu, 25 Jun 2015 18:44:36 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIiap4047340; Thu, 25 Jun 2015 18:44:36 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIiap4047340@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284831 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:37 -0000 Author: gjb Date: Thu Jun 25 18:44:36 2015 New Revision: 284831 URL: https://svnweb.freebsd.org/changeset/base/284831 Log: Move the crypt(3) entries from userland-programs to userland-libraries. 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 Thu Jun 25 18:44:34 2015 (r284830) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:36 2015 (r284831) @@ -220,10 +220,6 @@ to filter by &man.jail.8; ID or name, in followup to the &man.ps.1; change in r265229. - The Blowfish &man.crypt.3; default - format has been changed to - $2b$. - The &man.pmcstat.8; utility has been updated to include a new flag, -l, which ends event collection after the specified number of @@ -371,10 +367,6 @@ acquisition are now reported. - - The Blowfish &man.crypt.3; library - has been updated to support $2y$ hashes. @@ -542,6 +534,10 @@ Runtime Libraries and API + The Blowfish &man.crypt.3; default + format has been changed to + $2b$. + The &man.readline.3; library is now statically linked in software within the base system, and the shared library is no longer installed, allowing the Ports @@ -611,6 +607,10 @@ malloc.h headers have been updated to make use of the gcc alloc_align() attribute. + + The Blowfish &man.crypt.3; library + has been updated to support $2y$ hashes. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:39 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40EB498CE63; Thu, 25 Jun 2015 18:44:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E4D831D34; Thu, 25 Jun 2015 18:44:38 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIicbq047399; Thu, 25 Jun 2015 18:44:38 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIicgg047398; Thu, 25 Jun 2015 18:44:38 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIicgg047398@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284832 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:39 -0000 Author: gjb Date: Thu Jun 25 18:44:38 2015 New Revision: 284832 URL: https://svnweb.freebsd.org/changeset/base/284832 Log: Document r284589, fstyp(8) now recognizes ZFS and GELI filesystems. 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 Thu Jun 25 18:44:36 2015 (r284831) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:38 2015 (r284832) @@ -367,6 +367,11 @@ acquisition are now reported. + + The &man.fstyp.8; utility has been + updated to be able to detect &man.zfs.8; and &man.geli.8; + filesystems. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:34 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E9A7398CE27; Thu, 25 Jun 2015 18:44:34 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BFA571BEE; Thu, 25 Jun 2015 18:44:34 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIiYvs047285; Thu, 25 Jun 2015 18:44:34 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIiYbI047284; Thu, 25 Jun 2015 18:44:34 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIiYbI047284@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284830 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:35 -0000 Author: gjb Date: Thu Jun 25 18:44:34 2015 New Revision: 284830 URL: https://svnweb.freebsd.org/changeset/base/284830 Log: Document r284483, Blowfish crypt(3) now supports $2y$ format. 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 Thu Jun 25 18:44:31 2015 (r284829) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:34 2015 (r284830) @@ -371,6 +371,10 @@ acquisition are now reported. + + The Blowfish &man.crypt.3; library + has been updated to support $2y$ hashes. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:53 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EEF1798CF5A; Thu, 25 Jun 2015 18:44:53 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C76B721A6; Thu, 25 Jun 2015 18:44:53 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIirQe047818; Thu, 25 Jun 2015 18:44:53 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIir2L047817; Thu, 25 Jun 2015 18:44:53 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIir2L047817@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284839 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:54 -0000 Author: gjb Date: Thu Jun 25 18:44:53 2015 New Revision: 284839 URL: https://svnweb.freebsd.org/changeset/base/284839 Log: Document r258431, boot-time memory test on amd64 platforms is now disabled by default. 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 Thu Jun 25 18:44:50 2015 (r284838) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:53 2015 (r284839) @@ -1179,6 +1179,10 @@ loading the kernel. To enable this behavior, add geom_eli_passphrase_prompt="YES" to &man.loader.conf.5;. + + The + memory test run at boot time on &os;/&arch.amd64; platforms + has been disabled by default. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:43 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 628A198CEA5; Thu, 25 Jun 2015 18:44:43 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2F6E41E8A; Thu, 25 Jun 2015 18:44:43 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIigNA047497; Thu, 25 Jun 2015 18:44:43 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIigMX047495; Thu, 25 Jun 2015 18:44:42 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIigMX047495@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284834 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:43 -0000 Author: gjb Date: Thu Jun 25 18:44:42 2015 New Revision: 284834 URL: https://svnweb.freebsd.org/changeset/base/284834 Log: Add missing '-' in Hyper-V. 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 Thu Jun 25 18:44:40 2015 (r284833) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:42 2015 (r284834) @@ -1030,7 +1030,7 @@ has been added. The - HyperV™ drivers have been updated with several + Hyper-V™ drivers have been updated with several enhancements: From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:45 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5FCCD98CEBF; Thu, 25 Jun 2015 18:44:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C8841F2A; Thu, 25 Jun 2015 18:44:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIijSN047551; Thu, 25 Jun 2015 18:44:45 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIijWO047550; Thu, 25 Jun 2015 18:44:45 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIijWO047550@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284835 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:45 -0000 Author: gjb Date: Thu Jun 25 18:44:44 2015 New Revision: 284835 URL: https://svnweb.freebsd.org/changeset/base/284835 Log: Document r284746, TSO and checksum offloading support in hv_netvsc(4). 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 Thu Jun 25 18:44:42 2015 (r284834) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:44 2015 (r284835) @@ -1052,6 +1052,10 @@ Support for &man.xen.4; para-virtualized domU kernels has been removed. + + The + &man.hv.netvsc.4; driver has been updated to support checksum + offloading and TSO. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:47 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9612098CEF9; Thu, 25 Jun 2015 18:44:47 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5DDB81FD0; Thu, 25 Jun 2015 18:44:47 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIil91047634; Thu, 25 Jun 2015 18:44:47 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIilWI047633; Thu, 25 Jun 2015 18:44:47 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIilWI047633@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284836 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:47 -0000 Author: gjb Date: Thu Jun 25 18:44:46 2015 New Revision: 284836 URL: https://svnweb.freebsd.org/changeset/base/284836 Log: Update the svn revision marker. 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 Thu Jun 25 18:44:44 2015 (r284835) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:46 2015 (r284836) @@ -22,7 +22,7 @@ $FreeBSD$ - + 2015 From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:41 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 446F898CE84; Thu, 25 Jun 2015 18:44:41 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0524D1DE2; Thu, 25 Jun 2015 18:44:41 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIieIY047445; Thu, 25 Jun 2015 18:44:40 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIieFB047444; Thu, 25 Jun 2015 18:44:40 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIieFB047444@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284833 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:41 -0000 Author: gjb Date: Thu Jun 25 18:44:40 2015 New Revision: 284833 URL: https://svnweb.freebsd.org/changeset/base/284833 Log: Document r284702, uart(4) update to support AMT on newer systems. 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 Thu Jun 25 18:44:38 2015 (r284832) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:40 2015 (r284833) @@ -972,6 +972,9 @@ The &man.ig4.4; driver has been added, providing support for the fourth generation &intel; I2C SMBus. + + The &man.uart.4; driver has been updated to support + AMT devices on newer systems. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:26 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03E8398CD9E; Thu, 25 Jun 2015 18:44:26 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D18DD1923; Thu, 25 Jun 2015 18:44:25 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIiPdD047015; Thu, 25 Jun 2015 18:44:25 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIiP6H047014; Thu, 25 Jun 2015 18:44:25 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIiP6H047014@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284826 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:26 -0000 Author: gjb Date: Thu Jun 25 18:44:25 2015 New Revision: 284826 URL: https://svnweb.freebsd.org/changeset/base/284826 Log: Document r283959, EM_MULTIQUEUE kernel configuration option. 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 Thu Jun 25 18:44:22 2015 (r284825) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:25 2015 (r284826) @@ -687,6 +687,16 @@ arch="powerpc">The &man.pmap.9; implementation for 64-bit &powerpc; processors has been overhaulded to improve concurrency. + + A new kernel configuration option, + EM_MULTIQUEUE, has been added which enables + multi-queue support in the &man.em.4; driver. + + + Multi-queue support in the &man.em.4; driver is not + officially supported by &intel;. + From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:52 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3677598CF28; Thu, 25 Jun 2015 18:44:52 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AE4A6210D; Thu, 25 Jun 2015 18:44:51 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIipGZ047755; Thu, 25 Jun 2015 18:44:51 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIipIx047754; Thu, 25 Jun 2015 18:44:51 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIipIx047754@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284838 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:52 -0000 Author: gjb Date: Thu Jun 25 18:44:50 2015 New Revision: 284838 URL: https://svnweb.freebsd.org/changeset/base/284838 Log: Document r279955, autofs(5) '-noauto' map addition. 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 Thu Jun 25 18:44:48 2015 (r284837) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:50 2015 (r284838) @@ -1114,6 +1114,12 @@ allows automatically mounting removable media, such as CD drives or USB flash drives. + + The + &man.autofs.5; subsystem has been updated to include a new + &man.auto.master.5; map, -noauto, which + handles &man.fstab.5; entries set to + noauto. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:49 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1C3398CF10; Thu, 25 Jun 2015 18:44:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 82BC52070; Thu, 25 Jun 2015 18:44:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIinZj047694; Thu, 25 Jun 2015 18:44:49 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIinPQ047693; Thu, 25 Jun 2015 18:44:49 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIinPQ047693@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284837 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:49 -0000 Author: gjb Date: Thu Jun 25 18:44:48 2015 New Revision: 284837 URL: https://svnweb.freebsd.org/changeset/base/284837 Log: Document r275681, autofs(5) '-media' map addition. 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 Thu Jun 25 18:44:46 2015 (r284836) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:48 2015 (r284837) @@ -1107,6 +1107,13 @@ The &man.ctld.8; utility has been updated to allow controlling non-iSCSI &man.ctl.4; ports. + + The + &man.autofs.5; subsystem has been updated to include a new + &man.auto.master.5; map, -media, which + allows automatically mounting removable media, such as + CD drives or USB flash + drives. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:32 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DBA1798CE15; Thu, 25 Jun 2015 18:44:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9F2741B21; Thu, 25 Jun 2015 18:44:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIiWnP047227; Thu, 25 Jun 2015 18:44:32 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIiWS7047224; Thu, 25 Jun 2015 18:44:32 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIiWS7047224@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284829 - in head/release/doc: en_US.ISO8859-1/relnotes share/xml X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:33 -0000 Author: gjb Date: Thu Jun 25 18:44:31 2015 New Revision: 284829 URL: https://svnweb.freebsd.org/changeset/base/284829 Log: Document r284297, lockstat(1) improvements. Add ClusterHQ to sponsors.ent. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml head/release/doc/share/xml/sponsor.ent Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:29 2015 (r284828) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:31 2015 (r284829) @@ -345,6 +345,32 @@ would cause final results to be sent to &man.stderr.4; when receiving the SIGINFO signal has been fixed. + + The &man.lockstat.1; utility has been + updated with several improvements: + + + + Spin locks are now reported as the amount of time + spinning, instead of loop iterations. + + + + Reader locks are now recognized as adaptive and can + spin on &os;. + + + + Lock aquisition events for successful reader try-lock + events are now reported. + + + + Spin-and-block events that occur before lock + acquisition are now reported. + + Modified: head/release/doc/share/xml/sponsor.ent ============================================================================== --- head/release/doc/share/xml/sponsor.ent Thu Jun 25 18:44:29 2015 (r284828) +++ head/release/doc/share/xml/sponsor.ent Thu Jun 25 18:44:31 2015 (r284829) @@ -15,6 +15,8 @@ + + From owner-svn-src-head@freebsd.org Thu Jun 25 18:45:00 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F52998CF9D; Thu, 25 Jun 2015 18:45:00 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 129962457; Thu, 25 Jun 2015 18:45:00 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIixUh047965; Thu, 25 Jun 2015 18:44:59 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIixZK047964; Thu, 25 Jun 2015 18:44:59 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIixZK047964@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284842 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:45:00 -0000 Author: gjb Date: Thu Jun 25 18:44:59 2015 New Revision: 284842 URL: https://svnweb.freebsd.org/changeset/base/284842 Log: Document r284237, file(1) updated to 5.23. 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 Thu Jun 25 18:44:57 2015 (r284841) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:59 2015 (r284842) @@ -473,6 +473,9 @@ The &man.acpi.4; subsystem has been updated to version 20150515. + + The &man.file.1; utility has been + updated to version 5.23. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:56 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02A9298CF69; Thu, 25 Jun 2015 18:44:56 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D5762223D; Thu, 25 Jun 2015 18:44:55 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIitPp047869; Thu, 25 Jun 2015 18:44:55 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIito2047868; Thu, 25 Jun 2015 18:44:55 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIito2047868@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284840 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:56 -0000 Author: gjb Date: Thu Jun 25 18:44:55 2015 New Revision: 284840 URL: https://svnweb.freebsd.org/changeset/base/284840 Log: Document r284329, OpenSSL update to 1.0.1o. 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 Thu Jun 25 18:44:53 2015 (r284839) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:55 2015 (r284840) @@ -444,9 +444,6 @@ The &man.xz.1; utility has been updated to support multi-threaded compression. - OpenSSL has - been updated to version 1.0.1m. - The elftoolchain utilities have been updated to version 3179. @@ -473,6 +470,9 @@ bmake has been updated to version 20150606. + + OpenSSL has + been updated to version 1.0.1o. From owner-svn-src-head@freebsd.org Thu Jun 25 18:44:58 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 22C7798CF79; Thu, 25 Jun 2015 18:44:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EAC7322D5; Thu, 25 Jun 2015 18:44:57 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIivnH047916; Thu, 25 Jun 2015 18:44:57 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIiv3b047915; Thu, 25 Jun 2015 18:44:57 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506251844.t5PIiv3b047915@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 18:44:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284841 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 18:44:58 -0000 Author: gjb Date: Thu Jun 25 18:44:57 2015 New Revision: 284841 URL: https://svnweb.freebsd.org/changeset/base/284841 Log: Document r283092, ACPICA updated to 20150515. 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 Thu Jun 25 18:44:55 2015 (r284840) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:57 2015 (r284841) @@ -454,9 +454,6 @@ The &man.nvi.1; utility has been updated to version 2.1.3. - The &man.acpi.4; subsystem has been - updated to version 20150410. - The &man.wpa.supplicant.8; and &man.hostapd.8; utilities have been updated to version 2.4. @@ -473,6 +470,9 @@ OpenSSL has been updated to version 1.0.1o. + + The &man.acpi.4; subsystem has been + updated to version 20150515. From owner-svn-src-head@freebsd.org Thu Jun 25 19:39:07 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D504498C965; Thu, 25 Jun 2015 19:39:07 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C60D91936; Thu, 25 Jun 2015 19:39:07 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PJd7VL079006; Thu, 25 Jun 2015 19:39:07 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PJd7gk079005; Thu, 25 Jun 2015 19:39:07 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201506251939.t5PJd7gk079005@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Thu, 25 Jun 2015 19:39:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284858 - head/sys/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 19:39:07 -0000 Author: tijl Date: Thu Jun 25 19:39:07 2015 New Revision: 284858 URL: https://svnweb.freebsd.org/changeset/base/284858 Log: Enable the use of __builtin_va_* for ICC. PR: 198822 Submitted by: Sergey Melnikov MFC after: 5 days Modified: head/sys/sys/cdefs.h Modified: head/sys/sys/cdefs.h ============================================================================== --- head/sys/sys/cdefs.h Thu Jun 25 18:45:37 2015 (r284857) +++ head/sys/sys/cdefs.h Thu Jun 25 19:39:07 2015 (r284858) @@ -92,7 +92,7 @@ #undef __GNUCLIKE_BUILTIN_CONSTANT_P #endif -#if (__GNUC_MINOR__ > 95 || __GNUC__ >= 3) && !defined(__INTEL_COMPILER) +#if (__GNUC_MINOR__ > 95 || __GNUC__ >= 3) #define __GNUCLIKE_BUILTIN_VARARGS 1 #define __GNUCLIKE_BUILTIN_STDARG 1 #define __GNUCLIKE_BUILTIN_VAALIST 1 From owner-svn-src-head@freebsd.org Thu Jun 25 20:40:51 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C565398DD6E; Thu, 25 Jun 2015 20:40:51 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6D4811E9; Thu, 25 Jun 2015 20:40:51 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PKep0h017071; Thu, 25 Jun 2015 20:40:51 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PKep7S017070; Thu, 25 Jun 2015 20:40:51 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506252040.t5PKep7S017070@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 20:40:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284860 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 20:40:51 -0000 Author: gjb Date: Thu Jun 25 20:40:51 2015 New Revision: 284860 URL: https://svnweb.freebsd.org/changeset/base/284860 Log: Fix an incorrect revision number. 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 Thu Jun 25 20:01:27 2015 (r284859) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 20:40:51 2015 (r284860) @@ -1086,7 +1086,7 @@ Support for the hardware power button on the BeagleBone Black system has been added. - Initial ACPI support has been added for &os;/&arch.arm64;. From owner-svn-src-head@freebsd.org Thu Jun 25 20:44:47 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB61E98C13D; Thu, 25 Jun 2015 20:44:47 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ACB5A16ED; Thu, 25 Jun 2015 20:44:47 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PKilfL020506; Thu, 25 Jun 2015 20:44:47 GMT (envelope-from jmg@FreeBSD.org) Received: (from jmg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PKilTu020504; Thu, 25 Jun 2015 20:44:47 GMT (envelope-from jmg@FreeBSD.org) Message-Id: <201506252044.t5PKilTu020504@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jmg set sender to jmg@FreeBSD.org using -f From: John-Mark Gurney Date: Thu, 25 Jun 2015 20:44:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284861 - head/sys/vm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 20:44:47 -0000 Author: jmg Date: Thu Jun 25 20:44:46 2015 New Revision: 284861 URL: https://svnweb.freebsd.org/changeset/base/284861 Log: If INVARIANTS is specified, add ctor/dtor to junk memory if they are unspecified... Submitted by: Suresh Gumpula at Netapp Differential Revision: https://reviews.freebsd.org/D2725 Modified: head/sys/vm/uma_core.c head/sys/vm/uma_dbg.c Modified: head/sys/vm/uma_core.c ============================================================================== --- head/sys/vm/uma_core.c Thu Jun 25 20:40:51 2015 (r284860) +++ head/sys/vm/uma_core.c Thu Jun 25 20:44:46 2015 (r284861) @@ -1940,6 +1940,20 @@ uma_zcreate(const char *name, size_t siz args.dtor = dtor; args.uminit = uminit; args.fini = fini; +#ifdef INVARIANTS + /* + * If a zone is being created with an empty constructor and + * destructor, pass UMA constructor/destructor which checks for + * memory use after free. + */ + if ((!(flags & UMA_ZONE_ZINIT)) && ctor == NULL && dtor == NULL && + uminit == NULL && fini == NULL) { + args.ctor = trash_ctor; + args.dtor = trash_dtor; + args.uminit = trash_init; + args.fini = trash_fini; + } +#endif args.align = align; args.flags = flags; args.keg = NULL; Modified: head/sys/vm/uma_dbg.c ============================================================================== --- head/sys/vm/uma_dbg.c Thu Jun 25 20:40:51 2015 (r284860) +++ head/sys/vm/uma_dbg.c Thu Jun 25 20:44:46 2015 (r284861) @@ -69,8 +69,13 @@ trash_ctor(void *mem, int size, void *ar for (p = mem; cnt > 0; cnt--, p++) if (*p != uma_junk) { +#ifdef INVARIANTS + panic("Memory modified after free %p(%d) val=%x @ %p\n", + mem, size, *p, p); +#else printf("Memory modified after free %p(%d) val=%x @ %p\n", mem, size, *p, p); +#endif return (0); } return (0); From owner-svn-src-head@freebsd.org Thu Jun 25 20:46:12 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6DD8A98C288; Thu, 25 Jun 2015 20:46:12 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5E65E19F6; Thu, 25 Jun 2015 20:46:12 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PKkC7x020933; Thu, 25 Jun 2015 20:46:12 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PKkCEC020932; Thu, 25 Jun 2015 20:46:12 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506252046.t5PKkCEC020932@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 25 Jun 2015 20:46:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284862 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 20:46:12 -0000 Author: gjb Date: Thu Jun 25 20:46:11 2015 New Revision: 284862 URL: https://svnweb.freebsd.org/changeset/base/284862 Log: Revert r284860. I was looking at the wrong files. Sigh. 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 Thu Jun 25 20:44:46 2015 (r284861) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 20:46:11 2015 (r284862) @@ -1086,7 +1086,7 @@ Support for the hardware power button on the BeagleBone Black system has been added. - Initial ACPI support has been added for &os;/&arch.arm64;. From owner-svn-src-head@freebsd.org Thu Jun 25 23:16:02 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 274FD98C13A; Thu, 25 Jun 2015 23:16:02 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18AE41DAB; Thu, 25 Jun 2015 23:16:02 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PNG1F3098582; Thu, 25 Jun 2015 23:16:01 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PNG1ZD098581; Thu, 25 Jun 2015 23:16:01 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201506252316.t5PNG1ZD098581@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Thu, 25 Jun 2015 23:16:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284863 - head/sys/net/altq X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 23:16:02 -0000 Author: bz Date: Thu Jun 25 23:16:01 2015 New Revision: 284863 URL: https://svnweb.freebsd.org/changeset/base/284863 Log: Another attempt to make this compile on more architectures after r284777. Modified: head/sys/net/altq/altq_fairq.c Modified: head/sys/net/altq/altq_fairq.c ============================================================================== --- head/sys/net/altq/altq_fairq.c Thu Jun 25 20:46:11 2015 (r284862) +++ head/sys/net/altq/altq_fairq.c Thu Jun 25 23:16:01 2015 (r284863) @@ -742,8 +742,8 @@ fairq_pollq(struct fairq_class *cl, uint if (bw > cl->cl_bandwidth) *hit_limit = 1; #ifdef ALTQ_DEBUG - printf("BW %6lld relative to %6u %d queue %p\n", - bw, cl->cl_bandwidth, *hit_limit, b); + printf("BW %6ju relative to %6u %d queue %p\n", + (uintmax_t)bw, cl->cl_bandwidth, *hit_limit, b); #endif } return(m); From owner-svn-src-head@freebsd.org Fri Jun 26 03:29:24 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C16B98C7E0; Fri, 26 Jun 2015 03:29:24 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ECDD812FB; Fri, 26 Jun 2015 03:29:23 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5Q3TNRA022196; Fri, 26 Jun 2015 03:29:23 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5Q3TNDv022195; Fri, 26 Jun 2015 03:29:23 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201506260329.t5Q3TNDv022195@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Fri, 26 Jun 2015 03:29:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284864 - head/usr.sbin/ntp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 03:29:24 -0000 Author: cy Date: Fri Jun 26 03:29:23 2015 New Revision: 284864 URL: https://svnweb.freebsd.org/changeset/base/284864 Log: Add support for additional architectures in ntp. Differential Revision: D2720 Reviewed by: jmg, reoberto, andrew, ian, imp Modified: head/usr.sbin/ntp/config.h Modified: head/usr.sbin/ntp/config.h ============================================================================== --- head/usr.sbin/ntp/config.h Thu Jun 25 23:16:01 2015 (r284863) +++ head/usr.sbin/ntp/config.h Fri Jun 26 03:29:23 2015 (r284864) @@ -1379,7 +1379,7 @@ /* #undef NO_THREADS */ /* Default location of crypto key info */ -#define NTP_KEYSDIR "/usr/local/etc" +#define NTP_KEYSDIR "/etc/ntp" /* Path to sign daemon rendezvous socket */ #define NTP_SIGND_PATH "/var/run/ntp_signd" @@ -1469,7 +1469,7 @@ /* #undef SCO5_CLOCK */ /* The size of `char*', as computed by sizeof. */ -#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) +#ifdef __LP64__ #define SIZEOF_CHARP 8 #else #define SIZEOF_CHARP 4 @@ -1479,7 +1479,7 @@ #define SIZEOF_INT 4 /* The size of `long', as computed by sizeof. */ -#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) +#ifdef __LP64__ #define SIZEOF_LONG 8 #else #define SIZEOF_LONG 4 @@ -1498,10 +1498,10 @@ #define SIZEOF_SIGNED_CHAR 1 /* The size of `time_t', as computed by sizeof. */ -#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) -#define SIZEOF_TIME_T 8 -#else +#if defined(__i386__) || defined(__powerpc__) #define SIZEOF_TIME_T 4 +#else +#define SIZEOF_TIME_T 8 #endif /* Does SIOCGIFCONF return size in the buffer? */ @@ -1534,6 +1534,24 @@ #define STR_SYSTEM "sparc64-undermydesk-freebsd" #elif defined(__amd64__) #define STR_SYSTEM "amd64-undermydesk-freebsd" +#elif defined(__powerpc64__) +#define STR_SYSTEM "powerpc64-undermydesk-freebsd" +#elif defined(__powerpc__) +#define STR_SYSTEM "powerpc-undermydesk-freebsd" +#elif defined(__mips64) +#define STR_SYSTEM "mips64-undermydesk-freebsd" +#elif defined(__mips__) +#define STR_SYSTEM "mips-undermydesk-freebsd" +#elif defined(__aarch64__) +#define STR_SYSTEM "arm64-undermydesk-freebsd" +#elif defined(__arm__) +#define STR_SYSTEM "arm-undermydesk-freebsd" +#elif defined(__sparc64__) +#define STR_SYSTEM "sparc64-undermydesk-freebsd" +#elif defined(__sparc__) +#define STR_SYSTEM "sparc-undermydesk-freebsd" +#elif defined(__ia64__) +#define STR_SYSTEM "ia64-undermydesk-freebsd" #else #define STR_SYSTEM "i386-undermydesk-freebsd" #endif @@ -1600,14 +1618,9 @@ typedef unsigned int uintptr_t; /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -/* # undef WORDS_BIGENDIAN */ -# endif +#if defined(__ARMEB__) || defined(__MIPSEB__) || defined(__powerpc__) || \ + defined(__powerpc64__) || defined(__sparc64__) +#define WORDS_BIGENDIAN 1 #endif /* routine worker child proc uses to exit. */ From owner-svn-src-head@freebsd.org Fri Jun 26 03:37:39 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 262C898C9E5; Fri, 26 Jun 2015 03:37:39 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.139]) by mx1.freebsd.org (Postfix) with ESMTP id D05671AAE; Fri, 26 Jun 2015 03:37:38 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from slippy.cwsent.com ([24.68.119.200]) by shaw.ca with SMTP id 8KSNZyzeKyeFy8KSOZ6WxE; Thu, 25 Jun 2015 21:37:37 -0600 X-Authority-Analysis: v=2.1 cv=ELfMqQtC c=1 sm=1 tr=0 a=DtyMuQCYAJf2vvIh/Mv8eA==:117 a=DtyMuQCYAJf2vvIh/Mv8eA==:17 a=VxmjJ2MpAAAA:8 a=BWvPGDcYAAAA:8 a=ICAaq7hcmGcA:10 a=kj9zAlcOel0A:10 a=XAFQembCKUMA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=1-n_BZxRjJJqU6VZVQ4A:9 a=CjuIK1q_8ugA:10 Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.14.9/8.14.9) with ESMTP id t5Q3bYYG093136; Thu, 25 Jun 2015 20:37:34 -0700 (PDT) (envelope-from Cy.Schubert@komquats.com) Message-Id: <201506260337.t5Q3bYYG093136@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.komquats.com/ To: Cy Schubert cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284864 - head/usr.sbin/ntp In-Reply-To: Message from Cy Schubert of "Fri, 26 Jun 2015 03:29:23 -0000." <201506260329.t5Q3TNDv022195@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 25 Jun 2015 20:37:34 -0700 X-CMAE-Envelope: MS4wfK+IQ5oDkvX85tHLfy2bxURSnOj1jxWCosGoS5FuEUC96yPDb4lL6RMrizYLOI4T3IgjfKfaU/1z5wnS8GJ9UZAANsGMEbjS1beiOiaOaa4KyTPtvfgHkJmb9q7eIRmUqDmdN3Mr+Wbr1C9PrXLuPTkeLcIW3WvXF6vK4/ZGQ1zlhDVjw3IdPSUuLP44nlQjoDzeFqJnW8U1mSP9Aqndy2KDwchBosxNIJRp4OyAhfLHbFKx54v7PYt4MH0ryf7w4EBbVsPB66WCCXaIYxca0Bmi8zQXTceLBHXXCLnD6edd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 03:37:39 -0000 In message <201506260329.t5Q3TNDv022195@svn.freebsd.org>, Cy Schubert writes: > Author: cy > Date: Fri Jun 26 03:29:23 2015 > New Revision: 284864 > URL: https://svnweb.freebsd.org/changeset/base/284864 > > Log: > Add support for additional architectures in ntp. > > Differential Revision: D2720 > Reviewed by: jmg, reoberto, andrew, ian, imp roberto > > Modified: > head/usr.sbin/ntp/config.h I didn't want to write this in the commit log as it is more appropriate as a comment about the commit. This commit is a temporary measure until a per architecture set of config.h files is committed. This was a suggestion by kib, which after a bit of reflection, I had to agree with. -- Cheers, Cy Schubert or FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-head@freebsd.org Fri Jun 26 04:12:06 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D87B898D0CF; Fri, 26 Jun 2015 04:12:06 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C96741D15; Fri, 26 Jun 2015 04:12:06 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5Q4C6KC046103; Fri, 26 Jun 2015 04:12:06 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5Q4C6b4046102; Fri, 26 Jun 2015 04:12:06 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201506260412.t5Q4C6b4046102@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 26 Jun 2015 04:12:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284865 - head/sys/dev/sound/midi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 04:12:07 -0000 Author: adrian Date: Fri Jun 26 04:12:06 2015 New Revision: 284865 URL: https://svnweb.freebsd.org/changeset/base/284865 Log: Rename seq_* to mseq_*, to avoid clashes with seq.h (namely, seq_read.) Modified: head/sys/dev/sound/midi/sequencer.c Modified: head/sys/dev/sound/midi/sequencer.c ============================================================================== --- head/sys/dev/sound/midi/sequencer.c Fri Jun 26 03:29:23 2015 (r284864) +++ head/sys/dev/sound/midi/sequencer.c Fri Jun 26 04:12:06 2015 (r284865) @@ -98,21 +98,21 @@ __FBSDID("$FreeBSD$"); #define MIDIDEV(y) (dev2unit(y) & 0x0f) /* These are the entries to the sequencer driver. */ -static d_open_t seq_open; -static d_close_t seq_close; -static d_ioctl_t seq_ioctl; -static d_read_t seq_read; -static d_write_t seq_write; -static d_poll_t seq_poll; +static d_open_t mseq_open; +static d_close_t mseq_close; +static d_ioctl_t mseq_ioctl; +static d_read_t mseq_read; +static d_write_t mseq_write; +static d_poll_t mseq_poll; static struct cdevsw seq_cdevsw = { .d_version = D_VERSION, - .d_open = seq_open, - .d_close = seq_close, - .d_read = seq_read, - .d_write = seq_write, - .d_ioctl = seq_ioctl, - .d_poll = seq_poll, + .d_open = mseq_open, + .d_close = mseq_close, + .d_read = mseq_read, + .d_write = mseq_write, + .d_ioctl = mseq_ioctl, + .d_poll = mseq_poll, .d_name = "sequencer", }; @@ -737,7 +737,7 @@ seq_fetch_mid(struct seq_softc *scp, int } int -seq_open(struct cdev *i_dev, int flags, int mode, struct thread *td) +mseq_open(struct cdev *i_dev, int flags, int mode, struct thread *td) { struct seq_softc *scp = i_dev->si_drv1; int i; @@ -817,10 +817,10 @@ seq_open(struct cdev *i_dev, int flags, } /* - * seq_close + * mseq_close */ int -seq_close(struct cdev *i_dev, int flags, int mode, struct thread *td) +mseq_close(struct cdev *i_dev, int flags, int mode, struct thread *td) { int i; struct seq_softc *scp = i_dev->si_drv1; @@ -858,7 +858,7 @@ err: } int -seq_read(struct cdev *i_dev, struct uio *uio, int ioflag) +mseq_read(struct cdev *i_dev, struct uio *uio, int ioflag) { int retval, used; struct seq_softc *scp = i_dev->si_drv1; @@ -869,12 +869,12 @@ seq_read(struct cdev *i_dev, struct uio if (scp == NULL) return ENXIO; - SEQ_DEBUG(7, printf("seq_read: unit %d, resid %zd.\n", + SEQ_DEBUG(7, printf("mseq_read: unit %d, resid %zd.\n", scp->unit, uio->uio_resid)); mtx_lock(&scp->seq_lock); if ((scp->fflags & FREAD) == 0) { - SEQ_DEBUG(2, printf("seq_read: unit %d is not for reading.\n", + SEQ_DEBUG(2, printf("mseq_read: unit %d is not for reading.\n", scp->unit)); retval = EIO; goto err1; @@ -927,14 +927,14 @@ seq_read(struct cdev *i_dev, struct uio retval = 0; err1: mtx_unlock(&scp->seq_lock); - SEQ_DEBUG(6, printf("seq_read: ret %d, resid %zd.\n", + SEQ_DEBUG(6, printf("mseq_read: ret %d, resid %zd.\n", retval, uio->uio_resid)); return retval; } int -seq_write(struct cdev *i_dev, struct uio *uio, int ioflag) +mseq_write(struct cdev *i_dev, struct uio *uio, int ioflag) { u_char event[EV_SZ], newevent[EV_SZ], ev_code; struct seq_softc *scp = i_dev->si_drv1; @@ -1113,7 +1113,7 @@ err0: } int -seq_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, +mseq_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td) { int midiunit, ret, tmp; @@ -1417,7 +1417,7 @@ timerevent: } int -seq_poll(struct cdev *i_dev, int events, struct thread *td) +mseq_poll(struct cdev *i_dev, int events, struct thread *td) { int ret, lim; struct seq_softc *scp = i_dev->si_drv1; From owner-svn-src-head@freebsd.org Fri Jun 26 04:14:06 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B8E3F98D128; Fri, 26 Jun 2015 04:14:06 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AA5E61EC0; Fri, 26 Jun 2015 04:14:06 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5Q4E6Pa046412; Fri, 26 Jun 2015 04:14:06 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5Q4E6vx046409; Fri, 26 Jun 2015 04:14:06 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201506260414.t5Q4E6vx046409@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 26 Jun 2015 04:14:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284866 - in head/sys: kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 04:14:06 -0000 Author: adrian Date: Fri Jun 26 04:14:05 2015 New Revision: 284866 URL: https://svnweb.freebsd.org/changeset/base/284866 Log: Un-static cpuset_which() - it's useful in other contexts, such as some CPU set operations in my upcoming NUMA work. Tested/compiled: * i386 (run) * amd64 (run) * mips (run) * mips64 (run) * armv6 (built) Sponsored by: Norse Corp, Inc. Modified: head/sys/kern/kern_cpuset.c head/sys/sys/cpuset.h Modified: head/sys/kern/kern_cpuset.c ============================================================================== --- head/sys/kern/kern_cpuset.c Fri Jun 26 04:12:06 2015 (r284865) +++ head/sys/kern/kern_cpuset.c Fri Jun 26 04:14:05 2015 (r284866) @@ -400,7 +400,7 @@ out: * -1 may be supplied for any argument to mean the current proc/thread or * the base set of the current thread. May fail with ESRCH/EPERM. */ -static int +int cpuset_which(cpuwhich_t which, id_t id, struct proc **pp, struct thread **tdp, struct cpuset **setp) { Modified: head/sys/sys/cpuset.h ============================================================================== --- head/sys/sys/cpuset.h Fri Jun 26 04:12:06 2015 (r284865) +++ head/sys/sys/cpuset.h Fri Jun 26 04:14:05 2015 (r284866) @@ -124,6 +124,9 @@ int cpuset_setthread(lwpid_t id, cpuset_ int cpuset_setithread(lwpid_t id, int cpu); int cpuset_create_root(struct prison *, struct cpuset **); int cpuset_setproc_update_set(struct proc *, struct cpuset *); +int cpuset_which(cpuwhich_t, id_t, struct proc **, + struct thread **, struct cpuset **); + char *cpusetobj_strprint(char *, const cpuset_t *); int cpusetobj_strscan(cpuset_t *, const char *); #ifdef DDB From owner-svn-src-head@freebsd.org Fri Jun 26 06:46:35 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BAE1D98C259; Fri, 26 Jun 2015 06:46:35 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-qg0-x234.google.com (mail-qg0-x234.google.com [IPv6:2607:f8b0:400d:c04::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 79B9E1B91; Fri, 26 Jun 2015 06:46:35 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by qgeu36 with SMTP id u36so32413671qge.2; Thu, 25 Jun 2015 23:46:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=GD2eFjJjQHoum+ZzvXgV6DW31dJa59w36+tAboiy3rU=; b=XwxGPj7xJrDeMnDAt5WwGRHWXJcg2UuEQgC0BI/InfjM1+hCbYmAMKF2E1Ogj0Tqnl 828fvgx5s9K1y0GveVVyP4aLU4sPQQT2Bo6ES6VIt+ZHQ2kW3NHQy5QSvQSG9nqCjQ8h Po7xUCrB6+I7KgRIJJ0avXwYB9VxEAnF+NCd08JARawSK6syWI/RDBy6P0AQwOZMfAa2 tKnpTkjpbji97ViI7ZkAiXp7Zzx/gaKT+iA9oJGUvRaoDihTDUg4eCBytl1jIppSjoGh Hf3iKLarkYsqIDFYhrKzj4i1JLVtYtOjhWqUkKKPbG0GXOc+UvcsRErju6BlenU9M+Dy cpnQ== MIME-Version: 1.0 X-Received: by 10.140.91.23 with SMTP id y23mr124930qgd.90.1435301194463; Thu, 25 Jun 2015 23:46:34 -0700 (PDT) Received: by 10.140.98.73 with HTTP; Thu, 25 Jun 2015 23:46:34 -0700 (PDT) In-Reply-To: <201506260412.t5Q4C6b4046102@svn.freebsd.org> References: <201506260412.t5Q4C6b4046102@svn.freebsd.org> Date: Thu, 25 Jun 2015 23:46:34 -0700 Message-ID: Subject: Re: svn commit: r284865 - head/sys/dev/sound/midi From: NGie Cooper To: Adrian Chadd Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 06:46:35 -0000 On Thu, Jun 25, 2015 at 9:12 PM, Adrian Chadd wrote: > Author: adrian > Date: Fri Jun 26 04:12:06 2015 > New Revision: 284865 > URL: https://svnweb.freebsd.org/changeset/base/284865 > > Log: > Rename seq_* to mseq_*, to avoid clashes with seq.h (namely, seq_read.) Should this be MFCed? From owner-svn-src-head@freebsd.org Fri Jun 26 06:56:52 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C032198C3DD; Fri, 26 Jun 2015 06:56:52 +0000 (UTC) (envelope-from ermal.luci@gmail.com) Received: from mail-yk0-x229.google.com (mail-yk0-x229.google.com [IPv6:2607:f8b0:4002:c07::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 823621F3D; Fri, 26 Jun 2015 06:56:52 +0000 (UTC) (envelope-from ermal.luci@gmail.com) Received: by ykdy1 with SMTP id y1so52366148ykd.2; Thu, 25 Jun 2015 23:56:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=cNsv3W96rpeusYzSKnGBKIh81bmecxfJl8G9h6nyjgw=; b=k8/Xb++wDv8yLFO3FA0jXNPFMh5SqIrLDxAcI28WueAfqeqSdEmKVmTpXKyA2plLPT NXsNTH7kFhppDKsV3y8bAPnOLzCYZzO8RFRLzxk/dthORtDvUUJDttOi0QJ2PDgxfxwx EllHSoRRMYjAGsTznL77F9uG/co7KrU/2WXTLst+nFZk9jRnz3jtlOs9q3bUlnZmmsX6 5hJnNlrnP+IGwnwpYiHHIe++mW8sh/qVWG4hg9OYQ5RV/n5O6uOVSFQCHZ2Gw4OBWc6Y vAltFUNcxhP389Domnp7nL0/gTy1TsCsnWYS5tRjdCRIvGpF3OvY8T2vl/ddUs2KgVYM laXg== MIME-Version: 1.0 X-Received: by 10.129.78.130 with SMTP id c124mr145829ywb.162.1435301811451; Thu, 25 Jun 2015 23:56:51 -0700 (PDT) Received: by 10.129.83.139 with HTTP; Thu, 25 Jun 2015 23:56:51 -0700 (PDT) In-Reply-To: <201506252316.t5PNG1ZD098581@svn.freebsd.org> References: <201506252316.t5PNG1ZD098581@svn.freebsd.org> Date: Fri, 26 Jun 2015 08:56:51 +0200 Message-ID: Subject: Re: svn commit: r284863 - head/sys/net/altq From: =?UTF-8?Q?Ermal_Lu=C3=A7i?= To: "Bjoern A. Zeeb" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 06:56:52 -0000 On Fri, Jun 26, 2015 at 1:16 AM, Bjoern A. Zeeb wrote: > Author: bz > Date: Thu Jun 25 23:16:01 2015 > New Revision: 284863 > URL: https://svnweb.freebsd.org/changeset/base/284863 > > Log: > Another attempt to make this compile on more architectures after r284777. > > Modified: > head/sys/net/altq/altq_fairq.c > > Modified: head/sys/net/altq/altq_fairq.c > > ============================================================================== > --- head/sys/net/altq/altq_fairq.c Thu Jun 25 20:46:11 2015 > (r284862) > +++ head/sys/net/altq/altq_fairq.c Thu Jun 25 23:16:01 2015 > (r284863) > @@ -742,8 +742,8 @@ fairq_pollq(struct fairq_class *cl, uint > if (bw > cl->cl_bandwidth) > *hit_limit = 1; > #ifdef ALTQ_DEBUG > - printf("BW %6lld relative to %6u %d queue %p\n", > - bw, cl->cl_bandwidth, *hit_limit, b); > + printf("BW %6ju relative to %6u %d queue %p\n", > + (uintmax_t)bw, cl->cl_bandwidth, *hit_limit, b); > #endif > } > return(m); > > Thank you. -- Ermal From owner-svn-src-head@freebsd.org Fri Jun 26 07:01:30 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 811B198C539; Fri, 26 Jun 2015 07:01:30 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 713C41278; Fri, 26 Jun 2015 07:01:30 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5Q71UUe031077; Fri, 26 Jun 2015 07:01:30 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5Q71Tok031071; Fri, 26 Jun 2015 07:01:29 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201506260701.t5Q71Tok031071@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 26 Jun 2015 07:01:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284869 - head/sys/x86/iommu X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 07:01:30 -0000 Author: kib Date: Fri Jun 26 07:01:29 2015 New Revision: 284869 URL: https://svnweb.freebsd.org/changeset/base/284869 Log: Split the DMAR unit domains and contexts. Domains carry address space and related data structures. Contexts attach requests initiators to domains. There is still 1:1 correspondence between contexts and domains on the running system, since only busdma currently allocates them, using dmar_get_ctx_for_dev(). Large part of the change is formal rename of the ctx to domain, but patch also reworks the context allocation and free to allow for independent domain creation. The helper dmar_move_ctx_to_domain() is introduced for future use, to reassign request initiator from one domain to another. The hard issue which is not yet resolved with the context move is proper handling (or reserving) RMRR entries in the destination domain as required by ACPI DMAR table for moved context. Tested by: pho Sponsored by: The FreeBSD Foundation Modified: head/sys/x86/iommu/busdma_dmar.c head/sys/x86/iommu/intel_ctx.c head/sys/x86/iommu/intel_dmar.h head/sys/x86/iommu/intel_drv.c head/sys/x86/iommu/intel_gas.c head/sys/x86/iommu/intel_idpgtbl.c head/sys/x86/iommu/intel_qi.c head/sys/x86/iommu/intel_utils.c Modified: head/sys/x86/iommu/busdma_dmar.c ============================================================================== --- head/sys/x86/iommu/busdma_dmar.c Fri Jun 26 06:25:14 2015 (r284868) +++ head/sys/x86/iommu/busdma_dmar.c Fri Jun 26 07:01:29 2015 (r284869) @@ -225,7 +225,7 @@ dmar_instantiate_ctx(struct dmar_unit *d disabled = dmar_bus_dma_is_dev_disabled(pci_get_domain(requester), pci_get_bus(requester), pci_get_slot(requester), pci_get_function(requester)); - ctx = dmar_get_ctx(dmar, requester, rid, disabled, rmrr); + ctx = dmar_get_ctx_for_dev(dmar, requester, rid, disabled, rmrr); if (ctx == NULL) return (NULL); if (disabled) { @@ -371,16 +371,18 @@ dmar_bus_dmamap_destroy(bus_dma_tag_t dm { struct bus_dma_tag_dmar *tag; struct bus_dmamap_dmar *map; + struct dmar_domain *domain; tag = (struct bus_dma_tag_dmar *)dmat; map = (struct bus_dmamap_dmar *)map1; if (map != NULL) { - DMAR_CTX_LOCK(tag->ctx); + domain = tag->ctx->domain; + DMAR_DOMAIN_LOCK(domain); if (!TAILQ_EMPTY(&map->map_entries)) { - DMAR_CTX_UNLOCK(tag->ctx); + DMAR_DOMAIN_UNLOCK(domain); return (EBUSY); } - DMAR_CTX_UNLOCK(tag->ctx); + DMAR_DOMAIN_UNLOCK(domain); free(map, M_DMAR_DMAMAP); } tag->map_count--; @@ -457,6 +459,7 @@ dmar_bus_dmamap_load_something1(struct b struct dmar_map_entries_tailq *unroll_list) { struct dmar_ctx *ctx; + struct dmar_domain *domain; struct dmar_map_entry *entry; dmar_gaddr_t size; bus_size_t buflen1; @@ -466,6 +469,7 @@ dmar_bus_dmamap_load_something1(struct b if (segs == NULL) segs = tag->segments; ctx = tag->ctx; + domain = ctx->domain; seg = *segp; error = 0; idx = 0; @@ -487,7 +491,7 @@ dmar_bus_dmamap_load_something1(struct b if (seg + 1 < tag->common.nsegments) gas_flags |= DMAR_GM_CANSPLIT; - error = dmar_gas_map(ctx, &tag->common, size, offset, + error = dmar_gas_map(domain, &tag->common, size, offset, DMAR_MAP_ENTRY_READ | DMAR_MAP_ENTRY_WRITE, gas_flags, ma + idx, &entry); if (error != 0) @@ -534,10 +538,10 @@ dmar_bus_dmamap_load_something1(struct b (uintmax_t)entry->start, (uintmax_t)entry->end, (uintmax_t)buflen1, (uintmax_t)tag->common.maxsegsz)); - DMAR_CTX_LOCK(ctx); + DMAR_DOMAIN_LOCK(domain); TAILQ_INSERT_TAIL(&map->map_entries, entry, dmamap_link); entry->flags |= DMAR_MAP_ENTRY_MAP; - DMAR_CTX_UNLOCK(ctx); + DMAR_DOMAIN_UNLOCK(domain); TAILQ_INSERT_TAIL(unroll_list, entry, unroll_link); segs[seg].ds_addr = entry->start + offset; @@ -559,11 +563,13 @@ dmar_bus_dmamap_load_something(struct bu int flags, bus_dma_segment_t *segs, int *segp) { struct dmar_ctx *ctx; + struct dmar_domain *domain; struct dmar_map_entry *entry, *entry1; struct dmar_map_entries_tailq unroll_list; int error; ctx = tag->ctx; + domain = ctx->domain; atomic_add_long(&ctx->loads, 1); TAILQ_INIT(&unroll_list); @@ -575,7 +581,7 @@ dmar_bus_dmamap_load_something(struct bu * partial buffer load, so unfortunately we have to * revert all work done. */ - DMAR_CTX_LOCK(ctx); + DMAR_DOMAIN_LOCK(domain); TAILQ_FOREACH_SAFE(entry, &unroll_list, unroll_link, entry1) { /* @@ -586,19 +592,19 @@ dmar_bus_dmamap_load_something(struct bu */ TAILQ_REMOVE(&map->map_entries, entry, dmamap_link); TAILQ_REMOVE(&unroll_list, entry, unroll_link); - TAILQ_INSERT_TAIL(&ctx->unload_entries, entry, + TAILQ_INSERT_TAIL(&domain->unload_entries, entry, dmamap_link); } - DMAR_CTX_UNLOCK(ctx); - taskqueue_enqueue(ctx->dmar->delayed_taskqueue, - &ctx->unload_task); + DMAR_DOMAIN_UNLOCK(domain); + taskqueue_enqueue(domain->dmar->delayed_taskqueue, + &domain->unload_task); } if (error == ENOMEM && (flags & BUS_DMA_NOWAIT) == 0 && !map->cansleep) error = EINPROGRESS; if (error == EINPROGRESS) - dmar_bus_schedule_dmamap(ctx->dmar, map); + dmar_bus_schedule_dmamap(domain->dmar, map); return (error); } @@ -764,6 +770,7 @@ dmar_bus_dmamap_unload(bus_dma_tag_t dma struct bus_dma_tag_dmar *tag; struct bus_dmamap_dmar *map; struct dmar_ctx *ctx; + struct dmar_domain *domain; #if defined(__amd64__) struct dmar_map_entries_tailq entries; #endif @@ -771,20 +778,22 @@ dmar_bus_dmamap_unload(bus_dma_tag_t dma tag = (struct bus_dma_tag_dmar *)dmat; map = (struct bus_dmamap_dmar *)map1; ctx = tag->ctx; + domain = ctx->domain; atomic_add_long(&ctx->unloads, 1); #if defined(__i386__) - DMAR_CTX_LOCK(ctx); - TAILQ_CONCAT(&ctx->unload_entries, &map->map_entries, dmamap_link); - DMAR_CTX_UNLOCK(ctx); - taskqueue_enqueue(ctx->dmar->delayed_taskqueue, &ctx->unload_task); + DMAR_DOMAIN_LOCK(domain); + TAILQ_CONCAT(&domain->unload_entries, &map->map_entries, dmamap_link); + DMAR_DOMAIN_UNLOCK(domain); + taskqueue_enqueue(domain->dmar->delayed_taskqueue, + &domain->unload_task); #else /* defined(__amd64__) */ TAILQ_INIT(&entries); - DMAR_CTX_LOCK(ctx); + DMAR_DOMAIN_LOCK(domain); TAILQ_CONCAT(&entries, &map->map_entries, dmamap_link); - DMAR_CTX_UNLOCK(ctx); + DMAR_DOMAIN_UNLOCK(domain); THREAD_NO_SLEEPING(); - dmar_ctx_unload(ctx, &entries, false); + dmar_domain_unload(domain, &entries, false); THREAD_SLEEPING_OK(); KASSERT(TAILQ_EMPTY(&entries), ("lazy dmar_ctx_unload %p", ctx)); #endif Modified: head/sys/x86/iommu/intel_ctx.c ============================================================================== --- head/sys/x86/iommu/intel_ctx.c Fri Jun 26 06:25:14 2015 (r284868) +++ head/sys/x86/iommu/intel_ctx.c Fri Jun 26 07:01:29 2015 (r284869) @@ -68,8 +68,13 @@ __FBSDID("$FreeBSD$"); #include static MALLOC_DEFINE(M_DMAR_CTX, "dmar_ctx", "Intel DMAR Context"); +static MALLOC_DEFINE(M_DMAR_DOMAIN, "dmar_dom", "Intel DMAR Domain"); -static void dmar_ctx_unload_task(void *arg, int pending); +static void dmar_domain_unload_task(void *arg, int pending); +static void dmar_unref_domain_locked(struct dmar_unit *dmar, + struct dmar_domain *domain); +static void dmar_domain_destroy(struct dmar_domain *domain); +static void dmar_ctx_dtr(struct dmar_ctx *ctx); static void dmar_ensure_ctx_page(struct dmar_unit *dmar, int bus) @@ -108,8 +113,8 @@ dmar_map_ctx_entry(struct dmar_ctx *ctx, { dmar_ctx_entry_t *ctxp; - ctxp = dmar_map_pgtbl(ctx->dmar->ctx_obj, 1 + PCI_RID2BUS(ctx->rid), - DMAR_PGF_NOALLOC | DMAR_PGF_WAITOK, sfp); + ctxp = dmar_map_pgtbl(ctx->domain->dmar->ctx_obj, 1 + + PCI_RID2BUS(ctx->rid), DMAR_PGF_NOALLOC | DMAR_PGF_WAITOK, sfp); ctxp += ctx->rid & 0xff; return (ctxp); } @@ -119,7 +124,7 @@ ctx_tag_init(struct dmar_ctx *ctx, devic { bus_addr_t maxaddr; - maxaddr = MIN(ctx->end, BUS_SPACE_MAXADDR); + maxaddr = MIN(ctx->domain->end, BUS_SPACE_MAXADDR); ctx->ctx_tag.common.ref_count = 1; /* Prevent free */ ctx->ctx_tag.common.impl = &bus_dma_dmar_impl; ctx->ctx_tag.common.boundary = PCI_DMA_BOUNDARY; @@ -130,33 +135,42 @@ ctx_tag_init(struct dmar_ctx *ctx, devic ctx->ctx_tag.common.maxsegsz = maxaddr; ctx->ctx_tag.ctx = ctx; ctx->ctx_tag.owner = dev; - /* XXXKIB initialize tag further */ } static void -ctx_id_entry_init(struct dmar_ctx *ctx, dmar_ctx_entry_t *ctxp) +ctx_id_entry_init(struct dmar_ctx *ctx, dmar_ctx_entry_t *ctxp, bool move) { struct dmar_unit *unit; + struct dmar_domain *domain; vm_page_t ctx_root; - unit = ctx->dmar; - KASSERT(ctxp->ctx1 == 0 && ctxp->ctx2 == 0, + domain = ctx->domain; + unit = domain->dmar; + KASSERT(move || (ctxp->ctx1 == 0 && ctxp->ctx2 == 0), ("dmar%d: initialized ctx entry %d:%d:%d 0x%jx 0x%jx", unit->unit, pci_get_bus(ctx->ctx_tag.owner), pci_get_slot(ctx->ctx_tag.owner), pci_get_function(ctx->ctx_tag.owner), - ctxp->ctx1, - ctxp->ctx2)); - ctxp->ctx2 = DMAR_CTX2_DID(ctx->domain); - ctxp->ctx2 |= ctx->awlvl; - if ((ctx->flags & DMAR_CTX_IDMAP) != 0 && + ctxp->ctx1, ctxp->ctx2)); + /* + * For update due to move, the store is not atomic. It is + * possible that DMAR read upper doubleword, while low + * doubleword is not yet updated. The domain id is stored in + * the upper doubleword, while the table pointer in the lower. + * + * There is no good solution, for the same reason it is wrong + * to clear P bit in the ctx entry for update. + */ + dmar_pte_store1(&ctxp->ctx2, DMAR_CTX2_DID(domain->domain) | + domain->awlvl); + if ((domain->flags & DMAR_DOMAIN_IDMAP) != 0 && (unit->hw_ecap & DMAR_ECAP_PT) != 0) { - KASSERT(ctx->pgtbl_obj == NULL, + KASSERT(domain->pgtbl_obj == NULL, ("ctx %p non-null pgtbl_obj", ctx)); - dmar_pte_store(&ctxp->ctx1, DMAR_CTX1_T_PASS | DMAR_CTX1_P); + dmar_pte_store1(&ctxp->ctx1, DMAR_CTX1_T_PASS | DMAR_CTX1_P); } else { - ctx_root = dmar_pgalloc(ctx->pgtbl_obj, 0, DMAR_PGF_NOALLOC); - dmar_pte_store(&ctxp->ctx1, DMAR_CTX1_T_UNTR | + ctx_root = dmar_pgalloc(domain->pgtbl_obj, 0, DMAR_PGF_NOALLOC); + dmar_pte_store1(&ctxp->ctx1, DMAR_CTX1_T_UNTR | (DMAR_CTX1_ASR_MASK & VM_PAGE_TO_PHYS(ctx_root)) | DMAR_CTX1_P); } @@ -164,7 +178,31 @@ ctx_id_entry_init(struct dmar_ctx *ctx, } static int -ctx_init_rmrr(struct dmar_ctx *ctx, device_t dev) +dmar_flush_for_ctx_entry(struct dmar_unit *dmar, bool force) +{ + int error; + + /* + * If dmar declares Caching Mode as Set, follow 11.5 "Caching + * Mode Consideration" and do the (global) invalidation of the + * negative TLB entries. + */ + if ((dmar->hw_cap & DMAR_CAP_CM) == 0 && !force) + return (0); + if (dmar->qi_enabled) { + dmar_qi_invalidate_ctx_glob_locked(dmar); + if ((dmar->hw_ecap & DMAR_ECAP_DI) != 0 || force) + dmar_qi_invalidate_iotlb_glob_locked(dmar); + return (0); + } + error = dmar_inv_ctx_glob(dmar); + if (error == 0 && ((dmar->hw_ecap & DMAR_ECAP_DI) != 0 || force)) + error = dmar_inv_iotlb_glob(dmar); + return (error); +} + +static int +domain_init_rmrr(struct dmar_domain *domain, device_t dev) { struct dmar_map_entries_tailq rmrr_entries; struct dmar_map_entry *entry, *entry1; @@ -175,7 +213,7 @@ ctx_init_rmrr(struct dmar_ctx *ctx, devi error = 0; TAILQ_INIT(&rmrr_entries); - dmar_ctx_parse_rmrr(ctx, dev, &rmrr_entries); + dmar_dev_parse_rmrr(domain, dev, &rmrr_entries); TAILQ_FOREACH_SAFE(entry, &rmrr_entries, unroll_link, entry1) { /* * VT-d specification requires that the start of an @@ -195,7 +233,7 @@ ctx_init_rmrr(struct dmar_ctx *ctx, devi if (bootverbose) { device_printf(dev, "BIOS bug: dmar%d RMRR " "region (%jx, %jx) corrected\n", - ctx->dmar->unit, start, end); + domain->dmar->unit, start, end); } entry->end += DMAR_PAGE_SIZE * 0x20; } @@ -205,8 +243,9 @@ ctx_init_rmrr(struct dmar_ctx *ctx, devi ma[i] = vm_page_getfake(entry->start + PAGE_SIZE * i, VM_MEMATTR_DEFAULT); } - error1 = dmar_gas_map_region(ctx, entry, DMAR_MAP_ENTRY_READ | - DMAR_MAP_ENTRY_WRITE, DMAR_GM_CANWAIT, ma); + error1 = dmar_gas_map_region(domain, entry, + DMAR_MAP_ENTRY_READ | DMAR_MAP_ENTRY_WRITE, + DMAR_GM_CANWAIT, ma); /* * Non-failed RMRR entries are owned by context rb * tree. Get rid of the failed entry, but do not stop @@ -214,18 +253,19 @@ ctx_init_rmrr(struct dmar_ctx *ctx, devi * loaded and removed on the context destruction. */ if (error1 == 0 && entry->end != entry->start) { - DMAR_LOCK(ctx->dmar); - ctx->flags |= DMAR_CTX_RMRR; - DMAR_UNLOCK(ctx->dmar); + DMAR_LOCK(domain->dmar); + domain->refs++; /* XXXKIB prevent free */ + domain->flags |= DMAR_DOMAIN_RMRR; + DMAR_UNLOCK(domain->dmar); } else { if (error1 != 0) { device_printf(dev, "dmar%d failed to map RMRR region (%jx, %jx) %d\n", - ctx->dmar->unit, start, end, error1); + domain->dmar->unit, start, end, error1); error = error1; } TAILQ_REMOVE(&rmrr_entries, entry, unroll_link); - dmar_gas_free_entry(ctx, entry); + dmar_gas_free_entry(domain, entry); } for (i = 0; i < size; i++) vm_page_putfake(ma[i]); @@ -234,47 +274,144 @@ ctx_init_rmrr(struct dmar_ctx *ctx, devi return (error); } +static struct dmar_domain * +dmar_domain_alloc(struct dmar_unit *dmar, bool id_mapped) +{ + struct dmar_domain *domain; + int error, id, mgaw; + + id = alloc_unr(dmar->domids); + if (id == -1) + return (NULL); + domain = malloc(sizeof(*domain), M_DMAR_DOMAIN, M_WAITOK | M_ZERO); + domain->domain = id; + LIST_INIT(&domain->contexts); + RB_INIT(&domain->rb_root); + TAILQ_INIT(&domain->unload_entries); + TASK_INIT(&domain->unload_task, 0, dmar_domain_unload_task, domain); + mtx_init(&domain->lock, "dmardom", NULL, MTX_DEF); + domain->dmar = dmar; + + /* + * For now, use the maximal usable physical address of the + * installed memory to calculate the mgaw on id_mapped domain. + * It is useful for the identity mapping, and less so for the + * virtualized bus address space. + */ + domain->end = id_mapped ? ptoa(Maxmem) : BUS_SPACE_MAXADDR; + mgaw = dmar_maxaddr2mgaw(dmar, domain->end, !id_mapped); + error = domain_set_agaw(domain, mgaw); + if (error != 0) + goto fail; + if (!id_mapped) + /* Use all supported address space for remapping. */ + domain->end = 1ULL << (domain->agaw - 1); + + dmar_gas_init_domain(domain); + + if (id_mapped) { + if ((dmar->hw_ecap & DMAR_ECAP_PT) == 0) { + domain->pgtbl_obj = domain_get_idmap_pgtbl(domain, + domain->end); + } + domain->flags |= DMAR_DOMAIN_IDMAP; + } else { + error = domain_alloc_pgtbl(domain); + if (error != 0) + goto fail; + /* Disable local apic region access */ + error = dmar_gas_reserve_region(domain, 0xfee00000, + 0xfeefffff + 1); + if (error != 0) + goto fail; + } + return (domain); + +fail: + dmar_domain_destroy(domain); + return (NULL); +} + static struct dmar_ctx * -dmar_get_ctx_alloc(struct dmar_unit *dmar, uint16_t rid) +dmar_ctx_alloc(struct dmar_domain *domain, uint16_t rid) { struct dmar_ctx *ctx; ctx = malloc(sizeof(*ctx), M_DMAR_CTX, M_WAITOK | M_ZERO); - RB_INIT(&ctx->rb_root); - TAILQ_INIT(&ctx->unload_entries); - TASK_INIT(&ctx->unload_task, 0, dmar_ctx_unload_task, ctx); - mtx_init(&ctx->lock, "dmarctx", NULL, MTX_DEF); - ctx->dmar = dmar; + ctx->domain = domain; ctx->rid = rid; + ctx->refs = 1; return (ctx); } static void -dmar_ctx_dtr(struct dmar_ctx *ctx, bool gas_inited, bool pgtbl_inited) +dmar_ctx_link(struct dmar_ctx *ctx) { + struct dmar_domain *domain; - if (gas_inited) { - DMAR_CTX_LOCK(ctx); - dmar_gas_fini_ctx(ctx); - DMAR_CTX_UNLOCK(ctx); - } - if (pgtbl_inited) { - if (ctx->pgtbl_obj != NULL) - DMAR_CTX_PGLOCK(ctx); - ctx_free_pgtbl(ctx); - } - mtx_destroy(&ctx->lock); - free(ctx, M_DMAR_CTX); + domain = ctx->domain; + DMAR_ASSERT_LOCKED(domain->dmar); + KASSERT(domain->refs >= domain->ctx_cnt, + ("dom %p ref underflow %d %d", domain, domain->refs, + domain->ctx_cnt)); + domain->refs++; + domain->ctx_cnt++; + LIST_INSERT_HEAD(&domain->contexts, ctx, link); +} + +static void +dmar_ctx_unlink(struct dmar_ctx *ctx) +{ + struct dmar_domain *domain; + + domain = ctx->domain; + DMAR_ASSERT_LOCKED(domain->dmar); + KASSERT(domain->refs > 0, + ("domain %p ctx dtr refs %d", domain, domain->refs)); + KASSERT(domain->ctx_cnt >= domain->refs, + ("domain %p ctx dtr refs %d ctx_cnt %d", domain, + domain->refs, domain->ctx_cnt)); + domain->refs--; + domain->ctx_cnt--; + LIST_REMOVE(ctx, link); +} + +static void +dmar_domain_destroy(struct dmar_domain *domain) +{ + + KASSERT(TAILQ_EMPTY(&domain->unload_entries), + ("unfinished unloads %p", domain)); + KASSERT(LIST_EMPTY(&domain->contexts), + ("destroying dom %p with contexts", domain)); + KASSERT(domain->ctx_cnt == 0, + ("destroying dom %p with ctx_cnt %d", domain, domain->ctx_cnt)); + KASSERT(domain->refs == 0, + ("destroying dom %p with refs %d", domain, domain->refs)); + if ((domain->flags & DMAR_DOMAIN_GAS_INITED) != 0) { + DMAR_DOMAIN_LOCK(domain); + dmar_gas_fini_domain(domain); + DMAR_DOMAIN_UNLOCK(domain); + } + if ((domain->flags & DMAR_DOMAIN_PGTBL_INITED) != 0) { + if (domain->pgtbl_obj != NULL) + DMAR_DOMAIN_PGLOCK(domain); + domain_free_pgtbl(domain); + } + mtx_destroy(&domain->lock); + free_unr(domain->dmar->domids, domain->domain); + free(domain, M_DMAR_DOMAIN); } struct dmar_ctx * -dmar_get_ctx(struct dmar_unit *dmar, device_t dev, uint16_t rid, bool id_mapped, - bool rmrr_init) +dmar_get_ctx_for_dev(struct dmar_unit *dmar, device_t dev, uint16_t rid, + bool id_mapped, bool rmrr_init) { + struct dmar_domain *domain, *domain1; struct dmar_ctx *ctx, *ctx1; dmar_ctx_entry_t *ctxp; struct sf_buf *sf; - int bus, slot, func, error, mgaw; + int bus, slot, func, error; bool enable; bus = pci_get_bus(dev); @@ -292,67 +429,18 @@ dmar_get_ctx(struct dmar_unit *dmar, dev */ DMAR_UNLOCK(dmar); dmar_ensure_ctx_page(dmar, PCI_RID2BUS(rid)); - ctx1 = dmar_get_ctx_alloc(dmar, rid); - - if (id_mapped) { - /* - * For now, use the maximal usable physical - * address of the installed memory to - * calculate the mgaw. It is useful for the - * identity mapping, and less so for the - * virtualized bus address space. - */ - ctx1->end = ptoa(Maxmem); - mgaw = dmar_maxaddr2mgaw(dmar, ctx1->end, false); - error = ctx_set_agaw(ctx1, mgaw); - if (error != 0) { - dmar_ctx_dtr(ctx1, false, false); - TD_PINNED_ASSERT; - return (NULL); - } - } else { - ctx1->end = BUS_SPACE_MAXADDR; - mgaw = dmar_maxaddr2mgaw(dmar, ctx1->end, true); - error = ctx_set_agaw(ctx1, mgaw); - if (error != 0) { - dmar_ctx_dtr(ctx1, false, false); - TD_PINNED_ASSERT; - return (NULL); - } - /* Use all supported address space for remapping. */ - ctx1->end = 1ULL << (ctx1->agaw - 1); + domain1 = dmar_domain_alloc(dmar, id_mapped); + if (domain1 == NULL) { + TD_PINNED_ASSERT; + return (NULL); } - - - dmar_gas_init_ctx(ctx1); - if (id_mapped) { - if ((dmar->hw_ecap & DMAR_ECAP_PT) == 0) { - ctx1->pgtbl_obj = ctx_get_idmap_pgtbl(ctx1, - ctx1->end); - } - ctx1->flags |= DMAR_CTX_IDMAP; - } else { - error = ctx_alloc_pgtbl(ctx1); - if (error != 0) { - dmar_ctx_dtr(ctx1, true, false); - TD_PINNED_ASSERT; - return (NULL); - } - /* Disable local apic region access */ - error = dmar_gas_reserve_region(ctx1, 0xfee00000, - 0xfeefffff + 1); - if (error != 0) { - dmar_ctx_dtr(ctx1, true, true); - TD_PINNED_ASSERT; - return (NULL); - } - error = ctx_init_rmrr(ctx1, dev); - if (error != 0) { - dmar_ctx_dtr(ctx1, true, true); - TD_PINNED_ASSERT; - return (NULL); - } + error = domain_init_rmrr(domain1, dev); + if (error != 0) { + dmar_domain_destroy(domain1); + TD_PINNED_ASSERT; + return (NULL); } + ctx1 = dmar_ctx_alloc(domain1, rid); ctxp = dmar_map_ctx_entry(ctx1, &sf); DMAR_LOCK(dmar); @@ -362,16 +450,10 @@ dmar_get_ctx(struct dmar_unit *dmar, dev */ ctx = dmar_find_ctx_locked(dmar, rid); if (ctx == NULL) { + domain = domain1; ctx = ctx1; + dmar_ctx_link(ctx); ctx->ctx_tag.owner = dev; - ctx->domain = alloc_unrl(dmar->domids); - if (ctx->domain == -1) { - DMAR_UNLOCK(dmar); - dmar_unmap_pgtbl(sf); - dmar_ctx_dtr(ctx, true, true); - TD_PINNED_ASSERT; - return (NULL); - } ctx_tag_init(ctx, dev); /* @@ -379,46 +461,33 @@ dmar_get_ctx(struct dmar_unit *dmar, dev * DMAR unit. Enable the translation after * everything is set up. */ - if (LIST_EMPTY(&dmar->contexts)) + if (LIST_EMPTY(&dmar->domains)) enable = true; - LIST_INSERT_HEAD(&dmar->contexts, ctx, link); - ctx_id_entry_init(ctx, ctxp); + LIST_INSERT_HEAD(&dmar->domains, domain, link); + ctx_id_entry_init(ctx, ctxp, false); device_printf(dev, "dmar%d pci%d:%d:%d:%d rid %x domain %d mgaw %d " "agaw %d %s-mapped\n", dmar->unit, dmar->segment, bus, slot, - func, rid, ctx->domain, ctx->mgaw, ctx->agaw, - id_mapped ? "id" : "re"); + func, rid, domain->domain, domain->mgaw, + domain->agaw, id_mapped ? "id" : "re"); } else { - dmar_ctx_dtr(ctx1, true, true); + /* Nothing needs to be done to destroy ctx1. */ + dmar_domain_destroy(domain1); + domain = ctx->domain; + ctx->refs++; /* tag referenced us */ } dmar_unmap_pgtbl(sf); + } else { + domain = ctx->domain; + ctx->refs++; /* tag referenced us */ } - ctx->refs++; - if ((ctx->flags & DMAR_CTX_RMRR) != 0) - ctx->refs++; /* XXXKIB */ - /* - * If dmar declares Caching Mode as Set, follow 11.5 "Caching - * Mode Consideration" and do the (global) invalidation of the - * negative TLB entries. - */ - if ((dmar->hw_cap & DMAR_CAP_CM) != 0 || enable) { - if (dmar->qi_enabled) { - dmar_qi_invalidate_ctx_glob_locked(dmar); - if ((dmar->hw_ecap & DMAR_ECAP_DI) != 0) - dmar_qi_invalidate_iotlb_glob_locked(dmar); - } else { - error = dmar_inv_ctx_glob(dmar); - if (error == 0 && - (dmar->hw_ecap & DMAR_ECAP_DI) != 0) - error = dmar_inv_iotlb_glob(dmar); - if (error != 0) { - dmar_free_ctx_locked(dmar, ctx); - TD_PINNED_ASSERT; - return (NULL); - } - } + error = dmar_flush_for_ctx_entry(dmar, enable); + if (error != 0) { + dmar_free_ctx_locked(dmar, ctx); + TD_PINNED_ASSERT; + return (NULL); } /* @@ -439,11 +508,74 @@ dmar_get_ctx(struct dmar_unit *dmar, dev return (ctx); } +int +dmar_move_ctx_to_domain(struct dmar_domain *domain, struct dmar_ctx *ctx) +{ + struct dmar_unit *dmar; + struct dmar_domain *old_domain; + dmar_ctx_entry_t *ctxp; + struct sf_buf *sf; + int error; + + dmar = domain->dmar; + old_domain = ctx->domain; + if (domain == old_domain) + return (0); + KASSERT(old_domain->dmar == dmar, + ("domain %p %u moving between dmars %u %u", domain, + domain->domain, old_domain->dmar->unit, domain->dmar->unit)); + TD_PREP_PINNED_ASSERT; + + ctxp = dmar_map_ctx_entry(ctx, &sf); + DMAR_LOCK(dmar); + dmar_ctx_unlink(ctx); + ctx->domain = domain; + dmar_ctx_link(ctx); + ctx_id_entry_init(ctx, ctxp, true); + dmar_unmap_pgtbl(sf); + error = dmar_flush_for_ctx_entry(dmar, true); + /* If flush failed, rolling back would not work as well. */ + printf("dmar%d rid %x domain %d->%d %s-mapped\n", + dmar->unit, ctx->rid, old_domain->domain, domain->domain, + (domain->flags & DMAR_DOMAIN_IDMAP) != 0 ? "id" : "re"); + dmar_unref_domain_locked(dmar, old_domain); + TD_PINNED_ASSERT; + return (error); +} + +static void +dmar_unref_domain_locked(struct dmar_unit *dmar, struct dmar_domain *domain) +{ + + DMAR_ASSERT_LOCKED(dmar); + KASSERT(domain->refs >= 1, + ("dmar %d domain %p refs %u", dmar->unit, domain, domain->refs)); + KASSERT(domain->refs > domain->ctx_cnt, + ("dmar %d domain %p refs %d ctx_cnt %d", dmar->unit, domain, + domain->refs, domain->ctx_cnt)); + + if (domain->refs > 1) { + domain->refs--; + DMAR_UNLOCK(dmar); + return; + } + + KASSERT((domain->flags & DMAR_DOMAIN_RMRR) == 0, + ("lost ref on RMRR domain %p", domain)); + + LIST_REMOVE(domain, link); + DMAR_UNLOCK(dmar); + + taskqueue_drain(dmar->delayed_taskqueue, &domain->unload_task); + dmar_domain_destroy(domain); +} + void dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx) { struct sf_buf *sf; dmar_ctx_entry_t *ctxp; + struct dmar_domain *domain; DMAR_ASSERT_LOCKED(dmar); KASSERT(ctx->refs >= 1, @@ -459,8 +591,6 @@ dmar_free_ctx_locked(struct dmar_unit *d return; } - KASSERT((ctx->flags & DMAR_CTX_RMRR) == 0, - ("lost ref on RMRR ctx %p", ctx)); KASSERT((ctx->flags & DMAR_CTX_DISABLED) == 0, ("lost ref on disabled ctx %p", ctx)); @@ -488,8 +618,6 @@ dmar_free_ctx_locked(struct dmar_unit *d return; } - KASSERT((ctx->flags & DMAR_CTX_RMRR) == 0, - ("lost ref on RMRR ctx %p", ctx)); KASSERT((ctx->flags & DMAR_CTX_DISABLED) == 0, ("lost ref on disabled ctx %p", ctx)); @@ -507,19 +635,11 @@ dmar_free_ctx_locked(struct dmar_unit *d else dmar_inv_iotlb_glob(dmar); } - LIST_REMOVE(ctx, link); - DMAR_UNLOCK(dmar); - - /* - * The rest of the destruction is invisible for other users of - * the dmar unit. - */ - taskqueue_drain(dmar->delayed_taskqueue, &ctx->unload_task); - KASSERT(TAILQ_EMPTY(&ctx->unload_entries), - ("unfinished unloads %p", ctx)); dmar_unmap_pgtbl(sf); - free_unr(dmar->domids, ctx->domain); - dmar_ctx_dtr(ctx, true, true); + domain = ctx->domain; + dmar_ctx_unlink(ctx); + free(ctx, M_DMAR_CTX); + dmar_unref_domain_locked(dmar, domain); TD_PINNED_ASSERT; } @@ -528,86 +648,92 @@ dmar_free_ctx(struct dmar_ctx *ctx) { struct dmar_unit *dmar; - dmar = ctx->dmar; + dmar = ctx->domain->dmar; DMAR_LOCK(dmar); dmar_free_ctx_locked(dmar, ctx); } +/* + * Returns with the domain locked. + */ struct dmar_ctx * dmar_find_ctx_locked(struct dmar_unit *dmar, uint16_t rid) { + struct dmar_domain *domain; struct dmar_ctx *ctx; DMAR_ASSERT_LOCKED(dmar); - LIST_FOREACH(ctx, &dmar->contexts, link) { - if (ctx->rid == rid) - return (ctx); + LIST_FOREACH(domain, &dmar->domains, link) { + LIST_FOREACH(ctx, &domain->contexts, link) { + if (ctx->rid == rid) + return (ctx); + } } return (NULL); } void -dmar_ctx_free_entry(struct dmar_map_entry *entry, bool free) +dmar_domain_free_entry(struct dmar_map_entry *entry, bool free) { - struct dmar_ctx *ctx; + struct dmar_domain *domain; - ctx = entry->ctx; - DMAR_CTX_LOCK(ctx); + domain = entry->domain; + DMAR_DOMAIN_LOCK(domain); if ((entry->flags & DMAR_MAP_ENTRY_RMRR) != 0) - dmar_gas_free_region(ctx, entry); + dmar_gas_free_region(domain, entry); else - dmar_gas_free_space(ctx, entry); - DMAR_CTX_UNLOCK(ctx); + dmar_gas_free_space(domain, entry); + DMAR_DOMAIN_UNLOCK(domain); if (free) - dmar_gas_free_entry(ctx, entry); + dmar_gas_free_entry(domain, entry); else entry->flags = 0; } void -dmar_ctx_unload_entry(struct dmar_map_entry *entry, bool free) +dmar_domain_unload_entry(struct dmar_map_entry *entry, bool free) { struct dmar_unit *unit; - unit = entry->ctx->dmar; + unit = entry->domain->dmar; if (unit->qi_enabled) { DMAR_LOCK(unit); - dmar_qi_invalidate_locked(entry->ctx, entry->start, + dmar_qi_invalidate_locked(entry->domain, entry->start, entry->end - entry->start, &entry->gseq); if (!free) entry->flags |= DMAR_MAP_ENTRY_QI_NF; TAILQ_INSERT_TAIL(&unit->tlb_flush_entries, entry, dmamap_link); DMAR_UNLOCK(unit); } else { - ctx_flush_iotlb_sync(entry->ctx, entry->start, entry->end - - entry->start); - dmar_ctx_free_entry(entry, free); + domain_flush_iotlb_sync(entry->domain, entry->start, + entry->end - entry->start); + dmar_domain_free_entry(entry, free); } } void -dmar_ctx_unload(struct dmar_ctx *ctx, struct dmar_map_entries_tailq *entries, - bool cansleep) +dmar_domain_unload(struct dmar_domain *domain, + struct dmar_map_entries_tailq *entries, bool cansleep) { struct dmar_unit *unit; struct dmar_map_entry *entry, *entry1; struct dmar_qi_genseq gseq; int error; - unit = ctx->dmar; + unit = domain->dmar; TAILQ_FOREACH_SAFE(entry, entries, dmamap_link, entry1) { KASSERT((entry->flags & DMAR_MAP_ENTRY_MAP) != 0, - ("not mapped entry %p %p", ctx, entry)); - error = ctx_unmap_buf(ctx, entry->start, entry->end - + ("not mapped entry %p %p", domain, entry)); + error = domain_unmap_buf(domain, entry->start, entry->end - entry->start, cansleep ? DMAR_PGF_WAITOK : 0); - KASSERT(error == 0, ("unmap %p error %d", ctx, error)); + KASSERT(error == 0, ("unmap %p error %d", domain, error)); if (!unit->qi_enabled) { - ctx_flush_iotlb_sync(ctx, entry->start, + domain_flush_iotlb_sync(domain, entry->start, entry->end - entry->start); TAILQ_REMOVE(entries, entry, dmamap_link); - dmar_ctx_free_entry(entry, true); + dmar_domain_free_entry(entry, true); } } if (TAILQ_EMPTY(entries)) @@ -618,7 +744,7 @@ dmar_ctx_unload(struct dmar_ctx *ctx, st TAILQ_FOREACH(entry, entries, dmamap_link) { entry->gseq.gen = 0; entry->gseq.seq = 0; - dmar_qi_invalidate_locked(ctx, entry->start, entry->end - + dmar_qi_invalidate_locked(domain, entry->start, entry->end - entry->start, TAILQ_NEXT(entry, dmamap_link) == NULL ? &gseq : NULL); } @@ -631,21 +757,21 @@ dmar_ctx_unload(struct dmar_ctx *ctx, st } static void -dmar_ctx_unload_task(void *arg, int pending) +dmar_domain_unload_task(void *arg, int pending) { - struct dmar_ctx *ctx; + struct dmar_domain *domain; struct dmar_map_entries_tailq entries; - ctx = arg; + domain = arg; TAILQ_INIT(&entries); for (;;) { - DMAR_CTX_LOCK(ctx); - TAILQ_SWAP(&ctx->unload_entries, &entries, dmar_map_entry, + DMAR_DOMAIN_LOCK(domain); + TAILQ_SWAP(&domain->unload_entries, &entries, dmar_map_entry, dmamap_link); - DMAR_CTX_UNLOCK(ctx); + DMAR_DOMAIN_UNLOCK(domain); if (TAILQ_EMPTY(&entries)) break; - dmar_ctx_unload(ctx, &entries, true); + dmar_domain_unload(domain, &entries, true); } } Modified: head/sys/x86/iommu/intel_dmar.h ============================================================================== --- head/sys/x86/iommu/intel_dmar.h Fri Jun 26 06:25:14 2015 (r284868) +++ head/sys/x86/iommu/intel_dmar.h Fri Jun 26 07:01:29 2015 (r284869) @@ -50,10 +50,10 @@ struct dmar_map_entry { current R/B tree node */ u_int flags; TAILQ_ENTRY(dmar_map_entry) dmamap_link; /* Link for dmamap entries */ - RB_ENTRY(dmar_map_entry) rb_entry; /* Links for ctx entries */ + RB_ENTRY(dmar_map_entry) rb_entry; /* Links for domain entries */ TAILQ_ENTRY(dmar_map_entry) unroll_link; /* Link for unroll after dmamap_load failure */ - struct dmar_ctx *ctx; + struct dmar_domain *domain; struct dmar_qi_genseq gseq; }; @@ -73,51 +73,84 @@ RB_PROTOTYPE(dmar_gas_entries_tree, dmar #define DMAR_MAP_ENTRY_SNOOP 0x4000 /* Snoop */ #define DMAR_MAP_ENTRY_TM 0x8000 /* Transient */ +/* + * Locking annotations: + * (u) - Protected by dmar unit lock + * (d) - Protected by domain lock + * (c) - Immutable after initialization + */ + +/* + * The domain abstraction. Most non-constant members of the domain + * are locked by the owning dmar unit lock, not by the domain lock. + * Most important, dmar lock protects the contexts list. + * + * The domain lock protects the address map for the domain, and list + * of unload entries delayed. + * + * Page tables pages and pages content is protected by the vm object + * lock pgtbl_obj, which contains the page tables pages. + */ +struct dmar_domain { + int domain; /* (c) DID, written in context entry */ + int mgaw; /* (c) Real max address width */ + int agaw; /* (c) Adjusted guest address width */ + int pglvl; /* (c) The pagelevel */ + int awlvl; /* (c) The pagelevel as the bitmask, + to set in context entry */ + dmar_gaddr_t end; /* (c) Highest address + 1 in + the guest AS */ + u_int ctx_cnt; /* (u) Number of contexts owned */ + u_int refs; /* (u) Refs, including ctx */ + struct dmar_unit *dmar; /* (c) */ + struct mtx lock; /* (c) */ + LIST_ENTRY(dmar_domain) link; /* (u) Member in the dmar list */ + LIST_HEAD(, dmar_ctx) contexts; /* (u) */ + vm_object_t pgtbl_obj; /* (c) Page table pages */ + u_int flags; /* (u) */ + u_int entries_cnt; /* (d) */ + struct dmar_gas_entries_tree rb_root; /* (d) */ + struct dmar_map_entries_tailq unload_entries; /* (d) Entries to + unload */ + struct dmar_map_entry *first_place, *last_place; /* (d) */ + struct task unload_task; /* (c) */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Fri Jun 26 07:12:18 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38A0098C78E; Fri, 26 Jun 2015 07:12:18 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1CC5019CF; Fri, 26 Jun 2015 07:12:18 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5Q7CHjU037688; Fri, 26 Jun 2015 07:12:17 GMT (envelope-from royger@FreeBSD.org) Received: (from royger@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5Q7CHxo037686; Fri, 26 Jun 2015 07:12:17 GMT (envelope-from royger@FreeBSD.org) Message-Id: <201506260712.t5Q7CHxo037686@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: royger set sender to royger@FreeBSD.org using -f From: Roger Pau MonnĂ© Date: Fri, 26 Jun 2015 07:12:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284870 - in head/sys: amd64/amd64 conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 07:12:18 -0000 Author: royger Date: Fri Jun 26 07:12:17 2015 New Revision: 284870 URL: https://svnweb.freebsd.org/changeset/base/284870 Log: amd64: set the correct LMA values The current linker script generates program headers with VMA == LMA: Entry point 0xffffffff802e7000 There are 6 program headers, starting at offset 64 Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flags Align PHDR 0x0000000000000040 0xffffffff80200040 0xffffffff80200040 0x0000000000000150 0x0000000000000150 R E 8 INTERP 0x0000000000000190 0xffffffff80200190 0xffffffff80200190 0x000000000000000d 0x000000000000000d R 1 [Requesting program interpreter: /red/herring] LOAD 0x0000000000000000 0xffffffff80200000 0xffffffff80200000 0x00000000010559b0 0x00000000010559b0 R E 200000 LOAD 0x0000000001056000 0xffffffff81456000 0xffffffff81456000 0x0000000000132638 0x000000000052ecf8 RW 200000 DYNAMIC 0x0000000001056000 0xffffffff81456000 0xffffffff81456000 0x00000000000000d0 0x00000000000000d0 RW 8 GNU_STACK 0x0000000000000000 0x0000000000000000 0x0000000000000000 0x0000000000000000 0x0000000000000000 RWE 8 This is fine for the FreeBSD loader, because it completely ignores p_paddr and instead uses p_vaddr with a hardcoded offset. Other loaders however acknowledge p_paddr (like the Xen ELF loader), in which case they will try to load the kernel at the wrong place. Fix this by adding an AT keyword to the first section specifying the physical address, other sections will follow suit, so it ends up looking like: Entry point 0xffffffff802e7000 There are 6 program headers, starting at offset 64 Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flags Align PHDR 0x0000000000000040 0xffffffff80200040 0x0000000000200040 0x0000000000000150 0x0000000000000150 R E 8 INTERP 0x0000000000000190 0xffffffff80200190 0x0000000000200190 0x000000000000000d 0x000000000000000d R 1 [Requesting program interpreter: /red/herring] LOAD 0x0000000000000000 0xffffffff80200000 0x0000000000200000 0x00000000010559b0 0x00000000010559b0 R E 200000 LOAD 0x0000000001056000 0xffffffff81456000 0x0000000001456000 0x0000000000132638 0x000000000052ecf8 RW 200000 DYNAMIC 0x0000000001056000 0xffffffff81456000 0x0000000001456000 0x00000000000000d0 0x00000000000000d0 RW 8 GNU_STACK 0x0000000000000000 0x0000000000000000 0x0000000000000000 0x0000000000000000 0x0000000000000000 RWE 8 Tested on bare metal using the native FreeBSD loader and grub2 from TRUEOS. Sponsored by: Citrix Systems R&D Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D2783 Modified: head/sys/amd64/amd64/xen-locore.S head/sys/conf/ldscript.amd64 Modified: head/sys/amd64/amd64/xen-locore.S ============================================================================== --- head/sys/amd64/amd64/xen-locore.S Fri Jun 26 07:01:29 2015 (r284869) +++ head/sys/amd64/amd64/xen-locore.S Fri Jun 26 07:12:17 2015 (r284870) @@ -47,7 +47,7 @@ ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION, .asciz, __XSTRING(__FreeBSD_version)) ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION, .asciz, "xen-3.0") ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE, .quad, KERNBASE) - ELFNOTE(Xen, XEN_ELFNOTE_PADDR_OFFSET, .quad, KERNBASE) /* Xen honours elf->p_paddr; compensate for this */ + ELFNOTE(Xen, XEN_ELFNOTE_PADDR_OFFSET, .quad, 0) ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .quad, xen_start) ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .quad, hypercall_page) ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW, .quad, HYPERVISOR_VIRT_START) Modified: head/sys/conf/ldscript.amd64 ============================================================================== --- head/sys/conf/ldscript.amd64 Fri Jun 26 07:01:29 2015 (r284869) +++ head/sys/conf/ldscript.amd64 Fri Jun 26 07:12:17 2015 (r284870) @@ -8,7 +8,12 @@ SECTIONS /* Read-only sections, merged into text segment: */ kernphys = CONSTANT (MAXPAGESIZE); . = kernbase + kernphys + SIZEOF_HEADERS; - .interp : { *(.interp) } + /* + * Use the AT keyword in order to set the right LMA that contains + * the physical address where the section should be loaded. This is + * needed for the Xen loader which honours the LMA. + */ + .interp : AT (kernphys + SIZEOF_HEADERS) { *(.interp) } .hash : { *(.hash) } .gnu.hash : { *(.gnu.hash) } .dynsym : { *(.dynsym) } From owner-svn-src-head@freebsd.org Fri Jun 26 09:02:41 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C72A98C974; Fri, 26 Jun 2015 09:02:41 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0D7E21EC0; Fri, 26 Jun 2015 09:02:41 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5Q92eNu097219; Fri, 26 Jun 2015 09:02:40 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5Q92e9j097218; Fri, 26 Jun 2015 09:02:40 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201506260902.t5Q92e9j097218@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Fri, 26 Jun 2015 09:02:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284871 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 09:02:41 -0000 Author: andrew Date: Fri Jun 26 09:02:40 2015 New Revision: 284871 URL: https://svnweb.freebsd.org/changeset/base/284871 Log: pc_curpmap is only in the armv6 pcpu data. Modified: head/sys/arm/arm/genassym.c Modified: head/sys/arm/arm/genassym.c ============================================================================== --- head/sys/arm/arm/genassym.c Fri Jun 26 07:12:17 2015 (r284870) +++ head/sys/arm/arm/genassym.c Fri Jun 26 09:02:40 2015 (r284871) @@ -136,7 +136,9 @@ ASSYM(ARM_RAS_END, ARM_RAS_END); ASSYM(PCB_VFPSTATE, offsetof(struct pcb, pcb_vfpstate)); #endif +#if __ARM_ARCH >= 6 ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); +#endif ASSYM(PAGE_SIZE, PAGE_SIZE); ASSYM(PMAP_DOMAIN_KERNEL, PMAP_DOMAIN_KERNEL); From owner-svn-src-head@freebsd.org Fri Jun 26 11:56:04 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A980E98D442; Fri, 26 Jun 2015 11:56:04 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from kif.fubar.geek.nz (kif.fubar.geek.nz [178.62.119.249]) by mx1.freebsd.org (Postfix) with ESMTP id 79E0C1B4B; Fri, 26 Jun 2015 11:56:03 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from bender.Home (97e07b11.skybroadband.com [151.224.123.17]) by kif.fubar.geek.nz (Postfix) with ESMTPSA id 448B5D7E1C; Fri, 26 Jun 2015 11:55:31 +0000 (UTC) Date: Fri, 26 Jun 2015 12:55:30 +0100 From: Andrew Turner To: Glen Barber Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284817 - head/release/doc/en_US.ISO8859-1/relnotes Message-ID: <20150626125530.6409ee79@bender.Home> In-Reply-To: <201506251844.t5PIi6Fg046535@svn.freebsd.org> References: <201506251844.t5PIi6Fg046535@svn.freebsd.org> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.27; amd64-portbld-freebsd10.0) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 11:56:04 -0000 On Thu, 25 Jun 2015 18:44:06 +0000 (UTC) Glen Barber wrote: > Author: gjb > Date: Thu Jun 25 18:44:06 2015 > New Revision: 284817 > URL: https://svnweb.freebsd.org/changeset/base/284817 > > Log: > Document r282779, Thumb-2 support for ARMv7 added. > > 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 Thu > Jun 25 18:38:58 2015 (r284816) +++ > head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun > 25 18:44:06 2015 (r284817) @@ -980,6 +980,9 @@ revision="280259" contrib="sponsor" sponsor="&ff;">Initial support > for the ARM AArch64 architecture has been added. > + > + Kernel support for Thumb-2 > + has been added. > > It might be better to say "Kernel support for Thumb-2 userland has been added" to make it explicit it's userland that could be build with Thumb-2, not the kernel. Andrew From owner-svn-src-head@freebsd.org Fri Jun 26 11:58:43 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 12FC898D49E; Fri, 26 Jun 2015 11:58:43 +0000 (UTC) (envelope-from kadesai@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EEAC21D27; Fri, 26 Jun 2015 11:58:42 +0000 (UTC) (envelope-from kadesai@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5QBwgr4091065; Fri, 26 Jun 2015 11:58:42 GMT (envelope-from kadesai@FreeBSD.org) Received: (from kadesai@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5QBwgRj091064; Fri, 26 Jun 2015 11:58:42 GMT (envelope-from kadesai@FreeBSD.org) Message-Id: <201506261158.t5QBwgRj091064@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kadesai set sender to kadesai@FreeBSD.org using -f From: Kashyap D Desai Date: Fri, 26 Jun 2015 11:58:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284872 - head/sys/dev/mrsas X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 11:58:43 -0000 Author: kadesai Date: Fri Jun 26 11:58:42 2015 New Revision: 284872 URL: https://svnweb.freebsd.org/changeset/base/284872 Log: Kernel panic may be observed by user, if MR controller is under Chip reset (OCR) and there are some pending IOs at the time of OCR. This is mainly because of recursive mutext in OCR and IO completion function call. Generic IO completion (from ISR) needs sim_lock to be held before it calls completion to CAM (xpt_done), but in case of OCR path mrsas_ocr thread itself take sim_lock, so this condition is now handled in this patch. MFC after: 3 days Modified: head/sys/dev/mrsas/mrsas.c Modified: head/sys/dev/mrsas/mrsas.c ============================================================================== --- head/sys/dev/mrsas/mrsas.c Fri Jun 26 09:02:40 2015 (r284871) +++ head/sys/dev/mrsas/mrsas.c Fri Jun 26 11:58:42 2015 (r284872) @@ -2715,6 +2715,7 @@ mrsas_reset_ctrl(struct mrsas_softc *sc) "resetting adapter from %s.\n", __func__); /* Now return commands back to the CAM layer */ + mtx_unlock(&sc->sim_lock); for (i = 0; i < sc->max_fw_cmds; i++) { mpt_cmd = sc->mpt_cmd_list[i]; if (mpt_cmd->ccb_ptr) { @@ -2724,6 +2725,7 @@ mrsas_reset_ctrl(struct mrsas_softc *sc) mrsas_atomic_dec(&sc->fw_outstanding); } } + mtx_lock(&sc->sim_lock); status_reg = mrsas_read_reg(sc, offsetof(mrsas_reg_set, outbound_scratch_pad)); From owner-svn-src-head@freebsd.org Fri Jun 26 12:00:52 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A4BBE98D8AA; Fri, 26 Jun 2015 12:00:52 +0000 (UTC) (envelope-from kadesai@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C62710D6; Fri, 26 Jun 2015 12:00:52 +0000 (UTC) (envelope-from kadesai@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5QC0qel091683; Fri, 26 Jun 2015 12:00:52 GMT (envelope-from kadesai@FreeBSD.org) Received: (from kadesai@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5QC0q2T091680; Fri, 26 Jun 2015 12:00:52 GMT (envelope-from kadesai@FreeBSD.org) Message-Id: <201506261200.t5QC0q2T091680@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kadesai set sender to kadesai@FreeBSD.org using -f From: Kashyap D Desai Date: Fri, 26 Jun 2015 12:00:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284873 - head/sys/dev/mrsas X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 12:00:52 -0000 Author: kadesai Date: Fri Jun 26 12:00:51 2015 New Revision: 284873 URL: https://svnweb.freebsd.org/changeset/base/284873 Log: Counter part of mfi driver commit in mrsas Switch from make_dev_alias to make_dev_alias_p since make_dev_alias_p can gracefully fail if the /dev/megaraid_sas_ioctl_node symlink already exists. This can happen if mfi(4) and mrsas(4) are both attached to cards and providing Linux emulation support. Let the first one win. An equivalent change has been done in mfi(4). Extra credit would be to pass the Linux emulation call to the other driver when appropriate. This will probably be a rare case and the user can manually change where the symlink points to. MFC after: 3 days Modified: head/sys/dev/mrsas/mrsas.c head/sys/dev/mrsas/mrsas.h Modified: head/sys/dev/mrsas/mrsas.c ============================================================================== --- head/sys/dev/mrsas/mrsas.c Fri Jun 26 11:58:42 2015 (r284872) +++ head/sys/dev/mrsas/mrsas.c Fri Jun 26 12:00:51 2015 (r284873) @@ -811,6 +811,7 @@ mrsas_attach(device_t dev) { struct mrsas_softc *sc = device_get_softc(dev); uint32_t cmd, bar, error; + struct cdev *linux_dev; /* Look up our softc and initialize its fields. */ sc->mrsas_dev = dev; @@ -870,7 +871,8 @@ mrsas_attach(device_t dev) GID_OPERATOR, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP), "mrsas%u", device_get_unit(dev)); if (device_get_unit(dev) == 0) - make_dev_alias(sc->mrsas_cdev, "megaraid_sas_ioctl_node"); + make_dev_alias_p(MAKEDEV_CHECKNAME, &linux_dev, sc->mrsas_cdev, + "megaraid_sas_ioctl_node"); if (sc->mrsas_cdev) sc->mrsas_cdev->si_drv1 = sc; Modified: head/sys/dev/mrsas/mrsas.h ============================================================================== --- head/sys/dev/mrsas/mrsas.h Fri Jun 26 11:58:42 2015 (r284872) +++ head/sys/dev/mrsas/mrsas.h Fri Jun 26 12:00:51 2015 (r284873) @@ -102,7 +102,7 @@ __FBSDID("$FreeBSD$"); */ #define BYTE_ALIGNMENT 1 #define MRSAS_MAX_NAME_LENGTH 32 -#define MRSAS_VERSION "06.707.04.03-fbsd" +#define MRSAS_VERSION "06.707.05.00-fbsd" #define MRSAS_ULONG_MAX 0xFFFFFFFFFFFFFFFF #define MRSAS_DEFAULT_TIMEOUT 0x14 /* Temporarily set */ #define DONE 0 From owner-svn-src-head@freebsd.org Fri Jun 26 13:33:47 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9797298C9D4; Fri, 26 Jun 2015 13:33:47 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 88F781503; Fri, 26 Jun 2015 13:33:47 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5QDXlm4045023; Fri, 26 Jun 2015 13:33:47 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5QDXlVH045022; Fri, 26 Jun 2015 13:33:47 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506261333.t5QDXlVH045022@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 26 Jun 2015 13:33:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284874 - head/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 13:33:47 -0000 Author: gjb Date: Fri Jun 26 13:33:46 2015 New Revision: 284874 URL: https://svnweb.freebsd.org/changeset/base/284874 Log: Clarify the note about Thumb-2 kernel support. Submitted by: andrew 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 Fri Jun 26 12:00:51 2015 (r284873) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Jun 26 13:33:46 2015 (r284874) @@ -1081,7 +1081,7 @@ added. Kernel support for Thumb-2 - has been added. + userland has been added. Support for the hardware power button on the BeagleBone Black system has been added. From owner-svn-src-head@freebsd.org Fri Jun 26 13:34:17 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F13398CA23; Fri, 26 Jun 2015 13:34:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id F15C2168A; Fri, 26 Jun 2015 13:34:16 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by freefall.freebsd.org (Postfix) with ESMTP id 4B6361BDF; Fri, 26 Jun 2015 13:34:16 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Date: Fri, 26 Jun 2015 13:34:14 +0000 From: Glen Barber To: Andrew Turner Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284817 - head/release/doc/en_US.ISO8859-1/relnotes Message-ID: <20150626133414.GW1265@FreeBSD.org> References: <201506251844.t5PIi6Fg046535@svn.freebsd.org> <20150626125530.6409ee79@bender.Home> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ipiAXJWFVZGVDOzf" Content-Disposition: inline In-Reply-To: <20150626125530.6409ee79@bender.Home> X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event X-PEKBAC-Definition: Problem Exists, Keyboard Between Admin/Computer User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 13:34:17 -0000 --ipiAXJWFVZGVDOzf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jun 26, 2015 at 12:55:30PM +0100, Andrew Turner wrote: > On Thu, 25 Jun 2015 18:44:06 +0000 (UTC) > Glen Barber wrote: >=20 > > Author: gjb > > Date: Thu Jun 25 18:44:06 2015 > > New Revision: 284817 > > URL: https://svnweb.freebsd.org/changeset/base/284817 > >=20 > > Log: > > Document r282779, Thumb-2 support for ARMv7 added. > > =20 > > Sponsored by: The FreeBSD Foundation > >=20 > > Modified: > > head/release/doc/en_US.ISO8859-1/relnotes/article.xml > >=20 > > Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu > > Jun 25 18:38:58 2015 (r284816) +++ > > head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun > > 25 18:44:06 2015 (r284817) @@ -980,6 +980,9 @@ > revision=3D"280259" contrib=3D"sponsor" sponsor=3D"&ff;">Initial support > > for the ARM AArch64 architecture has been added. > > + > > + Kernel support for Thumb-2 > > + has been added. > > > > >=20 > It might be better to say "Kernel support for Thumb-2 userland has been > added" to make it explicit it's userland that could be build with > Thumb-2, not the kernel. >=20 Updated. Thank you for reviewing. Glen --ipiAXJWFVZGVDOzf Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVjVTWAAoJEAMUWKVHj+KTPygP/ipNoFB5QM/j0CkiJFj6sr+E 2icrPdW9j/QfAoDYn7203hizoXYeXx1pWY3YvhoMlI9tGixLlrHmiRstHrma0iYm r+BeZFm4q0z/ZeIXOA7dbyhOfN4Jm/1N7Hch2d5mpNKpw39/8jy+7xTui8cXGVfV IcIv6MqbJADTiUm96hj+DZw8tCvFsdPnOgbUf9yO4nTVMe599i0NMHTSE9k3ffmY O9VAkMOx/0pDeLuD8hYgtBuJwfoZ/ty+HKplZ+xGXoemSc3KLAz47SBmhlknu1fs EEQS/F+vCr9qVguFz6ihKq5nFCQ+32LN1UGZPYgGxuh3HdrO45HFf+BZhC82RHC/ ch4n5RwekqDOWEcEGZbDAPAVK8fc7ljU9ha2jhuEqLQhPEnJqJkNBazXHwNdlaxW TXl2FMe4mghaP4DvJLLfslHFSspfVDHtNzy4JI0WzPm1Ss0VTlCmSEAglxNjfdkH L0cLRNNU5ksAPwevclZUBgo/EVTAYBaB4U+TlDI9DhbDJGx0Q0knBKXEX+xpTFJk JwSbcy3QaFSH4bwgkgrdudIR4ZwMK4RsNdHv1wDxsxbi8Bh6TEMXZqmqmrx3+wF7 SiZOISak6yTDUS/r5wZCZ2yTCkdvguCJcn40wcOcUhGffZ4j9JyDyNWAizcSyWSM ss5dvSwyNXuv00SnY6x3 =C7Yz -----END PGP SIGNATURE----- --ipiAXJWFVZGVDOzf-- From owner-svn-src-head@freebsd.org Fri Jun 26 15:32:25 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A00598CF47; Fri, 26 Jun 2015 15:32:25 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-ig0-x233.google.com (mail-ig0-x233.google.com [IPv6:2607:f8b0:4001:c05::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 35CBD1E9D; Fri, 26 Jun 2015 15:32:25 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by igtg8 with SMTP id g8so3908681igt.0; Fri, 26 Jun 2015 08:32:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=DwUadfWwtNYUK4zBTzIEY77crnJ1L0trsuz5YzzNCf8=; b=s3kBLKzNJGCm1ks91mj3Tz5OWk6HQvQ9DFqMCh3gGYbTIjDtAe30FHmPrUXJARdzNM HxuOMSDiY9resabva8eNeAHxeyizQF69jEkdls8zXsaOwEe7QIQXby6mF9BVw/rktJG4 neJSTe9Lyh92TlljyFJlCBlXoXTnRlVFeyAwetyMOYXM6Gre+KIHWaEmX4YEU4vkJq0d 4MW9RS43S30o/qfPc/hBgd/tH7SK1gEri6jifaM4mW1UA6Ix/IXqYljogYdY1ubd09/z RrQ+x6tfLEQW3zBAz/14bGZBXbnIrBzIuURoxt7DXseGt3Idvwz+Ef6lm6ZdplAVyXQV BsQg== MIME-Version: 1.0 X-Received: by 10.107.11.169 with SMTP id 41mr3108418iol.8.1435332744589; Fri, 26 Jun 2015 08:32:24 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.36.38.133 with HTTP; Fri, 26 Jun 2015 08:32:24 -0700 (PDT) In-Reply-To: References: <201506260412.t5Q4C6b4046102@svn.freebsd.org> Date: Fri, 26 Jun 2015 08:32:24 -0700 X-Google-Sender-Auth: qiv6TXacpHkYpStNa31_e1_Yhk8 Message-ID: Subject: Re: svn commit: r284865 - head/sys/dev/sound/midi From: Adrian Chadd To: NGie Cooper Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 15:32:25 -0000 On 25 June 2015 at 23:46, NGie Cooper wrote: > On Thu, Jun 25, 2015 at 9:12 PM, Adrian Chadd wrote: >> Author: adrian >> Date: Fri Jun 26 04:12:06 2015 >> New Revision: 284865 >> URL: https://svnweb.freebsd.org/changeset/base/284865 >> >> Log: >> Rename seq_* to mseq_*, to avoid clashes with seq.h (namely, seq_read.) > > Should this be MFCed? I'm happy for it to be MFCed by anyone who wishes to. I won't be MFCing the NUMA stuff in a rush (as I have a feeling it'll take a while to soak/bikeshed) so there's no real rush. -a From owner-svn-src-head@freebsd.org Fri Jun 26 16:14:01 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 038B598D682; Fri, 26 Jun 2015 16:14:01 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DEA6419D7; Fri, 26 Jun 2015 16:14:00 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5QGE0Qm023993; Fri, 26 Jun 2015 16:14:00 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5QGE062023992; Fri, 26 Jun 2015 16:14:00 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201506261614.t5QGE062023992@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 26 Jun 2015 16:14:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284875 - head/usr.sbin/ctld X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 16:14:01 -0000 Author: mav Date: Fri Jun 26 16:14:00 2015 New Revision: 284875 URL: https://svnweb.freebsd.org/changeset/base/284875 Log: Plug minor memory leak at r284765. Reported by: Coverity CID: 1308401 MFC after: 3 days Modified: head/usr.sbin/ctld/kernel.c Modified: head/usr.sbin/ctld/kernel.c ============================================================================== --- head/usr.sbin/ctld/kernel.c Fri Jun 26 13:33:46 2015 (r284874) +++ head/usr.sbin/ctld/kernel.c Fri Jun 26 16:14:00 2015 (r284875) @@ -508,6 +508,8 @@ retry_port: name = NULL; STAILQ_FOREACH(port, &devlist.port_list, links) { + if (name) + free(name); if (port->pp == 0 && port->vp == 0) name = checked_strdup(port->port_name); else if (port->vp == 0) From owner-svn-src-head@freebsd.org Fri Jun 26 18:00:30 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0DDE198C832; Fri, 26 Jun 2015 18:00:30 +0000 (UTC) (envelope-from tychon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E148C11A8; Fri, 26 Jun 2015 18:00:29 +0000 (UTC) (envelope-from tychon@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5QI0TgR075957; Fri, 26 Jun 2015 18:00:29 GMT (envelope-from tychon@FreeBSD.org) Received: (from tychon@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5QI0TV2075956; Fri, 26 Jun 2015 18:00:29 GMT (envelope-from tychon@FreeBSD.org) Message-Id: <201506261800.t5QI0TV2075956@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tychon set sender to tychon@FreeBSD.org using -f From: Tycho Nightingale Date: Fri, 26 Jun 2015 18:00:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284877 - head/sys/amd64/vmm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 18:00:30 -0000 Author: tychon Date: Fri Jun 26 18:00:29 2015 New Revision: 284877 URL: https://svnweb.freebsd.org/changeset/base/284877 Log: verify_gla() needs to account for non-zero segment base addresses. Reviewed by: neel Modified: head/sys/amd64/vmm/vmm_instruction_emul.c Modified: head/sys/amd64/vmm/vmm_instruction_emul.c ============================================================================== --- head/sys/amd64/vmm/vmm_instruction_emul.c Fri Jun 26 17:13:23 2015 (r284876) +++ head/sys/amd64/vmm/vmm_instruction_emul.c Fri Jun 26 18:00:29 2015 (r284877) @@ -2321,10 +2321,13 @@ decode_moffset(struct vie *vie) * page table fault matches with our instruction decoding. */ static int -verify_gla(struct vm *vm, int cpuid, uint64_t gla, struct vie *vie) +verify_gla(struct vm *vm, int cpuid, uint64_t gla, struct vie *vie, + enum vm_cpu_mode cpu_mode) { int error; - uint64_t base, idx, gla2; + uint64_t base, segbase, idx, gla2; + enum vm_reg_name seg; + struct seg_desc desc; /* Skip 'gla' verification */ if (gla == VIE_INVALID_GLA) @@ -2357,14 +2360,48 @@ verify_gla(struct vm *vm, int cpuid, uin } } - /* XXX assuming that the base address of the segment is 0 */ - gla2 = base + vie->scale * idx + vie->displacement; + /* + * From "Specifying a Segment Selector", Intel SDM, Vol 1 + * + * In 64-bit mode, segmentation is generally (but not + * completely) disabled. The exceptions are the FS and GS + * segments. + * + * In legacy IA-32 mode, when the ESP or EBP register is used + * as the base, the SS segment is the default segment. For + * other data references, except when relative to stack or + * string destination the DS segment is the default. These + * can be overridden to allow other segments to be accessed. + */ + if (vie->segment_override) + seg = vie->segment_register; + else if (vie->base_register == VM_REG_GUEST_RSP || + vie->base_register == VM_REG_GUEST_RBP) + seg = VM_REG_GUEST_SS; + else + seg = VM_REG_GUEST_DS; + if (cpu_mode == CPU_MODE_64BIT && seg != VM_REG_GUEST_FS && + seg != VM_REG_GUEST_GS) { + segbase = 0; + } else { + error = vm_get_seg_desc(vm, cpuid, seg, &desc); + if (error) { + printf("verify_gla: error %d getting segment" + " descriptor %d", error, + vie->segment_register); + return (-1); + } + segbase = desc.base; + } + + gla2 = segbase + base + vie->scale * idx + vie->displacement; gla2 &= size2mask[vie->addrsize]; if (gla != gla2) { - printf("verify_gla mismatch: " + printf("verify_gla mismatch: segbase(0x%0lx)" "base(0x%0lx), scale(%d), index(0x%0lx), " "disp(0x%0lx), gla(0x%0lx), gla2(0x%0lx)\n", - base, vie->scale, idx, vie->displacement, gla, gla2); + segbase, base, vie->scale, idx, vie->displacement, + gla, gla2); return (-1); } @@ -2398,7 +2435,7 @@ vmm_decode_instruction(struct vm *vm, in return (-1); if ((vie->op.op_flags & VIE_OP_F_NO_GLA_VERIFICATION) == 0) { - if (verify_gla(vm, cpuid, gla, vie)) + if (verify_gla(vm, cpuid, gla, vie, cpu_mode)) return (-1); } From owner-svn-src-head@freebsd.org Fri Jun 26 18:03:20 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E41998CA07; Fri, 26 Jun 2015 18:03:20 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8EEBF169E; Fri, 26 Jun 2015 18:03:20 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5QI3KWe078937; Fri, 26 Jun 2015 18:03:20 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5QI3K1o078936; Fri, 26 Jun 2015 18:03:20 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506261803.t5QI3K1o078936@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 26 Jun 2015 18:03:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284878 - head/sys/boot/i386/boot2 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 18:03:20 -0000 Author: delphij Date: Fri Jun 26 18:03:19 2015 New Revision: 284878 URL: https://svnweb.freebsd.org/changeset/base/284878 Log: Reduce warnings: - Add prototype for boot2 main() - Don't make assignment within if statement, split it into two. No functional or binary change -- verified with sha256(1). MFC after: 2 weeks Modified: head/sys/boot/i386/boot2/boot2.c Modified: head/sys/boot/i386/boot2/boot2.c ============================================================================== --- head/sys/boot/i386/boot2/boot2.c Fri Jun 26 18:00:29 2015 (r284877) +++ head/sys/boot/i386/boot2/boot2.c Fri Jun 26 18:03:19 2015 (r284878) @@ -150,6 +150,7 @@ static int comspeed = SIOSPD; static uint8_t ioctrl = IO_KEYBOARD; #endif +int main(void); void exit(int); static void load(void); static int parse(void); @@ -481,7 +482,8 @@ parse() ? DRV_HARD : 0) + drv; dsk_meta = 0; } - if (k = ep - arg) { + k = ep - arg; + if (k > 0) { if (k >= sizeof(knamebuf)) return -1; memcpy(knamebuf, arg, k + 1); From owner-svn-src-head@freebsd.org Fri Jun 26 21:39:34 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E282E98DC60; Fri, 26 Jun 2015 21:39:34 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (mail.turbocat.net [IPv6:2a01:4f8:d16:4514::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9EE16120E; Fri, 26 Jun 2015 21:39:34 +0000 (UTC) (envelope-from hps@selasky.org) Received: from laptop015.home.selasky.org (cm-176.74.213.204.customer.telag.net [176.74.213.204]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 847861FE022; Fri, 26 Jun 2015 23:39:23 +0200 (CEST) Message-ID: <558DC6C7.5090003@selasky.org> Date: Fri, 26 Jun 2015 23:40:23 +0200 From: Hans Petter Selasky User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: David Chisnall CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r268137 - head/sys/sys References: <201407020845.s628jRG5031824@svn.freebsd.org> <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> In-Reply-To: <5BE3492F-86A0-4CE3-A27C-8DB5EB662C64@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 21:39:35 -0000 Hi David, On 06/19/15 12:16, David Chisnall wrote: > I only just caught this (having seen the fallout from NetBSD doing the same thing in a shipping release and the pain that it’s caused): > > __weak is a reserved keyword in Objective-C, please pick another name for this. Should be fixed by r284880. Let me know if not. Thank you! --HPS From owner-svn-src-head@freebsd.org Fri Jun 26 23:55:03 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 895F898D1AE; Fri, 26 Jun 2015 23:55:03 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7AF711A9F; Fri, 26 Jun 2015 23:55:03 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5QNt3xb056999; Fri, 26 Jun 2015 23:55:03 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5QNt3Ii056998; Fri, 26 Jun 2015 23:55:03 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506262355.t5QNt3Ii056998@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 26 Jun 2015 23:55:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284881 - head/usr.bin/xinstall X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 23:55:03 -0000 Author: bapt Date: Fri Jun 26 23:55:02 2015 New Revision: 284881 URL: https://svnweb.freebsd.org/changeset/base/284881 Log: short circuit install -l rs When requesting install(1) to only make relative symlinks, by pass all the done to actually compute the relative symlink if the path given in argument is already a relative path Modified: head/usr.bin/xinstall/xinstall.c Modified: head/usr.bin/xinstall/xinstall.c ============================================================================== --- head/usr.bin/xinstall/xinstall.c Fri Jun 26 21:35:36 2015 (r284880) +++ head/usr.bin/xinstall/xinstall.c Fri Jun 26 23:55:02 2015 (r284881) @@ -658,6 +658,14 @@ makelink(const char *from_name, const ch if (dolink & LN_RELATIVE) { char *cp, *d, *s; + if (*from_name != '/') { + /* this is already a relative link */ + do_symlink(from_name, to_name, target_sb); + /* XXX: from_name may point outside of destdir. */ + metadata_log(to_name, "link", NULL, from_name, NULL, 0); + return; + } + /* Resolve pathnames. */ if (realpath(from_name, src) == NULL) err(EX_OSERR, "%s: realpath", from_name); From owner-svn-src-head@freebsd.org Sat Jun 27 01:30:00 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A039D98C006; Sat, 27 Jun 2015 01:30:00 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 910C710F7; Sat, 27 Jun 2015 01:30:00 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5R1U0jg003734; Sat, 27 Jun 2015 01:30:00 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5R1U0lr003717; Sat, 27 Jun 2015 01:30:00 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506270130.t5R1U0lr003717@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 27 Jun 2015 01:30:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284882 - in head/release: . tools X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 01:30:00 -0000 Author: gjb Date: Sat Jun 27 01:29:59 2015 New Revision: 284882 URL: https://svnweb.freebsd.org/changeset/base/284882 Log: Add initial support for automatically uploading GCE virtual machine images to the Google Compute Engine platform. By default, gcutil/gsutil requires an Oauth2 login generated from a URL that must be opened in a browser, a verification code copied back to the terminal from which it was invoked, etc., etc., making it near impossible for automation. I've hacked together an evil solution to work around this, so unless GCE_LOGIN_SKIP is set to a non-empty value, this Makefile will not do anything useful. As a result of this commit, remove the gce-package.sh script that was never, nor will ever be, used. MFC after: 3 days X-MFC-Note: (hopefully) Sponsored by: The FreeBSD Foundation Added: head/release/Makefile.gce (contents, props changed) Deleted: head/release/tools/gce-package.sh Modified: head/release/Makefile.vm Added: head/release/Makefile.gce ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/Makefile.gce Sat Jun 27 01:29:59 2015 (r284882) @@ -0,0 +1,69 @@ +# +# $FreeBSD$ +# +# +# Makefile for uploading Google Compute Engine disk images. +# + +GCE_IMG?= ${.OBJDIR}/gce.raw +GCE_UPLOAD_TGTS= gce-check-depends \ + gce-do-package \ + gce-do-upload +# I do not yet have a better way to deal with the "must be run interactively" +# thing, so this is a fail-safe "do not do anything." +.if !defined(GCE_LOGIN_SKIP) || empty(GCE_LOGIN_SKIP) +GCE_UPLOAD_TGTS= gce-do-login +.endif +CLEANFILES+= ${GCE_UPLOAD_TGTS} + +GCE_BUCKET?= + +.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" +SNAPSHOT_DATE!= date +-%Y-%m-%d-%H-%M +.endif + +# Really? Uppercase characters are not allowed? Sigh... +# And don't even get me started on the '.'. +GCE_TARGET:= ${OSRELEASE:S,.raw,,:tl:S,.,-,g}${SNAPSHOT_DATE} + +gce-upload: ${GCE_UPLOAD_TGTS} + +gce-check-depends: +.for VAR in _BUCKET +. if !defined(GCE${VAR}) || empty(GCE${VAR}) + @echo "Variable GCE${VAR} cannot be empty." + @false +. endif +.endfor +.if !exists(/usr/local/bin/gcutil) +. if !execho ists(${PORTSDIR}/net/google-cloud-api/Makefile) +. if !exists(/usr/local/sbin/pkg-static) + env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf +. endif + env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-api +. else + make -C ${PORTSDIR}/net/google-cloud-api BATCH=1 all install clean +. endif +.endif + +gce-do-package: + @# Yes, really... Sigh. + cd ${.OBJDIR} && mv gce.raw disk.raw + cd ${.OBJDIR} && tar --format=gnutar -zcf \ + ${GCE_TARGET:S,${.OBJDIR}/,,}.tar.gz disk.raw + cd ${.OBJDIR} && mv disk.raw gce.raw + touch ${.OBJDIR}/${.TARGET} + +gce-do-login: + @echo "This requires human interaction, which is not yet supported." + @true + +gce-do-upload: + @# Fallthrough in case the bucket already exists. + /usr/local/bin/gsutil mb gs://${GCE_BUCKET} || true + /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET}.tar.gz \ + gs://${GCE_BUCKET}/ + /usr/local/bin/gcutil addimage ${GCE_TARGET} \ + gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz + touch ${.OBJDIR}/${.TARGET} + Modified: head/release/Makefile.vm ============================================================================== --- head/release/Makefile.vm Fri Jun 26 23:55:02 2015 (r284881) +++ head/release/Makefile.vm Sat Jun 27 01:29:59 2015 (r284882) @@ -155,3 +155,4 @@ cloudware-install: .include "${.CURDIR}/Makefile.ec2" .include "${.CURDIR}/Makefile.azure" +.include "${.CURDIR}/Makefile.gce" From owner-svn-src-head@freebsd.org Sat Jun 27 03:28:06 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8439C98E2E2; Sat, 27 Jun 2015 03:28:06 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 51BEF1A0B; Sat, 27 Jun 2015 03:28:06 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5R3S6gq064046; Sat, 27 Jun 2015 03:28:06 GMT (envelope-from marcel@FreeBSD.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5R3S5WH064041; Sat, 27 Jun 2015 03:28:05 GMT (envelope-from marcel@FreeBSD.org) Message-Id: <201506270328.t5R3S5WH064041@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcel set sender to marcel@FreeBSD.org using -f From: Marcel Moolenaar Date: Sat, 27 Jun 2015 03:28:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284883 - head/usr.bin/mkimg X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 03:28:06 -0000 Author: marcel Date: Sat Jun 27 03:28:04 2015 New Revision: 284883 URL: https://svnweb.freebsd.org/changeset/base/284883 Log: Add the ntfs alias and support it with the MBR and GPT schemes as DOSPTYP_NTFS and GPT_ENT_TYPE_MS_BASIC_DATA (resp). Modified: head/usr.bin/mkimg/gpt.c head/usr.bin/mkimg/mbr.c head/usr.bin/mkimg/scheme.c head/usr.bin/mkimg/scheme.h Modified: head/usr.bin/mkimg/gpt.c ============================================================================== --- head/usr.bin/mkimg/gpt.c Sat Jun 27 01:29:59 2015 (r284882) +++ head/usr.bin/mkimg/gpt.c Sat Jun 27 03:28:04 2015 (r284883) @@ -57,6 +57,7 @@ static uuid_t gpt_uuid_freebsd_ufs = GPT static uuid_t gpt_uuid_freebsd_vinum = GPT_ENT_TYPE_FREEBSD_VINUM; static uuid_t gpt_uuid_freebsd_zfs = GPT_ENT_TYPE_FREEBSD_ZFS; static uuid_t gpt_uuid_mbr = GPT_ENT_TYPE_MBR; +static uuid_t gpt_uuid_ms_basic_data = GPT_ENT_TYPE_MS_BASIC_DATA; static struct mkimg_alias gpt_aliases[] = { { ALIAS_EFI, ALIAS_PTR2TYPE(&gpt_uuid_efi) }, @@ -68,6 +69,7 @@ static struct mkimg_alias gpt_aliases[] { ALIAS_FREEBSD_VINUM, ALIAS_PTR2TYPE(&gpt_uuid_freebsd_vinum) }, { ALIAS_FREEBSD_ZFS, ALIAS_PTR2TYPE(&gpt_uuid_freebsd_zfs) }, { ALIAS_MBR, ALIAS_PTR2TYPE(&gpt_uuid_mbr) }, + { ALIAS_NTFS, ALIAS_PTR2TYPE(&gpt_uuid_ms_basic_data) }, { ALIAS_NONE, 0 } /* Keep last! */ }; Modified: head/usr.bin/mkimg/mbr.c ============================================================================== --- head/usr.bin/mkimg/mbr.c Sat Jun 27 01:29:59 2015 (r284882) +++ head/usr.bin/mkimg/mbr.c Sat Jun 27 03:28:04 2015 (r284883) @@ -51,6 +51,7 @@ static struct mkimg_alias mbr_aliases[] { ALIAS_EFI, ALIAS_INT2TYPE(DOSPTYP_EFI) }, { ALIAS_FAT32, ALIAS_INT2TYPE(DOSPTYP_FAT32) }, { ALIAS_FREEBSD, ALIAS_INT2TYPE(DOSPTYP_386BSD) }, + { ALIAS_NTFS, ALIAS_INT2TYPE(DOSPTYP_NTFS) }, { ALIAS_NONE, 0 } /* Keep last! */ }; Modified: head/usr.bin/mkimg/scheme.c ============================================================================== --- head/usr.bin/mkimg/scheme.c Sat Jun 27 01:29:59 2015 (r284882) +++ head/usr.bin/mkimg/scheme.c Sat Jun 27 03:28:04 2015 (r284883) @@ -59,6 +59,7 @@ static struct { { "freebsd-vinum", ALIAS_FREEBSD_VINUM }, { "freebsd-zfs", ALIAS_FREEBSD_ZFS }, { "mbr", ALIAS_MBR }, + { "ntfs", ALIAS_NTFS }, { NULL, ALIAS_NONE } /* Keep last! */ }; Modified: head/usr.bin/mkimg/scheme.h ============================================================================== --- head/usr.bin/mkimg/scheme.h Sat Jun 27 01:29:59 2015 (r284882) +++ head/usr.bin/mkimg/scheme.h Sat Jun 27 03:28:04 2015 (r284883) @@ -45,6 +45,7 @@ enum alias { ALIAS_FREEBSD_VINUM, ALIAS_FREEBSD_ZFS, ALIAS_MBR, + ALIAS_NTFS, /* end */ ALIAS_COUNT /* Keep last! */ }; From owner-svn-src-head@freebsd.org Sat Jun 27 05:18:09 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90F9F98C131; Sat, 27 Jun 2015 05:18:09 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7E7ED1C4A; Sat, 27 Jun 2015 05:18:09 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5R5I9II022510; Sat, 27 Jun 2015 05:18:09 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5R5I9hf022509; Sat, 27 Jun 2015 05:18:09 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506270518.t5R5I9hf022509@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 27 Jun 2015 05:18:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284884 - head/release X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 05:18:09 -0000 Author: gjb Date: Sat Jun 27 05:18:08 2015 New Revision: 284884 URL: https://svnweb.freebsd.org/changeset/base/284884 Log: Fix a vi-invoked typo. Submitted by: jkim (privately) Sponsored by: The FreeBSD Foundation Modified: head/release/Makefile.gce Modified: head/release/Makefile.gce ============================================================================== --- head/release/Makefile.gce Sat Jun 27 03:28:04 2015 (r284883) +++ head/release/Makefile.gce Sat Jun 27 05:18:08 2015 (r284884) @@ -36,7 +36,7 @@ gce-check-depends: . endif .endfor .if !exists(/usr/local/bin/gcutil) -. if !execho ists(${PORTSDIR}/net/google-cloud-api/Makefile) +. if !exists(${PORTSDIR}/net/google-cloud-api/Makefile) . if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf . endif From owner-svn-src-head@freebsd.org Sat Jun 27 08:49:42 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 974D598C27A; Sat, 27 Jun 2015 08:49:42 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 884F11DE2; Sat, 27 Jun 2015 08:49:42 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5R8ngoV024776; Sat, 27 Jun 2015 08:49:42 GMT (envelope-from nyan@FreeBSD.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5R8ng6c024775; Sat, 27 Jun 2015 08:49:42 GMT (envelope-from nyan@FreeBSD.org) Message-Id: <201506270849.t5R8ng6c024775@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nyan set sender to nyan@FreeBSD.org using -f From: Takahashi Yoshihiro Date: Sat, 27 Jun 2015 08:49:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284885 - head/sys/boot/pc98/boot2 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 08:49:42 -0000 Author: nyan Date: Sat Jun 27 08:49:41 2015 New Revision: 284885 URL: https://svnweb.freebsd.org/changeset/base/284885 Log: MFi386: r284878 Reduce warnings: - Add prototype for boot2 main() - Don't make assignment within if statement, split it into two. Modified: head/sys/boot/pc98/boot2/boot2.c Modified: head/sys/boot/pc98/boot2/boot2.c ============================================================================== --- head/sys/boot/pc98/boot2/boot2.c Sat Jun 27 05:18:08 2015 (r284884) +++ head/sys/boot/pc98/boot2/boot2.c Sat Jun 27 08:49:41 2015 (r284885) @@ -152,6 +152,7 @@ static int comspeed = SIOSPD; static uint8_t ioctrl = IO_KEYBOARD; #endif +int main(void); void exit(int); static void load(void); static int parse(void); @@ -620,7 +621,8 @@ parse() dsk.daua = dsk.disk | dsk.unit; dsk_meta = 0; } - if (k = ep - arg) { + k = ep - arg; + if (k > 0) { if (k >= sizeof(knamebuf)) return -1; memcpy(knamebuf, arg, k + 1); From owner-svn-src-head@freebsd.org Sat Jun 27 09:01:49 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3A9298D1EF; Sat, 27 Jun 2015 09:01:49 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D505314CD; Sat, 27 Jun 2015 09:01:49 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5R91n1o033092; Sat, 27 Jun 2015 09:01:49 GMT (envelope-from nyan@FreeBSD.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5R91nen033091; Sat, 27 Jun 2015 09:01:49 GMT (envelope-from nyan@FreeBSD.org) Message-Id: <201506270901.t5R91nen033091@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nyan set sender to nyan@FreeBSD.org using -f From: Takahashi Yoshihiro Date: Sat, 27 Jun 2015 09:01:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284886 - head/sys/dev/fe X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 09:01:50 -0000 Author: nyan Date: Sat Jun 27 09:01:49 2015 New Revision: 284886 URL: https://svnweb.freebsd.org/changeset/base/284886 Log: MFi386: r278165 Silence a coverity warning about ignoring a return value. Modified: head/sys/dev/fe/if_fe_cbus.c Modified: head/sys/dev/fe/if_fe_cbus.c ============================================================================== --- head/sys/dev/fe/if_fe_cbus.c Sat Jun 27 08:49:41 2015 (r284885) +++ head/sys/dev/fe/if_fe_cbus.c Sat Jun 27 09:01:49 2015 (r284886) @@ -157,10 +157,21 @@ static int fe_isa_attach(device_t dev) { struct fe_softc *sc = device_get_softc(dev); + int error = 0; - if (sc->port_used) - fe98_alloc_port(dev, sc->type); - fe_alloc_irq(dev, 0); + /* + * Note: these routines aren't expected to fail since we also call + * them in the probe routine. But coverity complains, so we'll honor + * that complaint since the intention here was never to ignore them.. + */ + if (sc->port_used) { + error = fe98_alloc_port(dev, sc->type); + if (error != 0) + return (error); + } + error = fe_alloc_irq(dev, 0); + if (error != 0) + return (error); return fe_attach(dev); } From owner-svn-src-head@freebsd.org Sat Jun 27 09:44:15 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9ACF898DA73; Sat, 27 Jun 2015 09:44:15 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 756E6264E; Sat, 27 Jun 2015 09:44:15 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5R9iFDs053348; Sat, 27 Jun 2015 09:44:15 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5R9iEjO053344; Sat, 27 Jun 2015 09:44:14 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201506270944.t5R9iEjO053344@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 27 Jun 2015 09:44:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284887 - in head/sys: kern sys ufs/ffs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 09:44:15 -0000 Author: kib Date: Sat Jun 27 09:44:14 2015 New Revision: 284887 URL: https://svnweb.freebsd.org/changeset/base/284887 Log: Handle errors from background write of the cylinder group blocks. First, on the write error, bufdone() call from ffs_backgroundwrite() panics because pbrelvp() cleared bp->b_bufobj, while brelse() would try to re-dirty the copy of the cg buffer. Handle this by setting B_INVAL for the case of BIO_ERROR. Second, we must re-dirty the real buffer containing the cylinder group block data when background write failed. Real cg buffer was already marked clean in ffs_bufwrite(). After the BV_BKGRDINPROG flag is cleared on the real cg buffer in ffs_backgroundwrite(), buffer scan may reuse the buffer at any moment. The result is lost write, and if the write error was only transient, we get corrupted bitmaps. We cannot re-dirty the original cg buffer in the ffs_backgroundwritedone(), since the context is not sleepable, preventing us from sleeping for origbp' lock. Add BV_BKGDERR flag (protected by the buffer object lock), which is converted into delayed write by brelse(), bqrelse() and buffer scan. In collaboration with: Conrad Meyer Reviewed by: mckusick Sponsored by: The FreeBSD Foundation (kib), EMC/Isilon storage division (Conrad) MFC after: 2 weeks Modified: head/sys/kern/vfs_bio.c head/sys/sys/buf.h head/sys/ufs/ffs/ffs_vfsops.c Modified: head/sys/kern/vfs_bio.c ============================================================================== --- head/sys/kern/vfs_bio.c Sat Jun 27 09:01:49 2015 (r284886) +++ head/sys/kern/vfs_bio.c Sat Jun 27 09:44:14 2015 (r284887) @@ -1597,6 +1597,12 @@ brelse(struct buf *bp) return; } + if ((bp->b_vflags & (BV_BKGRDINPROG | BV_BKGRDERR)) == BV_BKGRDERR) { + BO_LOCK(bp->b_bufobj); + bp->b_vflags &= ~BV_BKGRDERR; + BO_UNLOCK(bp->b_bufobj); + bdirty(bp); + } if (bp->b_iocmd == BIO_WRITE && (bp->b_ioflags & BIO_ERROR) && bp->b_error == EIO && !(bp->b_flags & B_INVAL)) { /* @@ -1853,7 +1859,11 @@ bqrelse(struct buf *bp) } /* buffers with stale but valid contents */ - if (bp->b_flags & B_DELWRI) { + if ((bp->b_flags & B_DELWRI) != 0 || (bp->b_vflags & (BV_BKGRDINPROG | + BV_BKGRDERR)) == BV_BKGRDERR) { + BO_LOCK(bp->b_bufobj); + bp->b_vflags &= ~BV_BKGRDERR; + BO_UNLOCK(bp->b_bufobj); qindex = QUEUE_DIRTY; } else { if ((bp->b_flags & B_DELWRI) == 0 && @@ -2372,6 +2382,16 @@ restart: continue; } + /* + * Requeue the background write buffer with error. + */ + if ((bp->b_vflags & BV_BKGRDERR) != 0) { + bremfreel(bp); + mtx_unlock(&bqclean); + bqrelse(bp); + continue; + } + KASSERT(bp->b_qindex == qindex, ("getnewbuf: inconsistent queue %d bp %p", qindex, bp)); Modified: head/sys/sys/buf.h ============================================================================== --- head/sys/sys/buf.h Sat Jun 27 09:01:49 2015 (r284886) +++ head/sys/sys/buf.h Sat Jun 27 09:44:14 2015 (r284887) @@ -253,8 +253,9 @@ struct buf { #define BV_SCANNED 0x00000001 /* VOP_FSYNC funcs mark written bufs */ #define BV_BKGRDINPROG 0x00000002 /* Background write in progress */ #define BV_BKGRDWAIT 0x00000004 /* Background write waiting */ +#define BV_BKGRDERR 0x00000008 /* Error from background write */ -#define PRINT_BUF_VFLAGS "\20\3bkgrdwait\2bkgrdinprog\1scanned" +#define PRINT_BUF_VFLAGS "\20\4bkgrderr\3bkgrdwait\2bkgrdinprog\1scanned" #ifdef _KERNEL /* Modified: head/sys/ufs/ffs/ffs_vfsops.c ============================================================================== --- head/sys/ufs/ffs/ffs_vfsops.c Sat Jun 27 09:01:49 2015 (r284886) +++ head/sys/ufs/ffs/ffs_vfsops.c Sat Jun 27 09:44:14 2015 (r284887) @@ -1978,12 +1978,19 @@ ffs_backgroundwritedone(struct buf *bp) BO_LOCK(bufobj); if ((origbp = gbincore(bp->b_bufobj, bp->b_lblkno)) == NULL) panic("backgroundwritedone: lost buffer"); + + /* + * We should mark the cylinder group buffer origbp as + * dirty, to not loose the failed write. + */ + if ((bp->b_ioflags & BIO_ERROR) != 0) + origbp->b_vflags |= BV_BKGRDERR; BO_UNLOCK(bufobj); /* * Process dependencies then return any unfinished ones. */ pbrelvp(bp); - if (!LIST_EMPTY(&bp->b_dep)) + if (!LIST_EMPTY(&bp->b_dep) && (bp->b_ioflags & BIO_ERROR) == 0) buf_complete(bp); #ifdef SOFTUPDATES if (!LIST_EMPTY(&bp->b_dep)) @@ -1995,6 +2002,15 @@ ffs_backgroundwritedone(struct buf *bp) */ bp->b_flags |= B_NOCACHE; bp->b_flags &= ~B_CACHE; + + /* + * Prevent brelse() from trying to keep and re-dirtying bp on + * errors. It causes b_bufobj dereference in + * bdirty()/reassignbuf(), and b_bufobj was cleared in + * pbrelvp() above. + */ + if ((bp->b_ioflags & BIO_ERROR) != 0) + bp->b_flags |= B_INVAL; bufdone(bp); BO_LOCK(bufobj); /* @@ -2056,6 +2072,8 @@ ffs_bufwrite(struct buf *bp) if (bp->b_vflags & BV_BKGRDINPROG) panic("bufwrite: still writing"); } + if ((bp->b_vflags & BV_BKGRDERR) != 0) + bp->b_vflags &= ~BV_BKGRDERR; BO_UNLOCK(bp->b_bufobj); /* From owner-svn-src-head@freebsd.org Sat Jun 27 12:00:41 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2B8CD98D301 for ; Sat, 27 Jun 2015 12:00:41 +0000 (UTC) (envelope-from reviveu@orange.ukhost4u.com) Received: from mx2.ukhost4u.com (mx2.ukhost4u.com [188.64.186.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D693E1BBD for ; Sat, 27 Jun 2015 12:00:40 +0000 (UTC) (envelope-from reviveu@orange.ukhost4u.com) Received: from [188.64.186.31] (helo=orange.ukhost4u.com) by mx2.ukhost4u.com with esmtps (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.85) (envelope-from ) id 1Z8oVq-0004WS-HY for svn-src-head@freebsd.org; Sat, 27 Jun 2015 12:43:17 +0100 Received: from reviveu by orange.ukhost4u.com with local (Exim 4.85) (envelope-from ) id 1Z8oVp-002LWn-Vq for svn-src-head@freebsd.org; Sat, 27 Jun 2015 12:43:10 +0100 To: svn-src-head@freebsd.org Subject: Indebted for driving on toll road #00000629403 X-PHP-Script: revive-uk.org/post.php for 87.106.28.133 Date: Sat, 27 Jun 2015 12:43:09 +0100 From: "E-ZPass Agent" Reply-To: "E-ZPass Agent" Message-ID: X-Priority: 3 MIME-Version: 1.0 X-OutGoing-Spam-Status: No, score=-1.9 X-AuthUser: reviveu X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - orange.ukhost4u.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [958 970] / [47 12] X-AntiAbuse: Sender Address Domain - orange.ukhost4u.com X-Get-Message-Sender-Via: orange.ukhost4u.com: authenticated_id: reviveu/primary_hostname/system user X-Filter-ID: s0sct1PQhAABKnZB5plbIWnuaEQBa5PhBTswXC+rcc4RZZwpQCICMys/dsnLLV0LiWmIB1XhEWkg vvHuv5pFDqsxchqyKnbcUzrz1LZfgujRLN8G3Z32ZgN8MEvMljzbTmOZZI12FKDZ2CE6AHMjUzOG vHR8sv+lyhyE7ybq/YXiEffupFLqklrwRpYypfB9uQ9t5DbEM526HI1JUwACxiG7X+t1TW39Ja77 LGPpOwBDg1mAE7gddt3rOvrrDKsycXZthpBW0FaLdEOqi5zwcHVfdhS9WjePOGVQywq2aujPO9rp hQbr+5A3nuCKYZKWn1bLLf0BFW7qWmmH8SmESV7gfIMYzWBshn4rLmyyqnQD4cpKc0+Gr+Tya3wx sj9hG5b/+/xmAxi+qQQD8d0Ycbh66UqSVOD0JahY/e/e8ILAeTtpPLOMvhM3PyI6yfPojh+xXpUx RAOezroAo0Kib0DD+GmmpFBIC8Krws9v6KHlBFK7V37HKbOyIn1IWGmmFGDdp/vmZLBtdXPyp1Qy TZmZ2Vvgju0X36d+Kgm6FO9oh9VoIekQHpwUfpYnEThmsKw20EuA8aPf8AzwmwDpwgZjVMCKZ65q aDtI/QZFHBD4YLHTLZJhjFOV0QTRcDAoNJ20Se/xFnp1NjB4Vq2Lcw== X-Report-Abuse-To: spam@mx1.ukhost4u.com X-Filter-Fingerprint: IFrWXGses7OKB5S5G8/dJR8Z5VD7FZiiT9tK6RAzQuhA3cTUQ1R++keuE7RDJ8Kg3RbMLUalw1oC mj99/u+PoqoVy8a3lsStJtAvpObFX0Wok1JBYnOLzfRIhlEHQynLUpndEJ0YoaLytXXo8BMTaX2p Mk7LBarWD9Fj4R3eIu5cOy/3Wm9qfF/CZNvP/2Kowv61T+KDYyYtREgszdyFwv8IxCB3p/oCKvxr eyISh3JGb7OS5oVgiO+kDxZrVPLz3MmEGC2PrUKqLq5WmHK+Nw== X-Originating-IP: 188.64.186.31 X-SpamExperts-Domain: orange.ukhost4u.com X-SpamExperts-Username: 188.64.186.31 Authentication-Results: ukhost4u.com; auth=pass smtp.auth=188.64.186.31@orange.ukhost4u.com X-SpamExperts-Outgoing-Class: unsure X-SpamExperts-Outgoing-Evidence: Combined (0.87) X-Recommended-Action: accept Content-Type: text/plain; charset=us-ascii X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 12:00:41 -0000 Notice to Appear, You have a debt to pay for using a toll road. Please, do not forget to service your debt. You can find the invoice is in the attachment. Sincerely, Billy Dougherty, E-ZPass Manager. From owner-svn-src-head@freebsd.org Sat Jun 27 12:37:10 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4458198D979; Sat, 27 Jun 2015 12:37:10 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 28B001BAE; Sat, 27 Jun 2015 12:37:10 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5RCbAUp036830; Sat, 27 Jun 2015 12:37:10 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5RCbAFA036829; Sat, 27 Jun 2015 12:37:10 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201506271237.t5RCbAFA036829@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Sat, 27 Jun 2015 12:37:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284889 - head/sys/dev/hyperv/netvsc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 12:37:10 -0000 Author: bz Date: Sat Jun 27 12:37:09 2015 New Revision: 284889 URL: https://svnweb.freebsd.org/changeset/base/284889 Log: Fix compilation without INET6 and without INET and INET6 after offload support was introduced in r284746. While here also fix the ioctl() handler for IPv4 added in r279819, which was never compiled in given opt_inet.h was not included. Modified: head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Modified: head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c ============================================================================== --- head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Sat Jun 27 09:47:28 2015 (r284888) +++ head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Sat Jun 27 12:37:09 2015 (r284889) @@ -55,6 +55,9 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_inet6.h" +#include "opt_inet.h" + #include #include #include @@ -179,8 +182,12 @@ static uint32_t get_transport_proto_type uint16_t ether_type = 0; int ether_len = 0; struct ether_vlan_header *eh; +#ifdef INET struct ip *iph; +#endif +#ifdef INET6 struct ip6_hdr *ip6; +#endif eh = mtod(m_head, struct ether_vlan_header*); if (eh->evl_encap_proto == htons(ETHERTYPE_VLAN)) { @@ -192,6 +199,7 @@ static uint32_t get_transport_proto_type } switch (ntohs(ether_type)) { +#ifdef INET6 case ETHERTYPE_IPV6: ip6 = (struct ip6_hdr *)(m_head->m_data + ether_len); @@ -201,6 +209,8 @@ static uint32_t get_transport_proto_type ret_val = TRANSPORT_TYPE_IPV6_UDP; } break; +#endif +#ifdef INET case ETHERTYPE_IP: iph = (struct ip *)(m_head->m_data + ether_len); @@ -210,6 +220,7 @@ static uint32_t get_transport_proto_type ret_val = TRANSPORT_TYPE_IPV4_UDP; } break; +#endif default: ret_val = TRANSPORT_TYPE_NOT_IP; break; @@ -608,6 +619,7 @@ do_tso: tso_info->lso_v2_xmit.type = RNDIS_TCP_LARGE_SEND_OFFLOAD_V2_TYPE; +#ifdef INET if (trans_proto_type & (TYPE_IPV4 << 16)) { struct ip *ip = (struct ip *)(m_head->m_data + ether_len); @@ -623,7 +635,13 @@ do_tso: th->th_sum = in_pseudo(ip->ip_src.s_addr, ip->ip_dst.s_addr, htons(IPPROTO_TCP)); - } else { + } +#endif +#if defined(INET6) && defined(INET) + else +#endif +#ifdef INET6 + { struct ip6_hdr *ip6 = (struct ip6_hdr *)(m_head->m_data + ether_len); struct tcphdr *th = (struct tcphdr *)(ip6 + 1); @@ -633,6 +651,7 @@ do_tso: ip6->ip6_plen = 0; th->th_sum = in6_cksum_pseudo(ip6, 0, IPPROTO_TCP, 0); } +#endif tso_info->lso_v2_xmit.tcp_header_offset = 0; tso_info->lso_v2_xmit.mss = m_head->m_pkthdr.tso_segsz; @@ -950,6 +969,9 @@ hn_ioctl(struct ifnet *ifp, u_long cmd, { hn_softc_t *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; +#ifdef INET + struct ifaddr *ifa = (struct ifaddr *)data; +#endif netvsc_device_info device_info; struct hv_device *hn_dev; int mask, error = 0; From owner-svn-src-head@freebsd.org Sat Jun 27 15:13:15 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 771A898D2C5; Sat, 27 Jun 2015 15:13:15 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6833F1C51; Sat, 27 Jun 2015 15:13:15 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5RFDFcJ019031; Sat, 27 Jun 2015 15:13:15 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5RFDFeT019030; Sat, 27 Jun 2015 15:13:15 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201506271513.t5RFDFeT019030@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 27 Jun 2015 15:13:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284890 - head/sys/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 15:13:15 -0000 Author: pfg Date: Sat Jun 27 15:13:14 2015 New Revision: 284890 URL: https://svnweb.freebsd.org/changeset/base/284890 Log: Change detection for the gnu_inline attribute. According to the GCC documentation: "This attribute is available in GCC 4.1.3 and later. It is available if either of the preprocessor macros __GNUC_GNU_INLINE__ or __GNUC_STDC_INLINE__ are defined." We don't keep the gcc granularity up to the minor number so it's better to use the documented way. Current clang defines both macros. Reference: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#Common-Function-Attributes Modified: head/sys/sys/cdefs.h Modified: head/sys/sys/cdefs.h ============================================================================== --- head/sys/sys/cdefs.h Sat Jun 27 12:37:09 2015 (r284889) +++ head/sys/sys/cdefs.h Sat Jun 27 15:13:14 2015 (r284890) @@ -542,7 +542,7 @@ * using these but GCC-compatible compilers tend to support the extensions * well enough to use them in limited cases. */ -#if __GNUC_PREREQ__(4, 1) +#if defined(__GNUC_GNU_INLINE__) || defined(__GNUC_STDC_INLINE__) #if __has_attribute(artificial) || __GNUC_PREREQ__(4, 3) #define __gnu_inline __attribute__((__gnu_inline__, __artificial__)) #else From owner-svn-src-head@freebsd.org Sat Jun 27 18:01:51 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B004998C81F; Sat, 27 Jun 2015 18:01:51 +0000 (UTC) (envelope-from pkelsey@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A14081479; Sat, 27 Jun 2015 18:01:51 +0000 (UTC) (envelope-from pkelsey@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5RI1p5N002297; Sat, 27 Jun 2015 18:01:51 GMT (envelope-from pkelsey@FreeBSD.org) Received: (from pkelsey@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5RI1p7a002296; Sat, 27 Jun 2015 18:01:51 GMT (envelope-from pkelsey@FreeBSD.org) Message-Id: <201506271801.t5RI1p7a002296@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pkelsey set sender to pkelsey@FreeBSD.org using -f From: Patrick Kelsey Date: Sat, 27 Jun 2015 18:01:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284891 - head/etc/rc.d X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 18:01:51 -0000 Author: pkelsey Date: Sat Jun 27 18:01:50 2015 New Revision: 284891 URL: https://svnweb.freebsd.org/changeset/base/284891 Log: Use correct flag in iovctl_start(). Differential Revision: https://reviews.freebsd.org/D2921 Reviewed by: rstone Approved by: jmallett (mentor) Sponsored by: Norse Corp, Inc. Modified: head/etc/rc.d/iovctl Modified: head/etc/rc.d/iovctl ============================================================================== --- head/etc/rc.d/iovctl Sat Jun 27 15:13:14 2015 (r284890) +++ head/etc/rc.d/iovctl Sat Jun 27 18:01:50 2015 (r284891) @@ -27,7 +27,7 @@ run_iovctl() iovctl_start() { - run_iovctl -E + run_iovctl -C } iovctl_stop() From owner-svn-src-head@freebsd.org Sat Jun 27 18:08:32 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B1C4F98C8A2 for ; Sat, 27 Jun 2015 18:08:32 +0000 (UTC) (envelope-from tvsmile@tvsmile.ru) Received: from tvsmile.ru (web01.softmg.ru [88.198.0.162]) (using TLSv1.1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3ECA818CB for ; Sat, 27 Jun 2015 18:08:30 +0000 (UTC) (envelope-from tvsmile@tvsmile.ru) Received: from tvsmile.ru (localhost.localdomain [127.0.0.1]) by tvsmile.ru (8.14.4/8.14.4/Debian-2ubuntu2.1) with ESMTP id t5RI0tXr020899 for ; Sat, 27 Jun 2015 21:00:55 +0300 Received: (from tvsmile@localhost) by tvsmile.ru (8.14.4/8.14.4/Submit) id t5RI0t5F020898; Sat, 27 Jun 2015 21:00:55 +0300 To: svn-src-head@freebsd.org Subject: Notice to appear in Court #0000157393 X-PHP-Originating-Script: 1000:post.php(13) : eval()'d code Date: Sat, 27 Jun 2015 21:00:55 +0300 From: "State Court" Reply-To: "State Court" Message-ID: X-Priority: 3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 18:08:32 -0000 Notice to Appear, You have to appear in the Court on the July 04. Please, prepare all the documents relating to the case and bring them to Court on the specified date. Note: If you do not come, the case will be heard in your absence. The Court Notice is attached to this email. Regards, Tom Hoffman, District Clerk. From owner-svn-src-head@freebsd.org Sat Jun 27 18:24:24 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 05CC798CB8A; Sat, 27 Jun 2015 18:24:24 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EB1D11E49; Sat, 27 Jun 2015 18:24:23 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5RIONBf012413; Sat, 27 Jun 2015 18:24:23 GMT (envelope-from neel@FreeBSD.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5RIONLF012412; Sat, 27 Jun 2015 18:24:23 GMT (envelope-from neel@FreeBSD.org) Message-Id: <201506271824.t5RIONLF012412@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org using -f From: Neel Natu Date: Sat, 27 Jun 2015 18:24:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284892 - head/usr.sbin/bhyveload X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 18:24:24 -0000 Author: neel Date: Sat Jun 27 18:24:23 2015 New Revision: 284892 URL: https://svnweb.freebsd.org/changeset/base/284892 Log: Fix issues detected by 'mandoc -Tlint bhyveload.8' Pointed out by: wblock Differential Revision: https://reviews.freebsd.org/D2762 Modified: head/usr.sbin/bhyveload/bhyveload.8 Modified: head/usr.sbin/bhyveload/bhyveload.8 ============================================================================== --- head/usr.sbin/bhyveload/bhyveload.8 Sat Jun 27 18:01:50 2015 (r284891) +++ head/usr.sbin/bhyveload/bhyveload.8 Sat Jun 27 18:24:23 2015 (r284892) @@ -114,8 +114,8 @@ The default value of is 256M. .It Fl S Wire guest memory. -.Sh EXAMPLES .El +.Sh EXAMPLES To create a virtual machine named .Ar freebsd-vm that boots off the ISO image From owner-svn-src-head@freebsd.org Sat Jun 27 20:39:15 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 405DD98EFD5; Sat, 27 Jun 2015 20:39:15 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2FD9710F6; Sat, 27 Jun 2015 20:39:15 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5RKdEs3079002; Sat, 27 Jun 2015 20:39:14 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5RKdEC9078999; Sat, 27 Jun 2015 20:39:14 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201506272039.t5RKdEC9078999@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Sat, 27 Jun 2015 20:39:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284893 - in head/release: . tools X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 20:39:15 -0000 Author: brd (doc,ports committer) Date: Sat Jun 27 20:39:13 2015 New Revision: 284893 URL: https://svnweb.freebsd.org/changeset/base/284893 Log: Add initial support for building Vagrant images for VMWare. Next steps will be adding Virtualbox support and uploading to Hashicorp Atlas for others to consume. Approved by: re (gjb) Added: head/release/Makefile.vagrant (contents, props changed) head/release/tools/vagrant.conf (contents, props changed) Modified: head/release/Makefile.vm Added: head/release/Makefile.vagrant ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/Makefile.vagrant Sat Jun 27 20:39:13 2015 (r284893) @@ -0,0 +1,94 @@ +# +# $FreeBSD$ +# +# +# Makefile for uploading Vagrant boxes to Hashicorp Atlas +# + +VAGRANT_UPLOAD_TGTS= vagrant-check-depends \ + vagrant-do-package-vmware +# atlas-do-upload +CLEANFILES+= ${VAGRANT_UPLOAD_TGTS} + +.if defined(VAGRANT_UPLOAD_CONF) && !empty(VAGRANT_UPLOAD_CONF) +. for VAR in _ACCOUNT _KEY +VAGRANT${VAR}!= grep -E ^VAGRANT${VAR} ${VAGRANT_UPLOAD_CONF} | awk -F' ' '{print $$2}' +. endfor +.endif + +.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" +SNAPSHOT_DATE!= date +-%Y-%m-%d-%H-%M +.endif + +VAGRANT_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.box + +vagrant-upload: ${VAGRANT_UPLOAD_TGTS} + +vagrant-check-depends: +.for VAR in _ACCOUNT _KEY +. if !defined(VAGRANT${VAR}) || empty(VAGRANT${VAR}) + @echo "Variable VAGRANT${VAR} cannot be empty." + @false +. endif +.endfor +.if !exists(/usr/local/bin/curl) +. if !exists(${PORTSDIR}/ftp/curl/Makefile) +. if !exists(/usr/local/sbin/pkg-static) + env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf +. endif + env ASSUME_ALWAYS_YES=yes pkg install -y ftp/curl +. else + make -C ${PORTSDIR}/ftp/curl BATCH=1 all install clean +. endif +.endif + +vagrant-do-package: cw-vagrant + +vagrant-do-package-vmware: vagrant-create-vmware-vmx vagrant-do-package + @cd ${.OBJDIR} && echo '{"provider":"vmware_desktop"}' > metadata.json + cd ${.OBJDIR} && tar -czf ${VAGRANT_TARGET} metadata.json vagrant.vmx vagrant.vmdk + touch ${.OBJDIR}/${.TARGET} + +atlas-create-upload: +.for PROVIDER in vmware_desktop virtualbox + /usr/local/bin/curl "https://vagrant.hashicorp.com/api/v1/box/${ATLAS_USERNAME}/${ATLAS_NAME}/version/${ATLAS_VERSION}/provider/${PROVIDER}/upload?access_token=${ATLAS_KEY}" +.endfor + touch ${.OBJDIR}/${.TARGET} + +atlas-do-upload: + /usr/local/bin/curl -X PUT --upload-file \ + ${VAGRANT_IMG} ${ATLAS_UPLOAD_PATH} + touch ${.OBJDIR}/${.TARGET} + +vagrant-create-vmware-vmx: + @cd ${.OBJDIR} && echo '.encoding = "UTF-8"' > vagrant.vmx + @cd ${.OBJDIR} && echo 'bios.bootorder = "hdd,CDROM"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'checkpoint.vmstate = ""' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'cleanshutdown = "TRUE"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'config.version = "8"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'displayname = "${VAGRANT_TARGET}"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'ethernet0.addresstype = "generated"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'ethernet0.bsdname = "en0"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'ethernet0.connectiontype = "nat"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'ethernet0.displayname = "Ethernet"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'ethernet0.linkstatepropagation.enable = "FALSE"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'ethernet0.pcislotnumber = "33"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'ethernet0.present = "TRUE"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'ethernet0.virtualdev = "e1000"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'ethernet0.wakeonpcktrcv = "FALSE"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'floppy0.present = "FALSE"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'guestos = "freebsd-64"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'gui.fullscreenatpoweron = "FALSE"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'gui.viewmodeatpoweron = "windowed"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'memsize = "512"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'sound.startconnected = "FALSE"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'softpoweroff = "TRUE"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'scsi0.pcislotnumber = "16"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'scsi0.present = "TRUE"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'scsi0.virtualdev = "lsilogic"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'scsi0:0.filename = "vagrant.vmdk"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'scsi0:0.present = "TRUE"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'tools.synctime = "TRUE"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'usb.present = "FALSE"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'virtualhw.productcompatibility = "hosted"' >> vagrant.vmx + @cd ${.OBJDIR} && echo 'virtualhw.version = "9"' >> vagrant.vmx Modified: head/release/Makefile.vm ============================================================================== --- head/release/Makefile.vm Sat Jun 27 18:24:23 2015 (r284892) +++ head/release/Makefile.vm Sat Jun 27 20:39:13 2015 (r284893) @@ -18,7 +18,8 @@ RAW_DESC= Unformatted raw disk image CLOUDWARE?= AZURE \ EC2 \ GCE \ - OPENSTACK + OPENSTACK \ + VAGRANT AZURE_FORMAT= vhdf AZURE_DESC= Microsoft Azure platform image AZURE_DISK= ${OSRELEASE}.${AZURE_FORMAT} @@ -31,6 +32,9 @@ GCE_DISK= disk.${GCE_FORMAT} OPENSTACK_FORMAT=qcow2 OPENSTACK_DESC= OpenStack platform image OPENSTACK_DISK= ${OSRELEASE}.${OPENSTACK_FORMAT} +VAGRANT_FORMAT= vmdk +VAGRANT_DESC= Vagrant Image +VAGRANT_DISK= ${OSRELEASE}.${VAGRANT_FORMAT} .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) . for _CW in ${CLOUDWARE} @@ -156,3 +160,4 @@ cloudware-install: .include "${.CURDIR}/Makefile.ec2" .include "${.CURDIR}/Makefile.azure" .include "${.CURDIR}/Makefile.gce" +.include "${.CURDIR}/Makefile.vagrant" Added: head/release/tools/vagrant.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/release/tools/vagrant.conf Sat Jun 27 20:39:13 2015 (r284893) @@ -0,0 +1,81 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Packages to install into the image we're creating. This is a deliberately +# minimalist set, providing only the packages necessary to bootstrap. +export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs" + +# Set to a list of third-party software to enable in rc.conf(5). +export VM_RC_LIST="firstboot_freebsd_update firstboot_pkgs" + +vm_extra_pre_umount() { + # The firstboot_pkgs rc.d script will download the repository + # catalogue and install or update pkg when the instance first + # launches, so these files would just be replaced anyway; removing + # them from the image allows it to boot faster. + env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg + rm ${DESTDIR}/var/db/pkg/repo-*.sqlite + + # The size of the EC2 root disk can be configured at instance launch + # time; expand our filesystem to fill the disk. + echo 'growfs_enable="YES"' >> ${DESTDIR}/etc/rc.conf + + # Vagrant instances use DHCP to get their network configuration. + echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf + + # Enable sshd by default + echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf + # Disable DNS lookups by default to make SSH connect quickly + echo 'UseDNS no' >> ${DESTDIR}/etc/ssh/sshd_config + + # Disable sendmail + echo 'sendmail_enable="NO"' >> ${DESTDIR}/etc/rc.conf + echo 'sendmail_submit_enable="NO"' >> ${DESTDIR}/etc/rc.conf + echo 'sendmail_outbound_enable="NO"' >> ${DESTDIR}/etc/rc.conf + echo 'sendmail_msp_queue_enable="NO"' >> ${DESTDIR}/etc/rc.conf + + # sudo is required + echo 'firstboot_pkgs_list="sudo rsync"' >> ${DESTDIR}/etc/rc.conf + + # Create the vagrant user with a password of vagrant + /usr/sbin/pw -R ${DESTDIR} \ + groupadd vagrant -g 1001 + chroot ${DESTDIR} mkdir -p /home/vagrant + /usr/sbin/pw -R ${DESTDIR} \ + useradd vagrant \ + -m -M 0755 -w yes -n vagrant -u 1001 -g 1001 -G 0 \ + -c 'Vagrant User' -d '/home/vagrant' -s '/bin/csh' + + # Change root's password to vagrant + echo 'vagrant' | /usr/sbin/pw -R ${DESTDIR} \ + usermod root -h 0 + + # Configure sudo to allow the vagrant user + echo 'vagrant ALL=(ALL) NOPASSWD: ALL' >> ${DESTDIR}/usr/local/etc/sudoers + + # Configure the vagrant ssh key + mkdir ${DESTDIR}/home/vagrant/.ssh + chmod 700 ${DESTDIR}/home/vagrant/.ssh + echo "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key" > ${DESTDIR}/home/vagrant/.ssh/authorized_keys + chown -R 1001 ${DESTDIR}/home/vagrant/.ssh + chmod 600 ${DESTDIR}/home/vagrant/.ssh/authorized_keys + + # Reboot quickly, Don't wait at the panic screen + echo 'debug.trace_on_panic=1' >> ${DESTDIR}/etc/sysctl.conf + echo 'debug.debugger_on_panic=0' >> ${DESTDIR}/etc/sysctl.conf + echo 'kern.panic_reboot_wait_time=0' >> ${DESTDIR}/etc/sysctl.conf + + # The console is not interactive, so we might as well boot quickly. + echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf + + # The first time the VM boots, the installed "first boot" scripts + # should be allowed to run: + # * growfs (expand the filesystem to fill the provided disk) + # * firstboot_freebsd_update (install critical updates) + # * firstboot_pkgs (install packages) + touch ${DESTDIR}/firstboot + + return 0 +} From owner-svn-src-head@freebsd.org Sat Jun 27 20:40:31 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4FAB498D04F; Sat, 27 Jun 2015 20:40:31 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 3E4421456; Sat, 27 Jun 2015 20:40:31 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by freefall.freebsd.org (Postfix) with ESMTP id 85CB81A2D; Sat, 27 Jun 2015 20:40:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Date: Sat, 27 Jun 2015 20:40:28 +0000 From: Glen Barber To: Brad Davis Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284893 - in head/release: . tools Message-ID: <20150627204028.GY1265@FreeBSD.org> References: <201506272039.t5RKdEC9078999@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="8QANErTbuLtKTfKg" Content-Disposition: inline In-Reply-To: <201506272039.t5RKdEC9078999@svn.freebsd.org> X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event X-PEKBAC-Definition: Problem Exists, Keyboard Between Admin/Computer User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 20:40:31 -0000 --8QANErTbuLtKTfKg Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jun 27, 2015 at 08:39:14PM +0000, Brad Davis wrote: > Author: brd (doc,ports committer) > Date: Sat Jun 27 20:39:13 2015 > New Revision: 284893 > URL: https://svnweb.freebsd.org/changeset/base/284893 >=20 > Log: > Add initial support for building Vagrant images for VMWare. > Next steps will be adding Virtualbox support and uploading to > Hashicorp Atlas for others to consume. > =20 Thank you very much for all your work on this! Glen --8QANErTbuLtKTfKg Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVjwo8AAoJEAMUWKVHj+KTClcP/0zMNx6+wv2ttWi1hH1XnOwh 8d/F9Kmze81EhSJJuuXeWdkmQEdlasyI+B4v88slm5VfECkoXMKCXZKvzVnr/Y/A ZVLD639hSdXc7PudX3kQG9HftA38XCkLL54QKtjtkxPFoSbz0z9GRDOCPEvxI6lg YHWGtPDvrCwjZY4K/MbN1l7ruZe90mY6hAGzBDREBXq+M2Y2UzQmAhD13aiY6Bn5 dkIqYwD0x3mty7DRD1OvWQXz0+fu9Econ/dLFneICP+6ZbqvE4QzuN/eEtYoh/sR T85EJR8juzmFgjIucajJocj4dSEyVlwB+2erTu/yJksgaWGuFmr3q1+GSxuuCoaD DSV8ZTa4MgFheuVyN4GVaTV9dfTepK+j/Giw6qWEiCYLsyN5UiB7GYRzJf3mVNM5 9DQ/M8DA8L05GgTi9v7ppZwl0YXGUGdEvAHDloNDR3IfWP8c/HKR+eRM63SnU0yB 3FbG9EQGDrYngTLChnmZ5KVP3d+aw/E/8uR+rfMHuylUhGlU0lL7Htr0LGzo4kXo in7d7sYPzvOVamdDfznDDSHLmQuR4pP28sR96V/uHUluVJjJDmroXDqMMxeaxN1i u2A3LMX6krTofb8TjyoyMlOYYndzPxgdF3LhrhcZukKcNTOH8bEdQwJrvmjEnwy8 v+F4BJIbg+qstibMaLEd =Mj9T -----END PGP SIGNATURE----- --8QANErTbuLtKTfKg-- From owner-svn-src-head@freebsd.org Sat Jun 27 22:54:17 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BCD4798E692; Sat, 27 Jun 2015 22:54:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A7B891CB6; Sat, 27 Jun 2015 22:54:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5RMsHJc047701; Sat, 27 Jun 2015 22:54:17 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5RMsHBR047700; Sat, 27 Jun 2015 22:54:17 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506272254.t5RMsHBR047700@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 27 Jun 2015 22:54:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284895 - head/release X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 22:54:17 -0000 Author: gjb Date: Sat Jun 27 22:54:16 2015 New Revision: 284895 URL: https://svnweb.freebsd.org/changeset/base/284895 Log: Add default VAGRANT_IMG variable. Sponsored by: The FreeBSD Foundation Modified: head/release/Makefile.vagrant Modified: head/release/Makefile.vagrant ============================================================================== --- head/release/Makefile.vagrant Sat Jun 27 22:48:22 2015 (r284894) +++ head/release/Makefile.vagrant Sat Jun 27 22:54:16 2015 (r284895) @@ -5,6 +5,7 @@ # Makefile for uploading Vagrant boxes to Hashicorp Atlas # +VAGRANT_IMG?= ${.OBJDIR}/vagrant.vmdk VAGRANT_UPLOAD_TGTS= vagrant-check-depends \ vagrant-do-package-vmware # atlas-do-upload From owner-svn-src-head@freebsd.org Sat Jun 27 22:59:30 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 138AD98E7A5; Sat, 27 Jun 2015 22:59:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 04E9F1F7B; Sat, 27 Jun 2015 22:59:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5RMxTm5048469; Sat, 27 Jun 2015 22:59:29 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5RMxTYA048468; Sat, 27 Jun 2015 22:59:29 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506272259.t5RMxTYA048468@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 27 Jun 2015 22:59:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284896 - head/release X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 22:59:30 -0000 Author: gjb Date: Sat Jun 27 22:59:29 2015 New Revision: 284896 URL: https://svnweb.freebsd.org/changeset/base/284896 Log: Remove _ACCOUNT and add _USERNAME, _NAME, _VERSION for the VAGRANT_${VAR} variables extracted from VAGRANT_UPLOAD_CONF. Set ATLAS_${VAR} to VAGRANT_${VAR} if VAGRANT_UPLOAD_CONF is set. There is intent to intentionally have separate variants of configuration entries, but the defaults do not yet have any reason to be different. Sponsored by: The FreeBSD Foundation Modified: head/release/Makefile.vagrant Modified: head/release/Makefile.vagrant ============================================================================== --- head/release/Makefile.vagrant Sat Jun 27 22:54:16 2015 (r284895) +++ head/release/Makefile.vagrant Sat Jun 27 22:59:29 2015 (r284896) @@ -12,8 +12,9 @@ VAGRANT_UPLOAD_TGTS= vagrant-check-depen CLEANFILES+= ${VAGRANT_UPLOAD_TGTS} .if defined(VAGRANT_UPLOAD_CONF) && !empty(VAGRANT_UPLOAD_CONF) -. for VAR in _ACCOUNT _KEY -VAGRANT${VAR}!= grep -E ^VAGRANT${VAR} ${VAGRANT_UPLOAD_CONF} | awk -F' ' '{print $$2}' +. for VAR in _KEY _USERNAME _NAME _VERSION +VAGRANT${VAR}!= grep -E ^VAGRANT${VAR} ${VAGRANT_UPLOAD_CONF} | awk -F' ' '{print $$2}' +ATLAS${VAR}:= ${VAGRANT${VAR}} . endfor .endif @@ -26,7 +27,7 @@ VAGRANT_TARGET:= ${OSRELEASE}${SNAPSHOT_ vagrant-upload: ${VAGRANT_UPLOAD_TGTS} vagrant-check-depends: -.for VAR in _ACCOUNT _KEY +.for VAR in _KEY _USERNAME _NAME _VERSION . if !defined(VAGRANT${VAR}) || empty(VAGRANT${VAR}) @echo "Variable VAGRANT${VAR} cannot be empty." @false From owner-svn-src-head@freebsd.org Sat Jun 27 23:03:29 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0FA8E98E8C9; Sat, 27 Jun 2015 23:03:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 00A041308; Sat, 27 Jun 2015 23:03:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5RN3SBT052703; Sat, 27 Jun 2015 23:03:28 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5RN3SLm052702; Sat, 27 Jun 2015 23:03:28 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201506272303.t5RN3SLm052702@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 27 Jun 2015 23:03:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284897 - head/release X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 23:03:29 -0000 Author: gjb Date: Sat Jun 27 23:03:28 2015 New Revision: 284897 URL: https://svnweb.freebsd.org/changeset/base/284897 Log: Instead of hard-coding the PROVIDERS for upload, add the VAGRANT_PROVIDERS variable. Right now, it defaults to only vmware_desktop, virtualbox support is to follow at some point. While here, fix the hashicorp URL: s/vagrant/atlas/, which was result of a sed(1) replace (and my fault). Sponsored by: The FreeBSD Foundation Modified: head/release/Makefile.vagrant Modified: head/release/Makefile.vagrant ============================================================================== --- head/release/Makefile.vagrant Sat Jun 27 22:59:29 2015 (r284896) +++ head/release/Makefile.vagrant Sat Jun 27 23:03:28 2015 (r284897) @@ -23,6 +23,8 @@ SNAPSHOT_DATE!= date +-%Y-%m-%d-%H-%M .endif VAGRANT_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.box +VAGRANT_PROVIDERS?= vmware_desktop +#VAGRANT_PROVIDERS+= virtualbox vagrant-upload: ${VAGRANT_UPLOAD_TGTS} @@ -52,8 +54,8 @@ vagrant-do-package-vmware: vagrant-creat touch ${.OBJDIR}/${.TARGET} atlas-create-upload: -.for PROVIDER in vmware_desktop virtualbox - /usr/local/bin/curl "https://vagrant.hashicorp.com/api/v1/box/${ATLAS_USERNAME}/${ATLAS_NAME}/version/${ATLAS_VERSION}/provider/${PROVIDER}/upload?access_token=${ATLAS_KEY}" +.for PROVIDER in ${VAGRANT_PROVIDERS} + /usr/local/bin/curl "https://atlas.hashicorp.com/api/v1/box/${ATLAS_USERNAME}/${ATLAS_NAME}/version/${ATLAS_VERSION}/provider/${PROVIDER}/upload?access_token=${ATLAS_KEY}" .endfor touch ${.OBJDIR}/${.TARGET} From owner-svn-src-head@freebsd.org Sat Jun 27 23:28:58 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27AB898EBB4; Sat, 27 Jun 2015 23:28:58 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F30E51D90; Sat, 27 Jun 2015 23:28:57 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5RNSv8a063173; Sat, 27 Jun 2015 23:28:57 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5RNSvQS063168; Sat, 27 Jun 2015 23:28:57 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506272328.t5RNSvQS063168@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 27 Jun 2015 23:28:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284898 - in head: . share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 23:28:58 -0000 Author: bapt Date: Sat Jun 27 23:28:56 2015 New Revision: 284898 URL: https://svnweb.freebsd.org/changeset/base/284898 Log: Make all shared library a relative symlink This makes sysroot usable for cross building, it also removes the need for _SHLIBDIRPREFIX (keeps its definition since picobsd uses it and I have no time to test it) Differential Revision: https://reviews.freebsd.org/D2920 Submitted by: imp, adrian Tested by: adrian Modified: head/Makefile.inc1 head/share/mk/bsd.lib.mk head/share/mk/bsd.own.mk Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sat Jun 27 23:03:28 2015 (r284897) +++ head/Makefile.inc1 Sat Jun 27 23:28:56 2015 (r284898) @@ -297,7 +297,6 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOB # world stage WMAKEENV= ${CROSSENV} \ - _SHLIBDIRPREFIX=${WORLDTMP} \ _LDSCRIPTROOT= \ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -439,7 +438,6 @@ LIB32FLAGS+= --sysroot=${WORLDTMP} # Yes, the flags are redundant. LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${LIB32_OBJTREE} \ - _SHLIBDIRPREFIX=${LIB32TMP} \ _LDSCRIPTROOT=${LIB32TMP} \ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -2123,7 +2121,6 @@ XDTP?=/usr/${XDDIR} CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ - _SHLIBDIRPREFIX=${XDDESTDIR} \ TOOLS_PREFIX=${XDTP} CD2CFLAGS=-isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib \ --sysroot=${XDDESTDIR}/ -B${XDDESTDIR}/usr/libexec \ Modified: head/share/mk/bsd.lib.mk ============================================================================== --- head/share/mk/bsd.lib.mk Sat Jun 27 23:03:28 2015 (r284897) +++ head/share/mk/bsd.lib.mk Sat Jun 27 23:28:56 2015 (r284898) @@ -362,7 +362,7 @@ _libinstall: .if ${_SHLIBDIR} == ${_LIBDIR} ${INSTALL_SYMLINK} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} .else - ${INSTALL_SYMLINK} ${_SHLIBDIRPREFIX}${_SHLIBDIR}/${SHLIB_NAME} \ + ${INSTALL_RSYMLINK} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} .if exists(${DESTDIR}${_LIBDIR}/${SHLIB_NAME}) -chflags noschg ${DESTDIR}${_LIBDIR}/${SHLIB_NAME} Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Sat Jun 27 23:03:28 2015 (r284897) +++ head/share/mk/bsd.own.mk Sat Jun 27 23:28:56 2015 (r284898) @@ -222,9 +222,11 @@ INCLUDEDIR?= /usr/include # HRDLINK?= -l h SYMLINK?= -l s +RSYMLINK?= -l rs INSTALL_LINK?= ${INSTALL} ${HRDLINK} INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} +INSTALL_RSYMLINK?= ${INSTALL} ${RSYMLINK} # Common variables .if !defined(DEBUG_FLAGS)