diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-06-16 12:59:30 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-06-16 15:19:56 +0200 |
| commit | 418690447a5340050e64efc3c811fd30d9e96e5b (patch) | |
| tree | 0b416dc586098c594d67cc9f966ba905ee168ed6 | |
| parent | c9d20029f43a08c6362a655c2c5272612186a004 (diff) | |
| download | qemu-418690447a5340050e64efc3c811fd30d9e96e5b.zip qemu-418690447a5340050e64efc3c811fd30d9e96e5b.tar.gz qemu-418690447a5340050e64efc3c811fd30d9e96e5b.tar.bz2 | |
block: Fix snapshot=on with aio=native
snapshot=on creates a temporary overlay that is always opened with
cache=unsafe (the cache mode specified by the user is only for the
actual image file and its children). This means that we must not inherit
the BDRV_O_NATIVE_AIO flag for the temporary overlay because trying to
use Linux AIO with cache=unsafe results in an error.
Reproducer without this patch:
$ x86_64-softmmu/qemu-system-x86_64 -drive file=/tmp/test.qcow2,cache=none,aio=native,snapshot=on
qemu-system-x86_64: -drive file=/tmp/test.qcow2,cache=none,aio=native,snapshot=on: aio=native was
specified, but it requires cache.direct=on, which was not specified.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -684,6 +684,10 @@ static void bdrv_temp_snapshot_options(int *child_flags, QDict *child_options, /* For temporary files, unconditional cache=unsafe is fine */ qdict_set_default_str(child_options, BDRV_OPT_CACHE_DIRECT, "off"); qdict_set_default_str(child_options, BDRV_OPT_CACHE_NO_FLUSH, "on"); + + /* aio=native doesn't work for cache.direct=off, so disable it for the + * temporary snapshot */ + *child_flags &= ~BDRV_O_NATIVE_AIO; } /* |