diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-09-07 15:26:42 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-09-29 14:13:38 +0200 |
| commit | 0ffcdd9c06343a3fe0b2b3e1ca93ce8aa5366f98 (patch) | |
| tree | 36a9d7fe92c657d78fa0231162543466795d9681 /blockdev.c | |
| parent | 24df38b00e23f76558ac12d7055c2df8d4b05150 (diff) | |
| download | qemu-0ffcdd9c06343a3fe0b2b3e1ca93ce8aa5366f98.tar.gz | |
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: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/blockdev.c b/blockdev.c index 62d0dd016f..7820f42210 100644 --- a/blockdev.c +++ b/blockdev.c @@ -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); |