From patchwork Fri Mar 15 17:17:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Bryant X-Patchwork-Id: 228118 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4B45A2C009C for ; Sat, 16 Mar 2013 04:38:39 +1100 (EST) Received: from localhost ([::1]:46086 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGYGo-0008S8-7A for incoming@patchwork.ozlabs.org; Fri, 15 Mar 2013 13:18:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGYGH-0008Bz-2B for qemu-devel@nongnu.org; Fri, 15 Mar 2013 13:17:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGYGA-0002XF-7h for qemu-devel@nongnu.org; Fri, 15 Mar 2013 13:17:44 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:57140) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGYG9-0002We-Uo for qemu-devel@nongnu.org; Fri, 15 Mar 2013 13:17:37 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 15 Mar 2013 13:17:36 -0400 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e7.ny.us.ibm.com (192.168.1.107) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 15 Mar 2013 13:17:34 -0400 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id A8ACE6E804C for ; Fri, 15 Mar 2013 13:17:26 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2FHHSgG325162 for ; Fri, 15 Mar 2013 13:17:28 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2FHHQJh019550 for ; Fri, 15 Mar 2013 13:17:27 -0400 Received: from localhost ([9.80.83.151]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r2FHHQPT019527; Fri, 15 Mar 2013 13:17:26 -0400 From: Corey Bryant To: qemu-devel@nongnu.org Date: Fri, 15 Mar 2013 13:17:15 -0400 Message-Id: <1363367835-11306-1-git-send-email-coreyb@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.1.4 X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13031517-5806-0000-0000-0000205B4DDE X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.182.137 Cc: Corey Bryant , lcapitulino@redhat.com, armbru@redhat.com, stefanb@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH] QMP: TPM QMP and man page documentation updates X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Corey Bryant Reviewed-by: Eric Blake --- qemu-options.hx | 3 ++- qmp-commands.hx | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/qemu-options.hx b/qemu-options.hx index 30fb85d..3b3cd0f 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2237,7 +2237,8 @@ Backend type must be: @option{passthrough}. The specific backend type will determine the applicable options. -The @code{-tpmdev} option requires a @code{-device} option. +The @code{-tpmdev} option creates the TPM backend and requires a +@code{-device} option that specifies the TPM frontend interface model. Options to each backend are described below. diff --git a/qmp-commands.hx b/qmp-commands.hx index b370060..4eda5ea 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2721,18 +2721,77 @@ EQMP .mhandler.cmd_new = qmp_marshal_input_query_tpm, }, +SQMP +query-tpm +--------- + +Return information about the TPM device. + +Arguments: None + +Example: + +-> { "execute": "query-tpm" } +<- { "return": + [ + { "model": "tpm-tis", + "tpm-options": + { "type": "tpm-passthrough-options", + "data": + { "cancel-path": "/sys/class/misc/tpm0/device/cancel", + "path": "/dev/tpm0" + } + }, + "type": "passthrough", + "id": "tpm0" + } + ] + } + +EQMP + { .name = "query-tpm-models", .args_type = "", .mhandler.cmd_new = qmp_marshal_input_query_tpm_models, }, +SQMP +query-tpm-models +---------------- + +Return a list of supported TPM models. + +Arguments: None + +Example: + +-> { "execute": "query-tpm-models" } +<- { "return": [ "tpm-tis" ] } + +EQMP + { .name = "query-tpm-types", .args_type = "", .mhandler.cmd_new = qmp_marshal_input_query_tpm_types, }, +SQMP +query-tpm-types +--------------- + +Return a list of supported TPM types. + +Arguments: None + +Example: + +-> { "execute": "query-tpm-types" } +<- { "return": [ "passthrough" ] } + +EQMP + { .name = "chardev-add", .args_type = "id:s,backend:q",