Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/985239/?format=api
{ "id": 985239, "url": "http://patchwork.ozlabs.org/api/patches/985239/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20181017082702.5581-27-armbru@redhat.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": "<20181017082702.5581-27-armbru@redhat.com>", "list_archive_url": null, "date": "2018-10-17T08:26:50", "name": "[v4,26/38] ui: Convert vnc_display_init(), init_keyboard_layout() to Error", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "d011402ad8b653ff8332207fa78f19698aca117d", "submitter": { "id": 2645, "url": "http://patchwork.ozlabs.org/api/people/2645/?format=api", "name": "Markus Armbruster", "email": "armbru@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20181017082702.5581-27-armbru@redhat.com/mbox/", "series": [ { "id": 71196, "url": "http://patchwork.ozlabs.org/api/series/71196/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=71196", "date": "2018-10-17T08:26:36", "name": "Replace some unwise uses of error_report() & friends", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/71196/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/985239/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/985239/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>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=redhat.com" ], "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 42Zm7T0P7lz9s9J\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 17 Oct 2018 19:49:09 +1100 (AEDT)", "from localhost ([::1]:34605 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 1gChVq-00012z-E7\n\tfor incoming@patchwork.ozlabs.org; Wed, 17 Oct 2018 04:49:06 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:51474)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1gChB4-0000Ky-Uz\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:40 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1gChB2-0001zP-O7\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:38 -0400", "from mx1.redhat.com ([209.132.183.28]:54790)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <armbru@redhat.com>) id 1gChB2-0001GQ-8V\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:36 -0400", "from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 7B6EB30020A0;\n\tWed, 17 Oct 2018 08:27:14 +0000 (UTC)", "from blackfin.pond.sub.org (ovpn-116-50.ams2.redhat.com\n\t[10.36.116.50])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 3383478981;\n\tWed, 17 Oct 2018 08:27:09 +0000 (UTC)", "by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 728CC11562E9; Wed, 17 Oct 2018 10:27:02 +0200 (CEST)" ], "From": "Markus Armbruster <armbru@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Wed, 17 Oct 2018 10:26:50 +0200", "Message-Id": "<20181017082702.5581-27-armbru@redhat.com>", "In-Reply-To": "<20181017082702.5581-1-armbru@redhat.com>", "References": "<20181017082702.5581-1-armbru@redhat.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.11", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.44]);\n\tWed, 17 Oct 2018 08:27:14 +0000 (UTC)", "Content-Transfer-Encoding": "quoted-printable", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]", "X-Received-From": "209.132.183.28", "Subject": "[Qemu-devel] [PATCH v4 26/38] ui: Convert vnc_display_init(),\n\tinit_keyboard_layout() to Error", "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": "Fei Li <fli@suse.com>, Gerd Hoffmann <kraxel@redhat.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": "From: Fei Li <fli@suse.com>\n\nSigned-off-by: Fei Li <fli@suse.com>\nCc: Gerd Hoffmann <kraxel@redhat.com>\nSigned-off-by: Markus Armbruster <armbru@redhat.com>\nReviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>\n---\n include/ui/console.h | 2 +-\n ui/curses.c | 6 +++---\n ui/keymaps.c | 11 ++++++-----\n ui/keymaps.h | 2 +-\n ui/sdl.c | 6 +++---\n ui/vnc.c | 15 ++++++++++-----\n 6 files changed, 24 insertions(+), 18 deletions(-)", "diff": "diff --git a/include/ui/console.h b/include/ui/console.h\nindex fb969caf70..c17803c530 100644\n--- a/include/ui/console.h\n+++ b/include/ui/console.h\n@@ -453,7 +453,7 @@ void qemu_display_early_init(DisplayOptions *opts);\n void qemu_display_init(DisplayState *ds, DisplayOptions *opts);\n \n /* vnc.c */\n-void vnc_display_init(const char *id);\n+void vnc_display_init(const char *id, Error **errp);\n void vnc_display_open(const char *id, Error **errp);\n void vnc_display_add_client(const char *id, int csock, bool skipauth);\n int vnc_display_password(const char *id, const char *password);\ndiff --git a/ui/curses.c b/ui/curses.c\nindex 59d819fd4d..f4e7a12f74 100644\n--- a/ui/curses.c\n+++ b/ui/curses.c\n@@ -28,6 +28,7 @@\n #include <termios.h>\n #endif\n \n+#include \"qapi/error.h\"\n #include \"qemu-common.h\"\n #include \"ui/console.h\"\n #include \"ui/input.h\"\n@@ -421,9 +422,8 @@ static void curses_keyboard_setup(void)\n keyboard_layout = \"en-us\";\n #endif\n if(keyboard_layout) {\n- kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout);\n- if (!kbd_layout)\n- exit(1);\n+ kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout,\n+ &error_fatal);\n }\n }\n \ndiff --git a/ui/keymaps.c b/ui/keymaps.c\nindex b05fb028dc..085889b555 100644\n--- a/ui/keymaps.c\n+++ b/ui/keymaps.c\n@@ -27,6 +27,7 @@\n #include \"sysemu/sysemu.h\"\n #include \"trace.h\"\n #include \"qemu/error-report.h\"\n+#include \"qapi/error.h\"\n \n struct keysym2code {\n uint32_t count;\n@@ -81,7 +82,7 @@ static void add_keysym(char *line, int keysym, int keycode, kbd_layout_t *k)\n \n static int parse_keyboard_layout(kbd_layout_t *k,\n const name2keysym_t *table,\n- const char *language)\n+ const char *language, Error **errp)\n {\n int ret;\n FILE *f;\n@@ -95,7 +96,7 @@ static int parse_keyboard_layout(kbd_layout_t *k,\n f = filename ? fopen(filename, \"r\") : NULL;\n g_free(filename);\n if (!f) {\n- fprintf(stderr, \"Could not read keymap file: '%s'\\n\", language);\n+ error_setg(errp, \"could not read keymap file: '%s'\", language);\n return -1;\n }\n \n@@ -114,7 +115,7 @@ static int parse_keyboard_layout(kbd_layout_t *k,\n continue;\n }\n if (!strncmp(line, \"include \", 8)) {\n- if (parse_keyboard_layout(k, table, line + 8) < 0) {\n+ if (parse_keyboard_layout(k, table, line + 8, errp) < 0) {\n ret = -1;\n goto out;\n }\n@@ -172,13 +173,13 @@ out:\n \n \n kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,\n- const char *language)\n+ const char *language, Error **errp)\n {\n kbd_layout_t *k;\n \n k = g_new0(kbd_layout_t, 1);\n k->hash = g_hash_table_new(NULL, NULL);\n- if (parse_keyboard_layout(k, table, language) < 0) {\n+ if (parse_keyboard_layout(k, table, language, errp) < 0) {\n g_hash_table_unref(k->hash);\n g_free(k);\n return NULL;\ndiff --git a/ui/keymaps.h b/ui/keymaps.h\nindex 0693588225..98213a4191 100644\n--- a/ui/keymaps.h\n+++ b/ui/keymaps.h\n@@ -53,7 +53,7 @@ typedef struct {\n typedef struct kbd_layout_t kbd_layout_t;\n \n kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,\n- const char *language);\n+ const char *language, Error **errp);\n int keysym2scancode(kbd_layout_t *k, int keysym,\n bool shift, bool altgr, bool ctrl);\n int keycode_is_keypad(kbd_layout_t *k, int keycode);\ndiff --git a/ui/sdl.c b/ui/sdl.c\nindex a5fd503c25..190b16f575 100644\n--- a/ui/sdl.c\n+++ b/ui/sdl.c\n@@ -29,6 +29,7 @@\n #include <SDL.h>\n #include <SDL_syswm.h>\n \n+#include \"qapi/error.h\"\n #include \"qemu-common.h\"\n #include \"qemu/cutils.h\"\n #include \"ui/console.h\"\n@@ -917,9 +918,8 @@ static void sdl1_display_init(DisplayState *ds, DisplayOptions *o)\n keyboard_layout = \"en-us\";\n #endif\n if(keyboard_layout) {\n- kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout);\n- if (!kbd_layout)\n- exit(1);\n+ kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout,\n+ &error_fatal);\n }\n \n g_printerr(\"Running QEMU with SDL 1.2 is deprecated, and will be removed\\n\"\ndiff --git a/ui/vnc.c b/ui/vnc.c\nindex cf221c83cc..98e3d3b1d8 100644\n--- a/ui/vnc.c\n+++ b/ui/vnc.c\n@@ -3205,7 +3205,7 @@ static const DisplayChangeListenerOps dcl_ops = {\n .dpy_cursor_define = vnc_dpy_cursor_define,\n };\n \n-void vnc_display_init(const char *id)\n+void vnc_display_init(const char *id, Error **errp)\n {\n VncDisplay *vd;\n \n@@ -3222,13 +3222,14 @@ void vnc_display_init(const char *id)\n \n if (keyboard_layout) {\n trace_vnc_key_map_init(keyboard_layout);\n- vd->kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout);\n+ vd->kbd_layout = init_keyboard_layout(name2keysym,\n+ keyboard_layout, errp);\n } else {\n- vd->kbd_layout = init_keyboard_layout(name2keysym, \"en-us\");\n+ vd->kbd_layout = init_keyboard_layout(name2keysym, \"en-us\", errp);\n }\n \n if (!vd->kbd_layout) {\n- exit(1);\n+ return;\n }\n \n vd->share_policy = VNC_SHARE_POLICY_ALLOW_EXCLUSIVE;\n@@ -4079,7 +4080,11 @@ int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp)\n char *id = (char *)qemu_opts_id(opts);\n \n assert(id);\n- vnc_display_init(id);\n+ vnc_display_init(id, &local_err);\n+ if (local_err) {\n+ error_report_err(local_err);\n+ exit(1);\n+ }\n vnc_display_open(id, &local_err);\n if (local_err != NULL) {\n error_reportf_err(local_err, \"Failed to start VNC server: \");\n", "prefixes": [ "v4", "26/38" ] }