From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhNHx-0005cf-Pk for qemu-devel@nongnu.org; Tue, 28 May 2013 13:02:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UhNHp-0006mY-9i for qemu-devel@nongnu.org; Tue, 28 May 2013 13:02:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9206) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhNHp-0006mR-1f for qemu-devel@nongnu.org; Tue, 28 May 2013 13:02:13 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4SH2CHW009381 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 28 May 2013 13:02:12 -0400 Message-ID: <51A4E313.5080300@redhat.com> Date: Tue, 28 May 2013 11:02:11 -0600 From: Eric Blake MIME-Version: 1.0 References: <1369754856-30036-1-git-send-email-kwolf@redhat.com> <1369754856-30036-6-git-send-email-kwolf@redhat.com> <20130528153714.GF5642@dhcp-200-207.str.redhat.com> In-Reply-To: <20130528153714.GF5642@dhcp-200-207.str.redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="----enig2WATRVRQVFURUCEDUGDUI" Subject: Re: [Qemu-devel] [PATCH 05/16] qemu-io: Don't use global bs in command implementations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: pbonzini@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, lcapitulino@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2WATRVRQVFURUCEDUGDUI Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 05/28/2013 09:37 AM, Kevin Wolf wrote: > Am 28.05.2013 um 17:27 hat Kevin Wolf geschrieben: >> Pass in the BlockDriverState to the command handlers instead of using >> the global variable. This is an important step to make the commands >> usable outside of qemu-io. >> >> Signed-off-by: Kevin Wolf >=20 >> @@ -1793,7 +1808,7 @@ static const cmdinfo_t abort_cmd =3D { >> .oneline =3D "simulate a program crash using abort(3)",= >> }; >> =20 >> -static int close_f(int argc, char **argv) >> +static int close_f(BlockDriverState *bs, int argc, char **argv) >> { >> bdrv_delete(bs); >> bs =3D NULL; >=20 > Here I missed the following hunk that I've applied locally now: >=20 > --- a/qemu-io.c > +++ b/qemu-io.c > @@ -1811,7 +1811,7 @@ static const cmdinfo_t abort_cmd =3D { > static int close_f(BlockDriverState *bs, int argc, char **argv) > { > bdrv_delete(bs); > - bs =3D NULL; > + qemuio_bs =3D NULL; Reviewed-by: Eric Blake --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org ------enig2WATRVRQVFURUCEDUGDUI 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.13 (GNU/Linux) Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJRpOMTAAoJEKeha0olJ0NqqXwH/2Rd5zs+/5aMYJ/SwFQkZYR9 2zVdheSZJ2MOSaRZEyIE3fyT3JdeA5Ix4yqRebtFCy5qOtFdgs83V9p+tPQLIUbT GlCHEa6tCyZ7EpdPAGr2ngub+BKXVGtAAtFUMzScGUHkHgVwi4fVrnQm8pIJrM4v AIIFJqmUdtWjpYnwPqabyZgbeaIA9rGP8zGz1r1Oi9l9FBpzil7jkZPe7Ir27fAa /zIMc3FJH912JaWcx8A5BYkuybwa+l58SVr93qYWRCfHgP7FnbOtxP++PgVMPvb+ UVX4hY9GV440W8QqRfDxaOMRbG4iHbAacJxIRVvmA13F9bxmU2juybVzMaiOf+w= =XbUM -----END PGP SIGNATURE----- ------enig2WATRVRQVFURUCEDUGDUI--