From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoFvi-0004uU-VI for qemu-devel@nongnu.org; Tue, 11 Nov 2014 13:12:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XoFvd-0000nX-Ow for qemu-devel@nongnu.org; Tue, 11 Nov 2014 13:12:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoFvd-0000nT-H3 for qemu-devel@nongnu.org; Tue, 11 Nov 2014 13:12:33 -0500 Message-ID: <5462518C.3040203@redhat.com> Date: Tue, 11 Nov 2014 11:12:28 -0700 From: Eric Blake MIME-Version: 1.0 References: <1415627159-15941-1-git-send-email-mreitz@redhat.com> <1415627159-15941-16-git-send-email-mreitz@redhat.com> In-Reply-To: <1415627159-15941-16-git-send-email-mreitz@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="vMis7KuwA1VPmCs6Jc2tfd9fBkeBdAKfO" Subject: Re: [Qemu-devel] [PATCH 15/21] qcow2: Use abort() instead of assert(false) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz , qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Lieven , Stefan Hajnoczi This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --vMis7KuwA1VPmCs6Jc2tfd9fBkeBdAKfO Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 11/10/2014 06:45 AM, Max Reitz wrote: > Signed-off-by: Max Reitz > --- > block/qcow2.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Eric Blake Is it worth hoisting this one into 2.2 via the -trivial tree? >=20 > diff --git a/block/qcow2.c b/block/qcow2.c > index beb7187..ebf843f 100644 > --- a/block/qcow2.c > +++ b/block/qcow2.c > @@ -2718,9 +2718,9 @@ static int qcow2_amend_options(BlockDriverState *= bs, QemuOpts *opts, > error_report("Cannot change refcount entry width"); > return -ENOTSUP; > } else { > - /* if this assertion fails, this probably means a new opti= on was > + /* if this point is reached, this probably means a new opt= ion was > * added without having it covered here */ > - assert(false); > + abort(); > } > =20 > desc++; >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --vMis7KuwA1VPmCs6Jc2tfd9fBkeBdAKfO 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 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg iQEcBAEBCAAGBQJUYlGMAAoJEKeha0olJ0Nq50YH/jhrmCx7RevpDCMprcc0tYcX dy9LGnGzZPYrNsUtES97SEylKofc0agn2DCQygQ1Qdr/cCEeqJay6nAMvJ1rYiqm Ir1ZQLIBlQxNyGXzSkU1i9RQuDXLQWIawkvbPeJRCOaEjUv7VlqXCfuesumKcu3D bc2q0FmkOcxJ+pDX5mZKl2xYZ0zhnP2M/5ufVjENjRrRIZhlyAGGeWFrgnwEMZzw Y+xA6mf0SZRg0HAHuwKNP8oufEroAcY2wFZPYYlUtehntc+z6wxasmXGXtVWlMSJ M5fFN+yna2Lqqb/PRj+iYRvi6XYVjc/RXdU4w1+8SrqQC40OHLtlSxzP4+bbCSo= =CO9H -----END PGP SIGNATURE----- --vMis7KuwA1VPmCs6Jc2tfd9fBkeBdAKfO--