Message ID | 20200129111536.9497-5-quintela@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=kzB/=3S=nongnu.org=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@kernel.org> 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 2461D112B for <patchwork-qemu-devel@patchwork.kernel.org>; Wed, 29 Jan 2020 11:18:26 +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 F00362070E for <patchwork-qemu-devel@patchwork.kernel.org>; Wed, 29 Jan 2020 11:18:25 +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="Q2pP2zA0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F00362070E 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]:44461 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>) id 1iwlMX-0005Pf-1x for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 06:18:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59991) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <quintela@redhat.com>) id 1iwlKA-0000lk-2M for qemu-devel@nongnu.org; Wed, 29 Jan 2020 06:15:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <quintela@redhat.com>) id 1iwlK9-00068J-6N for qemu-devel@nongnu.org; Wed, 29 Jan 2020 06:15:57 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:55837 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 <quintela@redhat.com>) id 1iwlK8-00068B-VQ for qemu-devel@nongnu.org; Wed, 29 Jan 2020 06:15:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580296556; 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=Q2pP2zA0bbIXPQaYiGHa+KgmqOoOJ5MwYRfxRX/8KhfkhsZCllnzrGo1neOiLGqO1fBCL0 xK4hBajFPoRfImGXIXkjiTqPTetPvqu/CIMOT7ONUoVhNOqOMiBScd/DDghBx5r2r9hZsQ bD1Ke1oP8NGKB0t+zazxoMMRVrrw0Pc= 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-307-G5xuWC35PmS8zUIpPA0Jiw-1; Wed, 29 Jan 2020 06:15:55 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 69F52800D5C for <qemu-devel@nongnu.org>; Wed, 29 Jan 2020 11:15:54 +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 99DD28E9E4; Wed, 29 Jan 2020 11:15:51 +0000 (UTC) From: Juan Quintela <quintela@redhat.com> To: qemu-devel@nongnu.org Subject: [PULL 04/18] migration: Don't send data if we have stopped Date: Wed, 29 Jan 2020 12:15:22 +0100 Message-Id: <20200129111536.9497-5-quintela@redhat.com> In-Reply-To: <20200129111536.9497-1-quintela@redhat.com> References: <20200129111536.9497-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: G5xuWC35PmS8zUIpPA0Jiw-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: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Thomas Huth <thuth@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Juan Quintela <quintela@redhat.com> Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> |
Series |
[PULL,01/18] migration-test: Use g_free() instead of free()
|
expand
|
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);