[Qemu-commits] [qemu/qemu] dc3c87: ui/curses: Fix build with -m32

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: dc3c871ae0f06030cfd713e44fcf79a4705553d1
      
https://github.com/qemu/qemu/commit/dc3c871ae0f06030cfd713e44fcf79a4705553d1
  Author: Max Reitz <address@hidden>
  Date:   2019-06-07 (Fri, 07 Jun 2019)

  Changed paths:
    M ui/curses.c

  Log Message:
  -----------
  ui/curses: Fix build with -m32

wchar_t may resolve to be an unsigned long on 32-bit architectures.
Using the %x conversion specifier will then give a compiler warning:

ui/curses.c: In function ‘get_ucs’:
ui/curses.c:492:49: error: format ‘%x’ expects argument of type ‘unsigned int’, 
but argument 3 has type ‘wchar_t’ {aka ‘long int’} [-Werror=format=]
  492 |         fprintf(stderr, "Could not convert 0x%04x "
      |                                              ~~~^
      |                                                 |
      |                                                 unsigned int
      |                                              %04lx
  493 |                         "from wchar_t to a multibyte character: %s\n",
  494 |                         wch, strerror(errno));
      |                         ~~~
      |                         |
      |                         wchar_t {aka long int}
ui/curses.c:504:49: error: format ‘%x’ expects argument of type ‘unsigned int’, 
but argument 3 has type ‘wchar_t’ {aka ‘long int’} [-Werror=format=]
  504 |         fprintf(stderr, "Could not convert 0x%04x "
      |                                              ~~~^
      |                                                 |
      |                                                 unsigned int
      |                                              %04lx
  505 |                         "from a multibyte character to UCS-2 : %s\n",
  506 |                         wch, strerror(errno));
      |                         ~~~
      |                         |
      |                         wchar_t {aka long int}

Fix this by casting the wchar_t value to an unsigned long and using %lx
as the conversion specifier.

Fixes: b7b664a4fe9a955338f2e11a0f7433b29c8cbad0
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Samuel Thibault <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 152b7af6106c7d6fb7488eb297d735045c1e68c3
      
https://github.com/qemu/qemu/commit/152b7af6106c7d6fb7488eb297d735045c1e68c3
  Author: Gerd Hoffmann <address@hidden>
  Date:   2019-06-07 (Fri, 07 Jun 2019)

  Changed paths:
    M include/ui/console.h

  Log Message:
  -----------
  console: add dmabuf modifier field.

dmabufs can have a format modifier (DRM_FORMAT_MOD_*) which is used for
tiled layouts for example.  Add a field to QemuDmaBuf so we can carry
around that information.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden


  Commit: a6c9d5da08e60eac3ec315abf243c2b7d2665089
      
https://github.com/qemu/qemu/commit/a6c9d5da08e60eac3ec315abf243c2b7d2665089
  Author: Gerd Hoffmann <address@hidden>
  Date:   2019-06-07 (Fri, 07 Jun 2019)

  Changed paths:
    M hw/vfio/display.c

  Log Message:
  -----------
  vfio/display: set dmabuf modifier field

Fill the new QemuDmaBuf->modifier field properly from plane info.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Acked-by: Alex Williamson <address@hidden>
Message-id: address@hidden


  Commit: 5fc1fb62af354c93b865420f58fe3a9497fd4990
      
https://github.com/qemu/qemu/commit/5fc1fb62af354c93b865420f58fe3a9497fd4990
  Author: Gerd Hoffmann <address@hidden>
  Date:   2019-06-07 (Fri, 07 Jun 2019)

  Changed paths:
    M include/ui/egl-helpers.h
    M ui/egl-helpers.c
    M ui/spice-display.c

  Log Message:
  -----------
  egl-helpers: add modifier support to egl_get_fd_for_texture().

Add modifier parameter to egl_get_fd_for_texture(), to return the used
modifier on dmabuf exports.

Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden


  Commit: 15ee0d9bc10b3de677ff6cd78b6dc9d5a7d40603
      
https://github.com/qemu/qemu/commit/15ee0d9bc10b3de677ff6cd78b6dc9d5a7d40603
  Author: Gerd Hoffmann <address@hidden>
  Date:   2019-06-07 (Fri, 07 Jun 2019)

  Changed paths:
    M ui/egl-helpers.c

  Log Message:
  -----------
  egl-helpers: add modifier support to egl_dmabuf_import_texture()

Check and use QemuDmaBuf->modifier in egl_dmabuf_import_texture()
for dmabuf imports.

Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden


  Commit: 9021fcfb883a17908a74a0ba1c09ff3b1bf97ebb
      
https://github.com/qemu/qemu/commit/9021fcfb883a17908a74a0ba1c09ff3b1bf97ebb
  Author: Peter Maydell <address@hidden>
  Date:   2019-06-07 (Fri, 07 Jun 2019)

  Changed paths:
    M hw/vfio/display.c
    M include/ui/console.h
    M include/ui/egl-helpers.h
    M ui/curses.c
    M ui/egl-helpers.c
    M ui/spice-display.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190607-pull-request' 
into staging

curses: 32bit build fix.
egl: dmabuf modifier support.

# gpg: Signature made Fri 07 Jun 2019 14:18:41 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20190607-pull-request:
  egl-helpers: add modifier support to egl_dmabuf_import_texture()
  egl-helpers: add modifier support to egl_get_fd_for_texture().
  vfio/display: set dmabuf modifier field
  console: add dmabuf modifier field.
  ui/curses: Fix build with -m32

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/33556237f652...9021fcfb883a