diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2020-10-23 12:12:17 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2020-11-17 12:26:47 +0100 |
| commit | 6deb20f6683662a3ff5b5248dea2fd4d1055a628 (patch) | |
| tree | 17a89f4d064d89c76a24d6d86550fa8322d2c67e | |
| parent | bce36c6c5436c0c2679b42c6de54de5393dfcf59 (diff) | |
| download | qemu-6deb20f6683662a3ff5b5248dea2fd4d1055a628.zip qemu-6deb20f6683662a3ff5b5248dea2fd4d1055a628.tar.gz qemu-6deb20f6683662a3ff5b5248dea2fd4d1055a628.tar.bz2 | |
char-stdio: Fix QMP default for 'signal'
Commit 02c4bdf1 tried to make signal=on the default for stdio chardevs
except for '-serial mon:stdio', but it forgot about QMP and accidentally
switched the QMP default from true (except for -nographic) to false
(always). The documentation was kept unchanged and still describes the
opposite of the old behaviour (which is an even older documentation
bug).
Fix all of this by making signal=true the default in ChardevStdio and
documenting it as such.
Fixes: 02c4bdf1d2ca8c02a9bae16398f260b5c08d08bf
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201023101222.250147-2-kwolf@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | chardev/char-stdio.c | 4 | ||||
| -rw-r--r-- | qapi/char.json | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c index 82eaebc..403da30 100644 --- a/chardev/char-stdio.c +++ b/chardev/char-stdio.c @@ -112,9 +112,7 @@ static void qemu_chr_open_stdio(Chardev *chr, qemu_chr_open_fd(chr, 0, 1); - if (opts->has_signal) { - stdio_allow_signal = opts->signal; - } + stdio_allow_signal = !opts->has_signal || opts->signal; qemu_chr_set_echo_stdio(chr, false); } #endif diff --git a/qapi/char.json b/qapi/char.json index b4d66ec..43486d1 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -321,8 +321,7 @@ # Configuration info for stdio chardevs. # # @signal: Allow signals (such as SIGINT triggered by ^C) -# be delivered to qemu. Default: true in -nographic mode, -# false otherwise. +# be delivered to qemu. Default: true. # # Since: 1.5 ## |