From nobody Fri Nov 14 16:59:41 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1588801140; cv=none; d=zohomail.com; s=zohoarc; b=JRmD+OsqcnpwOf7Bb0hc7mqEP4k7rbzZKo6ql0O0pC/5inBenTGF++DsK/f/peKO5h1NckpoWJGM78Baakrj/wKbDTmNacOMZ1YxoSEv/TbXTLm/+22z2eZ06kU4yP3w5UFsx8IMgbWasFlp4CWi4/WvCqDY8Jws4lcyKGNirC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588801140; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject; bh=wYBItL0O1HkGz9n/QNq2NII3wXKWScs2S1KCgSg+tyg=; b=lsk9i3hBlfeqB6gKqYC/Albc0SP30U5yUw/gxPjjohlKYD5y+zMaHCc+CFgfKRaEqhmulUVH3ZJAvxOOITEqqtZpoFT3bM27x0wfb3fSmFnhNY7FoWWQ2iOpDI0+SmzzllHjviCsBkSyp5uxzFa5+x7CUiW438mOKD0eXpxP8qo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158880114031325.429373862837565; Wed, 6 May 2020 14:39:00 -0700 (PDT) Received: from localhost ([::1]:39408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWRko-0003QK-Vd for importer@patchew.org; Wed, 06 May 2020 17:38:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWRhb-0007AA-L1; Wed, 06 May 2020 17:35:39 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:50490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWRhZ-0007ob-5z; Wed, 06 May 2020 17:35:39 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 046LJSHo100003; Wed, 6 May 2020 21:35:34 GMT Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by aserp2120.oracle.com with ESMTP id 30usgq3y98-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 06 May 2020 21:35:34 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 046LZ1pD118799; Wed, 6 May 2020 21:35:34 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserp3030.oracle.com with ESMTP id 30sjdwduf8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 06 May 2020 21:35:33 +0000 Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 046LZWQs016525; Wed, 6 May 2020 21:35:32 GMT Received: from localhost.localdomain (/10.74.121.228) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 06 May 2020 14:35:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2020-01-29; bh=wYBItL0O1HkGz9n/QNq2NII3wXKWScs2S1KCgSg+tyg=; b=Bzhan7eYLMAbpDdA91UuqJmOVkOCoTfPYlV6hIgtJWAFkvh8O+8UtRAz+ULpO1srq+fp vv+1gQ1mEp5RgkFJbi/NC5t9lUSZALS/37nMqC7DgLAnK+Ag0UrBrA4DqWxdxPD8XY6F 9QKdQ1frJSUEolfoeSslV0H25gBevIYl0uIK2h3+gEklK0Bl9xhCN394Xz4fHfc4R2Jd ytRaBk7jyq38+vK9eppZrqKfTBSl0DMHVyOvj6Faj+ZuAHjyXJO30IRL0DRLvOgt1lmM WPN0ZqJqvKC4mAM6HwjuU69y6qHRuZNaRWSr+5wpEMZca4mKPp4FEPvD/Yy31OPkaoq5 6g== From: Eyal Moscovici To: Subject: [PATCH v2 4/5] qemu-img: refactor dump_map_entry JSON format output Date: Thu, 7 May 2020 00:34:58 +0300 Message-Id: <20200506213459.44743-5-eyal.moscovici@oracle.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) In-Reply-To: <20200506213459.44743-1-eyal.moscovici@oracle.com> References: <59b0896d-85ad-08b5-fcc1-36adad7501a4@redhat.com> <20200506213459.44743-1-eyal.moscovici@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9613 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 mlxscore=0 bulkscore=0 adultscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2005060172 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9613 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 impostorscore=0 mlxscore=0 priorityscore=1501 lowpriorityscore=0 malwarescore=0 clxscore=1015 mlxlogscore=999 spamscore=0 adultscore=0 bulkscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2005060172 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=141.146.126.78; envelope-from=eyal.moscovici@oracle.com; helo=aserp2120.oracle.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/06 17:35:26 X-ACL-Warn: Detected OS = Linux 3.x [generic] [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Kevin Wolf , Eyal Moscovici , qemu-block@nongnu.org, qemu-devel@nongnu.org, Max Reitz , liran.alon@oracle.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Previously dump_map_entry identified whether we need to start a new JSON array based on whether start address =3D=3D 0. In this refactor we remove this assumption as in following patches we will allow map to start from an arbitrary position. Reviewed-by: Eric Blake Acked-by: Mark Kanda Signed-off-by: Eyal Moscovici --- qemu-img.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index a1b507a0be..0a140fe564 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2896,9 +2896,8 @@ static int dump_map_entry(OutputFormat output_format,= MapEntry *e, } break; case OFORMAT_JSON: - printf("%s{ \"start\": %"PRId64", \"length\": %"PRId64"," + printf("{ \"start\": %"PRId64", \"length\": %"PRId64"," " \"depth\": %"PRId64", \"zero\": %s, \"data\": %s", - (e->start =3D=3D 0 ? "[" : ",\n"), e->start, e->length, e->depth, e->zero ? "true" : "false", e->data ? "true" : "false"); @@ -2907,8 +2906,8 @@ static int dump_map_entry(OutputFormat output_format,= MapEntry *e, } putchar('}'); =20 - if (!next) { - printf("]\n"); + if (next) { + puts(","); } break; } @@ -3083,6 +3082,8 @@ static int img_map(int argc, char **argv) =20 if (output_format =3D=3D OFORMAT_HUMAN) { printf("%-16s%-16s%-16s%s\n", "Offset", "Length", "Mapped to", "Fi= le"); + } else if (output_format =3D=3D OFORMAT_JSON) { + putchar('['); } =20 length =3D blk_getlength(blk); @@ -3119,6 +3120,9 @@ static int img_map(int argc, char **argv) } =20 ret =3D dump_map_entry(output_format, &curr, NULL); + if (output_format =3D=3D OFORMAT_JSON) { + puts("]"); + } =20 out: blk_unref(blk); --=20 2.17.2 (Apple Git-113)