From 0ba83ccbe597ebcaca69a3363d8bc2a5dd74e0c7 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Sun, 29 Dec 2013 22:06:53 +0100 Subject: [PATCH 2/8] qemu-io: Let "open" pass options to block driver RH-Author: Max Reitz Message-id: <1388354817-3013-2-git-send-email-mreitz@redhat.com> Patchwork-id: 56443 O-Subject: [RHEL-7.0 qemu-kvm PATCH 1/5] qemu-io: Let "open" pass options to block driver Bugzilla: 1004347 RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Fam Zheng RH-Acked-by: Kevin Wolf BZ: 1004347 Add an option to the open command to specify runtime options for the block driver used. Signed-off-by: Max Reitz Signed-off-by: Kevin Wolf (cherry picked from commit b543c5cdcb818ffed90cfc97aa8e297214650d84) Signed-off-by: Max Reitz Conflicts: qemu-io.c Conflicts because 797ac58cb2093ab9192d8998a1fef85d87cc8661 has not been backported, which splits qemu-io-cmds.c from qemu-io.c. --- qemu-io.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) Signed-off-by: Miroslav Rezanina --- qemu-io.c | 39 +++++++++++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 8 deletions(-) diff --git a/qemu-io.c b/qemu-io.c index 393c2c8..64b060c 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -16,6 +16,8 @@ #include "qemu-common.h" #include "qemu/main-loop.h" +#include "qemu/option.h" +#include "qemu/config-file.h" #include "block/block_int.h" #include "block/qapi.h" #include "cmd.h" @@ -1771,7 +1773,7 @@ static const cmdinfo_t close_cmd = { .oneline = "close the current open file", }; -static int openfile(char *name, int flags, int growable) +static int openfile(char *name, int flags, int growable, QDict *opts) { Error *local_err = NULL; @@ -1781,7 +1783,7 @@ static int openfile(char *name, int flags, int growable) } if (growable) { - if (bdrv_file_open(&bs, name, NULL, flags, &local_err)) { + if (bdrv_file_open(&bs, name, opts, flags, &local_err)) { fprintf(stderr, "%s: can't open device %s: %s\n", progname, name, error_get_pretty(local_err)); error_free(local_err); @@ -1790,7 +1792,7 @@ static int openfile(char *name, int flags, int growable) } else { bs = bdrv_new("hda"); - if (bdrv_open(bs, name, NULL, flags, NULL, &local_err) < 0) { + if (bdrv_open(bs, name, opts, flags, NULL, &local_err) < 0) { fprintf(stderr, "%s: can't open device %s: %s\n", progname, name, error_get_pretty(local_err)); error_free(local_err); @@ -1816,7 +1818,8 @@ static void open_help(void) " -r, -- open file read-only\n" " -s, -- use snapshot file\n" " -n, -- disable host cache\n" -" -g, -- allow file to grow (only applies to protocols)" +" -g, -- allow file to grow (only applies to protocols)\n" +" -o, -- options to be given to the block driver" "\n"); } @@ -1829,19 +1832,30 @@ static const cmdinfo_t open_cmd = { .argmin = 1, .argmax = -1, .flags = CMD_NOFILE_OK, - .args = "[-Crsn] [path]", + .args = "[-Crsn] [-o options] [path]", .oneline = "open the file specified by path", .help = open_help, }; +static QemuOptsList empty_opts = { + .name = "drive", + .head = QTAILQ_HEAD_INITIALIZER(empty_opts.head), + .desc = { + /* no elements => accept any params */ + { /* end of list */ } + }, +}; + static int open_f(int argc, char **argv) { int flags = 0; int readonly = 0; int growable = 0; int c; + QemuOpts *qopts; + QDict *opts = NULL; - while ((c = getopt(argc, argv, "snrg")) != EOF) { + while ((c = getopt(argc, argv, "snrgo:")) != EOF) { switch (c) { case 's': flags |= BDRV_O_SNAPSHOT; @@ -1855,6 +1869,15 @@ static int open_f(int argc, char **argv) case 'g': growable = 1; break; + case 'o': + qopts = qemu_opts_parse(&empty_opts, optarg, 0); + if (qopts == NULL) { + printf("could not parse option list -- %s\n", optarg); + return 0; + } + opts = qemu_opts_to_qdict(qopts, opts); + qemu_opts_del(qopts); + break; default: return command_usage(&open_cmd); } @@ -1868,7 +1891,7 @@ static int open_f(int argc, char **argv) return command_usage(&open_cmd); } - return openfile(argv[optind], flags, growable); + return openfile(argv[optind], flags, growable, opts); } static int init_args_command(int index) @@ -2039,7 +2062,7 @@ int main(int argc, char **argv) } if ((argc - optind) == 1) { - openfile(argv[optind], flags, growable); + openfile(argv[optind], flags, growable, NULL); } command_loop(); -- 1.7.1