| Message ID | 1428649159-30879-2-git-send-email-quan.xu@intel.com |
|---|---|
| State | New |
| Headers | show |
On 04/10/2015 12:59 AM, Quan Xu wrote: > Signed-off-by: Quan Xu <quan.xu@intel.com> > > --Changes in v5: > -qapi schema enhancement. > --- > configure | 14 ++++++++++++++ > hmp.c | 2 ++ > qapi-schema.json | 17 +++++++++++++++-- > qemu-options.hx | 13 +++++++++++-- > tpm.c | 7 ++++++- > 5 files changed, 48 insertions(+), 5 deletions(-) > > +++ b/qapi-schema.json > @@ -2975,9 +2975,11 @@ > # > # @passthrough: TPM passthrough type > # > +# @xenstubdoms: TPM xenstubdoms type (since 2.4) > +# > # Since: 1.5 > ## > -{ 'enum': 'TpmType', 'data': [ 'passthrough' ] } > +{ 'enum': 'TpmType', 'data': [ 'passthrough', 'xenstubdoms' ] } > > ## > # @query-tpm-types: > @@ -3006,6 +3008,15 @@ > '*cancel-path' : 'str'} } > > ## > +# @TPMXenstubdomsOptions: > +# > +# Information about the TPM xenstubdoms type > +# > +# Since: 2.4 > +## > +{ 'type': 'TPMXenstubdomsOptions', 'data': { } } > + > +## > # @TpmTypeOptions: > # > # A union referencing different TPM backend types' configuration options > @@ -3015,7 +3026,9 @@ > # Since: 1.5 > ## > { 'union': 'TpmTypeOptions', > - 'data': { 'passthrough' : 'TPMPassthroughOptions' } } > + 'data': { 'passthrough' : 'TPMPassthroughOptions', > + 'xenstubdoms' : 'TPMXenstubdomsOptions' } } Hmm, maybe it is time for me to follow through with my threat of allowing anonymous types in union branches. > +## Stray insertion. Please remove it. > > ## > # @TpmInfo: > diff --git a/qemu-options.hx b/qemu-options.hx > index 319d971..9254902 100644
> -----Original Message----- > From: Eric Blake [mailto:eblake@redhat.com] > Sent: Friday, April 10, 2015 9:22 PM > To: Xu, Quan; stefano.stabellini@eu.citrix.com; stefanb@linux.vnet.ibm.com > Cc: pbonzini@redhat.com; qemu-devel@nongnu.org; aliguori@amazon.com; > wei.liu2@citrix.com; dgdegra@tycho.nsa.gov; xen-devel@lists.xen.org > Subject: Re: [PATCH v5 1/6] Qemu-Xen-vTPM: Support for Xen stubdom vTPM > command line options > > On 04/10/2015 12:59 AM, Quan Xu wrote: > > Signed-off-by: Quan Xu <quan.xu@intel.com> > > > > --Changes in v5: > > -qapi schema enhancement. > > --- > > configure | 14 ++++++++++++++ > > hmp.c | 2 ++ > > qapi-schema.json | 17 +++++++++++++++-- qemu-options.hx | 13 > > +++++++++++-- > > tpm.c | 7 ++++++- > > 5 files changed, 48 insertions(+), 5 deletions(-) > > > > > +++ b/qapi-schema.json > > @@ -2975,9 +2975,11 @@ > > # > > # @passthrough: TPM passthrough type > > # > > +# @xenstubdoms: TPM xenstubdoms type (since 2.4) # > > # Since: 1.5 > > ## > > -{ 'enum': 'TpmType', 'data': [ 'passthrough' ] } > > +{ 'enum': 'TpmType', 'data': [ 'passthrough', 'xenstubdoms' ] } > > > > ## > > # @query-tpm-types: > > @@ -3006,6 +3008,15 @@ > > '*cancel-path' : 'str'} > > } > > > > ## > > +# @TPMXenstubdomsOptions: > > +# > > +# Information about the TPM xenstubdoms type # # Since: 2.4 ## { > > +'type': 'TPMXenstubdomsOptions', 'data': { } } > > + > > +## > > # @TpmTypeOptions: > > # > > # A union referencing different TPM backend types' configuration > > options @@ -3015,7 +3026,9 @@ # Since: 1.5 ## { 'union': > > 'TpmTypeOptions', > > - 'data': { 'passthrough' : 'TPMPassthroughOptions' } } > > + 'data': { 'passthrough' : 'TPMPassthroughOptions', > > + 'xenstubdoms' : 'TPMXenstubdomsOptions' } } > > Hmm, maybe it is time for me to follow through with my threat of allowing > anonymous types in union branches. > > > +## > > Stray insertion. Please remove it. Thanks Eric.. I will send out the next version soon. Quan > > > > > ## > > # @TpmInfo: > > diff --git a/qemu-options.hx b/qemu-options.hx index 319d971..9254902 > > 100644 > > > -- > Eric Blake eblake redhat com +1-919-301-3266 > Libvirt virtualization library http://libvirt.org
diff --git a/configure b/configure index 09c9225..8c9411d 100755 --- a/configure +++ b/configure @@ -3010,6 +3010,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 @@ -4432,6 +4442,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" @@ -4919,6 +4930,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 f31ae27..c10b6f7 100644 --- a/hmp.c +++ b/hmp.c @@ -813,6 +813,8 @@ 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: + break; case TPM_TYPE_OPTIONS_KIND_MAX: break; } diff --git a/qapi-schema.json b/qapi-schema.json index ac9594d..36ca1a2 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2975,9 +2975,11 @@ # # @passthrough: TPM passthrough type # +# @xenstubdoms: TPM xenstubdoms type (since 2.4) +# # Since: 1.5 ## -{ 'enum': 'TpmType', 'data': [ 'passthrough' ] } +{ 'enum': 'TpmType', 'data': [ 'passthrough', 'xenstubdoms' ] } ## # @query-tpm-types: @@ -3006,6 +3008,15 @@ '*cancel-path' : 'str'} } ## +# @TPMXenstubdomsOptions: +# +# Information about the TPM xenstubdoms type +# +# Since: 2.4 +## +{ 'type': 'TPMXenstubdomsOptions', 'data': { } } + +## # @TpmTypeOptions: # # A union referencing different TPM backend types' configuration options @@ -3015,7 +3026,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 319d971..9254902 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2539,7 +2539,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 @@ -2549,7 +2550,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 @@ -2599,6 +2601,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 963b7ee..30643fd 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, @@ -254,6 +254,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; @@ -273,6 +274,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; }
Signed-off-by: Quan Xu <quan.xu@intel.com> --Changes in v5: -qapi schema enhancement. --- configure | 14 ++++++++++++++ hmp.c | 2 ++ qapi-schema.json | 17 +++++++++++++++-- qemu-options.hx | 13 +++++++++++-- tpm.c | 7 ++++++- 5 files changed, 48 insertions(+), 5 deletions(-)