libvirt-xend.patch

   1 diff -urp libvirt-1.3.2.orig/src/libxl/libxl_driver.c libvirt-1.3.2/src/libxl/libxl_driver.c
   2 --- libvirt-1.3.2.orig/src/libxl/libxl_driver.c 2016-02-26 09:14:56.000000000 +0000
   3 +++ libvirt-1.3.2/src/libxl/libxl_driver.c      2016-03-18 12:34:43.118768000 +0000
   4 @@ -477,7 +477,7 @@ libxlDriverShouldLoad(bool privileged)
   5      if (virFileExists("/usr/sbin/xend")) {
   6          virCommandPtr cmd;
   7
   8 -        cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
   9 +        cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
  10          if (virCommandRun(cmd, NULL) == 0) {
  11              VIR_INFO("Legacy xen tool stack seems to be in use, disabling "
  12                       "libxenlight driver.");
  13 diff -urp libvirt-1.3.2.orig/src/xen/xen_driver.c libvirt-1.3.2/src/xen/xen_driver.c
  14 --- libvirt-1.3.2.orig/src/xen/xen_driver.c     2016-02-16 14:25:07.000000000 +0000
  15 +++ libvirt-1.3.2/src/xen/xen_driver.c  2016-03-18 12:34:43.115768000 +0000
  16 @@ -308,7 +308,7 @@ xenUnifiedXendProbe(void)
  17      if (virFileExists("/usr/sbin/xend")) {
  18          virCommandPtr cmd;
  19
  20 -        cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
  21 +        cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
  22          if (virCommandRun(cmd, NULL) == 0)
  23              ret = true;
  24          virCommandFree(cmd);
  25 diff -urp libvirt-1.3.2.orig/tests/reconnect.c libvirt-1.3.2/tests/reconnect.c
  26 --- libvirt-1.3.2.orig/tests/reconnect.c        2015-01-23 11:46:24.000000000 +0000
  27 +++ libvirt-1.3.2/tests/reconnect.c     2016-03-18 12:34:43.119768000 +0000
  28 @@ -24,7 +24,7 @@ mymain(void)
  29      uname(&ut);
  30      if (strstr(ut.release, "xen") == NULL)
  31          return EXIT_AM_SKIP;
  32 -    cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
  33 +    cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
  34      if (virCommandRun(cmd, NULL) < 0) {
  35          virCommandFree(cmd);
  36          return EXIT_AM_SKIP;
  37 diff -urp libvirt-1.3.2.orig/tests/statstest.c libvirt-1.3.2/tests/statstest.c
  38 --- libvirt-1.3.2.orig/tests/statstest.c        2015-04-28 01:15:40.000000000 +0000
  39 +++ libvirt-1.3.2/tests/statstest.c     2016-03-18 12:34:43.119768000 +0000
  40 @@ -48,7 +48,7 @@ mymain(void)
  41      uname(&ut);
  42      if (strstr(ut.release, "xen") == NULL)
  43          return EXIT_AM_SKIP;
  44 -    cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
  45 +    cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
  46      if (virCommandRun(cmd, NULL) < 0) {
  47          virCommandFree(cmd);
  48          return EXIT_AM_SKIP;