aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Grehan <grehan@FreeBSD.org>2017-07-13 08:13:29 +0000
committerPeter Grehan <grehan@FreeBSD.org>2017-07-13 08:13:29 +0000
commit37af404ef0f455b52b83b656f0d6e0cfc0299706 (patch)
treef7007dbcfef6515dd1e782b43ed531eee0db8a7b
parentb568c7919b29f85d1e572fc6956659314d6aaa0e (diff)
downloadsrc-37af404ef0f455b52b83b656f0d6e0cfc0299706.tar.gz
src-37af404ef0f455b52b83b656f0d6e0cfc0299706.zip
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)
Notes
Notes: svn path=/releng/11.1/; revision=320935
-rw-r--r--usr.sbin/bhyve/pci_fbuf.c2
-rw-r--r--usr.sbin/bhyve/pci_xhci.c2
-rw-r--r--usr.sbin/bhyve/rfb.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/bhyve/pci_fbuf.c b/usr.sbin/bhyve/pci_fbuf.c
index c2de6221afbb..67279d2162b9 100644
--- a/usr.sbin/bhyve/pci_fbuf.c
+++ b/usr.sbin/bhyve/pci_fbuf.c
@@ -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;
diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c
index d28a3e698c4c..f178468108d0 100644
--- a/usr.sbin/bhyve/pci_xhci.c
+++ b/usr.sbin/bhyve/pci_xhci.c
@@ -28,7 +28,7 @@
-s <n>,xhci,{devices}
devices:
- ums USB tablet mouse
+ tablet USB tablet mouse
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
diff --git a/usr.sbin/bhyve/rfb.c b/usr.sbin/bhyve/rfb.c
index 78a3fa0945eb..f3e30244b5de 100644
--- a/usr.sbin/bhyve/rfb.c
+++ b/usr.sbin/bhyve/rfb.c
@@ -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");