From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOnGH-0008Da-Mn for qemu-devel@nongnu.org; Thu, 18 Oct 2012 06:23:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOnGD-0001en-Up for qemu-devel@nongnu.org; Thu, 18 Oct 2012 06:23:33 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:62641) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOnGD-0001aH-Om for qemu-devel@nongnu.org; Thu, 18 Oct 2012 06:23:29 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so8234740pad.4 for ; Thu, 18 Oct 2012 03:23:29 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 18 Oct 2012 12:22:32 +0200 Message-Id: <1350555758-29988-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1350555758-29988-1-git-send-email-pbonzini@redhat.com> References: <1350555758-29988-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 06/12] migration: use migrate_fd_close in migrate_fd_cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: quintela@redhat.com migrate_fd_cleanup will usually close the file descriptor via buffered_file_close's call to migrate_fd_close. However, in the case of s->file == NULL it is "inlining" migrate_fd_close (almost: there is a direct close() instead of using s->close(s)). To fix the inconsistency and clean up the code, allow multiple calls to migrate_fd_close and use the function in migrate_fd_cleanup. Signed-off-by: Paolo Bonzini --- migration.c | 20 ++++++++------------ 1 file modificato, 8 inserzioni(+), 12 rimozioni(-) diff --git a/migration.c b/migration.c index 62e0304..c1807e0 100644 --- a/migration.c +++ b/migration.c @@ -246,21 +246,12 @@ static int migrate_fd_cleanup(MigrationState *s) { int ret = 0; - if (s->fd != -1) { - qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL); - } - if (s->file) { DPRINTF("closing file\n"); ret = qemu_fclose(s->file); - s->file = NULL; - } - - if (s->fd != -1) { - close(s->fd); - s->fd = -1; } + migrate_fd_close(s); return ret; } @@ -396,8 +387,13 @@ int migrate_fd_wait_for_unfreeze(MigrationState *s) int migrate_fd_close(MigrationState *s) { - qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL); - return s->close(s); + int rc = 0; + if (s->fd != -1) { + qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL); + rc = s->close(s); + s->fd = -1; + } + return rc; } void add_migration_state_change_notifier(Notifier *notify) -- 1.7.12.1