diff options
| author | Anthony Liguori | 2012-10-12 18:19:56 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2012-10-12 18:19:56 +0200 |
| commit | 5d9619aa1fc348fe8894553c15c1ec886fa33939 (patch) | |
| tree | a62fd6509c3b318ea021fafb556b9dfd437bc842 /ui | |
| parent | Merge remote-tracking branch 'kraxel/usb.67' into staging (diff) | |
| parent | vnc: fix "info vnc" with "-vnc ..., reverse=on" (diff) | |
| download | qemu-5d9619aa1fc348fe8894553c15c1ec886fa33939.tar.gz qemu-5d9619aa1fc348fe8894553c15c1ec886fa33939.tar.xz qemu-5d9619aa1fc348fe8894553c15c1ec886fa33939.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
vnc: fix "info vnc" with "-vnc ..., reverse=on"
sheepdog: use bool for boolean variables
configure: Tidy up remnants of non-64-bit physaddrs
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/vnc.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -372,6 +372,10 @@ VncInfo *qmp_query_vnc(Error **errp) } } + if (vnc_display->lsock == -1) { + return info; + } + if (getsockname(vnc_display->lsock, (struct sockaddr *)&sa, &salen) == -1) { error_set(errp, QERR_UNDEFINED_ERROR); |
