From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TO8yZ-0005pJ-Sl for qemu-devel@nongnu.org; Tue, 16 Oct 2012 11:22:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TO8yT-0006Uz-Ve for qemu-devel@nongnu.org; Tue, 16 Oct 2012 11:22:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25377) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TO8yT-0006Ur-HZ for qemu-devel@nongnu.org; Tue, 16 Oct 2012 11:22:29 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9GFMSo6001222 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 16 Oct 2012 11:22:28 -0400 Message-ID: <507D7BB3.7090505@redhat.com> Date: Tue, 16 Oct 2012 09:22:27 -0600 From: Eric Blake MIME-Version: 1.0 References: <421ff837d7c7dc9f661d71b2606c25b5a2b8ac3c.1350398238.git.jcody@redhat.com> In-Reply-To: <421ff837d7c7dc9f661d71b2606c25b5a2b8ac3c.1350398238.git.jcody@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------enigB31FFAA3BEA7A1246CFE51DE" Subject: Re: [Qemu-devel] [PATCH v2 2/4] block: in commit, determine base image from the top image List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jeff Cody Cc: kwolf@redhat.com, qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigB31FFAA3BEA7A1246CFE51DE Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 10/16/2012 08:44 AM, Jeff Cody wrote: > This simplifies some code and error checking, and also fixes a bug. >=20 > bdrv_find_backing_image() should only be passed absolute filenames, > or filenames relative to the chain. In the QMP message handler for > block commit, when looking up the base do so from the determined top > image, so we know it is reachable from top. >=20 > Signed-off-by: Jeff Cody > --- > block/commit.c | 9 --------- > blockdev.c | 21 +++++++++++---------- > 2 files changed, 11 insertions(+), 19 deletions(-) As long as you are touching this code: > @@ -1182,6 +1172,17 @@ void qmp_block_commit(const char *device, > return; > } > =20 > + if (base && has_base) { please swap this to 'has_base && base' to avoid any potential of valgrind warnings about conditional jump based on uninitialized memory. Also, I raised another bug[1] about a bad error message regarding top_bs, if the user passes a different spelling than the canonical name of the active image. Is that worth fixing in this series, or is it okay to leave it until you actually add support for committing the top image? [1] https://lists.gnu.org/archive/html/qemu-devel/2012-10/msg02067.html --=20 Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --------------enigB31FFAA3BEA7A1246CFE51DE 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 Mozilla - http://www.enigmail.net/ iQEcBAEBCAAGBQJQfXu0AAoJEKeha0olJ0NqIJcIAJP5jr003DWlW1cf7QSsxgJj woNiXlmtJoHYoaZoyJFHU2Bh0U2ctZIr+bgf+Pep45vxUwt1mfSZLbUrYnxLhOqg ++XAcFCf7MrTV8DAN75WMtNjsa/vycH8B+9reRQ0AMQzy6m2+VQYILR7GJaus6wa deZOjCDNST3N2zWQWNfayjhL142O+TkntCzDtPiFHprXOHpZshbCfarETt0lRhy/ +ZQXRoleqQfKnDzhh2SQ+QHEyfd0lo8wQkcG0Dq8oo+snuw7LGhO7kaIaQT+OFz4 yG6sK59H2hcGDIOco7fiNw9JObtDFUMx5cUDOQRI3DxLxTA4gPct70gH1yT8R0I= =TRYZ -----END PGP SIGNATURE----- --------------enigB31FFAA3BEA7A1246CFE51DE--