commit 2e550e31518f90cc9cb7e5c855a1995c317463a3
author Peter Maydell <peter.maydell@linaro.org> Tue Nov 14 08:39:50 2017 +0000
committer Peter Maydell <peter.maydell@linaro.org> Tue Nov 14 08:39:50 2017 +0000
tree f170398eaa568f74f990d2f34a81b82cc7d8d1e6
parent 02e5844db2e4fb074f685a709abf82d2b8d2bed8
parent 2e9a8565701c22a0090876cb9e2293db4a6fb205

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20171110-pull-request' into staging

ui: fixes for 2.11

# gpg: Signature made Fri 10 Nov 2017 14:02:23 GMT
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20171110-pull-request:
  ui: use QEMU_IS_ALIGNED macro
  ui: fix dcl unregister

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

ui/console-gl.c

diff --git a/ui/console-gl.c b/ui/console-gl.c
index 5b77e7a..a56e1cd 100644
--- a/ui/console-gl.c
+++ b/ui/console-gl.c
@@ -48,7 +48,7 @@
                                DisplaySurface *surface)
 {
     assert(gls);
-    assert(surface_stride(surface) % surface_bytes_per_pixel(surface) == 0);
+    assert(QEMU_IS_ALIGNED(surface_stride(surface), surface_bytes_per_pixel(surface)));
 
     switch (surface->format) {
     case PIXMAN_BE_b8g8r8x8:

ui/console.c

diff --git a/ui/console.c b/ui/console.c
index eca854c..c4c95ab 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1471,6 +1471,7 @@
         dcl->con->dcls--;
     }
     QLIST_REMOVE(dcl, next);
+    dcl->ds = NULL;
     gui_setup_refresh(ds);
 }