fix compile with latest stable sheepdog

[Vasiliy Tolstov <v.tolstov@xxxxxxxxx>]

Latest stable sheepdog version change command from collie to dog.
Patch fixes this issue. (libvirt 1.2.5)


-- 
Vasiliy Tolstov,
e-mail: v.tolstov@xxxxxxxxx
jabber: vase@xxxxxxxxx

--- a/configure.ac	2014-06-11 12:51:22.852000000 +0400
+++ b/configure.ac	2014-06-11 12:52:21.452000000 +0400
@@ -1925,14 +1925,14 @@
 
 if test "$with_storage_sheepdog" = "yes" ||
    test "$with_storage_sheepdog" = "check"; then
-  AC_PATH_PROG([COLLIE], [collie], [], [$PATH:/sbin:/usr/sbin])
+  AC_PATH_PROG([DOG], [dog], [], [$PATH:/sbin:/usr/sbin])
 
   if test "$with_storage_sheepdog" = "yes"; then
-    if test -z "$COLLIE"; then
-      AC_MSG_ERROR([We need collie for Sheepdog storage driver])
+    if test -z "$DOG"; then
+      AC_MSG_ERROR([We need dog for Sheepdog storage driver])
     fi
   else
-    if test -z "$COLLIE"; then
+    if test -z "$DOG"; then
       with_storage_sheepdog=no
     fi
 
@@ -1944,7 +1944,7 @@
   if test "$with_storage_sheepdog" = "yes"; then
     AC_DEFINE_UNQUOTED([WITH_STORAGE_SHEEPDOG], 1,
       [whether Sheepdog backend for storage driver is enabled])
-    AC_DEFINE_UNQUOTED([COLLIE],["$COLLIE"],[Location of collie program])
+    AC_DEFINE_UNQUOTED([DOG],["$DOG"],[Location of dog program])
   fi
 fi
 AM_CONDITIONAL([WITH_STORAGE_SHEEPDOG],
--- a/src/storage/storage_backend_sheepdog.c	2014-06-11 13:00:09.528000000 +0400
+++ b/src/storage/storage_backend_sheepdog.c	2014-06-11 13:00:59.196000000 +0400
@@ -150,7 +150,7 @@ virStorageBackendSheepdogRefreshAllVol(v
     char **cells = NULL;
     size_t i;
 
-    virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "list", "-r", NULL);
+    virCommandPtr cmd = virCommandNewArgList(DOG, "vdi", "list", "-r", NULL);
     virStorageBackendSheepdogAddHostArg(cmd, pool);
     virCommandSetOutputBuffer(cmd, &output);
     if (virCommandRun(cmd, NULL) < 0)
@@ -195,7 +195,7 @@ virStorageBackendSheepdogRefreshPool(vir
     char *output = NULL;
     virCommandPtr cmd;
 
-    cmd = virCommandNewArgList(COLLIE, "node", "info", "-r", NULL);
+    cmd = virCommandNewArgList(DOG, "node", "info", "-r", NULL);
     virStorageBackendSheepdogAddHostArg(cmd, pool);
     virCommandSetOutputBuffer(cmd, &output);
     if (virCommandRun(cmd, NULL) < 0)
@@ -221,7 +221,7 @@ virStorageBackendSheepdogDeleteVol(virCo
 
     virCheckFlags(0, -1);
 
-    virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "delete", vol->name, NULL);
+    virCommandPtr cmd = virCommandNewArgList(DOG, "vdi", "delete", vol->name, NULL);
     virStorageBackendSheepdogAddHostArg(cmd, pool);
     int ret = virCommandRun(cmd, NULL);
 
@@ -266,7 +266,7 @@ virStorageBackendSheepdogBuildVol(virCon
 
     virCheckFlags(0, -1);
 
-    virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "create", vol->name, NULL);
+    virCommandPtr cmd = virCommandNewArgList(DOG, "vdi", "create", vol->name, NULL);
     virCommandAddArgFormat(cmd, "%llu", vol->target.capacity);
     virStorageBackendSheepdogAddHostArg(cmd, pool);
     if (virCommandRun(cmd, NULL) < 0)
@@ -351,7 +351,7 @@ virStorageBackendSheepdogRefreshVol(virC
     int ret;
     char *output = NULL;
 
-    virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "list", vol->name, "-r", NULL);
+    virCommandPtr cmd = virCommandNewArgList(DOG, "vdi", "list", vol->name, "-r", NULL);
     virStorageBackendSheepdogAddHostArg(cmd, pool);
     virCommandSetOutputBuffer(cmd, &output);
     ret = virCommandRun(cmd, NULL);
@@ -387,7 +387,7 @@ virStorageBackendSheepdogResizeVol(virCo
 
     virCheckFlags(0, -1);
 
-    virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "resize", vol->name, NULL);
+    virCommandPtr cmd = virCommandNewArgList(DOG, "vdi", "resize", vol->name, NULL);
     virCommandAddArgFormat(cmd, "%llu", capacity);
     virStorageBackendSheepdogAddHostArg(cmd, pool);
     int ret = virCommandRun(cmd, NULL);

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list