qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: owasserm@redhat.com, quintela@redhat.com
Subject: [Qemu-devel] [PATCH 2/6] migration: close socket QEMUFile from socket_close
Date: Tue,  7 Aug 2012 17:51:43 +0200	[thread overview]
Message-ID: <1344354707-27315-3-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1344354707-27315-1-git-send-email-pbonzini@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 migration-tcp.c  | 2 ++
 migration-unix.c | 2 ++
 savevm.c         | 1 +
 3 file modificati, 5 inserzioni(+)

diff --git a/migration-tcp.c b/migration-tcp.c
index 587413e..62a6891 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -137,6 +137,8 @@ static void tcp_accept_incoming_migration(void *opaque)
 
     process_incoming_migration(f);
     qemu_fclose(f);
+    return;
+
 out:
     close(c);
 }
diff --git a/migration-unix.c b/migration-unix.c
index a407af2..57aca11 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -147,6 +147,8 @@ static void unix_accept_incoming_migration(void *opaque)
 
     process_incoming_migration(f);
     qemu_fclose(f);
+    return;
+
 out:
     close(c);
 }
diff --git a/savevm.c b/savevm.c
index 6e82b2d..57cae52 100644
--- a/savevm.c
+++ b/savevm.c
@@ -210,6 +210,7 @@ static int socket_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size)
 static int socket_close(void *opaque)
 {
     QEMUFileSocket *s = opaque;
+    close(s->fd);
     g_free(s);
     return 0;
 }
-- 
1.7.11.2

  parent reply	other threads:[~2012-08-07 15:52 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-07 15:51 [Qemu-devel] [RFC PATCH 0/6] Run incoming migration in a coroutine Paolo Bonzini
2012-08-07 15:51 ` [Qemu-devel] [PATCH 1/6] migration: clean up server sockets and handlers before invoking process_incoming_migration Paolo Bonzini
2012-08-07 15:51 ` Paolo Bonzini [this message]
2012-08-07 15:51 ` [Qemu-devel] [PATCH 3/6] migration: move qemu_fclose to process_incoming_migration Paolo Bonzini
2012-08-07 15:51 ` [Qemu-devel] [PATCH 4/6] migration: remove iohandlers before closing the file Paolo Bonzini
2012-08-07 18:46   ` Anthony Liguori
2012-08-08  8:00     ` Paolo Bonzini
2012-08-07 15:51 ` [Qemu-devel] [PATCH 5/6] migration: handle EAGAIN while reading QEMUFile Paolo Bonzini
2012-08-07 15:51 ` [Qemu-devel] [PATCH 6/6] migration: move process_incoming_migration to a coroutine Paolo Bonzini

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=1344354707-27315-3-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=owasserm@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).