Commit-ID: c4b742a604f8f06639c097dcb030d1c62b69eca1 Gitweb: http://git.kernel.org/tip/c4b742a604f8f06639c097dcb030d1c62b69eca1 Author: Sasha Levin <levinsasha928@xxxxxxxxx> AuthorDate: Mon, 5 Dec 2011 16:16:35 +0200 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Sun, 11 Dec 2011 11:15:49 +0200 kvm tools: Ignore parameters after dashdash in 'kvm run' This allows other commands to wrap 'kvm run' and use the parameters user provides after a dash-dash for it's own use. Signed-off-by: Sasha Levin <levinsasha928@xxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/builtin-run.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index cd14159..5db6995 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -776,8 +776,13 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) while (argc != 0) { argc = parse_options(argc, argv, options, run_usage, - PARSE_OPT_STOP_AT_NON_OPTION); + PARSE_OPT_STOP_AT_NON_OPTION | + PARSE_OPT_KEEP_DASHDASH); if (argc != 0) { + /* Cusrom options, should have been handled elsewhere */ + if (strcmp(argv[0], "--") == 0) + break; + if (kernel_filename) { fprintf(stderr, "Cannot handle parameter: " "%s\n", argv[0]); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html