From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Date: Wed, 30 Nov 2016 09:47:52 +0000 (+0800)
Subject: libxl: Add COLO replication top-id support
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~3189
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ad774e70cdaf34505e675b4655dde9eda1b48c9a;p=xen.git

libxl: Add COLO replication top-id support

Because of qemu colo adds the top-id parameter, so we update libxl.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index be928ad275..52e6dfec34 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -826,8 +826,10 @@ static char *qemu_disk_scsi_drive_string(libxl__gc *gc, const char *target_path,
          *  file.backing.backing=exportname,
          */
         drive = GCSPRINTF(
-            "if=scsi,bus=0,unit=%d,cache=writeback,driver=replication,"
+            "if=scsi,id=top-colo,bus=0,unit=%d,cache=writeback,"
+            "driver=replication,"
             "mode=secondary,"
+            "top-id=top-colo,"
             "file.driver=qcow2,"
             "file.file.filename=%s,"
             "file.backing.driver=qcow2,"
@@ -889,8 +891,10 @@ static char *qemu_disk_ide_drive_string(libxl__gc *gc, const char *target_path,
          *  file.backing.backing=exportname,
          */
         drive = GCSPRINTF(
-            "if=ide,index=%d,media=disk,cache=writeback,driver=replication,"
+            "if=ide,index=%d,id=top-colo,media=disk,cache=writeback,"
+            "driver=replication,"
             "mode=secondary,"
+            "top-id=top-colo,"
             "file.driver=qcow2,"
             "file.file.filename=%s,"
             "file.backing.driver=qcow2,"