svn commit: r320935 - releng/11.1/usr.sbin/bhyve

[Peter Grehan]

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 <b>,fbuf,wait,tcp=<ip>:port,w=width,h=height
+ *  -s <b>,fbuf,wait,vga=on|io|off,rfb=<ip>: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 <n>,xhci,{devices}
 
    devices:
-     ums             USB tablet mouse
+     tablet             USB tablet mouse
  */
 #include <sys/cdefs.h>
 __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");