[PATCH] xl: Support (by ignoring) xl migrate --live

[PATCH] xl: Support (by ignoring) xl migrate --live

[Ian Jackson]

xm migrate would do non-live migration (effectively, save, transfer
and restore) by default, unless you specified --live.

xl migrate always does live migration.  Honour (by ignoring) --live
for compatibility with old callers.  Document this.

(This patch should be backported as far as possible.)

Reported-by: Matthew Vernon <mcv21@cam.ac.uk>
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Matthew Vernon <mcv21@cam.ac.uk>
---
 docs/man/xl.pod.1        |    8 ++++++++
 tools/libxl/xl_cmdimpl.c |    6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1
index 16783c8..217a0ab 100644
--- a/docs/man/xl.pod.1
+++ b/docs/man/xl.pod.1
@@ -1513,6 +1513,14 @@ monitor types are:
 
 =back
 
+=head1 IGNORED FOR COMPATIBILITY WITH XM
+
+xl is mostly command-line compatible with the old xm utility used with
+the old Python xend.  For compatibility, the following options are
+ignored:
+
+=item B<xl migrate --live>
+
 =head1 TO BE DOCUMENTED
 
 We need better documentation for:
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 648ca08..50a929a 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -4498,6 +4498,7 @@ int main_migrate(int argc, char **argv)
     int opt, daemonize = 1, monitor = 1, debug = 0;
     static struct option opts[] = {
         {"debug", 0, 0, 0x100},
+        {"live", 0, 0, 0x200},
         COMMON_LONG_OPTS,
         {0, 0, 0, 0}
     };
@@ -4516,9 +4517,12 @@ int main_migrate(int argc, char **argv)
         daemonize = 0;
         monitor = 0;
         break;
-    case 0x100:
+    case 0x100: /* --debug */
         debug = 1;
         break;
+    case 0x200: /* --live */
+        /* ignored for compatibility with xm */
+        break;
     }
 
     domid = find_domain(argv[optind]);
-- 
1.7.10.4

Re: [PATCH] xl: Support (by ignoring) xl migrate --live

[Ian Campbell]

On Thu, 2015-05-14 at 13:41 +0100, Ian Jackson wrote:
> xm migrate would do non-live migration (effectively, save, transfer
> and restore) by default, unless you specified --live.
> 
> xl migrate always does live migration.  Honour (by ignoring) --live
> for compatibility with old callers.  Document this.
> 
> (This patch should be backported as far as possible.)
> 
> Reported-by: Matthew Vernon <mcv21@cam.ac.uk>
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
> CC: Matthew Vernon <mcv21@cam.ac.uk>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

Re: [PATCH] xl: Support (by ignoring) xl migrate --live

[Ian Campbell]

On Thu, 2015-05-14 at 15:05 +0100, Ian Campbell wrote:
> On Thu, 2015-05-14 at 13:41 +0100, Ian Jackson wrote:
> > xm migrate would do non-live migration (effectively, save, transfer
> > and restore) by default, unless you specified --live.
> > 
> > xl migrate always does live migration.  Honour (by ignoring) --live
> > for compatibility with old callers.  Document this.
> > 
> > (This patch should be backported as far as possible.)
> > 
> > Reported-by: Matthew Vernon <mcv21@cam.ac.uk>
> > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
> > CC: Matthew Vernon <mcv21@cam.ac.uk>
> 
> Acked-by: Ian Campbell <ian.campbell@citrix.com>

Applied, thanks.

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

Re: [PATCH] xl: Support (by ignoring) xl migrate --live

[Olaf Hering]

On Thu, May 21, Ian Campbell wrote:

> On Thu, 2015-05-14 at 15:05 +0100, Ian Campbell wrote:
> > On Thu, 2015-05-14 at 13:41 +0100, Ian Jackson wrote:
> > > xm migrate would do non-live migration (effectively, save, transfer
> > > and restore) by default, unless you specified --live.
> > > 
> > > xl migrate always does live migration.  Honour (by ignoring) --live
> > > for compatibility with old callers.  Document this.
> > > 
> > > (This patch should be backported as far as possible.)
> > > 
> > > Reported-by: Matthew Vernon <mcv21@cam.ac.uk>
> > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
> > > CC: Matthew Vernon <mcv21@cam.ac.uk>
> > 
> > Acked-by: Ian Campbell <ian.campbell@citrix.com>
> 
> Applied, thanks.

I think this causes a build failure, somewhere introduced here:

git log -p -M --stat e13013d..upstream/staging -- docs/man/

