+Markus for QAPI deprecation On 1/20/22 00:57, Yang Zhong wrote: > The SGX NUMA patches were merged into Qemu 7.0 release, we need > clarify detailed version history information and also change > some related comments, which make SGX related comments clearer. > > The QMP command schema promises backwards compatibility as standard. > We temporarily restore "@section-size", which can avoid incompatible > API breakage. The "@section-size" will be deprecated in 7.2 version. > > Suggested-by: Daniel P. Berrangé <berra...@redhat.com> > Signed-off-by: Yang Zhong <yang.zh...@intel.com> > Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> > --- > qapi/machine.json | 4 ++-- > qapi/misc-target.json | 17 ++++++++++++----- > hw/i386/sgx.c | 11 +++++++++-- > 3 files changed, 23 insertions(+), 9 deletions(-)
> diff --git a/qapi/misc-target.json b/qapi/misc-target.json > index 1022aa0184..a87358ea44 100644 > --- a/qapi/misc-target.json > +++ b/qapi/misc-target.json > @@ -344,9 +344,9 @@ > # > # @node: the numa node > # > -# @size: the size of epc section > +# @size: the size of EPC section > # > -# Since: 6.2 > +# Since: 7.0 > ## > { 'struct': 'SGXEPCSection', > 'data': { 'node': 'int', > @@ -365,7 +365,9 @@ > # > # @flc: true if FLC is supported > # > -# @sections: The EPC sections info for guest > +# @section-size: The EPC section size for guest (Will be deprecated in 7.2) See commit 75ecee72625 ("qapi: Enable enum member introspection to show more than name"). I'd change as: # @section-size: The EPC section size for guest # Redundant with @sections. Just for backward compatibility. > +# > +# @sections: The EPC sections info for guest (Since: 7.0) and then add: # Features: # @deprecated: Member @section-size is deprecated. Use @sections instead. > # > # Since: 6.2 > ## > @@ -374,6 +376,7 @@ > 'sgx1': 'bool', > 'sgx2': 'bool', > 'flc': 'bool', > + 'section-size': 'uint64', > 'sections': ['SGXEPCSection']}, > 'if': 'TARGET_I386' }