[PATCH 0/2] Fix two small issues in COLO

[PATCH 0/2] Fix two small issues in COLO

[Wei Liu]

Wei Liu (2):
  docs: fix xl manpage compilation broken by COLO
  libxc: use PRIx64 to print out pfn

 docs/man/xl.pod.1        | 26 +++++++++++++++++---------
 tools/libxc/xc_sr_save.c |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

-- 
2.1.4


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

[PATCH 1/2] docs: fix xl manpage compilation broken by COLO

[Wei Liu]

Rearrange the section to conform with pod syntax. Fix some typos along
the way.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 docs/man/xl.pod.1 | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1
index c711203..fed0d74 100644
--- a/docs/man/xl.pod.1
+++ b/docs/man/xl.pod.1
@@ -457,16 +457,18 @@ B<NOTES>
 Remus support in xl is still in experimental (proof-of-concept) phase.
 Disk replication support is limited to DRBD disks.
 
-COLO support in xl is still in experimental (proof-of-concept) phase.
+COLO support in xl is still in experimental (proof-of-concept)
+phase. All options are subject to change in the future.
 
 =back
 
-B<EXAMPLE>
+COLO disk configuration looks like:
 
-=over 4
+  disk = ['...,colo,colo-host=xxx,colo-port=xxx,colo-export=xxx,active-disk=xxx,hidden-disk=xxx...']
 
-(a) An example for COLO replication's configuration: disk =['...,colo,colo-host
-=xxx,colo-port=xxx,colo-export=xxx,active-disk=xxx,hidden-disk=xxx...']
+The supported options are:
+
+=over 4
 
 =item B<colo-host>      :Secondary host's ip address.
 
@@ -481,13 +483,19 @@ and it's used by secondary.
 =item B<hidden-disk>    :Primary's modified contents will be buffered in this
 disk, and it's used by secondary.
 
-(b) An example for COLO network configuration: vif =[ '...,forwarddev=xxx,...']
+=back
+
+COLO network configuration looks like:
+
+  vif = [ '...,forwarddev=xxx,...']
+
+The supported options are:
+
+=over 4
 
-=item B<forwarddev>     :Forward devices for primary and secondary, there are
+=item B<forwarddev>     :Forward devices for primary and secondary, they are
 directly connected.
 
-Note that the COLO configuration settings should be considered unstable. They
-may change incompatibly in future versions of Xen.
 
 =back
 
-- 
2.1.4


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

[PATCH 2/2] libxc: use PRIx64 to print out pfn

[Wei Liu]

Pfn is always 64 bit long. Use PRIx64 to avoid truncation.

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/libxc/xc_sr_save.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c
index b861c7d..291fe9f 100644
--- a/tools/libxc/xc_sr_save.c
+++ b/tools/libxc/xc_sr_save.c
@@ -555,7 +555,7 @@ static int colo_merge_secondary_dirty_bitmap(struct xc_sr_context *ctx)
         pfn = pfns[i];
         if (pfn > ctx->save.p2m_size)
         {
-            PERROR("Invalid pfn 0x%" PRIpfn "", (unsigned long)pfn );
+            PERROR("Invalid pfn 0x%" PRIx64, pfn);
             rc = -1;
             goto err;
         }
-- 
2.1.4


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

Re: [PATCH 2/2] libxc: use PRIx64 to print out pfn

[Ian Jackson]

Wei Liu writes ("[PATCH 2/2] libxc: use PRIx64 to print out pfn"):
> Pfn is always 64 bit long. Use PRIx64 to avoid truncation.
..
>          {
> -            PERROR("Invalid pfn 0x%" PRIpfn "", (unsigned long)pfn );
> +            PERROR("Invalid pfn 0x%" PRIx64, pfn);

Err, sorry.

Applied both of these.

Ian.

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