[  146s] man/xl.pod.1 around line 1529: '=item' outside of any '=over'
[  146s] man/xl.pod.1 around line 1531: You forgot a '=back' before '=head1'
[  146s] POD document had syntax errors at /usr/bin/pod2text line 84.
[  146s] Makefile:167: recipe for target 'txt/man/xl.1.txt' failed
[  146s] make[1]: *** [txt/man/xl.1.txt] Error 255

Olaf

Re: [PATCH] xl: Support (by ignoring) xl migrate --live

[Ian Campbell]

On Thu, 2015-05-21 at 18:23 +0200, Olaf Hering wrote:
> On Thu, May 21, Ian Campbell wrote:
> 
> > On Thu, 2015-05-14 at 15:05 +0100, Ian Campbell wrote:
> > > On Thu, 2015-05-14 at 13:41 +0100, Ian Jackson wrote:
> > > > xm migrate would do non-live migration (effectively, save, transfer
> > > > and restore) by default, unless you specified --live.
> > > > 
> > > > xl migrate always does live migration.  Honour (by ignoring) --live
> > > > for compatibility with old callers.  Document this.
> > > > 
> > > > (This patch should be backported as far as possible.)
> > > > 
> > > > Reported-by: Matthew Vernon <mcv21@cam.ac.uk>
> > > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
> > > > CC: Matthew Vernon <mcv21@cam.ac.uk>
> > > 
> > > Acked-by: Ian Campbell <ian.campbell@citrix.com>
> > 
> > Applied, thanks.
> 
> I think this causes a build failure, somewhere introduced here:
> 
> git log -p -M --stat e13013d..upstream/staging -- docs/man/
> 
> [  146s] man/xl.pod.1 around line 1529: '=item' outside of any '=over'
> [  146s] man/xl.pod.1 around line 1531: You forgot a '=back' before '=head1'
> [  146s] POD document had syntax errors at /usr/bin/pod2text line 84.
> [  146s] Makefile:167: recipe for target 'txt/man/xl.1.txt' failed
> [  146s] make[1]: *** [txt/man/xl.1.txt] Error 255

My pod2text doesn't seem to complain, but does this help?

-----8>-------

>From 5da86305c378482ab2f6359375bd1b63ddc51102 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Thu, 21 May 2015 17:31:39 +0100
Subject: [PATCH] docs: correct pod syntax

Olaf reports:
[  146s] man/xl.pod.1 around line 1529: '=item' outside of any '=over'
[  146s] man/xl.pod.1 around line 1531: You forgot a '=back' before '=head1'
[  146s] POD document had syntax errors at /usr/bin/pod2text line 84.
[  146s] Makefile:167: recipe for target 'txt/man/xl.1.txt' failed
[  146s] make[1]: *** [txt/man/xl.1.txt] Error 255

Reported-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 docs/man/xl.pod.1 |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1
index b2bc362..4eb929d 100644
--- a/docs/man/xl.pod.1
+++ b/docs/man/xl.pod.1
@@ -1526,8 +1526,12 @@ xl is mostly command-line compatible with the old xm utility used with
 the old Python xend.  For compatibility, the following options are
 ignored:
 
+=over 4
+
 =item B<xl migrate --live>
 
+=back
+
 =head1 TO BE DOCUMENTED
 
 We need better documentation for:
-- 
1.7.10.4

Re: [PATCH] xl: Support (by ignoring) xl migrate --live

[Olaf Hering]

On Thu, May 21, Ian Campbell wrote:

> My pod2text doesn't seem to complain, but does this help?

Yes, this fixes it.

Thanks!

> Subject: [PATCH] docs: correct pod syntax

Re: [PATCH] xl: Support (by ignoring) xl migrate --live

[Andrew Cooper]

