Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/985240/?format=api
{ "id": 985240, "url": "http://patchwork.ozlabs.org/api/patches/985240/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20181017082702.5581-30-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-30-armbru@redhat.com>", "list_archive_url": null, "date": "2018-10-17T08:26:53", "name": "[v4,29/38] tpm: Clean up error reporting in tpm_init_tpmdev()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "fe52fc592bfa7a0b768443d85bb325be8e222f30", "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-30-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/985240/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/985240/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 42Zm853N4Gz9s55\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 17 Oct 2018 19:49:41 +1100 (AEDT)", "from localhost ([::1]:34607 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 1gChWM-0001WV-Lr\n\tfor incoming@patchwork.ozlabs.org; Wed, 17 Oct 2018 04:49:38 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:51292)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1gChAv-0008Py-AY\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:30 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1gChAo-0001Wb-2R\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:23 -0400", "from mx1.redhat.com ([209.132.183.28]:10904)\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 1gChAe-00016c-66\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:14 -0400", "from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 38277120DF;\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 CC7C280FEB;\n\tWed, 17 Oct 2018 08:27:09 +0000 (UTC)", "by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 7D2A411564B6; 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:53 +0200", "Message-Id": "<20181017082702.5581-30-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.14", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tWed, 17 Oct 2018 08:27:10 +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 29/38] tpm: Clean up error reporting in\n\ttpm_init_tpmdev()", "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": "Stefan Berger <stefanb@linux.vnet.ibm.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": "Calling error_report() in a function that takes an Error ** argument\nis suspicious. tpm_init_tpmdev() does that, and then fails without\nsetting an error. Its caller main(), via tpm_init() and\nqemu_opts_foreach(), is fine with it, but clean it up anyway.\n\nCc: Stefan Berger <stefanb@linux.vnet.ibm.com>\nSigned-off-by: Markus Armbruster <armbru@redhat.com>\nReviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>\nReviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>\nReviewed-by: Stefan Berger <stefanb@linux.ibm.com>\n---\n include/sysemu/tpm.h | 2 +-\n stubs/tpm.c | 3 +--\n tpm.c | 22 +++++++++-------------\n vl.c | 4 +---\n 4 files changed, 12 insertions(+), 19 deletions(-)", "diff": "diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h\nindex 9ae1ab6da3..17a97ed77a 100644\n--- a/include/sysemu/tpm.h\n+++ b/include/sysemu/tpm.h\n@@ -16,7 +16,7 @@\n #include \"qom/object.h\"\n \n int tpm_config_parse(QemuOptsList *opts_list, const char *optarg);\n-int tpm_init(void);\n+void tpm_init(void);\n void tpm_cleanup(void);\n \n typedef enum TPMVersion {\ndiff --git a/stubs/tpm.c b/stubs/tpm.c\nindex 6729bc8517..80939cd3db 100644\n--- a/stubs/tpm.c\n+++ b/stubs/tpm.c\n@@ -9,9 +9,8 @@\n #include \"qapi/qapi-commands-tpm.h\"\n #include \"sysemu/tpm.h\"\n \n-int tpm_init(void)\n+void tpm_init(void)\n {\n- return 0;\n }\n \n void tpm_cleanup(void)\ndiff --git a/tpm.c b/tpm.c\nindex 93031723ad..9c9e20bbb7 100644\n--- a/tpm.c\n+++ b/tpm.c\n@@ -89,19 +89,19 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp)\n int i;\n \n if (!QLIST_EMPTY(&tpm_backends)) {\n- error_report(\"Only one TPM is allowed.\");\n+ error_setg(errp, \"Only one TPM is allowed.\");\n return 1;\n }\n \n id = qemu_opts_id(opts);\n if (id == NULL) {\n- error_report(QERR_MISSING_PARAMETER, \"id\");\n+ error_setg(errp, QERR_MISSING_PARAMETER, \"id\");\n return 1;\n }\n \n value = qemu_opt_get(opts, \"type\");\n if (!value) {\n- error_report(QERR_MISSING_PARAMETER, \"type\");\n+ error_setg(errp, QERR_MISSING_PARAMETER, \"type\");\n tpm_display_backend_drivers();\n return 1;\n }\n@@ -109,8 +109,8 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp)\n i = qapi_enum_parse(&TpmType_lookup, value, -1, NULL);\n be = i >= 0 ? tpm_be_find_by_type(i) : NULL;\n if (be == NULL) {\n- error_report(QERR_INVALID_PARAMETER_VALUE,\n- \"type\", \"a TPM backend type\");\n+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, \"type\",\n+ \"a TPM backend type\");\n tpm_display_backend_drivers();\n return 1;\n }\n@@ -118,7 +118,7 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp)\n /* validate backend specific opts */\n qemu_opts_validate(opts, be->opts, &local_err);\n if (local_err) {\n- error_report_err(local_err);\n+ error_propagate(errp, local_err);\n return 1;\n }\n \n@@ -151,14 +151,10 @@ void tpm_cleanup(void)\n * Initialize the TPM. Process the tpmdev command line options describing the\n * TPM backend.\n */\n-int tpm_init(void)\n+void tpm_init(void)\n {\n- if (qemu_opts_foreach(qemu_find_opts(\"tpmdev\"),\n- tpm_init_tpmdev, NULL, NULL)) {\n- return -1;\n- }\n-\n- return 0;\n+ qemu_opts_foreach(qemu_find_opts(\"tpmdev\"),\n+ tpm_init_tpmdev, NULL, &error_fatal);\n }\n \n /*\ndiff --git a/vl.c b/vl.c\nindex 8e0006d49c..abfe991ed6 100644\n--- a/vl.c\n+++ b/vl.c\n@@ -4359,9 +4359,7 @@ int main(int argc, char **argv, char **envp)\n user_creatable_add_opts_foreach,\n object_create_delayed, &error_fatal);\n \n- if (tpm_init() < 0) {\n- exit(1);\n- }\n+ tpm_init();\n \n /* init the bluetooth world */\n if (foreach_device_config(DEV_BT, bt_parse))\n", "prefixes": [ "v4", "29/38" ] }