From nobody Mon Nov 10 17:55:30 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557859321; cv=none; d=zoho.com; s=zohoarc; b=EgDSUzQLThF82AqXaXTkIAp3fX1b3IRJpO2t3YZY2hPFSO+15cLShXbvgyMwRaSp4KZPIvT70xHoFuuy5VNKLVi3ocjwvvoE8ydbHFnou0p+9IYWAhUTgNcZHRl1I1VXuxv+WSxzEGtr8HygfcvSd3s8ltsUyEgeUXMWqcXK09c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557859321; h=Content-Transfer-Encoding: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=h4nqLuH9dvjKd6T+VmuB7Ck43mvZ0NA0eQtFKcfTeIA=; b=T5tHGv8PUfH7Gh9ZrHU5AOtdGw1jsoiqUM+O5yJ496AxYP23BLeeT2bXfUIhIlUTvElm+Z2eNXYWEAHj6Q3MWQYI8dZnaYSw+e/EYQQdC7YGwrg6owXtN0bEpzTIxy+QPdeVmiCOHA80ewlzzTD8MYL/aWfEZykQKdAuvdc0KVY= 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 1557859321429390.8838405233612; Tue, 14 May 2019 11:42:01 -0700 (PDT) Received: from localhost ([127.0.0.1]:52473 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQcN9-0003vH-BD for importer@patchew.org; Tue, 14 May 2019 14:41:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQcHQ-0007H9-3Z for qemu-devel@nongnu.org; Tue, 14 May 2019 14:36:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQcHP-0001mq-6Z for qemu-devel@nongnu.org; Tue, 14 May 2019 14:36:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52502) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQcHP-0001lq-0v for qemu-devel@nongnu.org; Tue, 14 May 2019 14:35:59 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 4BCCF33026D; Tue, 14 May 2019 18:35:58 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id C6FC1608A6; Tue, 14 May 2019 18:35:56 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, quintela@redhat.com, peterx@redhat.com, ehabkost@redhat.com, richardw.yang@linux.intel.com, yury-kotov@yandex-team.ru, chen.zhang@intel.com Date: Tue, 14 May 2019 19:34:50 +0100 Message-Id: <20190514183454.12758-13-dgilbert@redhat.com> In-Reply-To: <20190514183454.12758-1-dgilbert@redhat.com> References: <20190514183454.12758-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 14 May 2019 18:35:58 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 12/16] 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Wei Yang 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 Message-Id: <20190424004700.12766-4-richardw.yang@linux.intel.com> Reviewed-by: Dr. David Alan Gilbert Signed-off-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 6e8912af49..4c7b8379e8 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2434,10 +2434,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"); @@ -2452,6 +2448,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.21.0