In qemu_init()'s option parsing switch, several cases assigned the return value of qemu_opts_parse_noisily() to the shared 'opts' variable solely to check for NULL, without using the pointer afterwards. Inline the call directly into the if-condition, matching the style already used by QEMU_OPTION_action.
This affects the following options: -drive, -numa, -iscsi, -m, -mon, -chardev, -fsdev, -fwcfg Cases where the returned QemuOpts* is subsequently used (e.g. -acpitable, -smbios, -virtfs) are left unchanged. Signed-off-by: Bin Guo <[email protected]> --- system/vl.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/system/vl.c b/system/vl.c index 0e1fc217b4..0e0d3cb761 100644 --- a/system/vl.c +++ b/system/vl.c @@ -2961,9 +2961,8 @@ void qemu_init(int argc, char **argv) break; } case QEMU_OPTION_drive: - opts = qemu_opts_parse_noisily(qemu_find_opts("drive"), - optarg, false); - if (opts == NULL) { + if (!qemu_opts_parse_noisily(qemu_find_opts("drive"), + optarg, false)) { exit(1); } break; @@ -2988,9 +2987,8 @@ void qemu_init(int argc, char **argv) replay_add_blocker("-snapshot"); break; case QEMU_OPTION_numa: - opts = qemu_opts_parse_noisily(qemu_find_opts("numa"), - optarg, true); - if (!opts) { + if (!qemu_opts_parse_noisily(qemu_find_opts("numa"), + optarg, true)) { exit(1); } break; @@ -3049,9 +3047,8 @@ void qemu_init(int argc, char **argv) break; #ifdef CONFIG_LIBISCSI case QEMU_OPTION_iscsi: - opts = qemu_opts_parse_noisily(qemu_find_opts("iscsi"), - optarg, false); - if (!opts) { + if (!qemu_opts_parse_noisily(qemu_find_opts("iscsi"), + optarg, false)) { exit(1); } break; @@ -3104,8 +3101,8 @@ void qemu_init(int argc, char **argv) exit(0); break; case QEMU_OPTION_m: - opts = qemu_opts_parse_noisily(qemu_find_opts("memory"), optarg, true); - if (opts == NULL) { + if (!qemu_opts_parse_noisily(qemu_find_opts("memory"), + optarg, true)) { exit(1); } break; @@ -3226,17 +3223,15 @@ void qemu_init(int argc, char **argv) default_monitor = 0; break; case QEMU_OPTION_mon: - opts = qemu_opts_parse_noisily(qemu_find_opts("mon"), optarg, - true); - if (!opts) { + if (!qemu_opts_parse_noisily(qemu_find_opts("mon"), optarg, + true)) { exit(1); } default_monitor = 0; break; case QEMU_OPTION_chardev: - opts = qemu_opts_parse_noisily(qemu_find_opts("chardev"), - optarg, true); - if (!opts) { + if (!qemu_opts_parse_noisily(qemu_find_opts("chardev"), + optarg, true)) { exit(1); } break; @@ -3246,8 +3241,7 @@ void qemu_init(int argc, char **argv) error_report("fsdev support is disabled"); exit(1); } - opts = qemu_opts_parse_noisily(olist, optarg, true); - if (!opts) { + if (!qemu_opts_parse_noisily(olist, optarg, true)) { exit(1); } break; @@ -3386,9 +3380,8 @@ void qemu_init(int argc, char **argv) smbios_entry_add(opts, &error_fatal); break; case QEMU_OPTION_fwcfg: - opts = qemu_opts_parse_noisily(qemu_find_opts("fw_cfg"), - optarg, true); - if (opts == NULL) { + if (!qemu_opts_parse_noisily(qemu_find_opts("fw_cfg"), + optarg, true)) { exit(1); } break; -- 2.50.1 (Apple Git-155)
