Miscellaneous patches for 2021-07-27

-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmEAJAcSHGFybWJydUBy
 ZWRoYXQuY29tAAoJEDhwtADrkYZTdGEP/2j98W0SsQquFSaIbYjWDWJKBSZXrPdp
 Zd4QC2EL0AG7KSmbfpUyMSrn5cEN4+RVQq/RHEmyp6kSmKS2uDrdQ6eP9iiNmsFL
 xI+85cxAVhvMuDLp1Yw1lRv3POj/vLKpTt2vSxu9SyFfls0Eg2tTpCbxU4W1dZow
 7gcfeevtUQdTbo6BI9teXlVjucwiXRzqncLyU3h+m2gSrkPpE/0KhKs1TG8n+HTP
 iD8SMhIIIUA880pZe4ONJ7H1A7hpLlNoaLSD7DkAlLTijafRnJGPZO5ELLgrknU6
 E3QL1dSLlLwZcV7+KyfppMZRDX4R2UE9U+2+ppBF0394r5eOwjhKW2GAjRWRfQCR
 CAzV5bUKfsGCy5ASN/FkXsfXjk4QzdtIx6/SN5/y4GtezVh7ZhbCZqsvKJsepWNK
 PlUXJhhE8IevAV2zAENRe8buKwxd+1iCvNfLZ1YsChxJQO/yIjeXBfWzgTWvk9iQ
 H5N7uQTjS8z5zRmbpEouJPtr+CVUQiaZyARXql4YIxzZQKBAkh8Tz7zZ1gsUhSQ+
 51rWUuKqoHlLsP/EHIXP29rOSCJPURuzpFnGC14ZeLOlAMDnZ8Og+5ACJe0WBEKE
 1ejb1gyDdmiMiA5wueqEusTHy6DsDeOmmxVAr7BtMDyTwpHs5oBdLeXlYxReOd+y
 gKnanNv7i+1k
 =HI0j
 -----END PGP SIGNATURE-----

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>

pull/124/head

Peter Maydell 5 years ago

parent

f2da205cb4 3e61a13af3

commit

69ea12b19a

1 changed files with 1 additions and 1 deletions

Split View

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

Miscellaneous patches for 2021-07-27

2 softmmu/vl.c View File

2

softmmu/vl.c

View File