From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Wed, 22 Apr 2026 18:30:03 +0000 (-0400)
Subject: Merge tag 'ui-pull-request' of https://gitlab.com/marcandre.lureau/qemu into staging
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb230769b4d01de714bed686161ad39a8f4f3fd1;p=thirdparty%2Fqemu.git

Merge tag 'ui-pull-request' of https://gitlab.com/marcandre.lureau/qemu into staging

UI-related fixes and cleanups

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCgAdFiEEh6m9kz+HxgbSdvYt2ujhCXWWnOUFAmnoo+8ACgkQ2ujhCXWW
# nOXHBw//ZExbO7yBzNY8s+DReQdJ3tWjwRozT296Ep8DyCW7qloGDBdWpPJ+ENHy
# b+NNQp5BBzEbuiWenqbKZtCsWcB2ozKzKP3pdxKsYjJoV/33FQFFem9fXuRu721Q
# vDLiZz5hsvpheeJBtNrndEDXBzVVMtZ0rC6zo0TKTRKScsCoTWKacraDgjTiMGMT
# p0ASjJvu6EOClwm2hxuKjbu5J7bFUoFIoEE7r6HCIVJGxrIK1wf3es0/pGI1b6Id
# GKwqWDf1ny2QlVdrUkD0nkeLQz0ZhI1YHuOGAaJjUZ14SHqkvSDFClsYRmYL4AaM
# 5OwKjpKIBXDoXH8Jbuj/wScYMzZfbdaDM+84BYIiNDLnZzuPkQ9dZhsTaJLnjsTb
# cDbMcvZ/DI03/k2w/Vm82iZ0F7a3awrT5m+WymLCSitoxqtAT7+0zW/dQYkLsv87
# yAoFkTBie2NHOYEdqUK7hv8aozUA2NtIUzXhaGdMVB9r7KUzv9dZej+gknbyRqHM
# k6JrSgTjtLBz00yAk4dTT1jbtKrVL8octq3XhbYuHo8/3qNpYREFk6+qAwdj87gt
# Rpd9sVM+xe9xmw4l/6BGCwt4E7kEVVkBY78xZ8tQa0bRsRl7jZ1bCC+hqjAu7KsU
# bcHfN9h1udt2K7T2l3bNt/RyaehFGg8aPYSS1uuHPlSD6h2zqbk=
# =4Q/3
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 22 Apr 2026 06:33:19 EDT
# gpg:                using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full]
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full]
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* tag 'ui-pull-request' of https://gitlab.com/marcandre.lureau/qemu: (40 commits)
  tests: rename the dbus-daemon helper script
  ui/vnc: explicitly link with png
  ui/vnc: remove left-over dead code
  ui/vnc: make vnc_disconnect_finish() private
  ui/vnc: fix vnc_display_init() leak on failure
  ui/keymaps: introduce kbd_layout_free()
  ui/vnc: VncDisplay.id is not const
  ui/vnc: simplify vnc_init_func error handling
  ui/vnc: assert preconditions instead of silently returning
  system: make qemu_del_vm_change_state_handler accept NULL
  util: move datadir.c from system/
  ui/vgafont: add SPDX license header
  ui: avoid duplicating vgafont16 in each translation unit
  ui/console-vc: unify the write path
  ui/console-vc: move vc_put_lf() to VT100 layer as vt100_put_lf()
  ui/console-vc: refactor text_console_resize() into vt100_set_image()
  ui/console-vc: console_scroll() -> vt100_scroll()
  ui/console-vc: move cursor blinking logic into VT100 layer
  ui/console-vc: console_refresh() -> vt100_refresh()
  ui/console-vc: decouple VT100 display updates via function pointer
  ...

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

bb230769b4d01de714bed686161ad39a8f4f3fd1