From nobody Mon Nov 10 11:20:55 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=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556067361; cv=none; d=zoho.com; s=zohoarc; b=H82x4y2VZy2RXmGQaIaQV9YJsmYMYmoZ6KyoskZf/UaQ3ibjHB7LglPzELX0azcRtt57JnWuv2fWuqQll9qAUpPB+WeWuMR0u737GCEP5A3FVSFXX7qubGtOWYKK9LBOum8bhPge80v2BWlCpGOpzt7wxArQ951c0l/Xlhm0lQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556067361; h=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=ciEYsBSmssMgk60Ymd+Xu7yoMkogr0kIz2oW1l03axk=; b=i58Sg8tW87TilApWSXpIpU1j+KuBPXeWqfSUcApuwbK1uI0aKY4w9H0u82caT09cDEUt9AiFgNRYj/cK9KiDlKYOYsGX2hlmIObW7xJumYvB/3val0Ba0s0DNu19AyA4ug7v4Mi7/Itu5IllN9enzC7uqNoX2Fo9A/iD3s35SMc= 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556067361353678.3461235610476; Tue, 23 Apr 2019 17:56:01 -0700 (PDT) Received: from localhost ([127.0.0.1]:33593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ6CU-0004bV-Ha for importer@patchew.org; Tue, 23 Apr 2019 20:55:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ6Ab-0003Pg-7F for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:53:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJ64X-00006E-WC for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:47:38 -0400 Received: from mga18.intel.com ([134.134.136.126]:13721) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJ64X-00005J-OW for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:47:37 -0400 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Apr 2019 17:47:36 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga006.jf.intel.com with ESMTP; 23 Apr 2019 17:47:35 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,387,1549958400"; d="scan'208";a="138265316" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 24 Apr 2019 08:46:59 +0800 Message-Id: <20190424004700.12766-4-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190424004700.12766-1-richardw.yang@linux.intel.com> References: <20190424004700.12766-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [PATCH 3/4] migration/savevm: load_header before load_setup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" In migration_thread() and qemu_savevm_state(), we savevm_state in following sequence: qemu_savevm_state_header(f); qemu_savevm_state_setup(f); Then it would be more proper to loadvm_state in the save sequence. Signed-off-by: Wei Yang Reviewed-by: Dr. David Alan Gilbert --- migration/savevm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 6c61056cde..a80ae83663 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2427,10 +2427,6 @@ int qemu_loadvm_state(QEMUFile *f) return -ENOTSUP; } =20 - if (qemu_loadvm_state_setup(f) !=3D 0) { - return -EINVAL; - } - if (migrate_get_current()->send_configuration) { if (qemu_get_byte(f) !=3D QEMU_VM_CONFIGURATION) { error_report("Configuration section missing"); @@ -2445,6 +2441,10 @@ int qemu_loadvm_state(QEMUFile *f) } } =20 + if (qemu_loadvm_state_setup(f) !=3D 0) { + return -EINVAL; + } + cpu_synchronize_all_pre_loadvm(); =20 ret =3D qemu_loadvm_state_main(f, mis); --=20 2.19.1