From nobody Thu May 9 00:30:41 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554253927515958.6504279828014; Tue, 2 Apr 2019 18:12:07 -0700 (PDT) Received: from localhost ([127.0.0.1]:34651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBURT-0001LD-UO for importer@patchew.org; Tue, 02 Apr 2019 21:11:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBUQc-00011q-QZ for qemu-devel@nongnu.org; Tue, 02 Apr 2019 21:10:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hBUQa-0001MB-Mx for qemu-devel@nongnu.org; Tue, 02 Apr 2019 21:10:58 -0400 Received: from mga09.intel.com ([134.134.136.24]:6234) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hBUQY-0001Hr-U9 for qemu-devel@nongnu.org; Tue, 02 Apr 2019 21:10:55 -0400 Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Apr 2019 18:10:51 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga007.jf.intel.com with ESMTP; 02 Apr 2019 18:10:50 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,302,1549958400"; d="scan'208";a="128139556" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 3 Apr 2019 09:10:16 +0800 Message-Id: <20190403011016.12549-1-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Subject: [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: Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 Acked-by: Stefano Garzarella 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 V= MStateDescription *vmsd, void *opaque, QJSON *vmdesc) { const VMStateDescription **sub =3D vmsd->subsections; - bool subsection_found =3D false; + bool vmdesc_has_subsections =3D false; int ret =3D 0; =20 trace_vmstate_subsection_save_top(vmsd->name); @@ -508,9 +508,9 @@ static int vmstate_subsection_save(QEMUFile *f, const V= MStateDescription *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 =3D true; + vmdesc_has_subsections =3D true; } =20 json_start_object(vmdesc, NULL); @@ -533,7 +533,7 @@ static int vmstate_subsection_save(QEMUFile *f, const V= MStateDescription *vmsd, sub++; } =20 - if (vmdesc && subsection_found) { + if (vmdesc_has_subsections) { json_end_array(vmdesc); } =20 --=20 2.19.1