Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/985236/?format=api
{ "id": 985236, "url": "http://patchwork.ozlabs.org/api/patches/985236/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20181017082702.5581-32-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-32-armbru@redhat.com>", "list_archive_url": null, "date": "2018-10-17T08:26:55", "name": "[v4,31/38] fsdev: Clean up error reporting in qemu_fsdev_add()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "56c6d99f77938a097480d90c0459c5dbdb9c8d03", "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-32-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/985236/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/985236/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 42Zm4X4BLNz9sCW\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 17 Oct 2018 19:46:36 +1100 (AEDT)", "from localhost ([::1]:34598 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 1gChTN-0007dD-Iw\n\tfor incoming@patchwork.ozlabs.org; Wed, 17 Oct 2018 04:46:33 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:51342)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1gChAz-0000BH-8I\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:34 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1gChAw-0001ni-Qd\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:31 -0400", "from mx1.redhat.com ([209.132.183.28]:44568)\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 1gChAr-00016j-6R\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:26 -0400", "from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 497543082130;\n\tWed, 17 Oct 2018 08:27:10 +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 DAEE45F7C6;\n\tWed, 17 Oct 2018 08:27:09 +0000 (UTC)", "by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 84FAE11565AA; 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:55 +0200", "Message-Id": "<20181017082702.5581-32-armbru@redhat.com>", "In-Reply-To": "<20181017082702.5581-1-armbru@redhat.com>", "References": "<20181017082702.5581-1-armbru@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.13", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.42]);\n\tWed, 17 Oct 2018 08:27:10 +0000 (UTC)", "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 31/38] fsdev: Clean up error reporting in\n\tqemu_fsdev_add()", "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": "Greg Kurz <groug@kaod.org>", "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": "Calling error_report() from within a function that takes an Error **\nargument is suspicious. qemu_fsdev_add() does that, and its caller\nfsdev_init_func() then fails without setting an error. Its caller\nmain(), via qemu_opts_foreach(), is fine with it, but clean it up\nanyway.\n\nCc: Greg Kurz <groug@kaod.org>\nSigned-off-by: Markus Armbruster <armbru@redhat.com>\nAcked-by: Greg Kurz <groug@kaod.org>\n---\n fsdev/qemu-fsdev-dummy.c | 2 +-\n fsdev/qemu-fsdev.c | 12 +++++-------\n fsdev/qemu-fsdev.h | 2 +-\n hw/9pfs/xen-9p-backend.c | 7 ++++++-\n vl.c | 8 +++-----\n 5 files changed, 16 insertions(+), 15 deletions(-)", "diff": "diff --git a/fsdev/qemu-fsdev-dummy.c b/fsdev/qemu-fsdev-dummy.c\nindex 6dc0fbc4c4..489cd29081 100644\n--- a/fsdev/qemu-fsdev-dummy.c\n+++ b/fsdev/qemu-fsdev-dummy.c\n@@ -15,7 +15,7 @@\n #include \"qemu/config-file.h\"\n #include \"qemu/module.h\"\n \n-int qemu_fsdev_add(QemuOpts *opts)\n+int qemu_fsdev_add(QemuOpts *opts, Error **errp)\n {\n return 0;\n }\ndiff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c\nindex 8a4afbffbd..7a3b87cc9e 100644\n--- a/fsdev/qemu-fsdev.c\n+++ b/fsdev/qemu-fsdev.c\n@@ -30,7 +30,7 @@ static FsDriverTable FsDrivers[] = {\n { .name = \"proxy\", .ops = &proxy_ops},\n };\n \n-int qemu_fsdev_add(QemuOpts *opts)\n+int qemu_fsdev_add(QemuOpts *opts, Error **errp)\n {\n int i;\n struct FsDriverListEntry *fsle;\n@@ -38,10 +38,9 @@ int qemu_fsdev_add(QemuOpts *opts)\n const char *fsdriver = qemu_opt_get(opts, \"fsdriver\");\n const char *writeout = qemu_opt_get(opts, \"writeout\");\n bool ro = qemu_opt_get_bool(opts, \"readonly\", 0);\n- Error *local_err = NULL;\n \n if (!fsdev_id) {\n- error_report(\"fsdev: No id specified\");\n+ error_setg(errp, \"fsdev: No id specified\");\n return -1;\n }\n \n@@ -53,11 +52,11 @@ int qemu_fsdev_add(QemuOpts *opts)\n }\n \n if (i == ARRAY_SIZE(FsDrivers)) {\n- error_report(\"fsdev: fsdriver %s not found\", fsdriver);\n+ error_setg(errp, \"fsdev: fsdriver %s not found\", fsdriver);\n return -1;\n }\n } else {\n- error_report(\"fsdev: No fsdriver specified\");\n+ error_setg(errp, \"fsdev: No fsdriver specified\");\n return -1;\n }\n \n@@ -76,8 +75,7 @@ int qemu_fsdev_add(QemuOpts *opts)\n }\n \n if (fsle->fse.ops->parse_opts) {\n- if (fsle->fse.ops->parse_opts(opts, &fsle->fse, &local_err)) {\n- error_report_err(local_err);\n+ if (fsle->fse.ops->parse_opts(opts, &fsle->fse, errp)) {\n g_free(fsle->fse.fsdev_id);\n g_free(fsle);\n return -1;\ndiff --git a/fsdev/qemu-fsdev.h b/fsdev/qemu-fsdev.h\nindex 65e4b1cfab..d9716b4144 100644\n--- a/fsdev/qemu-fsdev.h\n+++ b/fsdev/qemu-fsdev.h\n@@ -38,7 +38,7 @@ typedef struct FsDriverListEntry {\n QTAILQ_ENTRY(FsDriverListEntry) next;\n } FsDriverListEntry;\n \n-int qemu_fsdev_add(QemuOpts *opts);\n+int qemu_fsdev_add(QemuOpts *opts, Error **errp);\n FsDriverEntry *get_fsdev_fsentry(char *id);\n extern FileOperations local_ops;\n extern FileOperations handle_ops;\ndiff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c\nindex 6026780f95..3f54a21c76 100644\n--- a/hw/9pfs/xen-9p-backend.c\n+++ b/hw/9pfs/xen-9p-backend.c\n@@ -14,6 +14,7 @@\n #include \"hw/9pfs/9p.h\"\n #include \"hw/xen/xen_backend.h\"\n #include \"hw/9pfs/xen-9pfs.h\"\n+#include \"qapi/error.h\"\n #include \"qemu/config-file.h\"\n #include \"qemu/option.h\"\n #include \"fsdev/qemu-fsdev.h\"\n@@ -355,6 +356,7 @@ static int xen_9pfs_free(struct XenDevice *xendev)\n \n static int xen_9pfs_connect(struct XenDevice *xendev)\n {\n+ Error *err = NULL;\n int i;\n Xen9pfsDev *xen_9pdev = container_of(xendev, Xen9pfsDev, xendev);\n V9fsState *s = &xen_9pdev->state;\n@@ -452,7 +454,10 @@ static int xen_9pfs_connect(struct XenDevice *xendev)\n qemu_opt_set(fsdev, \"path\", xen_9pdev->path, NULL);\n qemu_opt_set(fsdev, \"security_model\", xen_9pdev->security_model, NULL);\n qemu_opts_set_id(fsdev, s->fsconf.fsdev_id);\n- qemu_fsdev_add(fsdev);\n+ qemu_fsdev_add(fsdev, &err);\n+ if (err) {\n+ error_report_err(err);\n+ }\n v9fs_device_realize_common(s, &xen_9p_transport, NULL);\n \n return 0;\ndiff --git a/vl.c b/vl.c\nindex abfe991ed6..2a8ef05aef 100644\n--- a/vl.c\n+++ b/vl.c\n@@ -2249,7 +2249,7 @@ static int chardev_init_func(void *opaque, QemuOpts *opts, Error **errp)\n #ifdef CONFIG_VIRTFS\n static int fsdev_init_func(void *opaque, QemuOpts *opts, Error **errp)\n {\n- return qemu_fsdev_add(opts);\n+ return qemu_fsdev_add(opts, errp);\n }\n #endif\n \n@@ -4235,10 +4235,8 @@ int main(int argc, char **argv, char **envp)\n chardev_init_func, NULL, &error_fatal);\n \n #ifdef CONFIG_VIRTFS\n- if (qemu_opts_foreach(qemu_find_opts(\"fsdev\"),\n- fsdev_init_func, NULL, NULL)) {\n- exit(1);\n- }\n+ qemu_opts_foreach(qemu_find_opts(\"fsdev\"),\n+ fsdev_init_func, NULL, &error_fatal);\n #endif\n \n if (qemu_opts_foreach(qemu_find_opts(\"device\"),\n", "prefixes": [ "v4", "31/38" ] }