* [PATCH 0/5] COLO fixes
@ 2016-04-04 17:34 Wei Liu
2016-04-04 17:34 ` [PATCH 1/5] libxc: colo: don't leak pfns and iov in send_checkpoint_dirty_pfn_list Wei Liu
` (6 more replies)
0 siblings, 7 replies; 9+ messages in thread
From: Wei Liu @ 2016-04-04 17:34 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu, Changlong Xie, Ian Jackson, Wen Congyang
Wei Liu (5):
libxc: colo: don't leak pfns and iov in send_checkpoint_dirty_pfn_list
libxl: colo: simplify colo_proxy_async_wait_for_checkpoint
libxl: colo: add missing break in qemu_disk_scsi_drive_string
libxl: colo: fix indentation of abort()
libxl: colo: remove dead code in colo_save_setup_script_cb
tools/libxc/xc_sr_restore.c | 2 ++
tools/libxl/libxl_colo_nic.c | 5 -----
tools/libxl/libxl_colo_save.c | 8 ++++----
tools/libxl/libxl_dm.c | 3 ++-
4 files changed, 8 insertions(+), 10 deletions(-)
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/5] libxc: colo: don't leak pfns and iov in send_checkpoint_dirty_pfn_list
2016-04-04 17:34 [PATCH 0/5] COLO fixes Wei Liu
@ 2016-04-04 17:34 ` Wei Liu
2016-04-04 17:34 ` [PATCH 2/5] libxl: colo: simplify colo_proxy_async_wait_for_checkpoint Wei Liu
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Wei Liu @ 2016-04-04 17:34 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu, Changlong Xie, Ian Jackson, Wen Congyang
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxc/xc_sr_restore.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c
index 728edbc..3549f0a 100644
--- a/tools/libxc/xc_sr_restore.c
+++ b/tools/libxc/xc_sr_restore.c
@@ -494,6 +494,8 @@ static int send_checkpoint_dirty_pfn_list(struct xc_sr_context *ctx)
rc = 0;
err:
+ free(pfns);
+ free(iov);
return rc;
}
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/5] libxl: colo: simplify colo_proxy_async_wait_for_checkpoint
2016-04-04 17:34 [PATCH 0/5] COLO fixes Wei Liu
2016-04-04 17:34 ` [PATCH 1/5] libxc: colo: don't leak pfns and iov in send_checkpoint_dirty_pfn_list Wei Liu
@ 2016-04-04 17:34 ` Wei Liu
2016-04-04 17:34 ` [PATCH 3/5] libxl: colo: add missing break in qemu_disk_scsi_drive_string Wei Liu
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Wei Liu @ 2016-04-04 17:34 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu, Changlong Xie, Ian Jackson, Wen Congyang
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/libxl_colo_save.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/libxl/libxl_colo_save.c b/tools/libxl/libxl_colo_save.c
index e2fdc4b..26b3afd 100644
--- a/tools/libxl/libxl_colo_save.c
+++ b/tools/libxl/libxl_colo_save.c
@@ -533,11 +533,11 @@ static void colo_proxy_async_wait_for_checkpoint(libxl__colo_save_state *css)
if (req < 0) {
/* some error happens */
_exit(1);
- } else if (!req) {
- /* no checkpoint is needed, do a checkpoint every 5s */
- _exit(0);
} else {
- /* net packets is not consistent, we need to start a checkpoint */
+ /* req == 0: no checkpoint is needed, do a checkpoint every 5s */
+ /* req > 0: net packets is not consistent, we need to start a
+ * checkpoint
+ */
_exit(0);
}
}
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/5] libxl: colo: add missing break in qemu_disk_scsi_drive_string
2016-04-04 17:34 [PATCH 0/5] COLO fixes Wei Liu
2016-04-04 17:34 ` [PATCH 1/5] libxc: colo: don't leak pfns and iov in send_checkpoint_dirty_pfn_list Wei Liu
2016-04-04 17:34 ` [PATCH 2/5] libxl: colo: simplify colo_proxy_async_wait_for_checkpoint Wei Liu
@ 2016-04-04 17:34 ` Wei Liu
2016-04-04 17:34 ` [PATCH 4/5] libxl: colo: fix indentation of abort() Wei Liu
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Wei Liu @ 2016-04-04 17:34 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu, Changlong Xie, Ian Jackson, Wen Congyang
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/libxl_dm.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 5b79aa2..67f308d 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -816,6 +816,7 @@ static char *qemu_disk_scsi_drive_string(libxl__gc *gc, const char *target_path,
"file.backing.file.filename=%s,"
"file.backing.backing=%s",
unit, active_disk, hidden_disk, exportname);
+ break;
default:
abort();
}
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/5] libxl: colo: fix indentation of abort()
2016-04-04 17:34 [PATCH 0/5] COLO fixes Wei Liu
` (2 preceding siblings ...)
2016-04-04 17:34 ` [PATCH 3/5] libxl: colo: add missing break in qemu_disk_scsi_drive_string Wei Liu
@ 2016-04-04 17:34 ` Wei Liu
2016-04-04 17:34 ` [PATCH 5/5] libxl: colo: remove dead code in colo_save_setup_script_cb Wei Liu
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Wei Liu @ 2016-04-04 17:34 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu, Changlong Xie, Ian Jackson, Wen Congyang
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/libxl_dm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 67f308d..51be98a 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -818,7 +818,7 @@ static char *qemu_disk_scsi_drive_string(libxl__gc *gc, const char *target_path,
unit, active_disk, hidden_disk, exportname);
break;
default:
- abort();
+ abort();
}
return drive;
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/5] libxl: colo: remove dead code in colo_save_setup_script_cb
2016-04-04 17:34 [PATCH 0/5] COLO fixes Wei Liu
` (3 preceding siblings ...)
2016-04-04 17:34 ` [PATCH 4/5] libxl: colo: fix indentation of abort() Wei Liu
@ 2016-04-04 17:34 ` Wei Liu
2016-04-05 5:23 ` [PATCH 0/5] COLO fixes Changlong Xie
2016-04-06 13:51 ` Ian Jackson
6 siblings, 0 replies; 9+ messages in thread
From: Wei Liu @ 2016-04-04 17:34 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu, Changlong Xie, Ian Jackson, Wen Congyang
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/libxl_colo_nic.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/tools/libxl/libxl_colo_nic.c b/tools/libxl/libxl_colo_nic.c
index 2e00c28..5e0968c 100644
--- a/tools/libxl/libxl_colo_nic.c
+++ b/tools/libxl/libxl_colo_nic.c
@@ -219,11 +219,6 @@ static void colo_save_setup_script_cb(libxl__egc *egc,
goto out;
}
- if (status) {
- rc = ERROR_FAIL;
- goto out;
- }
-
rc = 0;
out:
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 0/5] COLO fixes
2016-04-04 17:34 [PATCH 0/5] COLO fixes Wei Liu
` (4 preceding siblings ...)
2016-04-04 17:34 ` [PATCH 5/5] libxl: colo: remove dead code in colo_save_setup_script_cb Wei Liu
@ 2016-04-05 5:23 ` Changlong Xie
2016-04-06 13:42 ` Wei Liu
2016-04-06 13:51 ` Ian Jackson
6 siblings, 1 reply; 9+ messages in thread
From: Changlong Xie @ 2016-04-05 5:23 UTC (permalink / raw)
To: Wei Liu, Xen-devel; +Cc: Ian Jackson, Wen Congyang
On 04/05/2016 01:34 AM, Wei Liu wrote:
> Wei Liu (5):
> libxc: colo: don't leak pfns and iov in send_checkpoint_dirty_pfn_list
> libxl: colo: simplify colo_proxy_async_wait_for_checkpoint
> libxl: colo: add missing break in qemu_disk_scsi_drive_string
> libxl: colo: fix indentation of abort()
> libxl: colo: remove dead code in colo_save_setup_script_cb
>
> tools/libxc/xc_sr_restore.c | 2 ++
> tools/libxl/libxl_colo_nic.c | 5 -----
> tools/libxl/libxl_colo_save.c | 8 ++++----
> tools/libxl/libxl_dm.c | 3 ++-
> 4 files changed, 8 insertions(+), 10 deletions(-)
>
All looks good to me. Thanks for your fix.
Thanks
-Xie
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/5] COLO fixes
2016-04-05 5:23 ` [PATCH 0/5] COLO fixes Changlong Xie
@ 2016-04-06 13:42 ` Wei Liu
0 siblings, 0 replies; 9+ messages in thread
From: Wei Liu @ 2016-04-06 13:42 UTC (permalink / raw)
To: Changlong Xie; +Cc: Xen-devel, Wei Liu, Ian Jackson, Wen Congyang
On Tue, Apr 05, 2016 at 01:23:47PM +0800, Changlong Xie wrote:
> On 04/05/2016 01:34 AM, Wei Liu wrote:
> >Wei Liu (5):
> > libxc: colo: don't leak pfns and iov in send_checkpoint_dirty_pfn_list
> > libxl: colo: simplify colo_proxy_async_wait_for_checkpoint
> > libxl: colo: add missing break in qemu_disk_scsi_drive_string
> > libxl: colo: fix indentation of abort()
> > libxl: colo: remove dead code in colo_save_setup_script_cb
> >
> > tools/libxc/xc_sr_restore.c | 2 ++
> > tools/libxl/libxl_colo_nic.c | 5 -----
> > tools/libxl/libxl_colo_save.c | 8 ++++----
> > tools/libxl/libxl_dm.c | 3 ++-
> > 4 files changed, 8 insertions(+), 10 deletions(-)
> >
>
> All looks good to me. Thanks for your fix.
>
I take this as Reviewed-by tag.
Please explicitly provide either Acked-by or Reviewed-by tags next time,
thanks.
Wei.
> Thanks
> -Xie
>
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/5] COLO fixes
2016-04-04 17:34 [PATCH 0/5] COLO fixes Wei Liu
` (5 preceding siblings ...)
2016-04-05 5:23 ` [PATCH 0/5] COLO fixes Changlong Xie
@ 2016-04-06 13:51 ` Ian Jackson
6 siblings, 0 replies; 9+ messages in thread
From: Ian Jackson @ 2016-04-06 13:51 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel, Changlong Xie, Wen Congyang
Wei Liu writes ("[PATCH 0/5] COLO fixes"):
> Wei Liu (5):
> libxc: colo: don't leak pfns and iov in send_checkpoint_dirty_pfn_list
> libxl: colo: simplify colo_proxy_async_wait_for_checkpoint
> libxl: colo: add missing break in qemu_disk_scsi_drive_string
> libxl: colo: fix indentation of abort()
> libxl: colo: remove dead code in colo_save_setup_script_cb
All five
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
and queued.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-04-06 13:57 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-04 17:34 [PATCH 0/5] COLO fixes Wei Liu
2016-04-04 17:34 ` [PATCH 1/5] libxc: colo: don't leak pfns and iov in send_checkpoint_dirty_pfn_list Wei Liu
2016-04-04 17:34 ` [PATCH 2/5] libxl: colo: simplify colo_proxy_async_wait_for_checkpoint Wei Liu
2016-04-04 17:34 ` [PATCH 3/5] libxl: colo: add missing break in qemu_disk_scsi_drive_string Wei Liu
2016-04-04 17:34 ` [PATCH 4/5] libxl: colo: fix indentation of abort() Wei Liu
2016-04-04 17:34 ` [PATCH 5/5] libxl: colo: remove dead code in colo_save_setup_script_cb Wei Liu
2016-04-05 5:23 ` [PATCH 0/5] COLO fixes Changlong Xie
2016-04-06 13:42 ` Wei Liu
2016-04-06 13:51 ` Ian Jackson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).