[Qemu-devel] [PULL 0/2] Ui 20171110 patches

[Qemu-devel] [PULL 0/2] Ui 20171110 patches

[Gerd Hoffmann]

The following changes since commit b0fbe46ad82982b289a44ee2495b59b0bad8a842:

  Update version for v2.11.0-rc0 release (2017-11-07 16:05:28 +0000)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/ui-20171110-pull-request

for you to fetch changes up to 2e9a8565701c22a0090876cb9e2293db4a6fb205:

  ui: use QEMU_IS_ALIGNED macro (2017-11-10 14:27:29 +0100)

----------------------------------------------------------------
ui: fixes for 2.11

----------------------------------------------------------------

Gerd Hoffmann (1):
  ui: fix dcl unregister

Philippe Mathieu-Daudé (1):
  ui: use QEMU_IS_ALIGNED macro

 ui/console-gl.c | 2 +-
 ui/console.c    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
2.9.3

[Qemu-devel] [PULL 1/2] ui: fix dcl unregister

[Gerd Hoffmann]

register checks for dcl->ds being NULL, to avoid registering
the same dcl twice.

Therefore dcl->ds must be cleared on unregister, otherwise
un-registering and re-registering doesn't work.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1510809
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20171109105154.29414-1-kraxel@redhat.com
---
 ui/console.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/console.c b/ui/console.c
index eca854cbd5..c4c95abed7 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1471,6 +1471,7 @@ void unregister_displaychangelistener(DisplayChangeListener *dcl)
         dcl->con->dcls--;
     }
     QLIST_REMOVE(dcl, next);
+    dcl->ds = NULL;
     gui_setup_refresh(ds);
 }
 
-- 
2.9.3

[Qemu-devel] [PULL 2/2] ui: use QEMU_IS_ALIGNED macro

[Gerd Hoffmann]

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

Applied using the Coccinelle semantic patch scripts/coccinelle/use_osdep.cocci

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20170718061005.29518-9-f4bug@amsat.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/console-gl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/console-gl.c b/ui/console-gl.c
index 5b77e7aa88..a56e1cd8eb 100644
--- a/ui/console-gl.c
+++ b/ui/console-gl.c
@@ -48,7 +48,7 @@ void surface_gl_create_texture(QemuGLShader *gls,
                                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:
-- 
2.9.3

Re: [Qemu-devel] [PULL 0/2] Ui 20171110 patches

[Peter Maydell]

On 10 November 2017 at 14:02, Gerd Hoffmann <kraxel@redhat.com> wrote:
> The following changes since commit b0fbe46ad82982b289a44ee2495b59b0bad8a842:
>
>   Update version for v2.11.0-rc0 release (2017-11-07 16:05:28 +0000)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/ui-20171110-pull-request
>
> for you to fetch changes up to 2e9a8565701c22a0090876cb9e2293db4a6fb205:
>
>   ui: use QEMU_IS_ALIGNED macro (2017-11-10 14:27:29 +0100)
>
> ----------------------------------------------------------------
> ui: fixes for 2.11
>
> ----------------------------------------------------------------
>
> Gerd Hoffmann (1):
>   ui: fix dcl unregister
>
> Philippe Mathieu-Daudé (1):
>   ui: use QEMU_IS_ALIGNED macro
>
>  ui/console-gl.c | 2 +-
>  ui/console.c    | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
>

Applied, thanks.

-- PMM