mbox

[PULL,v3,00/25] Pixman patches

Message ID 20231107101524.2993389-1-marcandre.lureau@redhat.com (mailing list archive)
State New, archived
Headers show

Pull-request

https://gitlab.com/marcandre.lureau/qemu.git tags/pixman-pull-request

Message

Marc-André Lureau Nov. 7, 2023, 10:14 a.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

The following changes since commit bb541a7068d2eee51a9abbe2dedcdf27298b1872:

  Merge tag 'pull-pa-20231106' of https://gitlab.com/rth7680/qemu into staging (2023-11-07 15:01:17 +0800)

are available in the Git repository at:

  https://gitlab.com/marcandre.lureau/qemu.git tags/pixman-pull-request

for you to fetch changes up to d017f28a2ee082f472ed69fedf0435b468000e92:

  build-sys: make pixman actually optional (2023-11-07 14:04:25 +0400)

----------------------------------------------------------------
Make Pixman an optional dependency

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

Marc-André Lureau (25):
  build-sys: add a "pixman" feature
  build-sys: drop needless warning pragmas for old pixman
  ui: compile out some qemu-pixman functions when !PIXMAN
  ui: add pixman-minimal.h
  vl: drop needless -spice checks
  qemu-options: define -vnc only #ifdef CONFIG_VNC
  vl: simplify display_remote logic
  vl: move display early init before default devices
  ui/console: allow to override the default VC
  ui/vc: console-vc requires PIXMAN
  qmp/hmp: disable screendump if PIXMAN is missing
  virtio-gpu: replace PIXMAN for region/rect test
  ui/console: when PIXMAN is unavailable, don't draw placeholder msg
  vhost-user-gpu: skip VHOST_USER_GPU_UPDATE when !PIXMAN
  ui/gl: opengl doesn't require PIXMAN
  ui/vnc: VNC requires PIXMAN
  ui/spice: SPICE/QXL requires PIXMAN
  ui/gtk: -display gtk requires PIXMAN
  ui/dbus: do not require PIXMAN
  arm/kconfig: XLNX_ZYNQMP_ARM depends on PIXMAN
  hw/arm: XLNX_VERSAL depends on XLNX_CSU_DMA
  hw/sm501: allow compiling without PIXMAN
  hw/mips: FULOONG depends on VT82C686
  hw/display/ati: allow compiling without PIXMAN
  build-sys: make pixman actually optional

 meson.build                   |  25 ++++-
 qapi/ui.json                  |   3 +-
 include/ui/console.h          |   2 +
 include/ui/pixman-minimal.h   | 195 ++++++++++++++++++++++++++++++++++
 include/ui/qemu-pixman.h      |  15 +--
 include/ui/rect.h             |  59 ++++++++++
 hw/display/ati.c              |  15 ++-
 hw/display/ati_2d.c           |  10 +-
 hw/display/sm501.c            |  45 +++++---
 hw/display/vhost-user-gpu.c   |   2 +
 hw/display/virtio-gpu.c       |  30 ++----
 system/vl.c                   |  84 ++++++++-------
 ui/console-vc-stubs.c         |  33 ++++++
 ui/console.c                  |  19 ++++
 ui/dbus-listener.c            |  90 +++++++++++-----
 ui/qemu-pixman.c              |   6 ++
 ui/ui-hmp-cmds.c              |   2 +
 ui/ui-qmp-cmds.c              |   2 +
 ui/vnc-stubs.c                |  12 ---
 Kconfig.host                  |   3 +
 hmp-commands.hx               |   2 +
 hw/arm/Kconfig                |   4 +-
 hw/display/Kconfig            |   7 +-
 hw/display/meson.build        |   4 +-
 hw/mips/Kconfig               |   1 +
 meson_options.txt             |   2 +
 qemu-options.hx               |   2 +
 scripts/meson-buildoptions.sh |   3 +
 ui/meson.build                |  22 ++--
 29 files changed, 560 insertions(+), 139 deletions(-)
 create mode 100644 include/ui/pixman-minimal.h
 create mode 100644 include/ui/rect.h
 create mode 100644 ui/console-vc-stubs.c

Comments

Marc-André Lureau Nov. 7, 2023, 10:26 a.m. UTC | #1 
Hi Stefan

