[Qemu-commits] [qemu/qemu] 3e61a1: vl: Don't continue after -smp help.

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 3e61a13af3d3a1942a1ec2f6dfd7b407a43e4273
      
https://github.com/qemu/qemu/commit/3e61a13af3d3a1942a1ec2f6dfd7b407a43e4273
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-07-27 (Tue, 27 Jul 2021)

  Changed paths:
    M softmmu/vl.c

  Log Message:
  -----------
  vl: Don't continue after -smp help.

We continue after -smp help:

    $ qemu-system-x86_64 -smp help -display none -monitor stdio
    smp-opts options:
      cores=<num>
      cpus=<num>
      dies=<num>
      maxcpus=<num>
      sockets=<num>
      threads=<num>
    QEMU 6.0.50 monitor - type 'help' for more information
    (qemu)

Other options, such as -object help and -device help, don't.

Adjust -smp not to continue either.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210720125408.387910-17-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>


  Commit: 69ea12b19a15ae006521cd5cc0f627f27f738746
      
https://github.com/qemu/qemu/commit/69ea12b19a15ae006521cd5cc0f627f27f738746
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-07-28 (Wed, 28 Jul 2021)

  Changed paths:
    M softmmu/vl.c

  Log Message:
  -----------
  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>


Compare: https://github.com/qemu/qemu/compare/f2da205cb414...69ea12b19a15