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, 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 9FE36C04AB4 for ; Tue, 14 May 2019 13:41:55 +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 7526A21473 for ; Tue, 14 May 2019 13:41:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7526A21473 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]:48425 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQXgo-0000cC-7y for qemu-devel@archiver.kernel.org; Tue, 14 May 2019 09:41:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQXfq-0000IW-UM for qemu-devel@nongnu.org; Tue, 14 May 2019 09:40:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQXfq-00032a-2U for qemu-devel@nongnu.org; Tue, 14 May 2019 09:40:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52524) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQXfp-00031d-TW for qemu-devel@nongnu.org; Tue, 14 May 2019 09:40:54 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 868093086235; Tue, 14 May 2019 13:40:47 +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 8F2F360F81; Tue, 14 May 2019 13:40:46 +0000 (UTC) Date: Tue, 14 May 2019 14:40:44 +0100 From: "Dr. David Alan Gilbert" To: Wei Yang Message-ID: <20190514134040.GA9618@work-vm> References: <20190403011016.12549-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190403011016.12549-1-richardw.yang@linux.intel.com> User-Agent: Mutt/1.11.4 (2019-03-13) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 14 May 2019 13:40: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 v2] vmstate: check subsection_found is enough 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: > subsection_found is true implies vmdesc is not NULL. > > This patch remove the additional check on vmdesc and rename > subsection_found to vmdesc_has_subsections to make it more self-explain. > > Signed-off-by: Wei Yang Queued. > --- > v2: > * rename it to vmdesc_has_subsections > --- > migration/vmstate.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/migration/vmstate.c b/migration/vmstate.c > index e2bbb7b5f7..1305d1a528 100644 > --- a/migration/vmstate.c > +++ b/migration/vmstate.c > @@ -496,7 +496,7 @@ static int vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd, > void *opaque, QJSON *vmdesc) > { > const VMStateDescription **sub = vmsd->subsections; > - bool subsection_found = false; > + bool vmdesc_has_subsections = false; > int ret = 0; > > trace_vmstate_subsection_save_top(vmsd->name); > @@ -508,9 +508,9 @@ static int vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd, > trace_vmstate_subsection_save_loop(vmsd->name, vmsdsub->name); > if (vmdesc) { > /* Only create subsection array when we have any */ > - if (!subsection_found) { > + if (!vmdesc_has_subsections) { > json_start_array(vmdesc, "subsections"); > - subsection_found = true; > + vmdesc_has_subsections = true; > } > > json_start_object(vmdesc, NULL); > @@ -533,7 +533,7 @@ static int vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd, > sub++; > } > > - if (vmdesc && subsection_found) { > + if (vmdesc_has_subsections) { > json_end_array(vmdesc); > } > > -- > 2.19.1 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK