Re: [Xen-devel] [PATCH] fix Remus failover regression

[Shriram Rajagopalan <rshriram@xxxxxxxxx>]

On Jul 27, 2014 11:35 PM, "Yang Hongyang" <yanghy@xxxxxxxxxxxxxx> wrote:
>
> commit: c2ba706c
> tools/libxc: goto correct label on error paths by Andrew broke
> Remus in Xen 4.4 or earlier versions that has this commit backported.
>
> With Remus, this jump essentially discards the last incomplete
> checkpoint received by the backup.
> This is required for Remus to work and this does not break live
> migration.
>
> CC: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> CC: Ian Campbell <ian.campbell@xxxxxxxxxx>
> CC: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> CC: Shriram Rajagopalan <rshriram@xxxxxxxxx>
> Signed-off-by: Yang Hongyang <yanghy@xxxxxxxxxxxxxx>
> ---
> Âtools/libxc/xc_domain_restore.c | 4 ++--
> Â1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c
> index e73e0a2..5d2fbd6 100644
> --- a/tools/libxc/xc_domain_restore.c
> +++ b/tools/libxc/xc_domain_restore.c
> @@ -1783,14 +1783,14 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom,
>
> Â Â Âif ( pagebuf_get(xch, ctx, &pagebuf, io_fd, dom) ) {
> Â Â Â Â ÂPERROR("error when buffering batch, finishing");
> - Â Â Â Âgoto out;
> + Â Â Â Âgoto finish;
> Â Â Â}
> Â Â Âmemset(&tmptail, 0, sizeof(tmptail));
> Â Â Âtmptail.ishvm = hvm;
> Â Â Âif ( buffer_tail(xch, ctx, &tmptail, io_fd, max_vcpu_id, vcpumap,
> Â Â Â Â Â Â Â Â Â Â Â ext_vcpucontext, vcpuextstate_size) < 0 ) {
> Â Â Â Â ÂERROR ("error buffering image tail, finishing");
> - Â Â Â Âgoto out;
> + Â Â Â Âgoto finish;
> Â Â Â}
> Â Â Âtailbuf_free(&tailbuf);
> Â Â Âmemcpy(&tailbuf, &tmptail, sizeof(tailbuf));
> --
> 1.9.1
>

Can you please add the comment about discarding the incomplete checkpoint on top of the two goto statements?

Otherwise things look ok to me.

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