aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-10-12 11:19:56 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-10-12 11:19:56 -0500
commit5d9619aa1fc348fe8894553c15c1ec886fa33939 (patch)
treea62fd6509c3b318ea021fafb556b9dfd437bc842 /ui
parent628cc97df70476c9e1f30791dcfb70511bb1ebdd (diff)
parent417b0b88904fe1dd8c41bff8092dfbab0134d9cb (diff)
downloadqemu-5d9619aa1fc348fe8894553c15c1ec886fa33939.zip
qemu-5d9619aa1fc348fe8894553c15c1ec886fa33939.tar.gz
qemu-5d9619aa1fc348fe8894553c15c1ec886fa33939.tar.bz2
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.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/vnc.c b/ui/vnc.c
index 01b2daf..33e6386 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -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);