From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9Bs8-0004ID-7e for qemu-devel@nongnu.org; Wed, 05 Sep 2012 05:26:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T9Bs5-0007uk-Pn for qemu-devel@nongnu.org; Wed, 05 Sep 2012 05:26:08 -0400 Received: from paradis.irqsave.net ([109.190.18.76]:32891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T9Bs5-0007tT-GG for qemu-devel@nongnu.org; Wed, 05 Sep 2012 05:26:05 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 5 Sep 2012 11:25:42 +0200 Message-Id: <1346837144-22881-1-git-send-email-benoit@irqsave.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH V7 0/2] Add JSON output to qemu-img info List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@linux.vnet.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com, eblake@redhat.com, xiawenc@linux.vnet.ibm.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= This patchset add a JSON output mode to the qemu-img info command. It's a rewrite from scratch of the original patchset by Wenchao Xia following Anthony Liguori advices on JSON formating. the --output=3D(json|human) option is now mandatory on the command line. Beno=C3=AEt Canet (3): qapi: Add SnapshotInfo. qapi: Add ImageInfo. qemu-img: Add json output option to the info command. in v2: eblake: make some field optionals squash the two qapi patchs together fix a typo on vm_clock_nsec bcanet: fix a potential memory leak in v3:=20 lcapitulino:=20 remove unneeded test put '\n' at the end of json in printf statement drop the uneeded head pointer in collect_snapshots in v4: Wenchao Xia && Kevin Wolf: -Refactor to separate rate ImageInfo collection from human printing. Kevin Wolf: -Use --output=3D(json|human). -make the two choice exclusive and print a message if none is specified. -cosmetic '=3D' alignement in collect snapshots. Beno=C3=AEt Canet: -add full-backing-filename to the ImageInfo structure (needed for human printing) -make ImageInfo->actual_size optional depending on the context. in v5: Eric Blake: -use a constant for getopt parsing to avoid future short options collision. -make the command default to --output=3Dhuman. -fix spurious whitespace change. -split vm-clock-nsec in two fields vm-clock-sec and vm-clock-nsec. -declare JSON structure as "Since 1.3"=20 =20 in v6: Blue Swirl: -Add missing const in getopt structure declaration. Eric Blake: -Remove spurious undef. -Use an enum instead of two boolean. in v7: Kevin Wolf: -Add missing documentation. -Change bogus comment about chained lists support in qapi. -Remove collect_backing_file_format and use bs->backing_forma= t instead. -Remove uneeded if. -Change bogus printing logic for backing file format. -Rename Format enum to OutputFormat. -Use OFORMAT_HUMAN by default and get rid of uneeded else bra= nch -Use error_report insted of fprintf. -Use a switch instead of ifs. Beno=C3=AEt Canet: Rename FORMAT_HUMAN and FORMAT_JSON to OFORMAT_JSON an= d OFORMAT_HUMAN Beno=C3=AEt Canet (2): qapi: Add SnapshotInfo and ImageInfo. qemu-img: Add json output option to the info command. Makefile | 3 +- qapi-schema.json | 64 +++++++++++++++ qemu-img-cmds.hx | 4 +- qemu-img.c | 232 +++++++++++++++++++++++++++++++++++++++++++-----= ------ qemu-img.texi | 5 +- 5 files changed, 259 insertions(+), 49 deletions(-) --=20 1.7.9.5