From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yang Hongyang Subject: Re: [PATCH v4 --for 4.6 COLOPre 21/25] tools/libxl: rename remus device to checkpoint device Date: Thu, 16 Jul 2015 17:36:06 +0800 Message-ID: <55A77B06.4030204@cn.fujitsu.com> References: <1436946351-21118-1-git-send-email-yanghy@cn.fujitsu.com> <1436946351-21118-22-git-send-email-yanghy@cn.fujitsu.com> <1436967160.32371.67.camel@citrix.com> <55A777FA.6070006@cn.fujitsu.com> <1437039116.32371.144.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1437039116.32371.144.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell Cc: wei.liu2@citrix.com, wency@cn.fujitsu.com, andrew.cooper3@citrix.com, yunhong.jiang@intel.com, eddie.dong@intel.com, xen-devel@lists.xen.org, guijianfeng@cn.fujitsu.com, rshriram@cs.ubc.ca, ian.jackson@eu.citrix.com List-Id: xen-devel@lists.xenproject.org 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@cn.fujitsu.com> 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? commit cdfc734337b008a811c1896f9248256474906c82 Author: Yang Hongyang 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 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.