From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0AF08C2D0DB for ; Wed, 22 Jan 2020 11:17:04 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C3AF72465A for ; Wed, 22 Jan 2020 11:17:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cEFLfNtz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C3AF72465A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuE0M-0005Pk-Sb for qemu-devel@archiver.kernel.org; Wed, 22 Jan 2020 06:17:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36609) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuDyq-000400-8h for qemu-devel@nongnu.org; Wed, 22 Jan 2020 06:15:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuDyp-0006b6-BJ for qemu-devel@nongnu.org; Wed, 22 Jan 2020 06:15:28 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:27991 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iuDyp-0006aa-7Z for qemu-devel@nongnu.org; Wed, 22 Jan 2020 06:15:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579691726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0XLEsLYuEFTegFIRqqZZE8oFcNpiNrP2fq/YbTYyWmM=; b=cEFLfNtzYOh3wT1qDvnGJd+MB9j5mp16zddw/+EMjOdfYWTNIX7imhjRMnai3db1rpTZMi +xs6VobuCzJ1p1jsD4pxKl5ZRSj1I48ioqtNmq69bCyD3P5Hwib/i1VHU7junUk5eW3LsX CilzxxuJUIxZoJNDw3gjeiVhPUUo2vw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-88-cYA4tp7jObuaE20yhghgZQ-1; Wed, 22 Jan 2020 06:15:24 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1C327DB21 for ; Wed, 22 Jan 2020 11:15:24 +0000 (UTC) Received: from secure.mitica (ovpn-116-207.ams2.redhat.com [10.36.116.207]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88BE05C1BB; Wed, 22 Jan 2020 11:15:22 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v4 2/6] multifd: Make sure that we don't do any IO after an error Date: Wed, 22 Jan 2020 12:15:13 +0100 Message-Id: <20200122111517.33223-3-quintela@redhat.com> In-Reply-To: <20200122111517.33223-1-quintela@redhat.com> References: <20200122111517.33223-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: cYA4tp7jObuaE20yhghgZQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth , "Dr. David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Juan Quintela --- migration/ram.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index d2208b5534..f95d656c26 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3445,7 +3445,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque= ) { RAMState **temp =3D opaque; RAMState *rs =3D *temp; - int ret; + int ret =3D 0; int i; int64_t t0; int done =3D 0; @@ -3524,12 +3524,14 @@ static int ram_save_iterate(QEMUFile *f, void *opaq= ue) ram_control_after_iterate(f, RAM_CONTROL_ROUND); =20 out: - multifd_send_sync_main(rs); - qemu_put_be64(f, RAM_SAVE_FLAG_EOS); - qemu_fflush(f); - ram_counters.transferred +=3D 8; + if (ret >=3D 0) { + multifd_send_sync_main(rs); + qemu_put_be64(f, RAM_SAVE_FLAG_EOS); + qemu_fflush(f); + ram_counters.transferred +=3D 8; =20 - ret =3D qemu_file_get_error(f); + ret =3D qemu_file_get_error(f); + } if (ret < 0) { return ret; } @@ -3581,9 +3583,11 @@ static int ram_save_complete(QEMUFile *f, void *opaq= ue) ram_control_after_iterate(f, RAM_CONTROL_FINISH); } =20 - multifd_send_sync_main(rs); - qemu_put_be64(f, RAM_SAVE_FLAG_EOS); - qemu_fflush(f); + if (ret >=3D 0) { + multifd_send_sync_main(rs); + qemu_put_be64(f, RAM_SAVE_FLAG_EOS); + qemu_fflush(f); + } =20 return ret; } --=20 2.24.1