| Message ID | 1480499272-11893-3-git-send-email-zhangchen.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Nov 30, 2016 at 05:47:51PM +0800, Zhang Chen wrote: > Because of qemu codes update, we update Xen colo block codes > > Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> COLO being an experimental feature means that you can change it at will, so for both patches: Acked-by: Wei Liu <wei.liu2@citrix.com> But, this sort of patch does make me wonder how QEMU handles backward compatibility for command line options... > --- > tools/libxl/libxl_colo_qdisk.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/libxl/libxl_colo_qdisk.c b/tools/libxl/libxl_colo_qdisk.c > index d271d1f..300bff2 100644 > --- a/tools/libxl/libxl_colo_qdisk.c > +++ b/tools/libxl/libxl_colo_qdisk.c > @@ -169,9 +169,9 @@ static void colo_qdisk_save_preresume(libxl__egc *egc, > /* qmp command doesn't support the driver "nbd" */ > node = GCSPRINTF("colo_node%d", > libxl__device_disk_dev_number(disk->vdev, NULL, NULL)); > - cmd = GCSPRINTF("drive_add buddy driver=replication,mode=primary," > + cmd = GCSPRINTF("drive_add -n buddy driver=replication,mode=primary," > "file.driver=nbd,file.host=%s,file.port=%d," > - "file.export=%s,node-name=%s,if=none", > + "file.export=%s,node-name=%s", > host, port, export_name, node); > ret = libxl__qmp_hmp(gc, domid, cmd, NULL); > if (ret) > -- > 2.7.4 > > >
On Thu, Dec 01, 2016 at 01:20:18PM +0000, Wei Liu wrote: > On Wed, Nov 30, 2016 at 05:47:51PM +0800, Zhang Chen wrote: > > Because of qemu codes update, we update Xen colo block codes > > > > Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> > > COLO being an experimental feature means that you can change it at will, > so for both patches: > > Acked-by: Wei Liu <wei.liu2@citrix.com> > Now that COLO is fixed on HV side, I've pushed these two toolstack patches. I adjusted the commit subject and text a bit while committing. Wei.
On 12/12/2016 06:37 PM, Wei Liu wrote: > On Thu, Dec 01, 2016 at 01:20:18PM +0000, Wei Liu wrote: >> On Wed, Nov 30, 2016 at 05:47:51PM +0800, Zhang Chen wrote: >>> Because of qemu codes update, we update Xen colo block codes >>> >>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >> COLO being an experimental feature means that you can change it at will, >> so for both patches: >> >> Acked-by: Wei Liu <wei.liu2@citrix.com> >> > Now that COLO is fixed on HV side, I've pushed these two toolstack > patches. > > I adjusted the commit subject and text a bit while committing. I'm glad to hear it. Thanks Zhang Chen > Wei. > > > . >
diff --git a/tools/libxl/libxl_colo_qdisk.c b/tools/libxl/libxl_colo_qdisk.c index d271d1f..300bff2 100644 --- a/tools/libxl/libxl_colo_qdisk.c +++ b/tools/libxl/libxl_colo_qdisk.c @@ -169,9 +169,9 @@ static void colo_qdisk_save_preresume(libxl__egc *egc, /* qmp command doesn't support the driver "nbd" */ node = GCSPRINTF("colo_node%d", libxl__device_disk_dev_number(disk->vdev, NULL, NULL)); - cmd = GCSPRINTF("drive_add buddy driver=replication,mode=primary," + cmd = GCSPRINTF("drive_add -n buddy driver=replication,mode=primary," "file.driver=nbd,file.host=%s,file.port=%d," - "file.export=%s,node-name=%s,if=none", + "file.export=%s,node-name=%s", host, port, export_name, node); ret = libxl__qmp_hmp(gc, domid, cmd, NULL); if (ret)
Because of qemu codes update, we update Xen colo block codes Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> --- tools/libxl/libxl_colo_qdisk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)