{"id":808737,"url":"http://patchwork.ozlabs.org/api/patches/808737/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-27-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-27-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:37","name":"[PULL,v2,26/47] qapi-schema: Collect TPM stuff in qapi/tpm.json","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"d79ecc2fe26125f44f7d9af1cd3d7c8482a97b93","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-27-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/808737/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808737/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-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.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 3xkNr64ZSsz9t3P\n\tfor ;\n\tSat, 2 Sep 2017 01:45:58 +1000 (AEST)","from localhost ([::1]:46517 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dno8q-0007Nb-I3\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 11:45:56 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51526)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1N-0006eK-3K\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:19 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dno1L-0001hj-9i\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:13 -0400","from mx1.redhat.com ([209.132.183.28]:33988)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dno1K-0001gV-VU\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:11 -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 E627F5F7A9\n\tfor ; Fri, 1 Sep 2017 15:38:09 +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 8F2D317C34\n\tfor ; Fri, 1 Sep 2017 15:38:09 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 8FC921132F3B; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com E627F5F7A9","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:37 +0200","Message-Id":"<20170901153758.8628-27-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.39]);\n\tFri, 01 Sep 2017 15:38:10 +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 26/47] qapi-schema: Collect TPM stuff in\n\tqapi/tpm.json","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","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Sadly, we don't have a TPM maintainer, not even a MAINTAINERS entry.\nCreate one, and mark it orphaned.\n\nSigned-off-by: Markus Armbruster \nMessage-Id: <1503602048-12268-12-git-send-email-armbru@redhat.com>\nReviewed-by: Marc-André Lureau \n---\n MAINTAINERS | 8 ++++\n Makefile | 1 +\n qapi-schema.json | 132 +----------------------------------------------------\n qapi/tpm.json | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 4 files changed, 147 insertions(+), 131 deletions(-)\n create mode 100644 qapi/tpm.json","diff":"diff --git a/MAINTAINERS b/MAINTAINERS\nindex 8cebd798ef..5ec945c9af 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -1486,6 +1486,14 @@ F: scripts/tracetool/\n F: docs/tracing.txt\n T: git git://github.com/stefanha/qemu.git tracing\n \n+TPM\n+S: Orphan\n+F: tpm.c\n+F: hw/tpm/*\n+F: include/hw/acpi/tpm.h\n+F: include/sysemu/tpm*\n+F: qapi/tpm.json\n+\n Checkpatch\n S: Odd Fixes\n F: scripts/checkpatch.pl\ndiff --git a/Makefile b/Makefile\nindex ea6de37197..3dde210662 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -418,6 +418,7 @@ qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \\\n $(SRC_PATH)/qapi/rocker.json \\\n $(SRC_PATH)/qapi/run-state.json \\\n $(SRC_PATH)/qapi/sockets.json \\\n+ $(SRC_PATH)/qapi/tpm.json \\\n $(SRC_PATH)/qapi/trace.json \\\n $(SRC_PATH)/qapi/transaction.json \\\n $(SRC_PATH)/qapi/ui.json\ndiff --git a/qapi-schema.json b/qapi-schema.json\nindex 4108ef0cc8..0ad4e0237d 100644\n--- a/qapi-schema.json\n+++ b/qapi-schema.json\n@@ -86,6 +86,7 @@\n { 'include': 'qapi/char.json' }\n { 'include': 'qapi/net.json' }\n { 'include': 'qapi/rocker.json' }\n+{ 'include': 'qapi/tpm.json' }\n { 'include': 'qapi/ui.json' }\n { 'include': 'qapi/migration.json' }\n { 'include': 'qapi/transaction.json' }\n@@ -2213,137 +2214,6 @@\n { 'command': 'query-target', 'returns': 'TargetInfo' }\n \n ##\n-# @TpmModel:\n-#\n-# An enumeration of TPM models\n-#\n-# @tpm-tis: TPM TIS model\n-#\n-# Since: 1.5\n-##\n-{ 'enum': 'TpmModel', 'data': [ 'tpm-tis' ] }\n-\n-##\n-# @query-tpm-models:\n-#\n-# Return a list of supported TPM models\n-#\n-# Returns: a list of TpmModel\n-#\n-# Since: 1.5\n-#\n-# Example:\n-#\n-# -> { \"execute\": \"query-tpm-models\" }\n-# <- { \"return\": [ \"tpm-tis\" ] }\n-#\n-##\n-{ 'command': 'query-tpm-models', 'returns': ['TpmModel'] }\n-\n-##\n-# @TpmType:\n-#\n-# An enumeration of TPM types\n-#\n-# @passthrough: TPM passthrough type\n-#\n-# Since: 1.5\n-##\n-{ 'enum': 'TpmType', 'data': [ 'passthrough' ] }\n-\n-##\n-# @query-tpm-types:\n-#\n-# Return a list of supported TPM types\n-#\n-# Returns: a list of TpmType\n-#\n-# Since: 1.5\n-#\n-# Example:\n-#\n-# -> { \"execute\": \"query-tpm-types\" }\n-# <- { \"return\": [ \"passthrough\" ] }\n-#\n-##\n-{ 'command': 'query-tpm-types', 'returns': ['TpmType'] }\n-\n-##\n-# @TPMPassthroughOptions:\n-#\n-# Information about the TPM passthrough type\n-#\n-# @path: string describing the path used for accessing the TPM device\n-#\n-# @cancel-path: string showing the TPM's sysfs cancel file\n-# for cancellation of TPM commands while they are executing\n-#\n-# Since: 1.5\n-##\n-{ 'struct': 'TPMPassthroughOptions', 'data': { '*path' : 'str',\n- '*cancel-path' : 'str'} }\n-\n-##\n-# @TpmTypeOptions:\n-#\n-# A union referencing different TPM backend types' configuration options\n-#\n-# @type: 'passthrough' The configuration options for the TPM passthrough type\n-#\n-# Since: 1.5\n-##\n-{ 'union': 'TpmTypeOptions',\n- 'data': { 'passthrough' : 'TPMPassthroughOptions' } }\n-\n-##\n-# @TPMInfo:\n-#\n-# Information about the TPM\n-#\n-# @id: The Id of the TPM\n-#\n-# @model: The TPM frontend model\n-#\n-# @options: The TPM (backend) type configuration options\n-#\n-# Since: 1.5\n-##\n-{ 'struct': 'TPMInfo',\n- 'data': {'id': 'str',\n- 'model': 'TpmModel',\n- 'options': 'TpmTypeOptions' } }\n-\n-##\n-# @query-tpm:\n-#\n-# Return information about the TPM device\n-#\n-# Returns: @TPMInfo on success\n-#\n-# Since: 1.5\n-#\n-# Example:\n-#\n-# -> { \"execute\": \"query-tpm\" }\n-# <- { \"return\":\n-# [\n-# { \"model\": \"tpm-tis\",\n-# \"options\":\n-# { \"type\": \"passthrough\",\n-# \"data\":\n-# { \"cancel-path\": \"/sys/class/misc/tpm0/device/cancel\",\n-# \"path\": \"/dev/tpm0\"\n-# }\n-# },\n-# \"id\": \"tpm0\"\n-# }\n-# ]\n-# }\n-#\n-##\n-{ 'command': 'query-tpm', 'returns': ['TPMInfo'] }\n-\n-##\n # @AcpiTableOptions:\n #\n # Specify an ACPI table on the command line to load.\ndiff --git a/qapi/tpm.json b/qapi/tpm.json\nnew file mode 100644\nindex 0000000000..e8b2d8dcb7\n--- /dev/null\n+++ b/qapi/tpm.json\n@@ -0,0 +1,137 @@\n+# -*- Mode: Python -*-\n+#\n+\n+##\n+# = TPM (trusted platform module) devices\n+##\n+\n+##\n+# @TpmModel:\n+#\n+# An enumeration of TPM models\n+#\n+# @tpm-tis: TPM TIS model\n+#\n+# Since: 1.5\n+##\n+{ 'enum': 'TpmModel', 'data': [ 'tpm-tis' ] }\n+\n+##\n+# @query-tpm-models:\n+#\n+# Return a list of supported TPM models\n+#\n+# Returns: a list of TpmModel\n+#\n+# Since: 1.5\n+#\n+# Example:\n+#\n+# -> { \"execute\": \"query-tpm-models\" }\n+# <- { \"return\": [ \"tpm-tis\" ] }\n+#\n+##\n+{ 'command': 'query-tpm-models', 'returns': ['TpmModel'] }\n+\n+##\n+# @TpmType:\n+#\n+# An enumeration of TPM types\n+#\n+# @passthrough: TPM passthrough type\n+#\n+# Since: 1.5\n+##\n+{ 'enum': 'TpmType', 'data': [ 'passthrough' ] }\n+\n+##\n+# @query-tpm-types:\n+#\n+# Return a list of supported TPM types\n+#\n+# Returns: a list of TpmType\n+#\n+# Since: 1.5\n+#\n+# Example:\n+#\n+# -> { \"execute\": \"query-tpm-types\" }\n+# <- { \"return\": [ \"passthrough\" ] }\n+#\n+##\n+{ 'command': 'query-tpm-types', 'returns': ['TpmType'] }\n+\n+##\n+# @TPMPassthroughOptions:\n+#\n+# Information about the TPM passthrough type\n+#\n+# @path: string describing the path used for accessing the TPM device\n+#\n+# @cancel-path: string showing the TPM's sysfs cancel file\n+# for cancellation of TPM commands while they are executing\n+#\n+# Since: 1.5\n+##\n+{ 'struct': 'TPMPassthroughOptions', 'data': { '*path' : 'str',\n+ '*cancel-path' : 'str'} }\n+\n+##\n+# @TpmTypeOptions:\n+#\n+# A union referencing different TPM backend types' configuration options\n+#\n+# @type: 'passthrough' The configuration options for the TPM passthrough type\n+#\n+# Since: 1.5\n+##\n+{ 'union': 'TpmTypeOptions',\n+ 'data': { 'passthrough' : 'TPMPassthroughOptions' } }\n+\n+##\n+# @TPMInfo:\n+#\n+# Information about the TPM\n+#\n+# @id: The Id of the TPM\n+#\n+# @model: The TPM frontend model\n+#\n+# @options: The TPM (backend) type configuration options\n+#\n+# Since: 1.5\n+##\n+{ 'struct': 'TPMInfo',\n+ 'data': {'id': 'str',\n+ 'model': 'TpmModel',\n+ 'options': 'TpmTypeOptions' } }\n+\n+##\n+# @query-tpm:\n+#\n+# Return information about the TPM device\n+#\n+# Returns: @TPMInfo on success\n+#\n+# Since: 1.5\n+#\n+# Example:\n+#\n+# -> { \"execute\": \"query-tpm\" }\n+# <- { \"return\":\n+# [\n+# { \"model\": \"tpm-tis\",\n+# \"options\":\n+# { \"type\": \"passthrough\",\n+# \"data\":\n+# { \"cancel-path\": \"/sys/class/misc/tpm0/device/cancel\",\n+# \"path\": \"/dev/tpm0\"\n+# }\n+# },\n+# \"id\": \"tpm0\"\n+# }\n+# ]\n+# }\n+#\n+##\n+{ 'command': 'query-tpm', 'returns': ['TPMInfo'] }\n","prefixes":["PULL","v2","26/47"]}