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