From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlOAo-0003IM-2k for qemu-devel@nongnu.org; Wed, 19 Dec 2012 13:15:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlOAl-0001Tj-OG for qemu-devel@nongnu.org; Wed, 19 Dec 2012 13:15:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlOAl-0001Te-HT for qemu-devel@nongnu.org; Wed, 19 Dec 2012 13:15:15 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBJIFE2a030230 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Dec 2012 13:15:15 -0500 Message-ID: <50D2042F.6000901@redhat.com> Date: Wed, 19 Dec 2012 11:15:11 -0700 From: Eric Blake MIME-Version: 1.0 References: <1355751593-31535-1-git-send-email-mrezanin@redhat.com> <1355751593-31535-2-git-send-email-mrezanin@redhat.com> <1355751593-31535-3-git-send-email-mrezanin@redhat.com> <1355751593-31535-4-git-send-email-mrezanin@redhat.com> <1355751593-31535-5-git-send-email-mrezanin@redhat.com> In-Reply-To: <1355751593-31535-5-git-send-email-mrezanin@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------enigAC501E7DFA019A2D618F8E37" Subject: Re: [Qemu-devel] [PATCH v7 4/4] Add qemu-img compare documentation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mrezanin@redhat.com Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigAC501E7DFA019A2D618F8E37 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 12/17/2012 06:39 AM, mrezanin@redhat.com wrote: > From: Miroslav Rezanina >=20 > Adding documentation for new qemu-img subcommand compare. >=20 > Signed-off-by: Miroslav Rezanina > --- > qemu-img.c | 7 ++++++- > qemu-img.texi | 32 ++++++++++++++++++++++++++++++++ > 2 files changed, 38 insertions(+), 1 deletion(-) >=20 > diff --git a/qemu-img.c b/qemu-img.c > index 8b4f01f..a185e9e 100644 > --- a/qemu-img.c > +++ b/qemu-img.c > @@ -103,7 +103,12 @@ static void help(void) > " '-a' applies a snapshot (revert disk to saved state)\n" > " '-c' creates a snapshot\n" > " '-d' deletes a snapshot\n" > - " '-l' lists all snapshots in the given image\n"; > + " '-l' lists all snapshots in the given image\n" > + "\n" > + "Parameters to compare subcommand:\n" > + " '-f' First image format\n" > + " '-F' Second image format\n" > + " '-s' Strict mode - fail on different image size or secto= r allocation\n"; s/First/first/; s/Second/second/; s/Strict/strict/ for consistent appearance of starting description with lower case > @table @option > @@ -117,6 +129,26 @@ it doesn't need to be specified separately in this= case. > =20 > Commit the changes recorded in @var{filename} in its base image. > =20 > +@item compare [-f @var{fmt}] [-F @var{fmt}] [-p] [-s] [-q] @var{filena= me1} @var{filename2} > + > +Check if two images have the same content. You can compare images with= > +different format or settings. > + > +The format is probed unless you specify it by @var{-f} (used for @var{= filename1}) and/or @var{-F} (used for @var{filename2}) option. Wrap this long line. --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --------------enigAC501E7DFA019A2D618F8E37 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQEcBAEBCAAGBQJQ0gQvAAoJEKeha0olJ0NqbTYH/3npLfEZ+0KZ8kvy/vkxze+5 m/EV/ECRu1yK2u5+YHkBS2HuUNjBTncq3wxtOPZzyrjG0bN3gV007LpPIVjn6BMO wqR2HH9O//OLwh9spsf00jESeGmaoRCBNggfODztYZSYqVE7xwkSo3bykOMtpOPS 5cB28FzAxPkpZpREHwDcG1aCo/zqxvqUShTRtPw7b7+jjydp5X0loSLhCwmkY/h4 D3KZTrXVEyziyujcZ7b5UEMC2kMcCJNeuThb2Au27O6WUiWaOqqcfIGSDbdQ5rKL hKsho/UACep9vb/KJLurhhXHU35oRf2H1WVmGCe6zfJ4Fgm3zOtQjK/zjJLlaCk= =qYcJ -----END PGP SIGNATURE----- --------------enigAC501E7DFA019A2D618F8E37--