diff options
| author | Peter Maydell | 2020-11-27 12:11:43 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-11-27 12:11:43 +0100 |
| commit | ea8208249d1082eae0444934efb3b59cd3183f05 (patch) | |
| tree | 6800b57895cbb5f9a1b5e081708bdcc57e9e6db6 | |
| parent | Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into ... (diff) | |
| parent | qxl: fix segfault (diff) | |
| download | qemu-ea8208249d1082eae0444934efb3b59cd3183f05.tar.gz qemu-ea8208249d1082eae0444934efb3b59cd3183f05.tar.xz qemu-ea8208249d1082eae0444934efb3b59cd3183f05.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20201127-pull-request' into staging
qxl: fix segfault
# gpg: Signature made Fri 27 Nov 2020 07:06:51 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/fixes-20201127-pull-request:
qxl: fix segfault
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | ui/console.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/console.c b/ui/console.c index e07d2c380d..53dee8e26b 100644 --- a/ui/console.c +++ b/ui/console.c @@ -264,7 +264,9 @@ static void gui_setup_refresh(DisplayState *ds) void graphic_hw_update_done(QemuConsole *con) { - qemu_co_queue_restart_all(&con->dump_queue); + if (con) { + qemu_co_queue_restart_all(&con->dump_queue); + } } void graphic_hw_update(QemuConsole *con) |