Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/808805/?format=api
{ "id": 808805, "url": "http://patchwork.ozlabs.org/api/patches/808805/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-35-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": "<20170901153758.8628-35-armbru@redhat.com>", "list_archive_url": null, "date": "2017-09-01T15:37:45", "name": "[PULL,v2,34/47] tpm: Clean up driver registration & lookup", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "39d6cb0d777a891407b843b9242e0169d732df99", "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/20170901153758.8628-35-armbru@redhat.com/mbox/", "series": [ { "id": 1049, "url": "http://patchwork.ozlabs.org/api/series/1049/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1049", "date": "2017-09-01T15:37:14", "name": "[PULL,v2,01/47] qapi: Fix error handling code on alternate conflict", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/1049/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/808805/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/808805/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>)", "ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=armbru@redhat.com" ], "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 3xkPmK1Tw1z9t2x\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 2 Sep 2017 02:27:45 +1000 (AEST)", "from localhost ([::1]:47852 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 1dnonH-0005RM-5G\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 12:27:43 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:51972)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1dno1p-0007C7-NM\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:46 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1dno1k-0001vw-Mq\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:41 -0400", "from mx1.redhat.com ([209.132.183.28]:56084)\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 1dno1k-0001vj-Dx\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38: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 719C2C9D23;\n\tFri, 1 Sep 2017 15:38:35 +0000 (UTC)", "from blackfin.pond.sub.org (ovpn-116-75.ams2.redhat.com\n\t[10.36.116.75])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 6C8BA957AC;\n\tFri, 1 Sep 2017 15:38:09 +0000 (UTC)", "by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid A8CB61132F43; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 719C2C9D23", "From": "Markus Armbruster <armbru@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Fri, 1 Sep 2017 17:37:45 +0200", "Message-Id": "<20170901153758.8628-35-armbru@redhat.com>", "In-Reply-To": "<20170901153758.8628-1-armbru@redhat.com>", "References": "<20170901153758.8628-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.29]);\n\tFri, 01 Sep 2017 15:38:35 +0000 (UTC)", "Content-Transfer-Encoding": "quoted-printable", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]", "X-Received-From": "209.132.183.28", "Subject": "[Qemu-devel] [PULL v2 34/47] tpm: Clean up driver registration &\n\tlookup", "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": "=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>,\n\tStefan Berger <stefanb@us.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": "From: Marc-André Lureau <marcandre.lureau@redhat.com>\n\nWe have a strict separation between enum TpmType and be_drivers[]:\n\n* TpmType may have any number of members. It just happens to have one.\n\n* tpm_register_driver() uses the first empty slot in be_drivers[].\n\n If you register more than tpm_models[] has space,\n tpm_register_driver() fails. Its caller silently ignores the\n failure.\n\n If you register more than one with a given TpmType,\n tpm_display_backend_drivers() will shows all of them, but\n tpm_driver_find_by_type() and tpm_get_backend_driver() will find\n only the one one that registered first.\n\nSince we only ever register one driver, and be_drivers[] has space for\njust that one, this contraption even works.\n\nTurn be_drivers[] into a straight map from enum TpmType to driver.\nMuch simpler, and has a decent chance to actually work should we ever\nacquire additional drivers.\n\nWhile there, use qapi_enum_parse() in tpm_get_backend_driver().\n\nSigned-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>\nMessage-Id: <20170822132255.23945-8-marcandre.lureau@redhat.com>\nReviewed-by: Markus Armbruster <armbru@redhat.com>\n[Rebased, superfluous initializer dropped, commit message rewritten]\nCc: Stefan Berger <stefanb@us.ibm.com>\nSigned-off-by: Markus Armbruster <armbru@redhat.com>\nMessage-Id: <1503564371-26090-4-git-send-email-armbru@redhat.com>\n---\n include/sysemu/tpm_backend.h | 2 +-\n tpm.c | 45 +++++++++++++-------------------------------\n 2 files changed, 14 insertions(+), 33 deletions(-)", "diff": "diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h\nindex b58f52d39f..1d21c6b19b 100644\n--- a/include/sysemu/tpm_backend.h\n+++ b/include/sysemu/tpm_backend.h\n@@ -227,6 +227,6 @@ TPMBackend *qemu_find_tpm(const char *id);\n \n const TPMDriverOps *tpm_get_backend_driver(const char *type);\n int tpm_register_model(enum TpmModel model);\n-int tpm_register_driver(const TPMDriverOps *tdo);\n+void tpm_register_driver(const TPMDriverOps *tdo);\n \n #endif\ndiff --git a/tpm.c b/tpm.c\nindex 9a7c7114d3..6f39ec9192 100644\n--- a/tpm.c\n+++ b/tpm.c\n@@ -14,6 +14,7 @@\n #include \"qemu/osdep.h\"\n \n #include \"qapi/qmp/qerror.h\"\n+#include \"qapi/util.h\"\n #include \"sysemu/tpm_backend.h\"\n #include \"sysemu/tpm.h\"\n #include \"qemu/config-file.h\"\n@@ -25,11 +26,8 @@ static QLIST_HEAD(, TPMBackend) tpm_backends =\n \n \n #define TPM_MAX_MODELS 1\n-#define TPM_MAX_DRIVERS 1\n \n-static TPMDriverOps const *be_drivers[TPM_MAX_DRIVERS] = {\n- NULL,\n-};\n+static TPMDriverOps const *be_drivers[TPM_TYPE__MAX];\n \n static enum TpmModel tpm_models[TPM_MAX_MODELS] = {\n TPM_MODEL__MAX,\n@@ -63,31 +61,18 @@ static bool tpm_model_is_registered(enum TpmModel model)\n \n const TPMDriverOps *tpm_get_backend_driver(const char *type)\n {\n- int i;\n+ int i = qapi_enum_parse(TpmType_lookup, type, -1, NULL);\n \n- for (i = 0; i < TPM_MAX_DRIVERS && be_drivers[i] != NULL; i++) {\n- if (!strcmp(TpmType_lookup[be_drivers[i]->type], type)) {\n- return be_drivers[i];\n- }\n- }\n-\n- return NULL;\n+ return i >= 0 ? be_drivers[i] : NULL;\n }\n \n #ifdef CONFIG_TPM\n \n-int tpm_register_driver(const TPMDriverOps *tdo)\n+void tpm_register_driver(const TPMDriverOps *tdo)\n {\n- int i;\n+ assert(!be_drivers[tdo->type]);\n \n- for (i = 0; i < TPM_MAX_DRIVERS; i++) {\n- if (!be_drivers[i]) {\n- be_drivers[i] = tdo;\n- return 0;\n- }\n- }\n- error_report(\"Could not register TPM driver\");\n- return 1;\n+ be_drivers[tdo->type] = tdo;\n }\n \n /*\n@@ -100,9 +85,12 @@ static void tpm_display_backend_drivers(void)\n \n fprintf(stderr, \"Supported TPM types (choose only one):\\n\");\n \n- for (i = 0; i < TPM_MAX_DRIVERS && be_drivers[i] != NULL; i++) {\n+ for (i = 0; i < TPM_TYPE__MAX; i++) {\n+ if (be_drivers[i] == NULL) {\n+ continue;\n+ }\n fprintf(stderr, \"%12s %s\\n\",\n- TpmType_lookup[be_drivers[i]->type], be_drivers[i]->desc());\n+ TpmType_lookup[i], be_drivers[i]->desc());\n }\n fprintf(stderr, \"\\n\");\n }\n@@ -239,14 +227,7 @@ int tpm_config_parse(QemuOptsList *opts_list, const char *optarg)\n \n static const TPMDriverOps *tpm_driver_find_by_type(enum TpmType type)\n {\n- int i;\n-\n- for (i = 0; i < TPM_MAX_DRIVERS && be_drivers[i] != NULL; i++) {\n- if (be_drivers[i]->type == type) {\n- return be_drivers[i];\n- }\n- }\n- return NULL;\n+ return be_drivers[type];\n }\n \n static TPMInfo *qmp_query_tpm_inst(TPMBackend *drv)\n", "prefixes": [ "PULL", "v2", "34/47" ] }