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.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 97DB8C7618F for ; Fri, 19 Jul 2019 17:00:10 +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 702D12184E for ; Fri, 19 Jul 2019 17:00:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 702D12184E 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 ([::1]:47162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoWEr-0008QS-Iz for qemu-devel@archiver.kernel.org; Fri, 19 Jul 2019 13:00:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49351) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoWEf-000812-O5 for qemu-devel@nongnu.org; Fri, 19 Jul 2019 12:59:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hoWEe-0000kW-5W for qemu-devel@nongnu.org; Fri, 19 Jul 2019 12:59:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59226) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hoWEd-0000jb-JS for qemu-devel@nongnu.org; Fri, 19 Jul 2019 12:59:55 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3D7E17FDF8; Fri, 19 Jul 2019 16:59:54 +0000 (UTC) Received: from work-vm (ovpn-117-245.ams2.redhat.com [10.36.117.245]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A5565DA38; Fri, 19 Jul 2019 16:59:53 +0000 (UTC) Date: Fri, 19 Jul 2019 17:59:50 +0100 From: "Dr. David Alan Gilbert" To: Wei Yang Message-ID: <20190719165950.GH3000@work-vm> References: <20190709140924.13291-1-richardw.yang@linux.intel.com> <20190709140924.13291-4-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190709140924.13291-4-richardw.yang@linux.intel.com> User-Agent: Mutt/1.12.0 (2019-05-25) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 19 Jul 2019 16:59:54 +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/3] migration/savevm: move non SaveStateEntry condition check out of iteration 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: 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_postcopy and iterable_only are not SaveStateEntry specific, it would > be more proper to check them out of iteration. > > Signed-off-by: Wei Yang Worth it just to make that big if statement simpler! Reviewed-by: Dr. David Alan Gilbert > --- > migration/savevm.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/migration/savevm.c b/migration/savevm.c > index c41e13e322..8a2ada529e 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -1247,8 +1247,7 @@ void qemu_savevm_state_complete_postcopy(QEMUFile *f) > } > > static > -int qemu_savevm_state_complete_precopy_iterable(QEMUFile *f, bool in_postcopy, > - bool iterable_only) > +int qemu_savevm_state_complete_precopy_iterable(QEMUFile *f, bool in_postcopy) > { > SaveStateEntry *se; > int ret; > @@ -1257,7 +1256,6 @@ int qemu_savevm_state_complete_precopy_iterable(QEMUFile *f, bool in_postcopy, > if (!se->ops || > (in_postcopy && se->ops->has_postcopy && > se->ops->has_postcopy(se->opaque)) || > - (in_postcopy && !iterable_only) || > !se->ops->save_live_complete_precopy) { > continue; > } > @@ -1369,10 +1367,11 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only, > > cpu_synchronize_all_states(); > > - ret = qemu_savevm_state_complete_precopy_iterable(f, in_postcopy, > - iterable_only); > - if (ret) { > - return ret; > + if (!in_postcopy || iterable_only) { > + ret = qemu_savevm_state_complete_precopy_iterable(f, in_postcopy); > + if (ret) { > + return ret; > + } > } > > if (iterable_only) { > -- > 2.17.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK