diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2024-10-04 17:08:01 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2024-10-04 17:08:01 +0100 |
| commit | a3fb4e93a3a7cf2be355c41cd550bef856f5ffe4 (patch) | |
| tree | 942ff6c7ae33112c34bd35c9c9c0d1173508c53e /qemu-keymap.c | |
| parent | 33dab2dda093a330656778c48ce88fb9c446cbf9 (diff) | |
| parent | 6b7d2f6e1896fb675e8518ed61c792d4dd92e034 (diff) | |
| download | focaccia-qemu-a3fb4e93a3a7cf2be355c41cd550bef856f5ffe4.tar.gz focaccia-qemu-a3fb4e93a3a7cf2be355c41cd550bef856f5ffe4.zip | |
Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging
trivial patches for 2024-10-04
# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCgAdFiEEZKoqtTHVaQM2a/75gqpKJDselHgFAmcAEU0ACgkQgqpKJDse
# lHgJlhAAmDwxXcHIeNgyOxSmopgKC5VKmux1qvi3PNmM46CGYTDG3s4MIUIRPNhi
# zoLQhSdjcFNQi133WoXAWZInTwYCeEe4JbWev7bTDZxoJvZFss6P/DhmSY7tCnaf
# QU+XeNl86Iy28glZjiL9EFZi7SM9+OWVF5Dqxd2NlCNA6OlnAtHoVp3bHUqkVgr1
# Lhq+0GRsxhU9bg3eO+yGXVquuOtSMa5LjEqP6kUe6ajo1E4/+GqO9hvfaj8K35Da
# B5wa39/MnSN0alnNS8rJUJXxBp2hZt8VamntL86v4kMLQCVGR+KL5FmApZzxzM/r
# fY8Ky4b5w8U0BDXnwCcr3A2bYlurC7FhDgBJw3YCQNwbxQbbG7PfbMATD86nfZPd
# HTjDjn874reGXgdXt15+3q1zm8kDylMZxEJpRdmsB+uYFVDlNCimPcCPe1YSjVcW
# AR5/NubrigpuX8qM5tSiLhjoeAZ0vQjoapGs5zi2dQtg4MltRgi32HPIRq3ooUUg
# T2XBhDUElrwwftGQuDN6Vt5Z0EQPP6HDoFLz0VhzWvlsR5DOLjxK4oLsDmQoV34n
# 9I4wSmFzwX0Vy0QJIjL6LFec/Ky8uO7QAX5PCLcsEnZy+/q2GsSdwXCPT+SPJ1AL
# bEfqLw7U6CSv/eiGOpScCnCLENrw3GXrN31SqtOtgxDPj2lVEsU=
# =HYZX
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 04 Oct 2024 17:01:17 BST
# gpg: using RSA key 64AA2AB531D56903366BFEF982AA4A243B1E9478
# gpg: Good signature from "Michael Tokarev <mjt@debian.org>" [full]
# gpg: aka "Michael Tokarev <mjt@corpit.ru>" [full]
# gpg: aka "Michael Tokarev <mjt@tls.msk.ru>" [full]
# Primary key fingerprint: 9D8B E14E 3F2A 9DD7 9199 28F1 61AD 3D98 ECDF 2C8E
# Subkey fingerprint: 64AA 2AB5 31D5 6903 366B FEF9 82AA 4A24 3B1E 9478
* tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu: (23 commits)
MAINTAINERS: Add myself as maintainer of e500 machines
docs/devel: Mention post_load hook restrictions where we document the hook
tests/functional: Fix hash validation
hw/mips: Build fw_cfg.c once
tests/tcg/plugins: Remove remainder of the cris target
block-backend: Remove deadcode
hw/net/rocker: Remove unused rocker_fp_ports
hw/pci: Remove unused pcie_chassis_find_slot
replay: Remove unused replay_disable_events
remote: Remove unused remote_iohub_finalize
vhost: Remove unused vhost_dev_{load|save}_inflight
ui/cursor: remove cursor_get_mono_image
hw: Remove unused fw_cfg_init_io
linux-user: Remove unused handle_vm86_fault
hw/char: Remove unused serial_set_frequency
hw/net/net_rx_pkt: Remove deadcode
net: Remove deadcode
q35: Remove unused mch_mcfg_base
hw/xen: Remove deadcode
MAINTAINERS: remove gensyscalls.sh from the linux-user section
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-keymap.c')
| -rw-r--r-- | qemu-keymap.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/qemu-keymap.c b/qemu-keymap.c index 701e4332af..6707067fea 100644 --- a/qemu-keymap.c +++ b/qemu-keymap.c @@ -154,9 +154,9 @@ static xkb_mod_mask_t get_mod(struct xkb_keymap *map, const char *name) int main(int argc, char *argv[]) { - static struct xkb_context *ctx; - static struct xkb_keymap *map; - static struct xkb_state *state; + struct xkb_context *ctx; + struct xkb_keymap *map; + struct xkb_state *state; xkb_mod_index_t mod, mods; int rc; @@ -213,6 +213,7 @@ int main(int argc, char *argv[]) ctx = xkb_context_new(XKB_CONTEXT_NO_FLAGS); map = xkb_keymap_new_from_names(ctx, &names, XKB_KEYMAP_COMPILE_NO_FLAGS); + xkb_context_unref(ctx); if (!map) { /* libxkbcommon prints error */ exit(1); @@ -234,6 +235,8 @@ int main(int argc, char *argv[]) state = xkb_state_new(map); xkb_keymap_key_for_each(map, walk_map, state); + xkb_state_unref(state); + xkb_keymap_unref(map); /* add quirks */ fprintf(outfile, |