8eb4b07b6f
This function takes four options (cache.direct, cache.no-flush, read-only and auto-read-only) from a QemuOpts object and updates the flags accordingly. If any of those options is not set (because it was missing from the original QDict or because it had an invalid value) then the function aborts with a failed assertion: $ qemu-io -c 'reopen -o read-only=foo' hd.qcow2 block.c:1126: update_flags_from_options: Assertion `qemu_opt_find(opts, BDRV_OPT_CACHE_DIRECT)' failed. Aborted This assertion is unnecessary, and it forces any caller of bdrv_reopen() to pass all the aforementioned four options. This may have made sense in order to remove ambiguity when bdrv_reopen() was taking both flags and options, but that's not the case anymore. It's also unnecessary if we want to validate the option values, because bdrv_reopen_prepare() already takes care of that, as we can see if we remove the assertions: $ qemu-io -c 'reopen -o read-only=foo' hd.qcow2 Parameter 'read-only' expects 'on' or 'off' Signed-off-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
43 lines
1.2 KiB
Plaintext
43 lines
1.2 KiB
Plaintext
QA output created by 133
|
|
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
|
|
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base
|
|
|
|
=== Check that node-name can't be changed ===
|
|
|
|
Cannot change the option 'node-name'
|
|
Cannot change the option 'node-name'
|
|
Cannot change the option 'node-name'
|
|
|
|
=== Check that unchanged node-name is okay ===
|
|
|
|
|
|
=== Check that driver can't be changed ===
|
|
|
|
Cannot change the option 'driver'
|
|
Cannot change the option 'driver'
|
|
Cannot change the option 'driver'
|
|
|
|
=== Check that unchanged driver is okay ===
|
|
|
|
|
|
=== Check that reopening works with non-string options ===
|
|
|
|
format name: null-co
|
|
format name: null-co
|
|
|
|
=== Check that mixing -c/-r/-w and their corresponding options is forbidden ===
|
|
|
|
Cannot set both -r/-w and 'read-only'
|
|
Cannot set both -r/-w and 'read-only'
|
|
Cannot set both -c and the cache options
|
|
Cannot set both -c and the cache options
|
|
Cannot set both -c and the cache options
|
|
|
|
=== Check that invalid options are handled correctly ===
|
|
|
|
Parameter 'read-only' expects 'on' or 'off'
|
|
Parameter 'cache.no-flush' expects 'on' or 'off'
|
|
Parameter 'cache.direct' expects 'on' or 'off'
|
|
Parameter 'auto-read-only' expects 'on' or 'off'
|
|
*** done
|