From owner-svn-src-releng@freebsd.org Thu Jul 13 08:13:30 2017 Return-Path: Delivered-To: svn-src-releng@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 7835ED9B218; Thu, 13 Jul 2017 08:13:30 +0000 (UTC) (envelope-from grehan@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 44A4E6E196; Thu, 13 Jul 2017 08:13:30 +0000 (UTC) (envelope-from grehan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6D8DTt1055259; Thu, 13 Jul 2017 08:13:29 GMT (envelope-from grehan@FreeBSD.org) Received: (from grehan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6D8DT14055256; Thu, 13 Jul 2017 08:13:29 GMT (envelope-from grehan@FreeBSD.org) Message-Id: <201707130813.v6D8DT14055256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grehan set sender to grehan@FreeBSD.org using -f From: Peter Grehan Date: Thu, 13 Jul 2017 08:13:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320935 - releng/11.1/usr.sbin/bhyve X-SVN-Group: releng X-SVN-Commit-Author: grehan X-SVN-Commit-Paths: releng/11.1/usr.sbin/bhyve X-SVN-Commit-Revision: 320935 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jul 2017 08:13:30 -0000 Author: grehan Date: Thu Jul 13 08:13:29 2017 New Revision: 320935 URL: https://svnweb.freebsd.org/changeset/base/320935 Log: MFS 320891 MFC r317542, r317543, r317543 317542 comment fix 317543 set rfb default port 317543 listen on localhost by default for rfb Approved by: re (kib) Modified: releng/11.1/usr.sbin/bhyve/pci_fbuf.c releng/11.1/usr.sbin/bhyve/pci_xhci.c releng/11.1/usr.sbin/bhyve/rfb.c Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/usr.sbin/bhyve/pci_fbuf.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/pci_fbuf.c Thu Jul 13 07:55:00 2017 (r320934) +++ releng/11.1/usr.sbin/bhyve/pci_fbuf.c Thu Jul 13 08:13:29 2017 (r320935) @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); * BAR0 points to the current mode information. * BAR1 is the 32-bit framebuffer address. * - * -s ,fbuf,wait,tcp=:port,w=width,h=height + * -s ,fbuf,wait,vga=on|io|off,rfb=:port,w=width,h=height */ static int fbuf_debug = 1; Modified: releng/11.1/usr.sbin/bhyve/pci_xhci.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/pci_xhci.c Thu Jul 13 07:55:00 2017 (r320934) +++ releng/11.1/usr.sbin/bhyve/pci_xhci.c Thu Jul 13 08:13:29 2017 (r320935) @@ -28,7 +28,7 @@ -s ,xhci,{devices} devices: - ums USB tablet mouse + tablet USB tablet mouse */ #include __FBSDID("$FreeBSD$"); Modified: releng/11.1/usr.sbin/bhyve/rfb.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/rfb.c Thu Jul 13 07:55:00 2017 (r320934) +++ releng/11.1/usr.sbin/bhyve/rfb.c Thu Jul 13 08:13:29 2017 (r320935) @@ -897,11 +897,11 @@ rfb_init(char *hostname, int port, int wait) sin.sin_len = sizeof(sin); sin.sin_family = AF_INET; - sin.sin_port = htons(port); + sin.sin_port = port ? htons(port) : htons(5900); if (hostname && strlen(hostname) > 0) inet_pton(AF_INET, hostname, &(sin.sin_addr)); else - sin.sin_addr.s_addr = htonl(INADDR_ANY); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); if (bind(rc->sfd, (struct sockaddr *)&sin, sizeof(sin)) < 0) { perror("bind");