Miscellaneous fixes
* Avoid memory leak in TLS GSource usage * Avoid sending key releases for lang1/lang2 keys in ps2 keyboard * Add missing key name constants for F13-F24 keys -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE2vOm/bJrYpEtDo4/vobrtBUQT98FAmQQn/gACgkQvobrtBUQ T9+BxRAAl1aOI2rHW27vnwX4xGJX4y4ENA4GAWrnGfya+Ewcoze544W3jwT8b94b KDY62P+NMrlxWMjYlDb8if+TYjXc5orlJFBl94zmbaIS7vajnYmprqP3ipCHD/rw J5sTOrE8j4+Q+SRQliSwozS+vFm74BoghSLNUBretjxoxZymkUtqKFC88eUFIXsZ prGpBVm9g22NWQ94YwJg4iqkAGm0iDjzNsDxHkYhg4yoAsfU800aoKZuSJft6Pfc PTQ+x2Y0rxoQ+YuFyf7/uGK7w7awguMkeIn/Nalz3LcxzB+BFPby+P8Srp6WABD5 N8COb38L5XtN4UffiK1//lxdLFmbO6NVMOaE1yUcG6CAOZNC4eZLIIEDEbvGWOm5 f2h/YRK59F4HEbYazimEMxqa2SKBGV7j2nvqUEERyNo++U6WLR2toZPlRYP0EWgK YuLNGKr4XwNZXmAUO36YglMCowXHUwQdITU+gZt4QIcrjEEAeG9U3pspwyfGcYQl 3zd/xzeHGJQHzXNBnyRX0OQamE1et+UGqGauFYAVKFcHHq5VIe5W3BDBLj57DvQn T+tZBA92esPl9/qHx0zFfSfiSDHvs67obHPp4LcrNENUXtJOVoqOxpAUtQ9aBX8J jhPpkqBrMHtpyjMSM9xyjstro8pD47Kt6t930Sp9fh7fOjO0awE= =lL/5 -----END PGP SIGNATURE----- Merge tag 'misc-next-pull-request' of https://gitlab.com/berrange/qemu into staging Miscellaneous fixes * Avoid memory leak in TLS GSource usage * Avoid sending key releases for lang1/lang2 keys in ps2 keyboard * Add missing key name constants for F13-F24 keys # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE2vOm/bJrYpEtDo4/vobrtBUQT98FAmQQn/gACgkQvobrtBUQ # T9+BxRAAl1aOI2rHW27vnwX4xGJX4y4ENA4GAWrnGfya+Ewcoze544W3jwT8b94b # KDY62P+NMrlxWMjYlDb8if+TYjXc5orlJFBl94zmbaIS7vajnYmprqP3ipCHD/rw # J5sTOrE8j4+Q+SRQliSwozS+vFm74BoghSLNUBretjxoxZymkUtqKFC88eUFIXsZ # prGpBVm9g22NWQ94YwJg4iqkAGm0iDjzNsDxHkYhg4yoAsfU800aoKZuSJft6Pfc # PTQ+x2Y0rxoQ+YuFyf7/uGK7w7awguMkeIn/Nalz3LcxzB+BFPby+P8Srp6WABD5 # N8COb38L5XtN4UffiK1//lxdLFmbO6NVMOaE1yUcG6CAOZNC4eZLIIEDEbvGWOm5 # f2h/YRK59F4HEbYazimEMxqa2SKBGV7j2nvqUEERyNo++U6WLR2toZPlRYP0EWgK # YuLNGKr4XwNZXmAUO36YglMCowXHUwQdITU+gZt4QIcrjEEAeG9U3pspwyfGcYQl # 3zd/xzeHGJQHzXNBnyRX0OQamE1et+UGqGauFYAVKFcHHq5VIe5W3BDBLj57DvQn # T+tZBA92esPl9/qHx0zFfSfiSDHvs67obHPp4LcrNENUXtJOVoqOxpAUtQ9aBX8J # jhPpkqBrMHtpyjMSM9xyjstro8pD47Kt6t930Sp9fh7fOjO0awE= # =lL/5 # -----END PGP SIGNATURE----- # gpg: Signature made Tue 14 Mar 2023 16:25:28 GMT # gpg: using RSA key DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full] # gpg: aka "Daniel P. Berrange <berrange@redhat.com>" [full] # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF * tag 'misc-next-pull-request' of https://gitlab.com/berrange/qemu: io/channel-tls: plug memory leakage on GSource ps2: Don't send key release event for Lang1, Lang2 keys Add qemu qcode support for keys F13 to F24 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
9636e51325
|
@ -402,6 +402,9 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
|
||||||
ps2_put_keycode(s, 0xaa);
|
ps2_put_keycode(s, 0xaa);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if ((qcode == Q_KEY_CODE_LANG1 || qcode == Q_KEY_CODE_LANG2)
|
||||||
|
&& !key->down) {
|
||||||
|
/* Ignore release for these keys */
|
||||||
} else {
|
} else {
|
||||||
if (qcode < qemu_input_map_qcode_to_atset1_len) {
|
if (qcode < qemu_input_map_qcode_to_atset1_len) {
|
||||||
keycode = qemu_input_map_qcode_to_atset1[qcode];
|
keycode = qemu_input_map_qcode_to_atset1[qcode];
|
||||||
|
@ -497,6 +500,9 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
|
||||||
ps2_put_keycode(s, 0x12);
|
ps2_put_keycode(s, 0x12);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if ((qcode == Q_KEY_CODE_LANG1 || qcode == Q_KEY_CODE_LANG2) &&
|
||||||
|
!key->down) {
|
||||||
|
/* Ignore release for these keys */
|
||||||
} else {
|
} else {
|
||||||
if (qcode < qemu_input_map_qcode_to_atset2_len) {
|
if (qcode < qemu_input_map_qcode_to_atset2_len) {
|
||||||
keycode = qemu_input_map_qcode_to_atset2[qcode];
|
keycode = qemu_input_map_qcode_to_atset2[qcode];
|
||||||
|
|
|
@ -446,6 +446,7 @@ qio_channel_tls_read_watch(QIOChannelTLS *tioc, GSource *source)
|
||||||
object_ref(OBJECT(tioc));
|
object_ref(OBJECT(tioc));
|
||||||
|
|
||||||
g_source_add_child_source(source, child);
|
g_source_add_child_source(source, child);
|
||||||
|
g_source_unref(child);
|
||||||
}
|
}
|
||||||
|
|
||||||
static GSource *qio_channel_tls_create_watch(QIOChannel *ioc,
|
static GSource *qio_channel_tls_create_watch(QIOChannel *ioc,
|
||||||
|
|
15
qapi/ui.json
15
qapi/ui.json
|
@ -886,6 +886,19 @@
|
||||||
# @lang1: since 6.1
|
# @lang1: since 6.1
|
||||||
# @lang2: since 6.1
|
# @lang2: since 6.1
|
||||||
#
|
#
|
||||||
|
# @f13: since 8.0
|
||||||
|
# @f14: since 8.0
|
||||||
|
# @f15: since 8.0
|
||||||
|
# @f16: since 8.0
|
||||||
|
# @f17: since 8.0
|
||||||
|
# @f18: since 8.0
|
||||||
|
# @f19: since 8.0
|
||||||
|
# @f20: since 8.0
|
||||||
|
# @f21: since 8.0
|
||||||
|
# @f22: since 8.0
|
||||||
|
# @f23: since 8.0
|
||||||
|
# @f24: since 8.0
|
||||||
|
#
|
||||||
# 'sysrq' was mistakenly added to hack around the fact that
|
# 'sysrq' was mistakenly added to hack around the fact that
|
||||||
# the ps2 driver was not generating correct scancodes sequences
|
# the ps2 driver was not generating correct scancodes sequences
|
||||||
# when 'alt+print' was pressed. This flaw is now fixed and the
|
# when 'alt+print' was pressed. This flaw is now fixed and the
|
||||||
|
@ -918,7 +931,7 @@
|
||||||
'volumeup', 'volumedown', 'mediaselect',
|
'volumeup', 'volumedown', 'mediaselect',
|
||||||
'mail', 'calculator', 'computer',
|
'mail', 'calculator', 'computer',
|
||||||
'ac_home', 'ac_back', 'ac_forward', 'ac_refresh', 'ac_bookmarks',
|
'ac_home', 'ac_back', 'ac_forward', 'ac_refresh', 'ac_bookmarks',
|
||||||
'lang1', 'lang2' ] }
|
'lang1', 'lang2','f13','f14','f15','f16','f17','f18','f19','f20','f21','f22','f23','f24' ] }
|
||||||
|
|
||||||
##
|
##
|
||||||
# @KeyValueKind:
|
# @KeyValueKind:
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit d21009b1c9f94b740ea66be8e48a1d8ad8124023
|
Subproject commit f5772a62ec52591ff6870b7e8ef32482371f22c6
|
Loading…
Reference in New Issue