Re: [Xen-devel] [PATCH v4 --for 4.6 COLOPre 21/25] tools/libxl: rename remus device to checkpoint device

[Yang Hongyang <yanghy@xxxxxxxxxxxxxx>]

On 07/16/2015 06:14 PM, Ian Campbell wrote:
> On Thu, 2015-07-16 at 17:36 +0800, Yang Hongyang wrote:
> > On 07/16/2015 05:31 PM, Ian Campbell wrote:
> > > On Thu, 2015-07-16 at 17:23 +0800, Yang Hongyang wrote:
> > > > On 07/15/2015 09:32 PM, Ian Campbell wrote:
> > > > > On Wed, 2015-07-15 at 15:45 +0800, Yang Hongyang wrote:
> > > > > >     tools/libxl/libxl_types.idl           |   4 +-
> > > > > > diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
> > > > > > index e8d3647..1d676ef 100644
> > > > > > --- a/tools/libxl/libxl_types.idl
> > > > > > +++ b/tools/libxl/libxl_types.idl
> > > > > > @@ -61,8 +61,8 @@ libxl_error = Enumeration("error", [
> > > > > >         (-15, "LOCK_FAIL"),
> > > > > >         (-16, "JSON_CONFIG_EMPTY"),
> > > > > >         (-17, "DEVICE_EXISTS"),
> > > > > > -    (-18, "REMUS_DEVOPS_DOES_NOT_MATCH"),
> > > > > > -    (-19, "REMUS_DEVICE_NOT_SUPPORTED"),
> > > > > > +    (-18, "CHECKPOINT_DEVOPS_DOES_NOT_MATCH"),
> > > > > > +    (-19, "CHECKPOINT_DEVICE_NOT_SUPPORTED"),
> > > > > >         (-20, "VNUMA_CONFIG_INVALID"),
> > > > > >         (-21, "DOMAIN_NOTFOUND"),
> > > > > >         (-22, "ABORTED"),
> > > > > This is an API change, which I think we discussed before.
> > > > >
> > > > > In <558BC6EE.60801@xxxxxxxxxxxxxx> you said you would add an extra patch
> > > > > to deal with that, and I think that needs to come before this automatic
> > > > > renaming so that there is no bisect hazard.
> > > > Seems either before or after will break the bisection...Only merge in one
> > > > patch will makes sense...
> > > If you break out this specific renaming into a precursor patch then you
> > > can add the compat stuff in at that time. Please don't combine all that
> > > into this one patch.
> > The fix is trival though, can I just quash them and also mention this
> > backword compatibility fix in the commit log?
> At the moment this particular patch is entirely mechanical (a long list
> of sed expression), this would make it no longer so.
Ok, I will break out this specific renaming into a precursor patch...

> Ian.
>
> > commit cdfc734337b008a811c1896f9248256474906c82
> > Author: Yang Hongyang <yanghy@xxxxxxxxxxxxxx>
> > Date:   Thu Jul 16 17:23:25 2015 +0800
> >
> >       tools/libxl: fix backword compatibility after the automatic renaming
> >
> >       The error code ERROR_REMUS_XXX was introduced in Xen 4.5, and
> >       changed to ERROR_CHECKPOINT_XXX after previous renaming.
> >       The patch fix the backword compatibility.
> >
> >       Signed-off-by: Yang Hongyang <yanghy@xxxxxxxxxxxxxx>
> >
> > diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
> > index c492d20..cb3d14f 100644
> > --- a/tools/libxl/libxl.h
> > +++ b/tools/libxl/libxl.h
> > @@ -835,6 +835,19 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst,
> > libxl_mac *src);
> >     */
> >    #define LIBXL_HAVE_SRM_V1 1
> >
> > +/* Remus stuff */
> > +/*
> > + * ERROR_REMUS_XXX error code only exists from Xen 4.5, and in Xen 4.6
> > + * it is changed to ERROR_CHECKPOINT_XXX
> > + */
> > +#if defined(LIBXL_API_VERSION) && LIBXL_API_VERSION >= 0x040500 \
> > +                               && LIBXL_API_VERSION < 0x040600
> > +#define ERROR_REMUS_DEVOPS_DOES_NOT_MATCH \
> > +        ERROR_CHECKPOINT_DEVOPS_DOES_NOT_MATCH
> > +#define ERROR_REMUS_DEVICE_NOT_SUPPORTED \
> > +        ERROR_CHECKPOINT_DEVICE_NOT_SUPPORTED
> > +#endif
> > +
> >    typedef char **libxl_string_list;
> >    void libxl_string_list_dispose(libxl_string_list *sl);
> >    int libxl_string_list_length(const libxl_string_list *sl);
> >
> >
> > > > I don't see any such patch
> > > > > even after this point though (from grepping your colo-v8 branch).
> > > > >
> > > > > Ian.
> > > > >
> > > > > .
> > >
> > > .
>
> .
--
Thanks,
Yang.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel