[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.4 v3 6/6] vl: Exit unsuccessfully on option ar
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH for-1.4 v3 6/6] vl: Exit unsuccessfully on option argument syntax error |
Date: |
Fri, 8 Feb 2013 21:22:19 +0100 |
We exit successfully after reporting syntax error for argument of
--sandbox and --add-fd.
We continue undaunted after reporting it for argument of -boot,
--option-rom and --object.
Change all five to exit unsuccessfully, like the other options.
Signed-off-by: Markus Armbruster <address@hidden>
---
vl.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/vl.c b/vl.c
index 73122d8..1355f69 100644
--- a/vl.c
+++ b/vl.c
@@ -3135,8 +3135,10 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
}
- qemu_opts_parse(qemu_find_opts("boot-opts"),
- optarg, 0);
+ if (!qemu_opts_parse(qemu_find_opts("boot-opts"),
+ optarg, 0)) {
+ exit(1);
+ }
}
}
break;
@@ -3623,6 +3625,9 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
opts = qemu_opts_parse(qemu_find_opts("option-rom"), optarg,
1);
+ if (!opts) {
+ exit(1);
+ }
option_rom[nb_option_roms].name = qemu_opt_get(opts,
"romfile");
option_rom[nb_option_roms].bootindex =
qemu_opt_get_number(opts, "bootindex", -1);
@@ -3780,14 +3785,14 @@ int main(int argc, char **argv, char **envp)
case QEMU_OPTION_sandbox:
opts = qemu_opts_parse(qemu_find_opts("sandbox"), optarg, 1);
if (!opts) {
- exit(0);
+ exit(1);
}
break;
case QEMU_OPTION_add_fd:
#ifndef _WIN32
opts = qemu_opts_parse(qemu_find_opts("add-fd"), optarg, 0);
if (!opts) {
- exit(0);
+ exit(1);
}
#else
error_report("File descriptor passing is disabled on this "
@@ -3797,6 +3802,9 @@ int main(int argc, char **argv, char **envp)
break;
case QEMU_OPTION_object:
opts = qemu_opts_parse(qemu_find_opts("object"), optarg, 1);
+ if (!opts) {
+ exit(1);
+ }
break;
default:
os_parse_cmd_args(popt->index, optarg);
--
1.7.11.7
- [Qemu-devel] [PATCH for-1.4 v3 0/6] Error reporting fixes, Markus Armbruster, 2013/02/08
- [Qemu-devel] [PATCH for-1.4 v3 1/6] error: Clean up error strings with embedded newlines, Markus Armbruster, 2013/02/08
- [Qemu-devel] [PATCH for-1.4 v3 4/6] qemu-option: Disable two helpful messages that got broken recently, Markus Armbruster, 2013/02/08
- [Qemu-devel] [PATCH for-1.4 v3 5/6] vl: Drop redundant "parse error" reports, Markus Armbruster, 2013/02/08
- [Qemu-devel] [PATCH for-1.4 v3 6/6] vl: Exit unsuccessfully on option argument syntax error,
Markus Armbruster <=
- [Qemu-devel] [PATCH for-1.4 v3 2/6] error: Clean up abuse of error_report() for help, Markus Armbruster, 2013/02/08
- [Qemu-devel] [PATCH for-1.4 v3 3/6] error: Strip trailing '\n' from error string arguments (again), Markus Armbruster, 2013/02/08
- Re: [Qemu-devel] [PATCH for-1.4 v3 0/6] Error reporting fixes, Anthony Liguori, 2013/02/11