diff options
| author | Peter Maydell | 2020-11-13 13:40:36 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-11-13 13:40:36 +0100 |
| commit | 6980c128b5cbc1d2a1b85609bb4d1e006e65109e (patch) | |
| tree | 9f88709c355aa38b91e18dafdb18f1fbf25e3bb6 /ui/console.c | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20201112' into staging (diff) | |
| parent | xhci: fix nec-usb-xhci properties (diff) | |
| download | qemu-6980c128b5cbc1d2a1b85609bb4d1e006e65109e.tar.gz qemu-6980c128b5cbc1d2a1b85609bb4d1e006e65109e.tar.xz qemu-6980c128b5cbc1d2a1b85609bb4d1e006e65109e.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20201113-pull-request' into staging
fixes for console, audio, usb, vga.
# gpg: Signature made Fri 13 Nov 2020 12:29:44 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-20201113-pull-request:
xhci: fix nec-usb-xhci properties
hw/display/cirrus_vga: Fix hexadecimal format string specifier
hw/display/cirrus_vga: Remove debugging code commented out
hw/usb/Kconfig: Fix USB_XHCI_NEC (depends on USB_XHCI_PCI)
console: avoid passing con=NULL to graphic_hw_update_done()
audio/jack: fix use after free segfault
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/console.c')
| -rw-r--r-- | ui/console.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/console.c b/ui/console.c index e8e59707d3..e07d2c380d 100644 --- a/ui/console.c +++ b/ui/console.c @@ -270,10 +270,11 @@ void graphic_hw_update_done(QemuConsole *con) void graphic_hw_update(QemuConsole *con) { bool async = false; + con = con ? con : active_console; if (!con) { - con = active_console; + return; } - if (con && con->hw_ops->gfx_update) { + if (con->hw_ops->gfx_update) { con->hw_ops->gfx_update(con->hw); async = con->hw_ops->gfx_update_async; } |