From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56092)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1ZmNnV-0005Bd-8z
	for qemu-devel@nongnu.org; Wed, 14 Oct 2015 11:16:58 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1ZmNnU-0005nJ-BK
	for qemu-devel@nongnu.org; Wed, 14 Oct 2015 11:16:57 -0400
References: <1444680042-13207-1-git-send-email-mreitz@redhat.com>
	<1444680042-13207-26-git-send-email-mreitz@redhat.com>
	<20151014151250.GD16803@noname.str.redhat.com>
From: Max Reitz <mreitz@redhat.com>
Message-ID: <561E71DE.20703@redhat.com>
Date: Wed, 14 Oct 2015 17:16:46 +0200
MIME-Version: 1.0
In-Reply-To: <20151014151250.GD16803@noname.str.redhat.com>
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature";
	boundary="ihLRvnm2LDbsSnvjKjrp7NmhOsNlHUfW2"
Subject: Re: [Qemu-devel] [PATCH v6 25/39] blockdev: Pull out blockdev
	option extraction
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Kevin Wolf <kwolf@redhat.com>
Cc: Alberto Garcia <berto@igalia.com>, qemu-block@nongnu.org, John Snow <jsnow@redhat.com>, qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--ihLRvnm2LDbsSnvjKjrp7NmhOsNlHUfW2
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: quoted-printable

On 14.10.2015 17:12, Kevin Wolf wrote:
> Am 12.10.2015 um 22:00 hat Max Reitz geschrieben:
>> Extract some of the blockdev option extraction code from blockdev_init=
()
>> into its own function. This simplifies blockdev_init() and will allow
>> reusing the code in a different function added in a follow-up patch.
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> Reviewed-by: Alberto Garcia <berto@igalia.com>
>=20
> Reviewed-by: Kevin Wolf <kwolf@redhat.com>
>=20
>> +#ifdef CONFIG_LINUX_AIO
>> +    if ((aio =3D qemu_opt_get(opts, "aio")) !=3D NULL) {
>> +        if (!strcmp(aio, "native")) {
>> +            *bdrv_flags |=3D BDRV_O_NATIVE_AIO;
>> +        } else if (!strcmp(aio, "threads")) {
>> +            /* this is the default */
>> +        } else {
>> +           error_setg(errp, "invalid aio option");
>> +           return;
>> +        }
>> +    }
>> +#endif
>=20
> Unrelated to your patch, but didn't we want to remove this #ifdef? I
> thought we had already done so... Oh, I've never flushed block-next
> after the 2.4 release. :-/
>=20
> Expect a merge conflict coming up here...

It won't be the first to hit this series. ;-)

Max


--ihLRvnm2LDbsSnvjKjrp7NmhOsNlHUfW2
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAEBCAAGBQJWHnHeAAoJEDuxQgLoOKytH0QH/RcApWdzzgRezo+FlD3tVITT
Zq0CjEoggYBHaMyNwCBg/kPZMyHFhSIdVeawYRwXuuLhbYLnh5fw8C2nhIhecaXk
r6zFXkvbt+Ix4Yp+hKiYKOLKroTDLvqAxBwLkcHEW8mTBFwrrT2x+K9na+xLOZd8
s9E0V2qxjoee9ZSVD9eztWFejXxaqr+kx5fXEbzQiM0ULk7N0GfEeMgCuCN1Pyu9
C0OYPPQP22CZ22/WL7fwr0WGWdY6mIfetvr94W4xYoZ3XuU57EVNfRn1VjNwtUoP
p3pj1Yl/royHd/hSXlZ5B3PZWifeYox8lz0QGYEs9ZBPzsrGj85UeOsnwM08t+A=
=iKit
-----END PGP SIGNATURE-----

--ihLRvnm2LDbsSnvjKjrp7NmhOsNlHUfW2--