Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/818697/?format=api
{ "id": 818697, "url": "http://patchwork.ozlabs.org/api/patches/818697/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1506437019-17946-3-git-send-email-owen.smith@citrix.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1506437019-17946-3-git-send-email-owen.smith@citrix.com>", "list_archive_url": null, "date": "2017-09-26T14:43:38", "name": "[2/3,v4] xenfb: Use Input Handlers directly", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "f766b36d71c561981d37419042aad0df04bf0cb9", "submitter": { "id": 64781, "url": "http://patchwork.ozlabs.org/api/people/64781/?format=api", "name": "Owen Smith", "email": "owen.smith@citrix.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1506437019-17946-3-git-send-email-owen.smith@citrix.com/mbox/", "series": [ { "id": 5156, "url": "http://patchwork.ozlabs.org/api/series/5156/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=5156", "date": "2017-09-26T14:43:39", "name": "xenfb: Enablement for Windows PV HID frontend", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/5156/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/818697/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/818697/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y1kQc44BGz9t6C\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 27 Sep 2017 00:50:32 +1000 (AEST)", "from localhost ([::1]:47950 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dwrBu-0005vi-KN\n\tfor incoming@patchwork.ozlabs.org; Tue, 26 Sep 2017 10:50:30 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:42591)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <prvs=435739c2e=owen.smith@citrix.com>)\n\tid 1dwrBF-0005sP-Dd\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 10:49:51 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <prvs=435739c2e=owen.smith@citrix.com>)\n\tid 1dwrBD-00041g-CZ\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 10:49:49 -0400", "from smtp.citrix.com ([66.165.176.89]:54430)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71)\n\t(envelope-from <prvs=435739c2e=owen.smith@citrix.com>)\n\tid 1dwrBD-00040M-4J\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 10:49:47 -0400" ], "X-IronPort-AV": "E=Sophos;i=\"5.42,441,1500940800\"; d=\"scan'208\";a=\"441260938\"", "From": "Owen Smith <owen.smith@citrix.com>", "To": "<sstabellini@kernel.org>, <anthony.perard@citrix.com>,\n\t<kraxel@redhat.com>", "Date": "Tue, 26 Sep 2017 14:43:38 +0000", "Message-ID": "<1506437019-17946-3-git-send-email-owen.smith@citrix.com>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<1506437019-17946-1-git-send-email-owen.smith@citrix.com>", "References": "<1506437019-17946-1-git-send-email-owen.smith@citrix.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-detected-operating-system": "by eggs.gnu.org: Genre and OS details not\n\trecognized.", "X-Received-From": "66.165.176.89", "Subject": "[Qemu-devel] [PATCH 2/3 v4] xenfb: Use Input Handlers directly", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "xen-devel@lists.xenproject.org, qemu-devel@nongnu.org,\n\tOwen Smith <owen.smith@citrix.com>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "Avoid the unneccessary calls through the input-legacy.c file by\nusing the qemu_input_handler_*() calls directly. This did require\nreworking the event and sync handlers to use the reverse mapping\nfrom qcode to linux using qemu_input_qcode_to_linux().\nRemoves the scancode2linux mapping, and supporting documention.\n\nSigned-off-by: Owen Smith <owen.smith@citrix.com>\n---\n hw/display/xenfb.c | 289 ++++++++++++++++++++++++-----------------------------\n 1 file changed, 133 insertions(+), 156 deletions(-)", "diff": "diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c\nindex df8b78f..33361b4 100644\n--- a/hw/display/xenfb.c\n+++ b/hw/display/xenfb.c\n@@ -27,6 +27,7 @@\n #include \"qemu/osdep.h\"\n \n #include \"hw/hw.h\"\n+#include \"ui/input.h\"\n #include \"ui/console.h\"\n #include \"hw/xen/xen_backend.h\"\n \n@@ -51,9 +52,10 @@ struct common {\n struct XenInput {\n struct common c;\n int abs_pointer_wanted; /* Whether guest supports absolute pointer */\n- int button_state; /* Last seen pointer button state */\n- int extended;\n- QEMUPutMouseEntry *qmouse;\n+ QemuInputHandlerState *qkbd;\n+ QemuInputHandlerState *qmou;\n+ int mouse_axes[INPUT_AXIS__MAX];\n+ int mouse_wheel;\n };\n \n #define UP_QUEUE 8\n@@ -119,79 +121,6 @@ static void common_unbind(struct common *c)\n }\n \n /* -------------------------------------------------------------------- */\n-\n-#if 0\n-/*\n- * These two tables are not needed any more, but left in here\n- * intentionally as documentation, to show how scancode2linux[]\n- * was generated.\n- *\n- * Tables to map from scancode to Linux input layer keycode.\n- * Scancodes are hardware-specific. These maps assumes a\n- * standard AT or PS/2 keyboard which is what QEMU feeds us.\n- */\n-const unsigned char atkbd_set2_keycode[512] = {\n-\n- 0, 67, 65, 63, 61, 59, 60, 88, 0, 68, 66, 64, 62, 15, 41,117,\n- 0, 56, 42, 93, 29, 16, 2, 0, 0, 0, 44, 31, 30, 17, 3, 0,\n- 0, 46, 45, 32, 18, 5, 4, 95, 0, 57, 47, 33, 20, 19, 6,183,\n- 0, 49, 48, 35, 34, 21, 7,184, 0, 0, 50, 36, 22, 8, 9,185,\n- 0, 51, 37, 23, 24, 11, 10, 0, 0, 52, 53, 38, 39, 25, 12, 0,\n- 0, 89, 40, 0, 26, 13, 0, 0, 58, 54, 28, 27, 0, 43, 0, 85,\n- 0, 86, 91, 90, 92, 0, 14, 94, 0, 79,124, 75, 71,121, 0, 0,\n- 82, 83, 80, 76, 77, 72, 1, 69, 87, 78, 81, 74, 55, 73, 70, 99,\n-\n- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,\n- 217,100,255, 0, 97,165, 0, 0,156, 0, 0, 0, 0, 0, 0,125,\n- 173,114, 0,113, 0, 0, 0,126,128, 0, 0,140, 0, 0, 0,127,\n- 159, 0,115, 0,164, 0, 0,116,158, 0,150,166, 0, 0, 0,142,\n- 157, 0, 0, 0, 0, 0, 0, 0,155, 0, 98, 0, 0,163, 0, 0,\n- 226, 0, 0, 0, 0, 0, 0, 0, 0,255, 96, 0, 0, 0,143, 0,\n- 0, 0, 0, 0, 0, 0, 0, 0, 0,107, 0,105,102, 0, 0,112,\n- 110,111,108,112,106,103, 0,119, 0,118,109, 0, 99,104,119, 0,\n-\n-};\n-\n-const unsigned char atkbd_unxlate_table[128] = {\n-\n- 0,118, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85,102, 13,\n- 21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 20, 28, 27,\n- 35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 93, 26, 34, 33, 42,\n- 50, 49, 58, 65, 73, 74, 89,124, 17, 41, 88, 5, 6, 4, 12, 3,\n- 11, 2, 10, 1, 9,119,126,108,117,125,123,107,115,116,121,105,\n- 114,122,112,113,127, 96, 97,120, 7, 15, 23, 31, 39, 47, 55, 63,\n- 71, 79, 86, 94, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 87,111,\n- 19, 25, 57, 81, 83, 92, 95, 98, 99,100,101,103,104,106,109,110\n-\n-};\n-#endif\n-\n-/*\n- * for (i = 0; i < 128; i++) {\n- * scancode2linux[i] = atkbd_set2_keycode[atkbd_unxlate_table[i]];\n- * scancode2linux[i | 0x80] = atkbd_set2_keycode[atkbd_unxlate_table[i] | 0x80];\n- * }\n- */\n-static const unsigned char scancode2linux[512] = {\n- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,\n- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,\n- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,\n- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,\n- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,\n- 80, 81, 82, 83, 99, 0, 86, 87, 88,117, 0, 0, 95,183,184,185,\n- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,\n- 93, 0, 0, 89, 0, 0, 85, 91, 90, 92, 0, 94, 0,124,121, 0,\n-\n- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,\n- 165, 0, 0, 0, 0, 0, 0, 0, 0,163, 0, 0, 96, 97, 0, 0,\n- 113,140,164, 0,166, 0, 0, 0, 0, 0,255, 0, 0, 0,114, 0,\n- 115, 0,150, 0, 0, 98,255, 99,100, 0, 0, 0, 0, 0, 0, 0,\n- 0, 0, 0, 0, 0,119,119,102,103,104, 0,105,112,106,118,107,\n- 108,109,110,111, 0, 0, 0, 0, 0, 0, 0,125,126,127,116,142,\n- 0, 0, 0,143, 0,217,156,173,128,159,158,157,155,226, 0,112,\n- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,\n-};\n-\n /* Send an event to the keyboard frontend driver */\n static int xenfb_kbd_event(struct XenInput *xenfb,\n \t\t\t union xenkbd_in_event *event)\n@@ -260,87 +189,126 @@ static int xenfb_send_position(struct XenInput *xenfb,\n return xenfb_kbd_event(xenfb, &event);\n }\n \n-/*\n- * Send a key event from the client to the guest OS\n- * QEMU gives us a raw scancode from an AT / PS/2 style keyboard.\n- * We have to turn this into a Linux Input layer keycode.\n- *\n- * Extra complexity from the fact that with extended scancodes\n- * (like those produced by arrow keys) this method gets called\n- * twice, but we only want to send a single event. So we have to\n- * track the '0xe0' scancode state & collapse the extended keys\n- * as needed.\n- *\n- * Wish we could just send scancodes straight to the guest which\n- * already has code for dealing with this...\n- */\n-static void xenfb_key_event(void *opaque, int scancode)\n+static void xenfb_key_event(DeviceState *dev, QemuConsole *src,\n+ InputEvent *evt)\n {\n- struct XenInput *xenfb = opaque;\n- int down = 1;\n-\n- if (scancode == 0xe0) {\n-\txenfb->extended = 1;\n-\treturn;\n- } else if (scancode & 0x80) {\n-\tscancode &= 0x7f;\n-\tdown = 0;\n+ struct XenInput *in = (struct XenInput *)dev;\n+ InputKeyEvent *key = evt->u.key.data;\n+ int qcode = qemu_input_key_value_to_qcode(key->key);\n+\n+ if (qcode) {\n+ unsigned int lnx = qemu_input_qcode_to_linux(qcode);\n+ if (lnx) {\n+ xenfb_send_key(in, key->down, lnx);\n+ }\n }\n- if (xenfb->extended) {\n-\tscancode |= 0x80;\n-\txenfb->extended = 0;\n+}\n+\n+static void xenfb_mouse_event(DeviceState *dev, QemuConsole *src,\n+ InputEvent *evt)\n+{\n+ struct XenInput *in = (struct XenInput *)dev;\n+ InputBtnEvent *btn;\n+ InputMoveEvent *move;\n+\n+ switch (evt->type) {\n+ case INPUT_EVENT_KIND_BTN:\n+ btn = evt->u.btn.data;\n+ switch (btn->button) {\n+ case INPUT_BUTTON_LEFT:\n+ xenfb_send_key(in, btn->down, BTN_LEFT);\n+ break;\n+ case INPUT_BUTTON_RIGHT:\n+ xenfb_send_key(in, btn->down, BTN_LEFT + 1);\n+ break;\n+ case INPUT_BUTTON_MIDDLE:\n+ xenfb_send_key(in, btn->down, BTN_LEFT + 2);\n+ break;\n+ case INPUT_BUTTON_WHEEL_UP:\n+ if (btn->down) {\n+ in->mouse_wheel--;\n+ }\n+ break;\n+ case INPUT_BUTTON_WHEEL_DOWN:\n+ if (btn->down) {\n+ in->mouse_wheel++;\n+ }\n+ break;\n+ default:\n+ break;\n+ }\n+ break;\n+ case INPUT_EVENT_KIND_ABS:\n+ move = evt->u.abs.data;\n+ in->mouse_axes[move->axis] = move->value;\n+ break;\n+ case INPUT_EVENT_KIND_REL:\n+ move = evt->u.rel.data;\n+ in->mouse_axes[move->axis] += move->value;\n+ break;\n+ default:\n+ break;\n }\n- xenfb_send_key(xenfb, down, scancode2linux[scancode]);\n }\n \n-/*\n- * Send a mouse event from the client to the guest OS\n- *\n- * The QEMU mouse can be in either relative, or absolute mode.\n- * Movement is sent separately from button state, which has to\n- * be encoded as virtual key events. We also don't actually get\n- * given any button up/down events, so have to track changes in\n- * the button state.\n- */\n-static void xenfb_mouse_event(void *opaque,\n-\t\t\t int dx, int dy, int dz, int button_state)\n+static void xenfb_mouse_sync(DeviceState *dev)\n {\n- struct XenInput *xenfb = opaque;\n- QemuConsole *con = qemu_console_lookup_by_index(0);\n- DisplaySurface *surface;\n- int dw, dh, i;\n+ struct XenInput *in = (struct XenInput *)dev;\n+ int dx, dy, dz;\n \n- if (!con) {\n- xen_pv_printf(&xenfb->c.xendev, 0, \"No QEMU console available\");\n- return;\n- }\n+ dx = in->mouse_axes[INPUT_AXIS_X];\n+ dy = in->mouse_axes[INPUT_AXIS_Y];\n+ dz = in->mouse_wheel;\n+\n+ trace_xenfb_mouse_event(in, dx, dy, dz, 0,\n+ in->abs_pointer_wanted);\n+\n+ if (in->abs_pointer_wanted) {\n+ QemuConsole *con = qemu_console_lookup_by_index(0);\n+ DisplaySurface *surface;\n+ int dw, dh;\n+\n+ if (!con) {\n+ xen_pv_printf(&in->c.xendev, 0, \"No QEMU console available\");\n+ return;\n+ }\n+\n+ surface = qemu_console_surface(con);\n+ dw = surface_width(surface);\n+ dh = surface_height(surface);\n+\n+ dx = dx * (dw - 1) / 0x7fff;\n+ dy = dy * (dh - 1) / 0x7fff;\n \n- surface = qemu_console_surface(con);\n- dw = surface_width(surface);\n- dh = surface_height(surface);\n-\n- trace_xenfb_mouse_event(opaque, dx, dy, dz, button_state,\n- xenfb->abs_pointer_wanted);\n- if (xenfb->abs_pointer_wanted)\n-\txenfb_send_position(xenfb,\n-\t\t\t dx * (dw - 1) / 0x7fff,\n-\t\t\t dy * (dh - 1) / 0x7fff,\n-\t\t\t dz);\n- else\n-\txenfb_send_motion(xenfb, dx, dy, dz);\n-\n- for (i = 0 ; i < 8 ; i++) {\n-\tint lastDown = xenfb->button_state & (1 << i);\n-\tint down = button_state & (1 << i);\n-\tif (down == lastDown)\n-\t continue;\n-\n-\tif (xenfb_send_key(xenfb, down, BTN_LEFT+i) < 0)\n-\t return;\n+ xenfb_send_position(in, dx, dy, dz);\n+ } else {\n+ xenfb_send_motion(in, dx, dy, dz);\n+\n+ in->mouse_axes[INPUT_AXIS_X] = 0;\n+ in->mouse_axes[INPUT_AXIS_Y] = 0;\n }\n- xenfb->button_state = button_state;\n+\n+ in->mouse_wheel = 0;\n }\n \n+static QemuInputHandler xenfb_keyboard = {\n+ .name = \"Xen PVFB Keyboard\",\n+ .mask = INPUT_EVENT_MASK_KEY,\n+ .event = xenfb_key_event,\n+};\n+static QemuInputHandler xenfb_abs_mouse = {\n+ .name = \"Xen PVFB Absolute Mouse\",\n+ .mask = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_ABS,\n+ .event = xenfb_mouse_event,\n+ .sync = xenfb_mouse_sync\n+};\n+static QemuInputHandler xenfb_rel_mouse = {\n+ .name = \"Xen PVFB Mouse\",\n+ .mask = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_REL,\n+ .event = xenfb_mouse_event,\n+ .sync = xenfb_mouse_sync,\n+};\n+\n static int input_init(struct XenDevice *xendev)\n {\n xenstore_write_be_int(xendev, \"feature-abs-pointer\", 1);\n@@ -356,7 +324,6 @@ static int input_initialise(struct XenDevice *xendev)\n if (rc != 0)\n \treturn rc;\n \n- qemu_add_kbd_event_handler(xenfb_key_event, in);\n return 0;\n }\n \n@@ -369,24 +336,34 @@ static void input_connected(struct XenDevice *xendev)\n in->abs_pointer_wanted = 0;\n }\n \n- if (in->qmouse) {\n- qemu_remove_mouse_event_handler(in->qmouse);\n+ if (in->qkbd) {\n+ qemu_input_handler_unregister(in->qkbd);\n+ }\n+ if (in->qmou) {\n+ qemu_input_handler_unregister(in->qmou);\n }\n trace_xenfb_input_connected(xendev, in->abs_pointer_wanted);\n- in->qmouse = qemu_add_mouse_event_handler(xenfb_mouse_event, in,\n-\t\t\t\t\t in->abs_pointer_wanted,\n-\t\t\t\t\t \"Xen PVFB Mouse\");\n+\n+ in->qkbd = qemu_input_handler_register((DeviceState *)in, &xenfb_keyboard);\n+ in->qmou = qemu_input_handler_register((DeviceState *)in,\n+ (in->abs_pointer_wanted ? &xenfb_abs_mouse : &xenfb_rel_mouse));\n+\n+ qemu_input_handler_activate(in->qkbd);\n+ qemu_input_handler_activate(in->qmou);\n }\n \n static void input_disconnect(struct XenDevice *xendev)\n {\n struct XenInput *in = container_of(xendev, struct XenInput, c.xendev);\n \n- if (in->qmouse) {\n-\tqemu_remove_mouse_event_handler(in->qmouse);\n-\tin->qmouse = NULL;\n+ if (in->qkbd) {\n+ qemu_input_handler_unregister(in->qkbd);\n+ in->qkbd = NULL;\n+ }\n+ if (in->qmou) {\n+ qemu_input_handler_unregister(in->qmou);\n+ in->qmou = NULL;\n }\n- qemu_add_kbd_event_handler(NULL, NULL);\n common_unbind(&in->c);\n }\n \n", "prefixes": [ "2/3", "v4" ] }