On 21/05/15 17:34, Ian Campbell wrote:
> On Thu, 2015-05-21 at 18:23 +0200, Olaf Hering wrote:
>> On Thu, May 21, Ian Campbell wrote:
>>
>>> On Thu, 2015-05-14 at 15:05 +0100, Ian Campbell wrote:
>>>> On Thu, 2015-05-14 at 13:41 +0100, Ian Jackson wrote:
>>>>> xm migrate would do non-live migration (effectively, save, transfer
>>>>> and restore) by default, unless you specified --live.
>>>>>
>>>>> xl migrate always does live migration.  Honour (by ignoring) --live
>>>>> for compatibility with old callers.  Document this.
>>>>>
>>>>> (This patch should be backported as far as possible.)
>>>>>
>>>>> Reported-by: Matthew Vernon <mcv21@cam.ac.uk>
>>>>> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
>>>>> CC: Matthew Vernon <mcv21@cam.ac.uk>
>>>> Acked-by: Ian Campbell <ian.campbell@citrix.com>
>>> Applied, thanks.
>> I think this causes a build failure, somewhere introduced here:
>>
>> git log -p -M --stat e13013d..upstream/staging -- docs/man/
>>
>> [  146s] man/xl.pod.1 around line 1529: '=item' outside of any '=over'
>> [  146s] man/xl.pod.1 around line 1531: You forgot a '=back' before '=head1'
>> [  146s] POD document had syntax errors at /usr/bin/pod2text line 84.
>> [  146s] Makefile:167: recipe for target 'txt/man/xl.1.txt' failed
>> [  146s] make[1]: *** [txt/man/xl.1.txt] Error 255
> My pod2text doesn't seem to complain, but does this help?
>
> -----8>-------
>
> From 5da86305c378482ab2f6359375bd1b63ddc51102 Mon Sep 17 00:00:00 2001
> From: Ian Campbell <ian.campbell@citrix.com>
> Date: Thu, 21 May 2015 17:31:39 +0100
> Subject: [PATCH] docs: correct pod syntax
>
> Olaf reports:
> [  146s] man/xl.pod.1 around line 1529: '=item' outside of any '=over'
> [  146s] man/xl.pod.1 around line 1531: You forgot a '=back' before '=head1'
> [  146s] POD document had syntax errors at /usr/bin/pod2text line 84.
> [  146s] Makefile:167: recipe for target 'txt/man/xl.1.txt' failed
> [  146s] make[1]: *** [txt/man/xl.1.txt] Error 255
>
> Reported-by: Olaf Hering <olaf@aepfle.de>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

This happens to be exactly the same patch as I debugged into existence
when attempting to fix this issue myself.

Tested-by: Andrew Cooper <andrew.cooper3@citrix.com>

> ---
>  docs/man/xl.pod.1 |    4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1
> index b2bc362..4eb929d 100644
> --- a/docs/man/xl.pod.1
> +++ b/docs/man/xl.pod.1
> @@ -1526,8 +1526,12 @@ xl is mostly command-line compatible with the old xm utility used with
>  the old Python xend.  For compatibility, the following options are
>  ignored:
>  
> +=over 4
> +
>  =item B<xl migrate --live>
>  
> +=back
> +
>  =head1 TO BE DOCUMENTED
>  
>  We need better documentation for:

Re: [PATCH] xl: Support (by ignoring) xl migrate --live

[Ian Campbell]

On Thu, 2015-05-21 at 19:44 +0200, Olaf Hering wrote:
> On Thu, May 21, Ian Campbell wrote:
> 
> > My pod2text doesn't seem to complain, but does this help?
> 
> Yes, this fixes it.

Pushed, thanks.

OOI what version of pod2text are you both using which exposes this?

Ian.

Re: [PATCH] xl: Support (by ignoring) xl migrate --live

[Andrew Cooper]

On 21/05/15 19:02, Ian Campbell wrote:
> On Thu, 2015-05-21 at 19:44 +0200, Olaf Hering wrote:
>> On Thu, May 21, Ian Campbell wrote:
>>
>>> My pod2text doesn't seem to complain, but does this help?
>> Yes, this fixes it.
> Pushed, thanks.
>
> OOI what version of pod2text are you both using which exposes this?
>
> Ian.
>

In my case it was pod2man, but it turns out that working out the version
is hard.

bash-4.2$ pod2man --version
Unknown option: version
bash-4.2$ pod2man -V
Unknown option: V

The best the manpage has to offer is

"The current version of this script is always available from its web
site at <http://www.eyrie.org/~eagle/software/podlators/>.  It is also
part of the Perl core distribution as of 5.6.0."

It is whatever comes as standard in CentOS 7.

~Andrew

Re: [PATCH] xl: Support (by ignoring) xl migrate --live

[Olaf Hering]

On Thu, May 21, Ian Campbell wrote:

> OOI what version of pod2text are you both using which exposes this?

perl 5.10 as included in SLE11 and 5.12 as included in 11.4 accept this.
But perl 5.18 as included in SLE12 and 13.1 reject it.

Olaf

Re: [PATCH] xl: Support (by ignoring) xl migrate --live

[Ian Campbell]

On Fri, 2015-05-22 at 07:28 +0200, Olaf Hering wrote:
> On Thu, May 21, Ian Campbell wrote:
> 
> > OOI what version of pod2text are you both using which exposes this?
> 
> perl 5.10 as included in SLE11 and 5.12 as included in 11.4 accept this.
> But perl 5.18 as included in SLE12 and 13.1 reject it.

Thanks. I seem to have perl 5.14 in all of my 4 pre-commit build
environments, which is why I won't see it (and neither will osstest).

Ian.