| From d24a791d6a9b4c316e666c95d676ceaf2f52198a Mon Sep 17 00:00:00 2001 |
| From: Gerd Hoffmann <kraxel@redhat.com> |
| Date: Mon, 14 Oct 2013 13:35:11 +0200 |
| Subject: [PATCH 04/18] qemu-socket: catch monitor_get_fd failures |
| |
| RH-Author: Gerd Hoffmann <kraxel@redhat.com> |
| Message-id: <1381757723-23134-4-git-send-email-kraxel@redhat.com> |
| Patchwork-id: 54862 |
| O-Subject: [RHEL-7 qemu-kvm PATCH 03/15] qemu-socket: catch monitor_get_fd failures |
| Bugzilla: 922010 |
| RH-Acked-by: Hans de Goede <hdegoede@redhat.com> |
| RH-Acked-by: Laszlo Ersek <lersek@redhat.com> |
| RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com> |
| |
| Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> |
| Reviewed-by: Laszlo Ersek <lersek@redhat.com> |
| Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> |
| (cherry picked from commit d1ec72a44e0a167f9e8254d6d1098d27f104571f) |
| |
| util/qemu-sockets.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| util/qemu-sockets.c | 2 +- |
| 1 files changed, 1 insertions(+), 1 deletions(-) |
| |
| diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c |
| index 35023a8..126cbb6 100644 |
| |
| |
| @@ -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); |
| } |
| -- |
| 1.7.1 |
| |