On Tue, Nov 7, 2023 at 2:16 PM <marcandre.lureau@redhat.com> wrote:
>
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> The following changes since commit bb541a7068d2eee51a9abbe2dedcdf27298b1872:
>
>   Merge tag 'pull-pa-20231106' of https://gitlab.com/rth7680/qemu into staging (2023-11-07 15:01:17 +0800)
>
> are available in the Git repository at:
>
>   https://gitlab.com/marcandre.lureau/qemu.git tags/pixman-pull-request
>
> for you to fetch changes up to d017f28a2ee082f472ed69fedf0435b468000e92:
>
>   build-sys: make pixman actually optional (2023-11-07 14:04:25 +0400)
>
> ----------------------------------------------------------------
> Make Pixman an optional dependency
>
> ----------------------------------------------------------------
>
> Marc-André Lureau (25):
>   build-sys: add a "pixman" feature
>   build-sys: drop needless warning pragmas for old pixman
>   ui: compile out some qemu-pixman functions when !PIXMAN
>   ui: add pixman-minimal.h
>   vl: drop needless -spice checks
>   qemu-options: define -vnc only #ifdef CONFIG_VNC
>   vl: simplify display_remote logic
>   vl: move display early init before default devices
>   ui/console: allow to override the default VC
>   ui/vc: console-vc requires PIXMAN
>   qmp/hmp: disable screendump if PIXMAN is missing
>   virtio-gpu: replace PIXMAN for region/rect test
>   ui/console: when PIXMAN is unavailable, don't draw placeholder msg
>   vhost-user-gpu: skip VHOST_USER_GPU_UPDATE when !PIXMAN
>   ui/gl: opengl doesn't require PIXMAN
>   ui/vnc: VNC requires PIXMAN
>   ui/spice: SPICE/QXL requires PIXMAN
>   ui/gtk: -display gtk requires PIXMAN
>   ui/dbus: do not require PIXMAN
>   arm/kconfig: XLNX_ZYNQMP_ARM depends on PIXMAN
>   hw/arm: XLNX_VERSAL depends on XLNX_CSU_DMA
>   hw/sm501: allow compiling without PIXMAN
>   hw/mips: FULOONG depends on VT82C686
>   hw/display/ati: allow compiling without PIXMAN

There is a kind of false-positive with check-patch here:
86: ERROR: suspect code indent for conditional statements (8, 8)

I think we can agree to ignore. thanks

>   build-sys: make pixman actually optional
>
>  meson.build                   |  25 ++++-
>  qapi/ui.json                  |   3 +-
>  include/ui/console.h          |   2 +
>  include/ui/pixman-minimal.h   | 195 ++++++++++++++++++++++++++++++++++
>  include/ui/qemu-pixman.h      |  15 +--
>  include/ui/rect.h             |  59 ++++++++++
>  hw/display/ati.c              |  15 ++-
>  hw/display/ati_2d.c           |  10 +-
>  hw/display/sm501.c            |  45 +++++---
>  hw/display/vhost-user-gpu.c   |   2 +
>  hw/display/virtio-gpu.c       |  30 ++----
>  system/vl.c                   |  84 ++++++++-------
>  ui/console-vc-stubs.c         |  33 ++++++
>  ui/console.c                  |  19 ++++
>  ui/dbus-listener.c            |  90 +++++++++++-----
>  ui/qemu-pixman.c              |   6 ++
>  ui/ui-hmp-cmds.c              |   2 +
>  ui/ui-qmp-cmds.c              |   2 +
>  ui/vnc-stubs.c                |  12 ---
>  Kconfig.host                  |   3 +
>  hmp-commands.hx               |   2 +
>  hw/arm/Kconfig                |   4 +-
>  hw/display/Kconfig            |   7 +-
>  hw/display/meson.build        |   4 +-
>  hw/mips/Kconfig               |   1 +
>  meson_options.txt             |   2 +
>  qemu-options.hx               |   2 +
>  scripts/meson-buildoptions.sh |   3 +
>  ui/meson.build                |  22 ++--
>  29 files changed, 560 insertions(+), 139 deletions(-)
>  create mode 100644 include/ui/pixman-minimal.h
>  create mode 100644 include/ui/rect.h
>  create mode 100644 ui/console-vc-stubs.c
>
> --
> 2.41.0
>
Stefan Hajnoczi Nov. 7, 2023, 1:40 p.m. UTC | #2 
Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.