summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>2010-08-20 19:10:41 +0900
committerAnthony Liguori <aliguori@us.ibm.com>2010-10-11 18:22:45 -0500
commitc2ccc98ceb07c009d64b7ee801f8966194510021 (patch)
tree56001e47300b1d810f5e06faf4369e78b93a498f
parentdisable guest-provided stats on "info balloon" command (diff)
downloadqemu-kvm-c2ccc98ceb07c009d64b7ee801f8966194510021.tar.gz
qemu-kvm-c2ccc98ceb07c009d64b7ee801f8966194510021.tar.bz2
qemu-kvm-c2ccc98ceb07c009d64b7ee801f8966194510021.zip
vnc: check fd before calling qemu_set_fd_handler2() in vnc_client_write()
Setting fd = -1 to qemu_set_fd_handler2() causes bus error at FD_SET in main_loop_wait(). Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit ac71103dc6b408775ae72067790ab367912f75ec)
-rw-r--r--ui/vnc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/vnc.c b/ui/vnc.c
index 7fc40acae..c7a18311f 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1184,7 +1184,7 @@ void vnc_client_write(void *opaque)
vnc_lock_output(vs);
if (vs->output.offset) {
vnc_client_write_locked(opaque);
- } else {
+ } else if (vs->csock != -1) {
qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, vs);
}
vnc_unlock_output(vs);