On 04/10/2015 12:59 AM, Quan Xu wrote: > Signed-off-by: Quan Xu > > --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 -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org