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>
> 
> Reviewed-by: Kevin Wolf <kwolf@redhat.com>
> 
>> +#ifdef CONFIG_LINUX_AIO
>> +    if ((aio = qemu_opt_get(opts, "aio")) != NULL) {
>> +        if (!strcmp(aio, "native")) {
>> +            *bdrv_flags |= BDRV_O_NATIVE_AIO;
>> +        } else if (!strcmp(aio, "threads")) {
>> +            /* this is the default */
>> +        } else {
>> +           error_setg(errp, "invalid aio option");
>> +           return;
>> +        }
>> +    }
>> +#endif
> 
> 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. :-/
> 
> Expect a merge conflict coming up here...

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

Max