{"id":808744,"url":"http://patchwork.ozlabs.org/api/patches/808744/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-36-armbru@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","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-36-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:46","name":"[PULL,v2,35/47] tpm: Clean up model registration & lookup","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7af55d85c539717085490e454058be69455445fc","submitter":{"id":2645,"url":"http://patchwork.ozlabs.org/api/people/2645/?format=json","name":"Markus Armbruster","email":"armbru@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-36-armbru@redhat.com/mbox/","series":[{"id":1049,"url":"http://patchwork.ozlabs.org/api/series/1049/?format=json","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/808744/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808744/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.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 3xkNxW1M68z9t3P\n\tfor ;\n\tSat, 2 Sep 2017 01:50:39 +1000 (AEST)","from localhost ([::1]:46539 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnoDN-0002Y1-8X\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 11:50:37 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51688)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1S-0006iM-K2\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:27 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dno1M-0001jT-HW\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:18 -0400","from mx1.redhat.com ([209.132.183.28]:56234)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dno1M-0001i8-9n\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:12 -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 0CB63356F2;\n\tFri, 1 Sep 2017 15:38:11 +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 6982117C70;\n\tFri, 1 Sep 2017 15:38:10 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid AA5271132F44; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0CB63356F2","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:46 +0200","Message-Id":"<20170901153758.8628-36-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.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tFri, 01 Sep 2017 15:38:11 +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 35/47] tpm: Clean up model registration &\n\tlookup","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Stefan Berger ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"We have a strict separation between enum TpmModel and tpm_models[]:\n\n* TpmModel may have any number of members. It just happens to have one.\n\n* tpm_register_model() uses the first empty slot in tpm_models[].\n\n If you register more than tpm_models[] has space,\n tpn_register_model() fails. Its caller silently ignores the\n failure.\n\n Register the same TpmModel more than once has no effect other than\n wasting tpm_models[] slots: tpm_model_is_registered() is happy with\n the first one it finds.\n\nSince we only ever register one model, and tpm_models[] has space for\njust that one, this contraption even works.\n\nTurn tpm_models[] into a straight map from enum TpmType to bool. Much\nsimpler.\n\nCc: Stefan Berger \nSigned-off-by: Markus Armbruster \nMessage-Id: <1503564371-26090-5-git-send-email-armbru@redhat.com>\nReviewed-by: Marc-André Lureau \n[Commit message typo fixed]\n---\n include/sysemu/tpm_backend.h | 2 +-\n tpm.c | 37 +++++--------------------------------\n 2 files changed, 6 insertions(+), 33 deletions(-)","diff":"diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h\nindex 1d21c6b19b..b0a9731aee 100644\n--- a/include/sysemu/tpm_backend.h\n+++ b/include/sysemu/tpm_backend.h\n@@ -226,7 +226,7 @@ TPMVersion tpm_backend_get_tpm_version(TPMBackend *s);\n 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+void tpm_register_model(enum TpmModel model);\n void tpm_register_driver(const TPMDriverOps *tdo);\n \n #endif\ndiff --git a/tpm.c b/tpm.c\nindex 6f39ec9192..7635fc779b 100644\n--- a/tpm.c\n+++ b/tpm.c\n@@ -24,39 +24,12 @@\n static QLIST_HEAD(, TPMBackend) tpm_backends =\n QLIST_HEAD_INITIALIZER(tpm_backends);\n \n-\n-#define TPM_MAX_MODELS 1\n-\n static TPMDriverOps const *be_drivers[TPM_TYPE__MAX];\n+static bool tpm_models[TPM_MODEL__MAX];\n \n-static enum TpmModel tpm_models[TPM_MAX_MODELS] = {\n- TPM_MODEL__MAX,\n-};\n-\n-int tpm_register_model(enum TpmModel model)\n+void tpm_register_model(enum TpmModel model)\n {\n- int i;\n-\n- for (i = 0; i < TPM_MAX_MODELS; i++) {\n- if (tpm_models[i] == TPM_MODEL__MAX) {\n- tpm_models[i] = model;\n- return 0;\n- }\n- }\n- error_report(\"Could not register TPM model\");\n- return 1;\n-}\n-\n-static bool tpm_model_is_registered(enum TpmModel model)\n-{\n- int i;\n-\n- for (i = 0; i < TPM_MAX_MODELS; i++) {\n- if (tpm_models[i] == model) {\n- return true;\n- }\n- }\n- return false;\n+ tpm_models[model] = true;\n }\n \n const TPMDriverOps *tpm_get_backend_driver(const char *type)\n@@ -270,7 +243,7 @@ TPMInfoList *qmp_query_tpm(Error **errp)\n TPMInfoList *info, *head = NULL, *cur_item = NULL;\n \n QLIST_FOREACH(drv, &tpm_backends, list) {\n- if (!tpm_model_is_registered(drv->fe_model)) {\n+ if (!tpm_models[drv->fe_model]) {\n continue;\n }\n info = g_new0(TPMInfoList, 1);\n@@ -317,7 +290,7 @@ TpmModelList *qmp_query_tpm_models(Error **errp)\n TpmModelList *head = NULL, *prev = NULL, *cur_item;\n \n for (i = 0; i < TPM_MODEL__MAX; i++) {\n- if (!tpm_model_is_registered(i)) {\n+ if (!tpm_models[i]) {\n continue;\n }\n cur_item = g_new0(TpmModelList, 1);\n","prefixes":["PULL","v2","35/47"]}