From patchwork Thu Oct 18 10:22:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 192276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 865BC2C0093 for ; Thu, 18 Oct 2012 21:38:30 +1100 (EST) Received: from localhost ([::1]:42960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOnH1-0001kv-3e for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2012 06:24:19 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=mmWsZ5wCG06LJqF11noTHSy5jsx4jH4n/l3FOnL734U=; b=uzl4HZ4UEwD+jJJRpB92toY6buBZpzeA0RXFNcxrjMuVeTG9EJ3pghhGChQM7iHENw +d+JV90dqsWf5Ka5XnXEMHWUOm0knL0r6Xnu2l9Lx69X8SjanUAebNADYqv2rGQZu0uT Q+IN+VXljCAj86RarITZA6pPzzYECJ+vdOur95UncD7tXgAgmgzCeZY0n/BWbCzROk+B SGzF+pA+L792Gs9DHN+Q4DsfLHircwrjnUz+sdhItnq5+bZtSy/xWfAx8XTDmyOESreC QDXeV2lkBTul2YEYeUxptBrrQcJA8G6uVmBhqGroZ9qGYMa+yjCgL9vouv7C8W7BcTDx zlCg== Received: by 10.68.221.225 with SMTP id qh1mr64795968pbc.50.1350555809440; Thu, 18 Oct 2012 03:23:29 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id hu5sm3581193pbc.72.2012.10.18.03.23.26 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 03:23:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2012 12:22:32 +0200 Message-Id: <1350555758-29988-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1350555758-29988-1-git-send-email-pbonzini@redhat.com> References: <1350555758-29988-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Cc: quintela@redhat.com Subject: [Qemu-devel] [PATCH 06/12] migration: use migrate_fd_close in migrate_fd_cleanup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)