From owner-svn-src-all@freebsd.org Mon Oct 24 17:12:49 2016 Return-Path: Delivered-To: svn-src-all@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 2620DC1E1F5; Mon, 24 Oct 2016 17:12:49 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 05E811966; Mon, 24 Oct 2016 17:12:49 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by mail.baldwin.cx (Postfix) with ESMTPSA id 199BF10AF6E; Mon, 24 Oct 2016 13:12:48 -0400 (EDT) From: John Baldwin To: Baptiste Daroussin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r307791 - stable/11/usr.sbin/bhyve Date: Mon, 24 Oct 2016 10:11:49 -0700 Message-ID: <18530830.i5Ci9ybOZ6@ralph.baldwin.cx> User-Agent: KMail/4.14.10 (FreeBSD/11.0-PRERELEASE; KDE/4.14.10; amd64; ; ) In-Reply-To: <201610222049.u9MKnirM010685@repo.freebsd.org> References: <201610222049.u9MKnirM010685@repo.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Mon, 24 Oct 2016 13:12:48 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2016 17:12:49 -0000 On Saturday, October 22, 2016 08:49:44 PM Baptiste Daroussin wrote: > Author: bapt > Date: Sat Oct 22 20:49:44 2016 > New Revision: 307791 > URL: https://svnweb.freebsd.org/changeset/base/307791 > > Log: > MFC r306554: > > Use accept4 with O_NONBLOCK rather than accept + fcntl > > Modified: > stable/11/usr.sbin/bhyve/dbgport.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/usr.sbin/bhyve/dbgport.c > ============================================================================== > --- stable/11/usr.sbin/bhyve/dbgport.c Sat Oct 22 20:49:07 2016 (r307790) > +++ stable/11/usr.sbin/bhyve/dbgport.c Sat Oct 22 20:49:44 2016 (r307791) > @@ -73,10 +73,8 @@ again: > printf("Waiting for connection from gdb\r\n"); > printonce = 1; > } > - conn_fd = accept(listen_fd, NULL, NULL); > - if (conn_fd >= 0) > - fcntl(conn_fd, F_SETFL, O_NONBLOCK); > - else if (errno != EINTR) > + conn_fd = accept4(listen_fd, NULL, NULL, O_NONBLOCK); > + if (conn_fd < 0 && errno != EINTR) This is actually wrong. accept4() uses SOCK_NONBLOCK, not O_NONBLOCK. Can you fix this in HEAD and MFC? -- John Baldwin