From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,T_HK_NAME_DR, URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B661C04AB4 for ; Tue, 14 May 2019 15:47:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D14952086A for ; Tue, 14 May 2019 15:47:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D14952086A 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:50074 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQZeQ-0002MK-2V for qemu-devel@archiver.kernel.org; Tue, 14 May 2019 11:47:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQZcp-0001j3-KV for qemu-devel@nongnu.org; Tue, 14 May 2019 11:46:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQZcn-0007mB-Jn for qemu-devel@nongnu.org; Tue, 14 May 2019 11:45:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60316) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQZcj-0007im-Uq for qemu-devel@nongnu.org; Tue, 14 May 2019 11:45:51 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6E0687E437; Tue, 14 May 2019 15:45:44 +0000 (UTC) Received: from work-vm (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7A838100203C; Tue, 14 May 2019 15:45:43 +0000 (UTC) Date: Tue, 14 May 2019 16:45:41 +0100 From: "Dr. David Alan Gilbert" To: Wei Yang Message-ID: <20190514154540.GM2753@work-vm> References: <20190424004700.12766-1-richardw.yang@linux.intel.com> <20190424004700.12766-4-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190424004700.12766-4-richardw.yang@linux.intel.com> User-Agent: Mutt/1.11.4 (2019-03-13) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 14 May 2019 15:45:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [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: qemu-devel@nongnu.org, quintela@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Wei Yang (richardw.yang@linux.intel.com) wrote: > 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 Yes, OK, I think that makes sense; the loadvm_state_setup and savevm_state_setup are actually quite different in what they do, however it does make sense to do the loadvm_state_setup after we have the configuration loaded, because then potentially it means we can alter the setup. 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; > } > > - if (qemu_loadvm_state_setup(f) != 0) { > - return -EINVAL; > - } > - > if (migrate_get_current()->send_configuration) { > if (qemu_get_byte(f) != QEMU_VM_CONFIGURATION) { > error_report("Configuration section missing"); > @@ -2445,6 +2441,10 @@ int qemu_loadvm_state(QEMUFile *f) > } > } > > + if (qemu_loadvm_state_setup(f) != 0) { > + return -EINVAL; > + } > + > cpu_synchronize_all_pre_loadvm(); > > ret = qemu_loadvm_state_main(f, mis); > -- > 2.19.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK