From patchwork Mon Nov 24 04:10:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Quan" X-Patchwork-Id: 413566 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0F8AE140168 for ; Mon, 24 Nov 2014 19:15:12 +1100 (AEDT) Received: from localhost ([::1]:51332 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsond-0005De-WC for incoming@patchwork.ozlabs.org; Mon, 24 Nov 2014 03:15:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xson5-0004U8-Gw for qemu-devel@nongnu.org; Mon, 24 Nov 2014 03:14:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xson0-0002r0-CO for qemu-devel@nongnu.org; Mon, 24 Nov 2014 03:14:35 -0500 Received: from mga11.intel.com ([192.55.52.93]:25261) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xson0-0002qv-4p for qemu-devel@nongnu.org; Mon, 24 Nov 2014 03:14:30 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 24 Nov 2014 00:14:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,447,1413270000"; d="scan'208";a="627257371" Received: from xen-commits.sh.intel.com ([10.239.131.208]) by fmsmga001.fm.intel.com with ESMTP; 24 Nov 2014 00:14:27 -0800 From: Quan Xu To: qemu-devel@nongnu.org Date: Sun, 23 Nov 2014 23:10:53 -0500 Message-Id: <1416802253-9891-1-git-send-email-quan.xu@intel.com> X-Mailer: git-send-email 1.8.3.2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 Cc: lcapitulino@redhat.com, armbru@redhat.com, Quan Xu , xen-devel@lists.xen.org Subject: [Qemu-devel] [v2 1/4] Qemu-Xen-vTPM: Support for Xen stubdom vTPM command line options 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: Quan Xu --- configure | 14 ++++++++++++++ hmp.c | 7 +++++++ qapi-schema.json | 20 ++++++++++++++++++-- qemu-options.hx | 13 +++++++++++-- tpm.c | 7 ++++++- 5 files changed, 56 insertions(+), 5 deletions(-) diff --git a/configure b/configure index a9e4d49..d63b8a1 100755 --- a/configure +++ b/configure @@ -2942,6 +2942,16 @@ else fi ########################################## +# TPM xenstubdoms is only on x86 Linux + +if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64 && \ + test "$xen" = "yes"; then + tpm_xenstubdoms=$tpm +else + tpm_xenstubdoms=no +fi + +########################################## # attr probe if test "$attr" != "no" ; then @@ -4333,6 +4343,7 @@ echo "gcov $gcov_tool" echo "gcov enabled $gcov" echo "TPM support $tpm" echo "libssh2 support $libssh2" +echo "TPM xenstubdoms $tpm_xenstubdoms" echo "TPM passthrough $tpm_passthrough" echo "QOM debugging $qom_cast_debug" echo "vhdx $vhdx" @@ -4810,6 +4821,9 @@ if test "$tpm" = "yes"; then if test "$tpm_passthrough" = "yes"; then echo "CONFIG_TPM_PASSTHROUGH=y" >> $config_host_mak fi + if test "$tpm_xenstubdoms" = "yes"; then + echo "CONFIG_TPM_XENSTUBDOMS=y" >> $config_host_mak + fi fi echo "TRACE_BACKENDS=$trace_backends" >> $config_host_mak diff --git a/hmp.c b/hmp.c index 63d7686..1df3ec7 100644 --- a/hmp.c +++ b/hmp.c @@ -689,6 +689,7 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict) Error *err = NULL; unsigned int c = 0; TPMPassthroughOptions *tpo; + TPMXenstubdomsOptions *txo; info_list = qmp_query_tpm(&err); if (err) { @@ -718,6 +719,12 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict) tpo->has_cancel_path ? ",cancel-path=" : "", tpo->has_cancel_path ? tpo->cancel_path : ""); break; + case TPM_TYPE_OPTIONS_KIND_XENSTUBDOMS: + txo = ti->options->xenstubdoms; + if (!txo) { + monitor_printf(mon, "null TPMXenstubdomsOptions error!\n"); + } + break; case TPM_TYPE_OPTIONS_KIND_MAX: break; } diff --git a/qapi-schema.json b/qapi-schema.json index 24379ab..17e9d0f 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2855,8 +2855,12 @@ # @passthrough: TPM passthrough type # # Since: 1.5 +# +# @xenstubdoms: TPM xenstubdoms type +# +# Since: 2.3 ## -{ 'enum': 'TpmType', 'data': [ 'passthrough' ] } +{ 'enum': 'TpmType', 'data': [ 'passthrough', 'xenstubdoms' ] } ## # @query-tpm-types: @@ -2884,6 +2888,16 @@ { 'type': 'TPMPassthroughOptions', 'data': { '*path' : 'str', '*cancel-path' : 'str'} } +# @TPMXenstubdomsOptions: +# +# Information about the TPM xenstubdoms type +# +# Since: 2.3 +## +{ 'type': 'TPMXenstubdomsOptions', 'data': { } } +# +## + ## # @TpmTypeOptions: # @@ -2894,7 +2908,9 @@ # Since: 1.5 ## { 'union': 'TpmTypeOptions', - 'data': { 'passthrough' : 'TPMPassthroughOptions' } } + 'data': { 'passthrough' : 'TPMPassthroughOptions', + 'xenstubdoms' : 'TPMXenstubdomsOptions' } } +## ## # @TpmInfo: diff --git a/qemu-options.hx b/qemu-options.hx index 1e7d5b8..fd73f57 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2485,7 +2485,8 @@ DEF("tpmdev", HAS_ARG, QEMU_OPTION_tpmdev, \ "-tpmdev passthrough,id=id[,path=path][,cancel-path=path]\n" " use path to provide path to a character device; default is /dev/tpm0\n" " use cancel-path to provide path to TPM's cancel sysfs entry; if\n" - " not provided it will be searched for in /sys/class/misc/tpm?/device\n", + " not provided it will be searched for in /sys/class/misc/tpm?/device\n" + "-tpmdev xenstubdoms,id=id\n", QEMU_ARCH_ALL) STEXI @@ -2495,7 +2496,8 @@ The general form of a TPM device option is: @item -tpmdev @var{backend} ,id=@var{id} [,@var{options}] @findex -tpmdev Backend type must be: -@option{passthrough}. +@option{passthrough}, or +@option{xenstubdoms}. The specific backend type will determine the applicable options. The @code{-tpmdev} option creates the TPM backend and requires a @@ -2545,6 +2547,13 @@ To create a passthrough TPM use the following two options: Note that the @code{-tpmdev} id is @code{tpm0} and is referenced by @code{tpmdev=tpm0} in the device option. +To create a xenstubdoms TPM use the following two options: +@example +-tpmdev xenstubdoms,id=tpm0 -device tpm-tis,tpmdev=tpm0 +@end example +Note that the @code{-tpmdev} id is @code{tpm0} and is referenced by +@code{tpmdev=tpm0} in the device option. + @end table ETEXI diff --git a/tpm.c b/tpm.c index c371023..ee9acb8 100644 --- a/tpm.c +++ b/tpm.c @@ -25,7 +25,7 @@ static QLIST_HEAD(, TPMBackend) tpm_backends = #define TPM_MAX_MODELS 1 -#define TPM_MAX_DRIVERS 1 +#define TPM_MAX_DRIVERS 2 static TPMDriverOps const *be_drivers[TPM_MAX_DRIVERS] = { NULL, @@ -256,6 +256,7 @@ static TPMInfo *qmp_query_tpm_inst(TPMBackend *drv) { TPMInfo *res = g_new0(TPMInfo, 1); TPMPassthroughOptions *tpo; + TPMXenstubdomsOptions *txo; res->id = g_strdup(drv->id); res->model = drv->fe_model; @@ -275,6 +276,10 @@ static TPMInfo *qmp_query_tpm_inst(TPMBackend *drv) tpo->has_cancel_path = true; } break; + case TPM_TYPE_XENSTUBDOMS: + res->options->kind = TPM_TYPE_OPTIONS_KIND_XENSTUBDOMS; + txo = g_new0(TPMXenstubdomsOptions, 1); + res->options->xenstubdoms = txo; case TPM_TYPE_MAX: break; }