qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Orit Wasserman <owasserm@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, aliguori@us.ibm.com, quintela@redhat.com,
	armbru@redhat.com, mst@redhat.com, mdroth@linux.vnet.ibm.com,
	lcapitulino@redhat.com, Orit Wasserman <owasserm@redhat.com>,
	pbonzini@redhat.com, akong@redhat.com
Subject: [Qemu-devel] [PATCH v5 4/4] Clear handler only for valid fd
Date: Mon, 24 Sep 2012 13:11:10 +0200	[thread overview]
Message-ID: <1348485070-8190-5-git-send-email-owasserm@redhat.com> (raw)
In-Reply-To: <1348485070-8190-1-git-send-email-owasserm@redhat.com>

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---
 migration.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/migration.c b/migration.c
index 1edeec5..22a05c4 100644
--- a/migration.c
+++ b/migration.c
@@ -240,7 +240,9 @@ static int migrate_fd_cleanup(MigrationState *s)
 {
     int ret = 0;
 
-    qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
+    if (s->fd != -1) {
+        qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
+    }
 
     if (s->file) {
         DPRINTF("closing file\n");
-- 
1.7.7.6

  parent reply	other threads:[~2012-09-24 11:11 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-24 11:11 [Qemu-devel] [PATCH v5 0/4] non-blocking connect address handling cleanup Orit Wasserman
2012-09-24 11:11 ` [Qemu-devel] [PATCH v5 1/4] Refactor inet_connect_opts function Orit Wasserman
2012-09-24 11:11 ` [Qemu-devel] [PATCH v5 2/4] Separate inet_connect into inet_connect (blocking) and inet_nonblocking_connect Orit Wasserman
2012-09-24 11:11 ` [Qemu-devel] [PATCH v5 3/4] Fix address handling in inet_nonblocking_connect Orit Wasserman
2012-09-24 11:11 ` Orit Wasserman [this message]
2012-09-24 14:22 ` [Qemu-devel] [PATCH v5 0/4] non-blocking connect address handling cleanup Markus Armbruster
2012-09-24 14:36 ` Michael S. Tsirkin
2012-09-24 14:37   ` Orit Wasserman
2012-09-25  1:54 ` Amos Kong
2012-09-26 12:37 ` Anthony Liguori

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=1348485070-8190-5-git-send-email-owasserm@redhat.com \
    --to=owasserm@redhat.com \
    --cc=akong@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=armbru@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=lcapitulino@redhat.com \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    /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).