From owner-svn-src-all@freebsd.org  Fri Dec  2 08:12:52 2016
Return-Path: <owner-svn-src-all@freebsd.org>
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 F2940C61E1A;
 Fri,  2 Dec 2016 08:12:52 +0000 (UTC)
 (envelope-from julian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 C1BB41E10;
 Fri,  2 Dec 2016 08:12:52 +0000 (UTC)
 (envelope-from julian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB28CpZZ097538;
 Fri, 2 Dec 2016 08:12:51 GMT (envelope-from julian@FreeBSD.org)
Received: (from julian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB28CpYh097537;
 Fri, 2 Dec 2016 08:12:51 GMT (envelope-from julian@FreeBSD.org)
Message-Id: <201612020812.uB28CpYh097537@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: julian set sender to
 julian@FreeBSD.org using -f
From: Julian Elischer <julian@FreeBSD.org>
Date: Fri, 2 Dec 2016 08:12:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r309398 - stable/10/usr.sbin/bhyve
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Dec 2016 08:12:53 -0000

Author: julian
Date: Fri Dec  2 08:12:51 2016
New Revision: 309398
URL: https://svnweb.freebsd.org/changeset/base/309398

Log:
  MFH: r306554
  
  Use accept4 with O_NONBLOCK rather than accept + fcntl

Modified:
  stable/10/usr.sbin/bhyve/dbgport.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bhyve/dbgport.c
==============================================================================
--- stable/10/usr.sbin/bhyve/dbgport.c	Fri Dec  2 08:02:31 2016	(r309397)
+++ stable/10/usr.sbin/bhyve/dbgport.c	Fri Dec  2 08:12:51 2016	(r309398)
@@ -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)
 			perror("accept");
 	}