qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH v2 03/13] qemu-socket: catch monitor_get_fd failures
Date: Mon, 24 Jun 2013 08:39:46 +0200	[thread overview]
Message-ID: <1372055996-4072-4-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1372055996-4072-1-git-send-email-kraxel@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 util/qemu-sockets.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 35023a8..126cbb6 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);
         }
-- 
1.7.9.7

  parent reply	other threads:[~2013-06-24  6:40 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-24  6:39 [Qemu-devel] [PATCH v2 00/13] A bunch of little socket + chardev fixes Gerd Hoffmann
2013-06-24  6:39 ` [Qemu-devel] [PATCH v2 01/13] qemu-socket: zero-initialize SocketAddress Gerd Hoffmann
2013-06-24  6:39 ` [Qemu-devel] [PATCH v2 02/13] qemu-socket: drop pointless allocation Gerd Hoffmann
2013-06-24  8:07   ` Markus Armbruster
2013-06-24  6:39 ` Gerd Hoffmann [this message]
2013-06-24  6:39 ` [Qemu-devel] [PATCH v2 04/13] qemu-char: check optional fields using has_* Gerd Hoffmann
2013-06-24  6:39 ` [Qemu-devel] [PATCH v2 05/13] qemu-char: use more specific error_setg_* variants Gerd Hoffmann
2013-06-24  6:39 ` [Qemu-devel] [PATCH v2 06/13] qemu-char: print notification to stderr Gerd Hoffmann
2013-06-24  6:39 ` [Qemu-devel] [PATCH v2 07/13] qemu-char: fix documentation for telnet+wait socket flags Gerd Hoffmann
2013-06-24  8:08   ` Markus Armbruster
2013-06-24  6:39 ` [Qemu-devel] [PATCH v2 08/13] qemu-char: don't leak opts on error Gerd Hoffmann
2013-06-24  6:39 ` [Qemu-devel] [PATCH v2 09/13] qemu-char: use ChardevBackendKind in in CharDriver Gerd Hoffmann
2013-06-24  6:39 ` [Qemu-devel] [PATCH v2 10/13] qemu-char: minor mux chardev fixes Gerd Hoffmann
2013-06-24  6:39 ` [Qemu-devel] [PATCH v2 11/13] qemu-char: add -chardev mux support Gerd Hoffmann
2013-06-24  6:39 ` [Qemu-devel] [PATCH v2 12/13] qemu-char: report udb backend errors Gerd Hoffmann
2013-06-24  8:06   ` Markus Armbruster
2013-06-24  6:39 ` [Qemu-devel] [PATCH v2 13/13] qemu-socket: don't leak opts on error Gerd Hoffmann
2013-06-24  7:18 ` [Qemu-devel] [Qemu-trivial] [PATCH v2 00/13] A bunch of little socket + chardev fixes Michael Tokarev
2013-06-24  8:14   ` Markus Armbruster
2013-06-24  8:24     ` Michael Tokarev
2013-06-24  8:57       ` Markus Armbruster
2013-06-24  8:54 ` [Qemu-devel] " Laszlo Ersek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1372055996-4072-4-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).