[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/14] Consolidate printing of block driver options
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 05/14] Consolidate printing of block driver options |
Date: |
Thu, 9 Dec 2010 12:10:01 +0100 |
From: Jes Sorensen <address@hidden>
This consolidates the printing of block driver options in
print_block_option_help() which is called from both img_create() and
img_convert().
This allows for the "?" detection to be done just after the parsing of
options and the filename, instead of half way down the codepath of
these functions.
Signed-off-by: Jes Sorensen <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
qemu-img.c | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index aded72d..50cfdda 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -188,6 +188,33 @@ static int read_password(char *buf, int buf_size)
}
#endif
+static int print_block_option_help(const char *filename, const char *fmt)
+{
+ BlockDriver *drv, *proto_drv;
+ QEMUOptionParameter *create_options = NULL;
+
+ /* Find driver and parse its options */
+ drv = bdrv_find_format(fmt);
+ if (!drv) {
+ error("Unknown file format '%s'", fmt);
+ return 1;
+ }
+
+ proto_drv = bdrv_find_protocol(filename);
+ if (!proto_drv) {
+ error("Unknown protocol '%s'", filename);
+ return 1;
+ }
+
+ create_options = append_option_parameters(create_options,
+ drv->create_options);
+ create_options = append_option_parameters(create_options,
+ proto_drv->create_options);
+ print_option_help(create_options);
+ free_option_parameters(create_options);
+ return 0;
+}
+
static BlockDriverState *bdrv_new_open(const char *filename,
const char *fmt,
int flags)
@@ -310,6 +337,11 @@ static int img_create(int argc, char **argv)
help();
filename = argv[optind++];
+ if (options && !strcmp(options, "?")) {
+ ret = print_block_option_help(filename, fmt);
+ goto out;
+ }
+
/* Find driver and parse its options */
drv = bdrv_find_format(fmt);
if (!drv) {
@@ -328,11 +360,6 @@ static int img_create(int argc, char **argv)
create_options = append_option_parameters(create_options,
proto_drv->create_options);
- if (options && !strcmp(options, "?")) {
- print_option_help(create_options);
- goto out;
- }
-
/* Create parameter list with default values */
param = parse_option_parameters("", create_options, param);
set_option_parameter_int(param, BLOCK_OPT_SIZE, -1);
@@ -694,6 +721,11 @@ static int img_convert(int argc, char **argv)
out_filename = argv[argc - 1];
+ if (options && !strcmp(options, "?")) {
+ ret = print_block_option_help(out_filename, out_fmt);
+ goto out;
+ }
+
if (bs_n > 1 && out_baseimg) {
error("-B makes no sense when concatenating multiple input images");
ret = -1;
@@ -746,10 +778,6 @@ static int img_convert(int argc, char **argv)
drv->create_options);
create_options = append_option_parameters(create_options,
proto_drv->create_options);
- if (options && !strcmp(options, "?")) {
- print_option_help(create_options);
- goto out;
- }
if (options) {
param = parse_option_parameters(options, create_options, param);
--
1.7.2.3
- [Qemu-devel] [PULL 00/14] Block patches, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 01/14] block: Make bdrv_create_file() ':' handling consistent, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 03/14] Use qemu_mallocz() instead of calloc() in img_convert(), Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 02/14] Add missing tracing to qemu_mallocz(), Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 05/14] Consolidate printing of block driver options,
Kevin Wolf <=
- [Qemu-devel] [PATCH 07/14] Fail if detecting an unknown option, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 06/14] Fix formatting and missing braces in qemu-img.c, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 04/14] img_convert(): Only try to free bs[] entries if bs is valid., Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 08/14] Make error handling more consistent in img_create() and img_resize(), Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 10/14] qemu-img: Deprecate obsolete -6 and -e options, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 11/14] qemu-option: Don't reinvent append_option_parameters(), Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 12/14] qemu-option: Fix parse_option_parameters() documentation typo, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 09/14] ceph/rbd block driver for qemu-kvm, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 14/14] qemu-img: Fail creation if backing format is invalid, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 13/14] qemu-img: Free option parameter lists in img_create(), Kevin Wolf, 2010/12/09