From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 24 Jun 2013 06:39:46 +0000 (+0200)
Subject: qemu-socket: catch monitor_get_fd failures
X-Git-Tag: v1.6.0-rc0~164^2~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d1ec72a44e0a167f9e8254d6d1098d27f104571f;p=users%2Fdwmw2%2Fqemu.git

qemu-socket: catch monitor_get_fd failures

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 35023a8a92..126cbb603b 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -903,7 +903,7 @@ int socket_connect(SocketAddress *addr, Error **errp,
 
     case SOCKET_ADDRESS_KIND_FD:
         fd = monitor_get_fd(cur_mon, addr->fd->str, errp);
-        if (callback) {
+        if (fd >= 0 && callback) {
             qemu_set_nonblock(fd);
             callback(fd, opaque);
         }