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 v4 4/4] Clear handler only for valid fd
Date: Sun, 23 Sep 2012 16:49:07 +0200 [thread overview]
Message-ID: <1348411747-29804-5-git-send-email-owasserm@redhat.com> (raw)
In-Reply-To: <1348411747-29804-1-git-send-email-owasserm@redhat.com>
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---
migration.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/migration.c b/migration.c
index 1edeec5..c20a2fe 100644
--- a/migration.c
+++ b/migration.c
@@ -240,8 +240,6 @@ static int migrate_fd_cleanup(MigrationState *s)
{
int ret = 0;
- qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
-
if (s->file) {
DPRINTF("closing file\n");
ret = qemu_fclose(s->file);
@@ -249,6 +247,7 @@ static int migrate_fd_cleanup(MigrationState *s)
}
if (s->fd != -1) {
+ qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
close(s->fd);
s->fd = -1;
}
--
1.7.7.6
next prev parent reply other threads:[~2012-09-23 14:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-23 14:49 [Qemu-devel] [PATCH v4 0/4] nonblocking connect address handling cleanup Orit Wasserman
2012-09-23 14:49 ` [Qemu-devel] [PATCH v4 1/4] Refactor inet_connect_opts function Orit Wasserman
2012-09-23 14:49 ` [Qemu-devel] [PATCH v4 2/4] Separate inet_connect into inet_connect (blocking) and inet_nonblocking_connect Orit Wasserman
2012-09-24 9:53 ` Markus Armbruster
2012-09-24 10:07 ` Paolo Bonzini
2012-09-24 13:37 ` Orit Wasserman
2012-09-24 13:43 ` Paolo Bonzini
2012-09-23 14:49 ` [Qemu-devel] [PATCH v4 3/4] Fix address handling in inet_nonblocking_connect Orit Wasserman
2012-09-24 9:54 ` Markus Armbruster
2012-09-24 10:05 ` Amos Kong
2012-09-24 10:12 ` Orit Wasserman
[not found] ` <20120924101011.GA5848@redhat.com>
2012-09-24 10:11 ` Orit Wasserman
2012-09-23 14:49 ` Orit Wasserman [this message]
2012-09-24 9:45 ` [Qemu-devel] [PATCH v4 4/4] Clear handler only for valid fd Markus Armbruster
2012-09-24 9:58 ` Orit Wasserman
2012-09-24 10:06 ` Paolo Bonzini
2012-09-24 11:34 ` Markus Armbruster
2012-09-23 15:05 ` [Qemu-devel] [PATCH v4 0/4] nonblocking connect address handling cleanup Michael S. Tsirkin
2012-09-24 9:54 ` Markus Armbruster
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=1348411747-29804-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).