On Thu, Jan 20, 2022 at 05:16:01PM +0800, Yang Zhong wrote: > On Thu, Jan 20, 2022 at 09:10:34AM +0000, Daniel P. Berrangé wrote: > > On Wed, Jan 19, 2022 at 06:57:20PM -0500, 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/machine.json b/qapi/machine.json > > > index b6a37e17c4..cf47cb63a9 100644 > > > --- a/qapi/machine.json > > > +++ b/qapi/machine.json > > > @@ -1207,7 +1207,7 @@ > > > # > > > # @memdev: memory backend linked with device > > > # > > > -# @node: the numa node > > > +# @node: the numa node (Since: 7.0) > > > # > > > # Since: 6.2 > > > ## > > > @@ -1288,7 +1288,7 @@ > > > # > > > # @memdev: memory backend linked with device > > > # > > > -# @node: the numa node > > > +# @node: the numa node (Since: 7.0) > > > # > > > # Since: 6.2 > > > ## > > > 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) > > > > I expected deprecation would start now (7.0, and it would be removed > > in 7.2. > > > > Also needs to be documented in docs/about/deprecated.rst > > > > > > Thanks Daniel, Please check if below comments are okay or not? If no > problem, I will send v3 today, thanks! > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index e21e07478f..810542427f 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -441,3 +441,13 @@ nanoMIPS ISA > > The ``nanoMIPS`` ISA has never been upstreamed to any compiler toolchain. > As it is hard to generate binaries for it, declare it deprecated. > + > + > +SGX backwards compatibility > +--------------------------- > + > +@section-size (Since 7.0) > +'''''''''''''''''''''''' > + > +The ``@section-size`` will be replaced with ``@sections`` struct and > declare > +it deprecated.
This needs to be higher up in the file - look at the section with the heading 'QEMU Machine Protocol (QMP) commands' for how we list QMP features we're removing. > diff --git a/qapi/misc-target.json b/qapi/misc-target.json > index a87358ea44..c88fd0c2a2 100644 > --- a/qapi/misc-target.json > +++ b/qapi/misc-target.json > @@ -365,7 +365,7 @@ > # > # @flc: true if FLC is supported > # > -# @section-size: The EPC section size for guest (Will be deprecated in 7.2) > +# @section-size: The EPC section size for guest (7.0, and it would be > removed in 7.2) We don't need this comment - see the other reply in this thread about using an '@deprecated' tag instead, which gets turned into a comment in the auto-generated documentation. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|