From patchwork Thu Oct 27 07:12:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 122074 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 610B71007D8 for ; Thu, 27 Oct 2011 18:12:23 +1100 (EST) Received: from localhost ([::1]:55438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJK8N-00045X-15 for incoming@patchwork.ozlabs.org; Thu, 27 Oct 2011 03:12:15 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJK8H-00045C-NP for qemu-devel@nongnu.org; Thu, 27 Oct 2011 03:12:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJK8G-0005nB-DE for qemu-devel@nongnu.org; Thu, 27 Oct 2011 03:12:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62830) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJK8G-0005n7-2p for qemu-devel@nongnu.org; Thu, 27 Oct 2011 03:12:08 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9R7C6Kx003342 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 27 Oct 2011 03:12:07 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-16.ams2.redhat.com [10.36.116.16]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p9R7C5bl010372; Thu, 27 Oct 2011 03:12:06 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 816BC40185; Thu, 27 Oct 2011 09:12:04 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 27 Oct 2011 09:12:04 +0200 Message-Id: <1319699524-32758-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: Jiri Denemark , Gerd Hoffmann , Juan Quintela Subject: [Qemu-devel] [PATCH v2] migration: flush migration data to disk. 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 This patch increases robustness when migrating to a file with two little changes: (1) Before closing the migration file handle checks if it happens to be a regular file and if so it issues a fsync. This way the data is flushed to disk before qemu sends the migration completed event. (2) It adds error checking. In case either fsync or close syscall fails pass up the error (and fail migration). [ v2: return -errno instead of -1 ] Cc: Juan Quintela Cc: Jiri Denemark Signed-off-by: Gerd Hoffmann --- migration-fd.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/migration-fd.c b/migration-fd.c index d0aec89..6211124 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -42,10 +42,31 @@ static int fd_write(MigrationState *s, const void * buf, size_t size) static int fd_close(MigrationState *s) { + struct stat st; + int ret; + DPRINTF("fd_close\n"); if (s->fd != -1) { - close(s->fd); + ret = fstat(s->fd, &st); + if (ret == 0 && S_ISREG(st.st_mode)) { + /* + * If the file handle is a regular file make sure the + * data is flushed to disk before signaling success. + */ + ret = fsync(s->fd); + if (ret != 0) { + ret = -errno; + perror("migration-fd: fsync"); + return ret; + } + } + ret = close(s->fd); s->fd = -1; + if (ret != 0) { + ret = -errno; + perror("migration-fd: close"); + return ret; + } } return 0; }