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

pm215 · pm215 · commit 69ea12b19a15 · 2021-07-28T13:32:12.000+01:00
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 &lt;armbru@redhat.com&gt;" [full]
# gpg:                 aka "Markus Armbruster &lt;armbru@pond.sub.org&gt;" [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 &lt;peter.maydell@linaro.org&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -1545,7 +1545,7 @@ machine_parse_property_opt(QemuOptsList opts_list, const char propname,`
`1545`	`1545`	`prop = keyval_parse(arg, opts_list->implied_opt_name, &help, errp);`
`1546`	`1546`	`if (help) {`
`1547`	`1547`	`qemu_opts_print_help(opts_list, true);`
`1548`		`- return;`
	`1548`	`+ exit(0);`
`1549`	`1549`	`}`
`1550`	`1550`	`opts = qdict_new();`
`1551`	`1551`	`qdict_put(opts, propname, prop);`