From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHeAX-0004QZ-SX for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:48:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UHeAU-0006ts-Nm for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:48:21 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:47163) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHeAU-0006ti-Ga for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:48:18 -0400 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 18 Mar 2013 11:48:17 -0600 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 52B22C90025 for ; Mon, 18 Mar 2013 13:48:14 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2IHlwO051380260 for ; Mon, 18 Mar 2013 13:47:58 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2IHkvOs002008 for ; Mon, 18 Mar 2013 14:46:57 -0300 Message-ID: <51475310.2060008@linux.vnet.ibm.com> Date: Mon, 18 Mar 2013 13:46:56 -0400 From: Stefan Berger MIME-Version: 1.0 References: <1363367835-11306-1-git-send-email-coreyb@linux.vnet.ibm.com> <878v5k65ur.fsf@blackfin.pond.sub.org> In-Reply-To: <878v5k65ur.fsf@blackfin.pond.sub.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] QMP: TPM QMP and man page documentation updates List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: Corey Bryant , qemu-devel@nongnu.org, lcapitulino@redhat.com On 03/18/2013 12:16 PM, Markus Armbruster wrote: > Corey Bryant writes: > >> Signed-off-by: Corey Bryant >> --- >> 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 >> + > "tpm-options" is a discriminated union. How is its discriminator "type" > (here: "tpm-passthrough-options") related to the outer "type" (here: > "passthrough")? It gives you similar information twice. So there is a direct relationship between the two types.