Commit 0ffcdd9c authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Drop aio/cache consistency check from qmp_blockdev_add() 



The TODO comment has been addressed a while ago and this is now checked
in raw-posix, so we don't have to special case this in blockdev-add any
more.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent 24df38b0

blockdev.c

+0 −15
Original line number Diff line number Diff line
@@ -3832,21 +3832,6 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp) 
    QDict *qdict;

    Error *local_err = NULL;



    /* TODO Sort it out in raw-posix and drive_new(): Reject aio=native with

     * cache.direct=false instead of silently switching to aio=threads, except

     * when called from drive_new().

     *

     * For now, simply forbidding the combination for all drivers will do. */

    if (options->has_aio && options->aio == BLOCKDEV_AIO_OPTIONS_NATIVE) {

        bool direct = options->has_cache &&

                      options->cache->has_direct &&

                      options->cache->direct;

        if (!direct) {

            error_setg(errp, "aio=native requires cache.direct=true");

            goto fail;

        }

    }



    visit_type_BlockdevOptions(v, NULL, &options, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

tests/qemu-iotests/087.out

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ QMP_VERSION 
Testing:

QMP_VERSION

{"return": {}}

{"error": {"class": "GenericError", "desc": "aio=native requires cache.direct=true"}}

{"error": {"class": "GenericError", "desc": "aio=native was specified, but it requires cache.direct=on, which was not specified."}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN"}