diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-07-28 13:32:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-07-28 13:32:12 +0100 |
| commit | 69ea12b19a15ae006521cd5cc0f627f27f738746 (patch) | |
| tree | 4bf0b854d3fc6732b5daf47b3ea96b92ec93d482 | |
| parent | f2da205cb4142259d9bc6b9d4596ebbe2426fe49 (diff) | |
| parent | 3e61a13af3d3a1942a1ec2f6dfd7b407a43e4273 (diff) | |
| download | qemu-69ea12b19a15ae006521cd5cc0f627f27f738746.zip qemu-69ea12b19a15ae006521cd5cc0f627f27f738746.tar.gz qemu-69ea12b19a15ae006521cd5cc0f627f27f738746.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2021-07-27' into staging
Miscellaneous patches for 2021-07-27
# gpg: Signature made Tue 27 Jul 2021 16:19:35 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-misc-2021-07-27:
vl: Don't continue after -smp help.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | softmmu/vl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c index f815acc..4dee472 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1545,7 +1545,7 @@ machine_parse_property_opt(QemuOptsList *opts_list, const char *propname, prop = keyval_parse(arg, opts_list->implied_opt_name, &help, errp); if (help) { qemu_opts_print_help(opts_list, true); - return; + exit(0); } opts = qdict_new(); qdict_put(opts, propname, prop); |