diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-02 20:02:14 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-02 20:02:14 +0000 |
| commit | 4a55bfdfcf051f45619d422285be4b8c30ff20ae (patch) | |
| tree | 3e99e2686d813116934d035aea3d91a8604cf3e8 | |
| parent | d4b55be509f8a12cf8f456847596df88f49c2bf8 (diff) | |
| download | focaccia-qemu-4a55bfdfcf051f45619d422285be4b8c30ff20ae.tar.gz focaccia-qemu-4a55bfdfcf051f45619d422285be4b8c30ff20ae.zip | |
Exclude unix: from vnc call to unix_listen() (Ryan Harper)
When using an existing unix socket like: -vnc unix:/tmp/file1Y2nY2 qemu fails to bind a unix socket because the vnc call to unix_listen includes the unix: prefix and stores that in the unix.sun_path. The fix is to not pass in unix: for the filename (same way qemu-char.c does it). Signed-off-by: Ryan Harper <ryanh@us.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5856 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | vnc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vnc.c b/vnc.c index 62dd317ec5..bd75854de9 100644 --- a/vnc.c +++ b/vnc.c @@ -2544,7 +2544,7 @@ int vnc_display_open(DisplayState *ds, const char *display) dpy = qemu_malloc(256); if (strncmp(display, "unix:", 5) == 0) { strcpy(dpy, "unix:"); - vs->lsock = unix_listen(display, dpy+5, 256-5); + vs->lsock = unix_listen(display+5, dpy+5, 256-5); } else { vs->lsock = inet_listen(display, dpy, 256, SOCK_STREAM, 5900); } |