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
---
blockdev.c | 15 ---
tests/qemu-iotests/087.out | 2 +-
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index a51434c..a611cc8 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3834,21 +3834,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);
diff --git a/tests/qemu-iotests/087.out b/tests/qemu-iotests/087.out
index f2d6f96..6cd5e37 100644
--- a/tests/qemu-iotests/087.out
+++ b/tests/qemu-iotests/087.out
@@ -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"}
--
1.8.3.1
