diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-09-16 13:48:09 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-09-16 13:48:09 +0100 |
| commit | 63cf61256aea21363c2adc18d5b703ed14d85b74 (patch) | |
| tree | b1d835632a8056e7539a0eb84d3e192f2d930099 /hw/display/qxl.c | |
| parent | 57b6f58c1d0df757c9311496c32d502925056894 (diff) | |
| parent | b3a5dfdea99da55fdc70538eeeb2227ebe6d6a5f (diff) | |
| download | focaccia-qemu-63cf61256aea21363c2adc18d5b703ed14d85b74.tar.gz focaccia-qemu-63cf61256aea21363c2adc18d5b703ed14d85b74.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20210916-pull-request' into staging
virtio-gpu + ui: fence syncronization. qxl: unbreak live migration. # gpg: Signature made Thu 16 Sep 2021 06:56:03 BST # gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138 # 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/vga-20210916-pull-request: virtio-gpu: Add gl_flushed callback ui/gtk-egl: Wait for the draw signal for dmabuf blobs ui: Create sync objects and fences only for blobs ui/egl: Add egl helpers to help with synchronization ui/gtk: Create a common release_dmabuf helper qxl: fix pre-save logic Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/qxl.c')
| -rw-r--r-- | hw/display/qxl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 43482d4364..29c80b4289 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2252,7 +2252,7 @@ static int qxl_pre_save(void *opaque) } else { d->last_release_offset = (uint8_t *)d->last_release - ram_start; } - if (d->last_release_offset < d->vga.vram_size) { + if (d->last_release_offset >= d->vga.vram_size) { return 1; } |