From patchwork Mon Jan 27 22:33:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 11353317 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DCFAC1398 for ; Mon, 27 Jan 2020 22:35:01 +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 B329A20CC7 for ; Mon, 27 Jan 2020 22:35:01 +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="LjCOL3PA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B329A20CC7 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwCyC-00021C-RJ for patchwork-qemu-devel@patchwork.kernel.org; Mon, 27 Jan 2020 17:35:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47253) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwCwy-0000Ej-Um for qemu-devel@nongnu.org; Mon, 27 Jan 2020 17:33:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwCwx-00035k-Ta for qemu-devel@nongnu.org; Mon, 27 Jan 2020 17:33:44 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:25692 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwCwx-00035V-Pk for qemu-devel@nongnu.org; Mon, 27 Jan 2020 17:33:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580164423; 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=JCwYKiDZExftH/t5jOvpdjhb5wSHzgFLLxxsJOsl808=; b=LjCOL3PApOXzZ8i0POmIgZ8VrKONhld8qF9DS3qDlISL/T5RyN60TsQTtvlvxbfXvsHHM+ h7VClPdxXYC2e33VpdXZF85F5cH5VMU2uI5jzbPUS/wzUNmo+PrV2SBB/WU8CGwGTXI+Rv S9Z8zXffj/FkoYx3KV7Qcpd+6MAZ1dU= 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-274-lv1NBAlsNg-OsskWFK52Ow-1; Mon, 27 Jan 2020 17:33:42 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 14C80DB21 for ; Mon, 27 Jan 2020 22:33:41 +0000 (UTC) Received: from secure.mitica (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id C3307451D; Mon, 27 Jan 2020 22:33:38 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 04/19] migration: Don't send data if we have stopped Date: Mon, 27 Jan 2020 23:33:06 +0100 Message-Id: <20200127223321.2742-5-quintela@redhat.com> In-Reply-To: <20200127223321.2742-1-quintela@redhat.com> References: <20200127223321.2742-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: lv1NBAlsNg-OsskWFK52Ow-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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 , Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , Markus Armbruster , "Dr. David Alan Gilbert" , Paolo Bonzini Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" If we do a cancel, we got out without one error, but we can't do the rest of the output as in a normal situation. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index f95d656c26..3fd7fdffcf 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3524,7 +3524,8 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) ram_control_after_iterate(f, RAM_CONTROL_ROUND); out: - if (ret >= 0) { + if (ret >= 0 + && migration_is_setup_or_active(migrate_get_current()->state)) { multifd_send_sync_main(rs); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f);