diff options
| author | Andrey Shinkevich | 2019-03-07 14:33:58 +0100 |
|---|---|---|
| committer | Kevin Wolf | 2019-03-08 12:26:45 +0100 |
| commit | 9ac404c5233f3033435ab250d30ea9f776188a01 (patch) | |
| tree | e1e0d6369a04c920bb6b1d3aa993fbaf5b972cdf /qemu-img.c | |
| parent | iotests: open notrun files in text mode (diff) | |
| download | qemu-9ac404c5233f3033435ab250d30ea9f776188a01.tar.gz qemu-9ac404c5233f3033435ab250d30ea9f776188a01.tar.xz qemu-9ac404c5233f3033435ab250d30ea9f776188a01.zip | |
block: iterate_format with account of whitelisting
bdrv_iterate_format (which is currently only used for printing out the
formats supported by the block layer) doesn't take format whitelisting
into account.
This creates a problem for tests: they enumerate supported formats to
decide which tests to enable, but then discover that QEMU doesn't let
them actually use some of those formats.
To avoid that, exclude formats that are not whitelisted from
enumeration, if whitelisting is in use. Since we have separate
whitelists for r/w and r/o, take this a parameter to
bdrv_iterate_format, and print two lists of supported formats (r/w and
r/o) in main qemu.
Signed-off-by: Roman Kagan <rkagan@virtuozzo.com>
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-img.c b/qemu-img.c index 660c01898e..5fac840742 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -198,7 +198,7 @@ static void QEMU_NORETURN help(void) " 'skip=N' skip N bs-sized blocks at the start of input\n"; printf("%s\nSupported formats:", help_msg); - bdrv_iterate_format(format_print, NULL); + bdrv_iterate_format(format_print, NULL, false); printf("\n\n" QEMU_HELP_BOTTOM "\n"); exit(EXIT_SUCCESS); } |