diff options
| author | Kevin Wolf | 2016-03-18 15:36:31 +0100 |
|---|---|---|
| committer | Kevin Wolf | 2016-03-30 12:16:03 +0200 |
| commit | 19dbecdceef3f0800a96c25931d71b0b82c3a47a (patch) | |
| tree | 11bb70b5e272daf0ec9a4550d0d45334d1eebc70 /tests | |
| parent | block: Use bdrv_parse_cache_mode() in drive_init() (diff) | |
| download | qemu-19dbecdceef3f0800a96c25931d71b0b82c3a47a.tar.gz qemu-19dbecdceef3f0800a96c25931d71b0b82c3a47a.tar.xz qemu-19dbecdceef3f0800a96c25931d71b0b82c3a47a.zip | |
qemu-io: Use bdrv_parse_cache_mode() in reopen_f()
We must forbid changing the WCE flag in bdrv_reopen() in the same patch,
as otherwise the behaviour would change so that the flag takes
precedence over the explicitly specified option.
The correct value of the WCE flag depends on the BlockBackend user (e.g.
guest device) and isn't a decision that the QMP client makes, so this
change is what we want.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/142 | 2 | ||||
| -rw-r--r-- | tests/qemu-iotests/142.out | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142 index 8bbbfde3a1..a035747904 100755 --- a/tests/qemu-iotests/142 +++ b/tests/qemu-iotests/142 @@ -216,7 +216,7 @@ echo # BDS initialised with the json: pseudo-protocol, but still have it inherit # options from its parent node. -hmp_cmds="qemu-io none0 \"reopen -o cache.writeback=off,cache.direct=on,cache.no-flush=on\" +hmp_cmds="qemu-io none0 \"reopen -o cache.direct=on,cache.no-flush=on\" info block none0 info block image info block blkdebug diff --git a/tests/qemu-iotests/142.out b/tests/qemu-iotests/142.out index c9224909b5..3d5ef5fe8d 100644 --- a/tests/qemu-iotests/142.out +++ b/tests/qemu-iotests/142.out @@ -414,7 +414,7 @@ cache.no-flush=on on backing-file --- Change cache mode in parent, child has explicit option in JSON --- - Cache mode: writethrough, direct, ignore flushes + Cache mode: writeback, direct, ignore flushes Cache mode: writeback, direct, ignore flushes Cache mode: writeback, direct, ignore flushes Cache mode: writeback, ignore flushes |