From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:42660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBdLt-0002rD-Gn for qemu-devel@nongnu.org; Wed, 03 Apr 2019 06:42:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hBdLn-0003uR-GG for qemu-devel@nongnu.org; Wed, 03 Apr 2019 06:42:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46239) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hBdLh-0003p7-Q1 for qemu-devel@nongnu.org; Wed, 03 Apr 2019 06:42:31 -0400 Date: Wed, 3 Apr 2019 11:42:25 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20190403104225.GB2790@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> Subject: Re: [Qemu-devel] [PATCH v2] vmstate: check subsection_found is enough List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wei Yang Cc: qemu-devel@nongnu.org, quintela@redhat.com * 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 Thanks, Reviewed-by: Dr. David Alan Gilbert > > --- > 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