* [PULL 0/1] Miscellaneous patches for 2021-07-27
@ 2021-07-27 15:22 Markus Armbruster
2021-07-27 15:22 ` [PULL 1/1] vl: Don't continue after -smp help Markus Armbruster
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Markus Armbruster @ 2021-07-27 15:22 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
The following changes since commit ca4b5ef371d6602b73bc5eec08e3199b05caf146:
Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-migration-20210726a' into staging (2021-07-27 10:55:50 +0100)
are available in the Git repository at:
git://repo.or.cz/qemu/armbru.git tags/pull-misc-2021-07-27
for you to fetch changes up to 3e61a13af3d3a1942a1ec2f6dfd7b407a43e4273:
vl: Don't continue after -smp help. (2021-07-27 16:52:37 +0200)
----------------------------------------------------------------
Miscellaneous patches for 2021-07-27
----------------------------------------------------------------
Markus Armbruster (1):
vl: Don't continue after -smp help.
softmmu/vl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
2.31.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PULL 1/1] vl: Don't continue after -smp help.
2021-07-27 15:22 [PULL 0/1] Miscellaneous patches for 2021-07-27 Markus Armbruster
@ 2021-07-27 15:22 ` Markus Armbruster
2021-07-27 17:08 ` [PULL 0/1] Miscellaneous patches for 2021-07-27 Peter Maydell
2021-07-28 14:42 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Markus Armbruster @ 2021-07-27 15:22 UTC (permalink / raw)
To: qemu-devel
Cc: peter.maydell, Michael S . Tsirkin, Philippe Mathieu-Daudé,
Pankaj Gupta, Paolo Bonzini
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>
---
softmmu/vl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/softmmu/vl.c b/softmmu/vl.c
index f815acccaa..4dee472c79 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);
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PULL 0/1] Miscellaneous patches for 2021-07-27
2021-07-27 15:22 [PULL 0/1] Miscellaneous patches for 2021-07-27 Markus Armbruster
2021-07-27 15:22 ` [PULL 1/1] vl: Don't continue after -smp help Markus Armbruster
@ 2021-07-27 17:08 ` Peter Maydell
2021-07-28 14:42 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2021-07-27 17:08 UTC (permalink / raw)
To: Markus Armbruster; +Cc: QEMU Developers
On Tue, 27 Jul 2021 at 16:22, Markus Armbruster <armbru@redhat.com> wrote:
>
> The following changes since commit ca4b5ef371d6602b73bc5eec08e3199b05caf146:
>
> Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-migration-20210726a' into staging (2021-07-27 10:55:50 +0100)
>
> are available in the Git repository at:
>
> git://repo.or.cz/qemu/armbru.git tags/pull-misc-2021-07-27
>
> for you to fetch changes up to 3e61a13af3d3a1942a1ec2f6dfd7b407a43e4273:
>
> vl: Don't continue after -smp help. (2021-07-27 16:52:37 +0200)
>
> ----------------------------------------------------------------
> Miscellaneous patches for 2021-07-27
>
> ----------------------------------------------------------------
> Markus Armbruster (1):
> vl: Don't continue after -smp help.
>
> softmmu/vl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Just a note to say this has missed rc1 but is still on my list and
I'll apply it for rc2.
thanks
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PULL 0/1] Miscellaneous patches for 2021-07-27
2021-07-27 15:22 [PULL 0/1] Miscellaneous patches for 2021-07-27 Markus Armbruster
2021-07-27 15:22 ` [PULL 1/1] vl: Don't continue after -smp help Markus Armbruster
2021-07-27 17:08 ` [PULL 0/1] Miscellaneous patches for 2021-07-27 Peter Maydell
@ 2021-07-28 14:42 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2021-07-28 14:42 UTC (permalink / raw)
To: Markus Armbruster; +Cc: QEMU Developers
On Tue, 27 Jul 2021 at 16:22, Markus Armbruster <armbru@redhat.com> wrote:
>
> The following changes since commit ca4b5ef371d6602b73bc5eec08e3199b05caf146:
>
> Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-migration-20210726a' into staging (2021-07-27 10:55:50 +0100)
>
> are available in the Git repository at:
>
> git://repo.or.cz/qemu/armbru.git tags/pull-misc-2021-07-27
>
> for you to fetch changes up to 3e61a13af3d3a1942a1ec2f6dfd7b407a43e4273:
>
> vl: Don't continue after -smp help. (2021-07-27 16:52:37 +0200)
>
> ----------------------------------------------------------------
> Miscellaneous patches for 2021-07-27
>
> ----------------------------------------------------------------
> Markus Armbruster (1):
> vl: Don't continue after -smp help.
>
> softmmu/vl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/6.1
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-28 14:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-27 15:22 [PULL 0/1] Miscellaneous patches for 2021-07-27 Markus Armbruster
2021-07-27 15:22 ` [PULL 1/1] vl: Don't continue after -smp help Markus Armbruster
2021-07-27 17:08 ` [PULL 0/1] Miscellaneous patches for 2021-07-27 Peter Maydell
2021-07-28 14:42 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.