mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-22 15:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2021-07-27' into staging

Browse Source 
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>
This commit is contained in:
Peter Maydell
2021-07-28 13:32:12 +01:00
parent f2da205cb4 3e61a13af3
commit 69ea12b19a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
softmmu/vl.c
View File

@ -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); prop = keyval_parse(arg, opts_list->implied_opt_name, &help, errp);
if (help) { if (help) {
qemu_opts_print_help(opts_list, true); qemu_opts_print_help(opts_list, true);
return; exit(0);
} }
opts = qdict_new(); opts = qdict_new();
qdict_put(opts, propname, prop); qdict_put(opts, propname, prop);