Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/985229/?format=api
{ "id": 985229, "url": "http://patchwork.ozlabs.org/api/patches/985229/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20181017082702.5581-12-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-12-armbru@redhat.com>", "list_archive_url": null, "date": "2018-10-17T08:26:35", "name": "[v4,11/38] smbios: Clean up error handling in smbios_add()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "05d6401f63f2138ff6c720f10308bacd4733cb10", "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-12-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/985229/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/985229/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 42Zlxh6SHnz9s9J\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 17 Oct 2018 19:40:40 +1100 (AEDT)", "from localhost ([::1]:34563 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 1gChNe-0002SY-7b\n\tfor incoming@patchwork.ozlabs.org; Wed, 17 Oct 2018 04:40:38 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:51036)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1gChAb-00085B-KZ\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:11 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1gChAZ-00010l-9H\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:09 -0400", "from mx1.redhat.com ([209.132.183.28]:58272)\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 1gChAY-0000zv-Tg\n\tfor qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:27:07 -0400", "from smtp.corp.redhat.com\n\t(int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23])\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 2035A307D866\n\tfor <qemu-devel@nongnu.org>; Wed, 17 Oct 2018 08:27:06 +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 BA78D43FFE;\n\tWed, 17 Oct 2018 08:27:05 +0000 (UTC)", "by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 3D0F81132988; 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:35 +0200", "Message-Id": "<20181017082702.5581-12-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.84 on 10.5.11.23", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.48]);\n\tWed, 17 Oct 2018 08:27:06 +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 11/38] smbios: Clean up error handling in\n\tsmbios_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": "Paolo Bonzini <pbonzini@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": "Calling error_report() in a function that takes an Error ** argument\nis suspicious. smbios_entry_add() does that, and then exit()s. It\nalso passes &error_fatal to qemu_opts_validate(). Both wrong, but\ncurrently harmless, as its only caller passes &error_fatal. Messed up\nin commit 1007a37e208. Clean it up.\n\nCc: Paolo Bonzini <pbonzini@redhat.com>\nSigned-off-by: Markus Armbruster <armbru@redhat.com>\nReviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>\nAcked-by: Paolo Bonzini <pbonzini@redhat.com>\n---\n hw/smbios/smbios.c | 90 +++++++++++++++++++++++++++++++---------------\n 1 file changed, 62 insertions(+), 28 deletions(-)", "diff": "diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c\nindex a27e54b2fa..920939454e 100644\n--- a/hw/smbios/smbios.c\n+++ b/hw/smbios/smbios.c\n@@ -950,6 +950,7 @@ static void save_opt_list(size_t *ndest, const char ***dest,\n \n void smbios_entry_add(QemuOpts *opts, Error **errp)\n {\n+ Error *err = NULL;\n const char *val;\n \n assert(!smbios_immutable);\n@@ -960,12 +961,16 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)\n int size;\n struct smbios_table *table; /* legacy mode only */\n \n- qemu_opts_validate(opts, qemu_smbios_file_opts, &error_fatal);\n+ qemu_opts_validate(opts, qemu_smbios_file_opts, &err);\n+ if (err) {\n+ error_propagate(errp, err);\n+ return;\n+ }\n \n size = get_image_size(val);\n if (size == -1 || size < sizeof(struct smbios_structure_header)) {\n- error_report(\"Cannot read SMBIOS file %s\", val);\n- exit(1);\n+ error_setg(errp, \"Cannot read SMBIOS file %s\", val);\n+ return;\n }\n \n /*\n@@ -978,14 +983,15 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)\n smbios_tables_len);\n \n if (load_image(val, (uint8_t *)header) != size) {\n- error_report(\"Failed to load SMBIOS file %s\", val);\n- exit(1);\n+ error_setg(errp, \"Failed to load SMBIOS file %s\", val);\n+ return;\n }\n \n if (test_bit(header->type, have_fields_bitmap)) {\n- error_report(\"can't load type %d struct, fields already specified!\",\n- header->type);\n- exit(1);\n+ error_setg(errp,\n+ \"can't load type %d struct, fields already specified!\",\n+ header->type);\n+ return;\n }\n set_bit(header->type, have_binfile_bitmap);\n \n@@ -1030,19 +1036,23 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)\n unsigned long type = strtoul(val, NULL, 0);\n \n if (type > SMBIOS_MAX_TYPE) {\n- error_report(\"out of range!\");\n- exit(1);\n+ error_setg(errp, \"out of range!\");\n+ return;\n }\n \n if (test_bit(type, have_binfile_bitmap)) {\n- error_report(\"can't add fields, binary file already loaded!\");\n- exit(1);\n+ error_setg(errp, \"can't add fields, binary file already loaded!\");\n+ return;\n }\n set_bit(type, have_fields_bitmap);\n \n switch (type) {\n case 0:\n- qemu_opts_validate(opts, qemu_smbios_type0_opts, &error_fatal);\n+ qemu_opts_validate(opts, qemu_smbios_type0_opts, &err);\n+ if (err) {\n+ error_propagate(errp, err);\n+ return;\n+ }\n save_opt(&type0.vendor, opts, \"vendor\");\n save_opt(&type0.version, opts, \"version\");\n save_opt(&type0.date, opts, \"date\");\n@@ -1051,14 +1061,18 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)\n val = qemu_opt_get(opts, \"release\");\n if (val) {\n if (sscanf(val, \"%hhu.%hhu\", &type0.major, &type0.minor) != 2) {\n- error_report(\"Invalid release\");\n- exit(1);\n+ error_setg(errp, \"Invalid release\");\n+ return;\n }\n type0.have_major_minor = true;\n }\n return;\n case 1:\n- qemu_opts_validate(opts, qemu_smbios_type1_opts, &error_fatal);\n+ qemu_opts_validate(opts, qemu_smbios_type1_opts, &err);\n+ if (err) {\n+ error_propagate(errp, err);\n+ return;\n+ }\n save_opt(&type1.manufacturer, opts, \"manufacturer\");\n save_opt(&type1.product, opts, \"product\");\n save_opt(&type1.version, opts, \"version\");\n@@ -1069,14 +1083,18 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)\n val = qemu_opt_get(opts, \"uuid\");\n if (val) {\n if (qemu_uuid_parse(val, &qemu_uuid) != 0) {\n- error_report(\"Invalid UUID\");\n- exit(1);\n+ error_setg(errp, \"Invalid UUID\");\n+ return;\n }\n qemu_uuid_set = true;\n }\n return;\n case 2:\n- qemu_opts_validate(opts, qemu_smbios_type2_opts, &error_fatal);\n+ qemu_opts_validate(opts, qemu_smbios_type2_opts, &err);\n+ if (err) {\n+ error_propagate(errp, err);\n+ return;\n+ }\n save_opt(&type2.manufacturer, opts, \"manufacturer\");\n save_opt(&type2.product, opts, \"product\");\n save_opt(&type2.version, opts, \"version\");\n@@ -1085,7 +1103,11 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)\n save_opt(&type2.location, opts, \"location\");\n return;\n case 3:\n- qemu_opts_validate(opts, qemu_smbios_type3_opts, &error_fatal);\n+ qemu_opts_validate(opts, qemu_smbios_type3_opts, &err);\n+ if (err) {\n+ error_propagate(errp, err);\n+ return;\n+ }\n save_opt(&type3.manufacturer, opts, \"manufacturer\");\n save_opt(&type3.version, opts, \"version\");\n save_opt(&type3.serial, opts, \"serial\");\n@@ -1093,7 +1115,11 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)\n save_opt(&type3.sku, opts, \"sku\");\n return;\n case 4:\n- qemu_opts_validate(opts, qemu_smbios_type4_opts, &error_fatal);\n+ qemu_opts_validate(opts, qemu_smbios_type4_opts, &err);\n+ if (err) {\n+ error_propagate(errp, err);\n+ return;\n+ }\n save_opt(&type4.sock_pfx, opts, \"sock_pfx\");\n save_opt(&type4.manufacturer, opts, \"manufacturer\");\n save_opt(&type4.version, opts, \"version\");\n@@ -1102,11 +1128,19 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)\n save_opt(&type4.part, opts, \"part\");\n return;\n case 11:\n- qemu_opts_validate(opts, qemu_smbios_type11_opts, &error_fatal);\n+ qemu_opts_validate(opts, qemu_smbios_type11_opts, &err);\n+ if (err) {\n+ error_propagate(errp, err);\n+ return;\n+ }\n save_opt_list(&type11.nvalues, &type11.values, opts, \"value\");\n return;\n case 17:\n- qemu_opts_validate(opts, qemu_smbios_type17_opts, &error_fatal);\n+ qemu_opts_validate(opts, qemu_smbios_type17_opts, &err);\n+ if (err) {\n+ error_propagate(errp, err);\n+ return;\n+ }\n save_opt(&type17.loc_pfx, opts, \"loc_pfx\");\n save_opt(&type17.bank, opts, \"bank\");\n save_opt(&type17.manufacturer, opts, \"manufacturer\");\n@@ -1116,12 +1150,12 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)\n type17.speed = qemu_opt_get_number(opts, \"speed\", 0);\n return;\n default:\n- error_report(\"Don't know how to build fields for SMBIOS type %ld\",\n- type);\n- exit(1);\n+ error_setg(errp,\n+ \"Don't know how to build fields for SMBIOS type %ld\",\n+ type);\n+ return;\n }\n }\n \n- error_report(\"Must specify type= or file=\");\n- exit(1);\n+ error_setg(errp, \"Must specify type= or file=\");\n }\n", "prefixes": [ "v4", "11/38" ] }