From nobody Sat Oct 25 17:18:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1561107235; cv=none; d=zoho.com; s=zohoarc; b=klKIl5+uRyq2dxlxcnG6q3Bdp9uC1bFouTlslXV9fIaF8MqTAYAyiujDZlAVE6rarqwItIMaz4u2ngMr/Dv9pZgIMNTQ9mSAXvMRTThFtiYYURSOKVis3vZJOqBVI3aotYDnvb+7NtxYtIePnXRCePo5GYvTvZ41O0mnuM+G0oM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561107235; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=+eFSo492UrIX0DEwTk5trN5Jp2orxOVHrCmM7BKtC7M=; b=J83cFoV5Zi+SAFPtFfEx8cAjCM+TjfP3sGuwr9eF7IHTvoHPGyyTUKGozE/pgWFB4GQM0aQMZaKAIE7yXETZ617f9+syBMApo7bqe2Qlp40L6XfeIA2DNhnMsz/qEm70cIufEFVElfDC5nqkxKbcrZlTL+vCtlFk4v/n0LOTX8Y= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1561107235421733.611826381432; Fri, 21 Jun 2019 01:53:55 -0700 (PDT) Received: from localhost ([::1]:55590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heFIt-0008FZ-5l for importer@patchew.org; Fri, 21 Jun 2019 04:53:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58774) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heEza-0004Ue-SB for qemu-devel@nongnu.org; Fri, 21 Jun 2019 04:33:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1heEoC-0000wq-4C for qemu-devel@nongnu.org; Fri, 21 Jun 2019 04:22:09 -0400 Received: from mail.ispras.ru ([83.149.199.45]:41570) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1heEoA-0000sM-45 for qemu-devel@nongnu.org; Fri, 21 Jun 2019 04:22:06 -0400 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 76A6154006B; Fri, 21 Jun 2019 11:22:03 +0300 (MSK) From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Fri, 21 Jun 2019 11:22:03 +0300 Message-ID: <156110532327.25431.17706154271325991738.stgit@pasha-Precision-3630-Tower> In-Reply-To: <156110523748.25431.9310430853468653085.stgit@pasha-Precision-3630-Tower> References: <156110523748.25431.9310430853468653085.stgit@pasha-Precision-3630-Tower> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [PATCH for-4.1 15/24] replay: flush rr queue before loading the vmstate 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: kwolf@redhat.com, peter.maydell@linaro.org, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, quintela@redhat.com, ciro.santilli@gmail.com, jasowang@redhat.com, crosthwaite.peter@gmail.com, armbru@redhat.com, mreitz@redhat.com, alex.bennee@linaro.org, maria.klimushenkova@ispras.ru, mst@redhat.com, kraxel@redhat.com, boost.lists@gmail.com, thomas.dullien@googlemail.com, dovgaluk@ispras.ru, artem.k.pisarenko@gmail.com, dgilbert@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Pavel Dovgalyuk Non-empty record/replay queue prevents saving and loading the VM state, because it includes pending bottom halves and block coroutines. But when the new VM state is loaded, we don't have to preserve the consiste= ncy of the current state anymore. Therefore this patch just flushes the queue allowing the coroutines to finish. Signed-off-by: Pavel Dovgalyuk --- include/sysemu/replay.h | 2 ++ migration/savevm.c | 6 ++++++ replay/replay-internal.h | 2 -- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index 3fe14b5f57..d7e859d915 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -140,6 +140,8 @@ void replay_disable_events(void); void replay_enable_events(void); /*! Returns true when saving events is enabled */ bool replay_events_enabled(void); +/* Flushes events queue */ +void replay_flush_events(void); /*! Adds bottom half event to the queue */ void replay_bh_schedule_event(QEMUBH *bh); /*! Adds input event to the queue */ diff --git a/migration/savevm.c b/migration/savevm.c index a113cc187d..053f470eea 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2793,6 +2793,12 @@ int load_snapshot(const char *name, Error **errp) return -EINVAL; } =20 + /* + * Flush the record/replay queue. Now the VM state is going + * to change. Therefore we don't need to preserve its consistency + */ + replay_flush_events(); + /* Flush all IO requests so they don't interfere with the new state. = */ bdrv_drain_all_begin(); =20 diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 8c15a41350..945802361b 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -146,8 +146,6 @@ void replay_read_next_clock(unsigned int kind); void replay_init_events(void); /*! Clears internal data structures for events handling */ void replay_finish_events(void); -/*! Flushes events queue */ -void replay_flush_events(void); /*! Returns true if there are any unsaved events in the queue */ bool replay_has_events(void); /*! Saves events from queue into the file */