- updated for 1.3.2

[packages/libvirt.git] / libvirt-xend.patch

diff --git a/libvirt-xend.patch b/libvirt-xend.patch
index a6d4d5b953f562062b44d11c531250f545fdbce7..dcbb0b31e87220c94ff7fa2d38b13bd91e0a2fca 100644 (file)
--- a/libvirt-xend.patch
+++ b/libvirt-xend.patch
@@ -1,28 +1,31 @@
---- libvirt-1.2.4/src/xen/xen_driver.c.orig    2014-05-25 21:03:34.237326121 +0200
-+++ libvirt-1.2.4/src/xen/xen_driver.c 2014-05-25 21:25:26.260632109 +0200
-@@ -320,7 +320,7 @@
+diff -urp libvirt-1.3.2.orig/src/libxl/libxl_driver.c libvirt-1.3.2/src/libxl/libxl_driver.c
+--- libvirt-1.3.2.orig/src/libxl/libxl_driver.c        2016-02-26 09:14:56.000000000 +0000
++++ libvirt-1.3.2/src/libxl/libxl_driver.c     2016-03-18 12:34:43.118768000 +0000
+@@ -477,7 +477,7 @@ libxlDriverShouldLoad(bool privileged)
      if (virFileExists("/usr/sbin/xend")) {
          virCommandPtr cmd;
  
 -        cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
 +        cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
-         if (virCommandRun(cmd, NULL) == 0)
-             ret = true;
-         virCommandFree(cmd);
---- libvirt-1.2.4/src/libxl/libxl_driver.c.orig        2014-05-25 21:03:34.447326117 +0200
-+++ libvirt-1.2.4/src/libxl/libxl_driver.c     2014-05-25 21:28:23.317295096 +0200
-@@ -258,7 +258,7 @@
+         if (virCommandRun(cmd, NULL) == 0) {
+             VIR_INFO("Legacy xen tool stack seems to be in use, disabling "
+                      "libxenlight driver.");
+diff -urp libvirt-1.3.2.orig/src/xen/xen_driver.c libvirt-1.3.2/src/xen/xen_driver.c
+--- libvirt-1.3.2.orig/src/xen/xen_driver.c    2016-02-16 14:25:07.000000000 +0000
++++ libvirt-1.3.2/src/xen/xen_driver.c 2016-03-18 12:34:43.115768000 +0000
+@@ -308,7 +308,7 @@ xenUnifiedXendProbe(void)
      if (virFileExists("/usr/sbin/xend")) {
          virCommandPtr cmd;
  
 -        cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
 +        cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL);
-         if (virCommandRun(cmd, NULL) == 0) {
-             VIR_INFO("Legacy xen tool stack seems to be in use, disabling "
-                      "libxenlight driver.");
---- libvirt-1.2.3/tests/statstest.c.orig       2014-04-04 15:57:05.109436604 +0200
-+++ libvirt-1.2.3/tests/statstest.c    2014-04-04 16:00:09.836099420 +0200
-@@ -49,7 +49,7 @@
+         if (virCommandRun(cmd, NULL) == 0)
+             ret = true;
+         virCommandFree(cmd);
+diff -urp libvirt-1.3.2.orig/tests/reconnect.c libvirt-1.3.2/tests/reconnect.c
+--- libvirt-1.3.2.orig/tests/reconnect.c       2015-01-23 11:46:24.000000000 +0000
++++ libvirt-1.3.2/tests/reconnect.c    2016-03-18 12:34:43.119768000 +0000
+@@ -24,7 +24,7 @@ mymain(void)
      uname(&ut);
      if (strstr(ut.release, "xen") == NULL)
          return EXIT_AM_SKIP;
@@ -31,9 +34,10 @@
      if (virCommandRun(cmd, NULL) < 0) {
          virCommandFree(cmd);
          return EXIT_AM_SKIP;
---- libvirt-1.2.3/tests/reconnect.c.orig       2014-04-04 15:57:05.109436604 +0200
-+++ libvirt-1.2.3/tests/reconnect.c    2014-04-04 16:03:28.892761936 +0200
-@@ -24,7 +24,7 @@
+diff -urp libvirt-1.3.2.orig/tests/statstest.c libvirt-1.3.2/tests/statstest.c
+--- libvirt-1.3.2.orig/tests/statstest.c       2015-04-28 01:15:40.000000000 +0000
++++ libvirt-1.3.2/tests/statstest.c    2016-03-18 12:34:43.119768000 +0000
+@@ -48,7 +48,7 @@ mymain(void)
      uname(&ut);
      if (strstr(ut.release, "xen") == NULL)
          return EXIT_AM_SKIP;