From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOlHE-0002y9-8r for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:11:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOlH8-0001n2-NZ for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:11:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33410) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eOlH8-0001lv-Em for qemu-devel@nongnu.org; Tue, 12 Dec 2017 09:11:14 -0500 From: "Daniel P. Berrange" Date: Tue, 12 Dec 2017 14:10:44 +0000 Message-Id: <20171212141044.2582-5-berrange@redhat.com> In-Reply-To: <20171212141044.2582-1-berrange@redhat.com> References: <20171212141044.2582-1-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v6 4/4] hw: convert XenInput keyboard to keycodemapdb List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Paolo Bonzini , Stefano Stabellini , Anthony Perard , xen-devel@lists.xenproject.org, "Daniel P. Berrange" Replace the scancode2linux table with an automatically generated table. In doing so, the XenFB keyboard handler is also converted to the modern InputEvent framework. Signed-off-by: Daniel P. Berrange --- hw/display/xenfb.c | 138 +++++++++++++---------------------------------------- 1 file changed, 33 insertions(+), 105 deletions(-) diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 8e2547ac05..407b6d04e9 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -28,6 +28,7 @@ #include "hw/hw.h" #include "ui/console.h" +#include "ui/input.h" #include "hw/xen/xen_backend.h" #include @@ -52,7 +53,7 @@ struct XenInput { struct common c; int abs_pointer_wanted; /* Whether guest supports absolute pointer */ int button_state; /* Last seen pointer button state */ - int extended; + QemuInputHandlerState *qkbd; QEMUPutMouseEntry *qmouse; }; @@ -120,78 +121,6 @@ static void common_unbind(struct common *c) /* -------------------------------------------------------------------- */ -#if 0 -/* - * These two tables are not needed any more, but left in here - * intentionally as documentation, to show how scancode2linux[] - * was generated. - * - * Tables to map from scancode to Linux input layer keycode. - * Scancodes are hardware-specific. These maps assumes a - * standard AT or PS/2 keyboard which is what QEMU feeds us. - */ -const unsigned char atkbd_set2_keycode[512] = { - - 0, 67, 65, 63, 61, 59, 60, 88, 0, 68, 66, 64, 62, 15, 41,117, - 0, 56, 42, 93, 29, 16, 2, 0, 0, 0, 44, 31, 30, 17, 3, 0, - 0, 46, 45, 32, 18, 5, 4, 95, 0, 57, 47, 33, 20, 19, 6,183, - 0, 49, 48, 35, 34, 21, 7,184, 0, 0, 50, 36, 22, 8, 9,185, - 0, 51, 37, 23, 24, 11, 10, 0, 0, 52, 53, 38, 39, 25, 12, 0, - 0, 89, 40, 0, 26, 13, 0, 0, 58, 54, 28, 27, 0, 43, 0, 85, - 0, 86, 91, 90, 92, 0, 14, 94, 0, 79,124, 75, 71,121, 0, 0, - 82, 83, 80, 76, 77, 72, 1, 69, 87, 78, 81, 74, 55, 73, 70, 99, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 217,100,255, 0, 97,165, 0, 0,156, 0, 0, 0, 0, 0, 0,125, - 173,114, 0,113, 0, 0, 0,126,128, 0, 0,140, 0, 0, 0,127, - 159, 0,115, 0,164, 0, 0,116,158, 0,150,166, 0, 0, 0,142, - 157, 0, 0, 0, 0, 0, 0, 0,155, 0, 98, 0, 0,163, 0, 0, - 226, 0, 0, 0, 0, 0, 0, 0, 0,255, 96, 0, 0, 0,143, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0,107, 0,105,102, 0, 0,112, - 110,111,108,112,106,103, 0,119, 0,118,109, 0, 99,104,119, 0, - -}; - -const unsigned char atkbd_unxlate_table[128] = { - - 0,118, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85,102, 13, - 21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 20, 28, 27, - 35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 93, 26, 34, 33, 42, - 50, 49, 58, 65, 73, 74, 89,124, 17, 41, 88, 5, 6, 4, 12, 3, - 11, 2, 10, 1, 9,119,126,108,117,125,123,107,115,116,121,105, - 114,122,112,113,127, 96, 97,120, 7, 15, 23, 31, 39, 47, 55, 63, - 71, 79, 86, 94, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 87,111, - 19, 25, 57, 81, 83, 92, 95, 98, 99,100,101,103,104,106,109,110 - -}; -#endif - -/* - * for (i = 0; i < 128; i++) { - * scancode2linux[i] = atkbd_set2_keycode[atkbd_unxlate_table[i]]; - * scancode2linux[i | 0x80] = atkbd_set2_keycode[atkbd_unxlate_table[i] | 0x80]; - * } - */ -static const unsigned char scancode2linux[512] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 99, 0, 86, 87, 88,117, 0, 0, 95,183,184,185, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 93, 0, 0, 89, 0, 0, 85, 91, 90, 92, 0, 94, 0,124,121, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 165, 0, 0, 0, 0, 0, 0, 0, 0,163, 0, 0, 96, 97, 0, 0, - 113,140,164, 0,166, 0, 0, 0, 0, 0,255, 0, 0, 0,114, 0, - 115, 0,150, 0, 0, 98,255, 99,100, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0,119,119,102,103,104, 0,105,112,106,118,107, - 108,109,110,111, 0, 0, 0, 0, 0, 0, 0,125,126,127,116,142, - 0, 0, 0,143, 0,217,156,173,128,159,158,157,155,226, 0,112, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -}; - /* Send an event to the keyboard frontend driver */ static int xenfb_kbd_event(struct XenInput *xenfb, union xenkbd_in_event *event) @@ -260,38 +189,23 @@ static int xenfb_send_position(struct XenInput *xenfb, return xenfb_kbd_event(xenfb, &event); } -/* - * Send a key event from the client to the guest OS - * QEMU gives us a raw scancode from an AT / PS/2 style keyboard. - * We have to turn this into a Linux Input layer keycode. - * - * Extra complexity from the fact that with extended scancodes - * (like those produced by arrow keys) this method gets called - * twice, but we only want to send a single event. So we have to - * track the '0xe0' scancode state & collapse the extended keys - * as needed. - * - * Wish we could just send scancodes straight to the guest which - * already has code for dealing with this... - */ -static void xenfb_key_event(void *opaque, int scancode) +static void xenfb_key_event(DeviceState *dev, QemuConsole *src, + InputEvent *evt) { - struct XenInput *xenfb = opaque; - int down = 1; - - if (scancode == 0xe0) { - xenfb->extended = 1; - return; - } else if (scancode & 0x80) { - scancode &= 0x7f; - down = 0; - } - if (xenfb->extended) { - scancode |= 0x80; - xenfb->extended = 0; + struct XenInput *xenfb = container_of(dev, struct XenInput, + c.xendev.qdev); + InputKeyEvent *key = evt->u.key.data; + int qcode; + + assert(evt->type == INPUT_EVENT_KIND_KEY); + + qcode = qemu_input_key_value_to_qcode(key->key); + if (qcode < qemu_input_map_qcode_to_linux_len) { + trace_xenfb_key_event(xenfb, qemu_input_map_qcode_to_linux[qcode], + key->down); + xenfb_send_key(xenfb, key->down, + qemu_input_map_qcode_to_linux[qcode]); } - trace_xenfb_key_event(opaque, scancode2linux[scancode], down); - xenfb_send_key(xenfb, down, scancode2linux[scancode]); } /* @@ -348,6 +262,12 @@ static int input_init(struct XenDevice *xendev) return 0; } +static QemuInputHandler xenfb_keyboard_handler = { + .name = "Xen FB Keyboard", + .mask = INPUT_EVENT_MASK_KEY, + .event = xenfb_key_event, +}; + static int input_initialise(struct XenDevice *xendev) { struct XenInput *in = container_of(xendev, struct XenInput, c.xendev); @@ -357,7 +277,6 @@ static int input_initialise(struct XenDevice *xendev) if (rc != 0) return rc; - qemu_add_kbd_event_handler(xenfb_key_event, in); return 0; } @@ -377,6 +296,12 @@ static void input_connected(struct XenDevice *xendev) in->qmouse = qemu_add_mouse_event_handler(xenfb_mouse_event, in, in->abs_pointer_wanted, "Xen PVFB Mouse"); + + if (in->qkbd) { + qemu_input_handler_unregister(in->qkbd); + } + in->qkbd = qemu_input_handler_register((DeviceState *)in, + &xenfb_keyboard_handler); } static void input_disconnect(struct XenDevice *xendev) @@ -387,7 +312,10 @@ static void input_disconnect(struct XenDevice *xendev) qemu_remove_mouse_event_handler(in->qmouse); in->qmouse = NULL; } - qemu_add_kbd_event_handler(NULL, NULL); + if (in->qkbd) { + qemu_input_handler_unregister(in->qkbd); + in->qkbd = NULL; + } common_unbind(&in->c); } -- 2.14.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Daniel P. Berrange" Subject: [PATCH v6 4/4] hw: convert XenInput keyboard to keycodemapdb Date: Tue, 12 Dec 2017 14:10:44 +0000 Message-ID: <20171212141044.2582-5-berrange@redhat.com> References: <20171212141044.2582-1-berrange@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOlH9-0004dD-O6 for xen-devel@lists.xenproject.org; Tue, 12 Dec 2017 14:11:15 +0000 In-Reply-To: <20171212141044.2582-1-berrange@redhat.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Stefano Stabellini , "Daniel P. Berrange" , Gerd Hoffmann , xen-devel@lists.xenproject.org, Anthony Perard , Paolo Bonzini List-Id: xen-devel@lists.xenproject.org UmVwbGFjZSB0aGUgc2NhbmNvZGUybGludXggdGFibGUgd2l0aCBhbiBhdXRvbWF0aWNhbGx5Cmdl bmVyYXRlZCB0YWJsZS4gSW4gZG9pbmcgc28sIHRoZSBYZW5GQiBrZXlib2FyZApoYW5kbGVyIGlz IGFsc28gY29udmVydGVkIHRvIHRoZSBtb2Rlcm4gSW5wdXRFdmVudApmcmFtZXdvcmsuCgpTaWdu ZWQtb2ZmLWJ5OiBEYW5pZWwgUC4gQmVycmFuZ2UgPGJlcnJhbmdlQHJlZGhhdC5jb20+Ci0tLQog aHcvZGlzcGxheS94ZW5mYi5jIHwgMTM4ICsrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKSwg MTA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3L2Rpc3BsYXkveGVuZmIuYyBiL2h3L2Rp c3BsYXkveGVuZmIuYwppbmRleCA4ZTI1NDdhYzA1Li40MDdiNmQwNGU5IDEwMDY0NAotLS0gYS9o dy9kaXNwbGF5L3hlbmZiLmMKKysrIGIvaHcvZGlzcGxheS94ZW5mYi5jCkBAIC0yOCw2ICsyOCw3 IEBACiAKICNpbmNsdWRlICJody9ody5oIgogI2luY2x1ZGUgInVpL2NvbnNvbGUuaCIKKyNpbmNs dWRlICJ1aS9pbnB1dC5oIgogI2luY2x1ZGUgImh3L3hlbi94ZW5fYmFja2VuZC5oIgogCiAjaW5j bHVkZSA8eGVuL2V2ZW50X2NoYW5uZWwuaD4KQEAgLTUyLDcgKzUzLDcgQEAgc3RydWN0IFhlbklu cHV0IHsKICAgICBzdHJ1Y3QgY29tbW9uIGM7CiAgICAgaW50IGFic19wb2ludGVyX3dhbnRlZDsg LyogV2hldGhlciBndWVzdCBzdXBwb3J0cyBhYnNvbHV0ZSBwb2ludGVyICovCiAgICAgaW50IGJ1 dHRvbl9zdGF0ZTsgICAgICAgLyogTGFzdCBzZWVuIHBvaW50ZXIgYnV0dG9uIHN0YXRlICovCi0g ICAgaW50IGV4dGVuZGVkOworICAgIFFlbXVJbnB1dEhhbmRsZXJTdGF0ZSAqcWtiZDsKICAgICBR RU1VUHV0TW91c2VFbnRyeSAqcW1vdXNlOwogfTsKIApAQCAtMTIwLDc4ICsxMjEsNiBAQCBzdGF0 aWMgdm9pZCBjb21tb25fdW5iaW5kKHN0cnVjdCBjb21tb24gKmMpCiAKIC8qIC0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t ICovCiAKLSNpZiAwCi0vKgotICogVGhlc2UgdHdvIHRhYmxlcyBhcmUgbm90IG5lZWRlZCBhbnkg bW9yZSwgYnV0IGxlZnQgaW4gaGVyZQotICogaW50ZW50aW9uYWxseSBhcyBkb2N1bWVudGF0aW9u LCB0byBzaG93IGhvdyBzY2FuY29kZTJsaW51eFtdCi0gKiB3YXMgZ2VuZXJhdGVkLgotICoKLSAq IFRhYmxlcyB0byBtYXAgZnJvbSBzY2FuY29kZSB0byBMaW51eCBpbnB1dCBsYXllciBrZXljb2Rl LgotICogU2NhbmNvZGVzIGFyZSBoYXJkd2FyZS1zcGVjaWZpYy4gIFRoZXNlIG1hcHMgYXNzdW1l cyBhCi0gKiBzdGFuZGFyZCBBVCBvciBQUy8yIGtleWJvYXJkIHdoaWNoIGlzIHdoYXQgUUVNVSBm ZWVkcyB1cy4KLSAqLwotY29uc3QgdW5zaWduZWQgY2hhciBhdGtiZF9zZXQyX2tleWNvZGVbNTEy XSA9IHsKLQotICAgICAwLCA2NywgNjUsIDYzLCA2MSwgNTksIDYwLCA4OCwgIDAsIDY4LCA2Niwg NjQsIDYyLCAxNSwgNDEsMTE3LAotICAgICAwLCA1NiwgNDIsIDkzLCAyOSwgMTYsICAyLCAgMCwg IDAsICAwLCA0NCwgMzEsIDMwLCAxNywgIDMsICAwLAotICAgICAwLCA0NiwgNDUsIDMyLCAxOCwg IDUsICA0LCA5NSwgIDAsIDU3LCA0NywgMzMsIDIwLCAxOSwgIDYsMTgzLAotICAgICAwLCA0OSwg NDgsIDM1LCAzNCwgMjEsICA3LDE4NCwgIDAsICAwLCA1MCwgMzYsIDIyLCAgOCwgIDksMTg1LAot ICAgICAwLCA1MSwgMzcsIDIzLCAyNCwgMTEsIDEwLCAgMCwgIDAsIDUyLCA1MywgMzgsIDM5LCAy NSwgMTIsICAwLAotICAgICAwLCA4OSwgNDAsICAwLCAyNiwgMTMsICAwLCAgMCwgNTgsIDU0LCAy OCwgMjcsICAwLCA0MywgIDAsIDg1LAotICAgICAwLCA4NiwgOTEsIDkwLCA5MiwgIDAsIDE0LCA5 NCwgIDAsIDc5LDEyNCwgNzUsIDcxLDEyMSwgIDAsICAwLAotICAgIDgyLCA4MywgODAsIDc2LCA3 NywgNzIsICAxLCA2OSwgODcsIDc4LCA4MSwgNzQsIDU1LCA3MywgNzAsIDk5LAotCi0gICAgICAw LCAgMCwgIDAsICAwLCAgMCwgIDAsICAwLCAgMCwgIDAsICAwLCAgMCwgIDAsICAwLCAgMCwgIDAs ICAwLAotICAgIDIxNywxMDAsMjU1LCAgMCwgOTcsMTY1LCAgMCwgIDAsMTU2LCAgMCwgIDAsICAw LCAgMCwgIDAsICAwLDEyNSwKLSAgICAxNzMsMTE0LCAgMCwxMTMsICAwLCAgMCwgIDAsMTI2LDEy OCwgIDAsICAwLDE0MCwgIDAsICAwLCAgMCwxMjcsCi0gICAgMTU5LCAgMCwxMTUsICAwLDE2NCwg IDAsICAwLDExNiwxNTgsICAwLDE1MCwxNjYsICAwLCAgMCwgIDAsMTQyLAotICAgIDE1NywgIDAs ICAwLCAgMCwgIDAsICAwLCAgMCwgIDAsMTU1LCAgMCwgOTgsICAwLCAgMCwxNjMsICAwLCAgMCwK LSAgICAyMjYsICAwLCAgMCwgIDAsICAwLCAgMCwgIDAsICAwLCAgMCwyNTUsIDk2LCAgMCwgIDAs ICAwLDE0MywgIDAsCi0gICAgICAwLCAgMCwgIDAsICAwLCAgMCwgIDAsICAwLCAgMCwgIDAsMTA3 LCAgMCwxMDUsMTAyLCAgMCwgIDAsMTEyLAotICAgIDExMCwxMTEsMTA4LDExMiwxMDYsMTAzLCAg MCwxMTksICAwLDExOCwxMDksICAwLCA5OSwxMDQsMTE5LCAgMCwKLQotfTsKLQotY29uc3QgdW5z aWduZWQgY2hhciBhdGtiZF91bnhsYXRlX3RhYmxlWzEyOF0gPSB7Ci0KLSAgICAgIDAsMTE4LCAy MiwgMzAsIDM4LCAzNywgNDYsIDU0LCA2MSwgNjIsIDcwLCA2OSwgNzgsIDg1LDEwMiwgMTMsCi0g ICAgIDIxLCAyOSwgMzYsIDQ1LCA0NCwgNTMsIDYwLCA2NywgNjgsIDc3LCA4NCwgOTEsIDkwLCAy MCwgMjgsIDI3LAotICAgICAzNSwgNDMsIDUyLCA1MSwgNTksIDY2LCA3NSwgNzYsIDgyLCAxNCwg MTgsIDkzLCAyNiwgMzQsIDMzLCA0MiwKLSAgICAgNTAsIDQ5LCA1OCwgNjUsIDczLCA3NCwgODks MTI0LCAxNywgNDEsIDg4LCAgNSwgIDYsICA0LCAxMiwgIDMsCi0gICAgIDExLCAgMiwgMTAsICAx LCAgOSwxMTksMTI2LDEwOCwxMTcsMTI1LDEyMywxMDcsMTE1LDExNiwxMjEsMTA1LAotICAgIDEx NCwxMjIsMTEyLDExMywxMjcsIDk2LCA5NywxMjAsICA3LCAxNSwgMjMsIDMxLCAzOSwgNDcsIDU1 LCA2MywKLSAgICAgNzEsIDc5LCA4NiwgOTQsICA4LCAxNiwgMjQsIDMyLCA0MCwgNDgsIDU2LCA2 NCwgNzIsIDgwLCA4NywxMTEsCi0gICAgIDE5LCAyNSwgNTcsIDgxLCA4MywgOTIsIDk1LCA5OCwg OTksMTAwLDEwMSwxMDMsMTA0LDEwNiwxMDksMTEwCi0KLX07Ci0jZW5kaWYKLQotLyoKLSAqIGZv ciAoaSA9IDA7IGkgPCAxMjg7IGkrKykgewotICogICAgIHNjYW5jb2RlMmxpbnV4W2ldID0gYXRr YmRfc2V0Ml9rZXljb2RlW2F0a2JkX3VueGxhdGVfdGFibGVbaV1dOwotICogICAgIHNjYW5jb2Rl MmxpbnV4W2kgfCAweDgwXSA9IGF0a2JkX3NldDJfa2V5Y29kZVthdGtiZF91bnhsYXRlX3RhYmxl W2ldIHwgMHg4MF07Ci0gKiB9Ci0gKi8KLXN0YXRpYyBjb25zdCB1bnNpZ25lZCBjaGFyIHNjYW5j b2RlMmxpbnV4WzUxMl0gPSB7Ci0gICAgICAwLCAgMSwgIDIsICAzLCAgNCwgIDUsICA2LCAgNywg IDgsICA5LCAxMCwgMTEsIDEyLCAxMywgMTQsIDE1LAotICAgICAxNiwgMTcsIDE4LCAxOSwgMjAs IDIxLCAyMiwgMjMsIDI0LCAyNSwgMjYsIDI3LCAyOCwgMjksIDMwLCAzMSwKLSAgICAgMzIsIDMz LCAzNCwgMzUsIDM2LCAzNywgMzgsIDM5LCA0MCwgNDEsIDQyLCA0MywgNDQsIDQ1LCA0NiwgNDcs Ci0gICAgIDQ4LCA0OSwgNTAsIDUxLCA1MiwgNTMsIDU0LCA1NSwgNTYsIDU3LCA1OCwgNTksIDYw LCA2MSwgNjIsIDYzLAotICAgICA2NCwgNjUsIDY2LCA2NywgNjgsIDY5LCA3MCwgNzEsIDcyLCA3 MywgNzQsIDc1LCA3NiwgNzcsIDc4LCA3OSwKLSAgICAgODAsIDgxLCA4MiwgODMsIDk5LCAgMCwg ODYsIDg3LCA4OCwxMTcsICAwLCAgMCwgOTUsMTgzLDE4NCwxODUsCi0gICAgICAwLCAgMCwgIDAs ICAwLCAgMCwgIDAsICAwLCAgMCwgIDAsICAwLCAgMCwgIDAsICAwLCAgMCwgIDAsICAwLAotICAg ICA5MywgIDAsICAwLCA4OSwgIDAsICAwLCA4NSwgOTEsIDkwLCA5MiwgIDAsIDk0LCAgMCwxMjQs MTIxLCAgMCwKLQotICAgICAgMCwgIDAsICAwLCAgMCwgIDAsICAwLCAgMCwgIDAsICAwLCAgMCwg IDAsICAwLCAgMCwgIDAsICAwLCAgMCwKLSAgICAxNjUsICAwLCAgMCwgIDAsICAwLCAgMCwgIDAs ICAwLCAgMCwxNjMsICAwLCAgMCwgOTYsIDk3LCAgMCwgIDAsCi0gICAgMTEzLDE0MCwxNjQsICAw LDE2NiwgIDAsICAwLCAgMCwgIDAsICAwLDI1NSwgIDAsICAwLCAgMCwxMTQsICAwLAotICAgIDEx NSwgIDAsMTUwLCAgMCwgIDAsIDk4LDI1NSwgOTksMTAwLCAgMCwgIDAsICAwLCAgMCwgIDAsICAw LCAgMCwKLSAgICAgIDAsICAwLCAgMCwgIDAsICAwLDExOSwxMTksMTAyLDEwMywxMDQsICAwLDEw NSwxMTIsMTA2LDExOCwxMDcsCi0gICAgMTA4LDEwOSwxMTAsMTExLCAgMCwgIDAsICAwLCAgMCwg IDAsICAwLCAgMCwxMjUsMTI2LDEyNywxMTYsMTQyLAotICAgICAgMCwgIDAsICAwLDE0MywgIDAs MjE3LDE1NiwxNzMsMTI4LDE1OSwxNTgsMTU3LDE1NSwyMjYsICAwLDExMiwKLSAgICAgIDAsICAw LCAgMCwgIDAsICAwLCAgMCwgIDAsICAwLCAgMCwgIDAsICAwLCAgMCwgIDAsICAwLCAgMCwgIDAs Ci19OwotCiAvKiBTZW5kIGFuIGV2ZW50IHRvIHRoZSBrZXlib2FyZCBmcm9udGVuZCBkcml2ZXIg Ki8KIHN0YXRpYyBpbnQgeGVuZmJfa2JkX2V2ZW50KHN0cnVjdCBYZW5JbnB1dCAqeGVuZmIsCiAJ CQkgICB1bmlvbiB4ZW5rYmRfaW5fZXZlbnQgKmV2ZW50KQpAQCAtMjYwLDM4ICsxODksMjMgQEAg c3RhdGljIGludCB4ZW5mYl9zZW5kX3Bvc2l0aW9uKHN0cnVjdCBYZW5JbnB1dCAqeGVuZmIsCiAg ICAgcmV0dXJuIHhlbmZiX2tiZF9ldmVudCh4ZW5mYiwgJmV2ZW50KTsKIH0KIAotLyoKLSAqIFNl bmQgYSBrZXkgZXZlbnQgZnJvbSB0aGUgY2xpZW50IHRvIHRoZSBndWVzdCBPUwotICogUUVNVSBn aXZlcyB1cyBhIHJhdyBzY2FuY29kZSBmcm9tIGFuIEFUIC8gUFMvMiBzdHlsZSBrZXlib2FyZC4K LSAqIFdlIGhhdmUgdG8gdHVybiB0aGlzIGludG8gYSBMaW51eCBJbnB1dCBsYXllciBrZXljb2Rl LgotICoKLSAqIEV4dHJhIGNvbXBsZXhpdHkgZnJvbSB0aGUgZmFjdCB0aGF0IHdpdGggZXh0ZW5k ZWQgc2NhbmNvZGVzCi0gKiAobGlrZSB0aG9zZSBwcm9kdWNlZCBieSBhcnJvdyBrZXlzKSB0aGlz IG1ldGhvZCBnZXRzIGNhbGxlZAotICogdHdpY2UsIGJ1dCB3ZSBvbmx5IHdhbnQgdG8gc2VuZCBh IHNpbmdsZSBldmVudC4gU28gd2UgaGF2ZSB0bwotICogdHJhY2sgdGhlICcweGUwJyBzY2FuY29k ZSBzdGF0ZSAmIGNvbGxhcHNlIHRoZSBleHRlbmRlZCBrZXlzCi0gKiBhcyBuZWVkZWQuCi0gKgot ICogV2lzaCB3ZSBjb3VsZCBqdXN0IHNlbmQgc2NhbmNvZGVzIHN0cmFpZ2h0IHRvIHRoZSBndWVz dCB3aGljaAotICogYWxyZWFkeSBoYXMgY29kZSBmb3IgZGVhbGluZyB3aXRoIHRoaXMuLi4KLSAq Lwotc3RhdGljIHZvaWQgeGVuZmJfa2V5X2V2ZW50KHZvaWQgKm9wYXF1ZSwgaW50IHNjYW5jb2Rl KQorc3RhdGljIHZvaWQgeGVuZmJfa2V5X2V2ZW50KERldmljZVN0YXRlICpkZXYsIFFlbXVDb25z b2xlICpzcmMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgSW5wdXRFdmVudCAqZXZ0KQog ewotICAgIHN0cnVjdCBYZW5JbnB1dCAqeGVuZmIgPSBvcGFxdWU7Ci0gICAgaW50IGRvd24gPSAx OwotCi0gICAgaWYgKHNjYW5jb2RlID09IDB4ZTApIHsKLQl4ZW5mYi0+ZXh0ZW5kZWQgPSAxOwot CXJldHVybjsKLSAgICB9IGVsc2UgaWYgKHNjYW5jb2RlICYgMHg4MCkgewotCXNjYW5jb2RlICY9 IDB4N2Y7Ci0JZG93biA9IDA7Ci0gICAgfQotICAgIGlmICh4ZW5mYi0+ZXh0ZW5kZWQpIHsKLQlz Y2FuY29kZSB8PSAweDgwOwotCXhlbmZiLT5leHRlbmRlZCA9IDA7CisgICAgc3RydWN0IFhlbklu cHV0ICp4ZW5mYiA9IGNvbnRhaW5lcl9vZihkZXYsIHN0cnVjdCBYZW5JbnB1dCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGMueGVuZGV2LnFkZXYpOworICAgIElu cHV0S2V5RXZlbnQgKmtleSA9IGV2dC0+dS5rZXkuZGF0YTsKKyAgICBpbnQgcWNvZGU7CisKKyAg ICBhc3NlcnQoZXZ0LT50eXBlID09IElOUFVUX0VWRU5UX0tJTkRfS0VZKTsKKworICAgIHFjb2Rl ID0gcWVtdV9pbnB1dF9rZXlfdmFsdWVfdG9fcWNvZGUoa2V5LT5rZXkpOworICAgIGlmIChxY29k ZSA8IHFlbXVfaW5wdXRfbWFwX3Fjb2RlX3RvX2xpbnV4X2xlbikgeworICAgICAgICB0cmFjZV94 ZW5mYl9rZXlfZXZlbnQoeGVuZmIsIHFlbXVfaW5wdXRfbWFwX3Fjb2RlX3RvX2xpbnV4W3Fjb2Rl XSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGtleS0+ZG93bik7CisgICAgICAgIHhl bmZiX3NlbmRfa2V5KHhlbmZiLCBrZXktPmRvd24sCisgICAgICAgICAgICAgICAgICAgICAgIHFl bXVfaW5wdXRfbWFwX3Fjb2RlX3RvX2xpbnV4W3Fjb2RlXSk7CiAgICAgfQotICAgIHRyYWNlX3hl bmZiX2tleV9ldmVudChvcGFxdWUsIHNjYW5jb2RlMmxpbnV4W3NjYW5jb2RlXSwgZG93bik7Ci0g ICAgeGVuZmJfc2VuZF9rZXkoeGVuZmIsIGRvd24sIHNjYW5jb2RlMmxpbnV4W3NjYW5jb2RlXSk7 CiB9CiAKIC8qCkBAIC0zNDgsNiArMjYyLDEyIEBAIHN0YXRpYyBpbnQgaW5wdXRfaW5pdChzdHJ1 Y3QgWGVuRGV2aWNlICp4ZW5kZXYpCiAgICAgcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBRZW11SW5w dXRIYW5kbGVyIHhlbmZiX2tleWJvYXJkX2hhbmRsZXIgPSB7CisgICAgLm5hbWUgID0gIlhlbiBG QiBLZXlib2FyZCIsCisgICAgLm1hc2sgID0gSU5QVVRfRVZFTlRfTUFTS19LRVksCisgICAgLmV2 ZW50ID0geGVuZmJfa2V5X2V2ZW50LAorfTsKKwogc3RhdGljIGludCBpbnB1dF9pbml0aWFsaXNl KHN0cnVjdCBYZW5EZXZpY2UgKnhlbmRldikKIHsKICAgICBzdHJ1Y3QgWGVuSW5wdXQgKmluID0g Y29udGFpbmVyX29mKHhlbmRldiwgc3RydWN0IFhlbklucHV0LCBjLnhlbmRldik7CkBAIC0zNTcs NyArMjc3LDYgQEAgc3RhdGljIGludCBpbnB1dF9pbml0aWFsaXNlKHN0cnVjdCBYZW5EZXZpY2Ug KnhlbmRldikKICAgICBpZiAocmMgIT0gMCkKIAlyZXR1cm4gcmM7CiAKLSAgICBxZW11X2FkZF9r YmRfZXZlbnRfaGFuZGxlcih4ZW5mYl9rZXlfZXZlbnQsIGluKTsKICAgICByZXR1cm4gMDsKIH0K IApAQCAtMzc3LDYgKzI5NiwxMiBAQCBzdGF0aWMgdm9pZCBpbnB1dF9jb25uZWN0ZWQoc3RydWN0 IFhlbkRldmljZSAqeGVuZGV2KQogICAgIGluLT5xbW91c2UgPSBxZW11X2FkZF9tb3VzZV9ldmVu dF9oYW5kbGVyKHhlbmZiX21vdXNlX2V2ZW50LCBpbiwKIAkJCQkJICAgICAgaW4tPmFic19wb2lu dGVyX3dhbnRlZCwKIAkJCQkJICAgICAgIlhlbiBQVkZCIE1vdXNlIik7CisKKyAgICBpZiAoaW4t PnFrYmQpIHsKKyAgICAgICAgcWVtdV9pbnB1dF9oYW5kbGVyX3VucmVnaXN0ZXIoaW4tPnFrYmQp OworICAgIH0KKyAgICBpbi0+cWtiZCA9IHFlbXVfaW5wdXRfaGFuZGxlcl9yZWdpc3RlcigoRGV2 aWNlU3RhdGUgKilpbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAmeGVuZmJfa2V5Ym9hcmRfaGFuZGxlcik7CiB9CiAKIHN0YXRpYyB2b2lkIGlucHV0X2Rpc2Nv bm5lY3Qoc3RydWN0IFhlbkRldmljZSAqeGVuZGV2KQpAQCAtMzg3LDcgKzMxMiwxMCBAQCBzdGF0 aWMgdm9pZCBpbnB1dF9kaXNjb25uZWN0KHN0cnVjdCBYZW5EZXZpY2UgKnhlbmRldikKIAlxZW11 X3JlbW92ZV9tb3VzZV9ldmVudF9oYW5kbGVyKGluLT5xbW91c2UpOwogCWluLT5xbW91c2UgPSBO VUxMOwogICAgIH0KLSAgICBxZW11X2FkZF9rYmRfZXZlbnRfaGFuZGxlcihOVUxMLCBOVUxMKTsK KyAgICBpZiAoaW4tPnFrYmQpIHsKKyAgICAgICAgcWVtdV9pbnB1dF9oYW5kbGVyX3VucmVnaXN0 ZXIoaW4tPnFrYmQpOworICAgICAgICBpbi0+cWtiZCA9IE5VTEw7CisgICAgfQogICAgIGNvbW1v bl91bmJpbmQoJmluLT5jKTsKIH0KIAotLSAKMi4xNC4zCgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2 ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWls bWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==