From e5c6318b4df37175386b615212c877efbb4591f865139339dbebcee5620e59b3 Mon Sep 17 00:00:00 2001
From: James Fehlig <jfehlig@suse.com>
Date: Mon, 2 Jun 2014 04:12:51 +0000
Subject: [PATCH] Accepting request 235993 from
 home:jfehlig:branches:Virtualization

- Update to libvirt 1.2.5
  - Introduce virDomain{Get,Set}Time APIs
  - Introduce virDomainFSFreeze() and virDomainFSThaw() public API
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Drop upstream patches:
    b98bf811-add-paravirt-shutdown-flag.patch,
    c4fe29f8-use-shutdown-flag.patch,
    da744120-use-reboot-flag.patch,
    d6b27d3e-CVE-2014-0179.patch,
    fd43d1f8-libxl-iface-hostdev.patch,
    99f50208-managed-hostdev-iface.patch,
    292d3f2d-libselinux-build-fix1.patch,
    b109c097-libselinux-build-fix2.patch

OBS-URL: https://build.opensuse.org/request/show/235993
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=381
---
 292d3f2d-libselinux-build-fix1.patch       |  98 -------------------
 99f50208-managed-hostdev-iface.patch       |  40 --------
 add-nocow-to-vol-xml.patch                 |  28 +++---
 b109c097-libselinux-build-fix2.patch       | 101 --------------------
 b98bf811-add-paravirt-shutdown-flag.patch  | 106 ---------------------
 c4fe29f8-use-shutdown-flag.patch           |  68 -------------
 d6b27d3e-CVE-2014-0179.patch               |  34 -------
 da744120-use-reboot-flag.patch             |  44 ---------
 disable-virCgroupGetPercpuStats-test.patch |   6 +-
 fd43d1f8-libxl-iface-hostdev.patch         |  55 -----------
 fix-pci-attach-xen-driver.patch            |   6 +-
 ia64-clone.patch                           |   6 +-
 install-apparmor-profiles.patch            |  22 ++---
 libvirt-1.2.4.tar.bz2                      |   3 -
 libvirt-1.2.5.tar.bz2                      |   3 +
 libvirt-guests-init-script.patch           |  18 ++--
 libvirt-suse-netcontrol.patch              |  40 ++++----
 libvirt.changes                            |  18 ++++
 libvirt.spec                               |  18 +---
 libvirtd-defaults.patch                    |  18 ++--
 libvirtd-init-script.patch                 |   6 +-
 libxl-migration-support.patch              |  42 ++++----
 support-managed-pci-xen-driver.patch       |  12 +--
 suse-qemu-conf.patch                       |   6 +-
 systemd-service-xen.patch                  |   6 +-
 virtlockd-init-script.patch                |  12 +--
 xen-name-for-devid.patch                   |   6 +-
 xen-pv-cdrom.patch                         |   6 +-
 28 files changed, 142 insertions(+), 686 deletions(-)
 delete mode 100644 292d3f2d-libselinux-build-fix1.patch
 delete mode 100644 99f50208-managed-hostdev-iface.patch
 delete mode 100644 b109c097-libselinux-build-fix2.patch
 delete mode 100644 b98bf811-add-paravirt-shutdown-flag.patch
 delete mode 100644 c4fe29f8-use-shutdown-flag.patch
 delete mode 100644 d6b27d3e-CVE-2014-0179.patch
 delete mode 100644 da744120-use-reboot-flag.patch
 delete mode 100644 fd43d1f8-libxl-iface-hostdev.patch
 delete mode 100644 libvirt-1.2.4.tar.bz2
 create mode 100644 libvirt-1.2.5.tar.bz2

diff --git a/292d3f2d-libselinux-build-fix1.patch b/292d3f2d-libselinux-build-fix1.patch
deleted file mode 100644
index 5e40d74..0000000
--- a/292d3f2d-libselinux-build-fix1.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-commit 292d3f2d38e8faca075ababcb652f2e090b745b2
-Author: Cédric Bosdonnat <cbosdonnat@suse.com>
-Date:   Wed May 28 14:44:08 2014 +0200
-
-    build: fix build with libselinux 2.3
-    
-    Several function signatures changed in libselinux 2.3, now taking
-    a 'const char *' instead of 'security_context_t'.  The latter is
-    defined in selinux/selinux.h as
-    
-      typedef char *security_context_t;
-    
-    Signed-off-by: Eric Blake <eblake@redhat.com>
-
-Index: libvirt-1.2.4/m4/virt-selinux.m4
-===================================================================
---- libvirt-1.2.4.orig/m4/virt-selinux.m4
-+++ libvirt-1.2.4/m4/virt-selinux.m4
-@@ -1,6 +1,6 @@
- dnl The libselinux.so library
- dnl
--dnl Copyright (C) 2012-2013 Red Hat, Inc.
-+dnl Copyright (C) 2012-2014 Red Hat, Inc.
- dnl
- dnl This library is free software; you can redistribute it and/or
- dnl modify it under the terms of the GNU Lesser General Public
-@@ -28,6 +28,21 @@ AC_DEFUN([LIBVIRT_CHECK_SELINUX],[
-     [with_selinux_mount=check])
- 
-   if test "$with_selinux" = "yes"; then
-+    # libselinux changed signatures between 2.2 and 2.3
-+    AC_CACHE_CHECK([for selinux setcon parameter type], [gt_cv_setcon_param],
-+    [AC_COMPILE_IFELSE(
-+      [AC_LANG_PROGRAM(
-+         [[
-+#include <selinux/selinux.h>
-+int setcon(const security_context_t context);
-+         ]])],
-+         [gt_cv_setcon_param='security_context_t'],
-+         [gt_cv_setcon_param='const char*'])])
-+    if test "$gt_cv_setcon_param" = 'const char*'; then
-+       AC_DEFINE_UNQUOTED([SELINUX_CTX_CHAR_PTR], 1,
-+                          [SELinux uses newer char * for security context])
-+    fi
-+
-     AC_MSG_CHECKING([SELinux mount point])
-     if test "$with_selinux_mount" = "check" || test -z "$with_selinux_mount"; then
-       if test -d /sys/fs/selinux ; then
-Index: libvirt-1.2.4/tests/securityselinuxhelper.c
-===================================================================
---- libvirt-1.2.4.orig/tests/securityselinuxhelper.c
-+++ libvirt-1.2.4/tests/securityselinuxhelper.c
-@@ -156,7 +156,11 @@ int getpidcon(pid_t pid, security_contex
-     return getpidcon_raw(pid, context);
- }
- 
-+#ifdef SELINUX_CTX_CHAR_PTR
-+int setcon_raw(const char *context)
-+#else
- int setcon_raw(security_context_t context)
-+#endif
- {
-     if (!is_selinux_enabled()) {
-         errno = EINVAL;
-@@ -165,13 +169,21 @@ int setcon_raw(security_context_t contex
-     return setenv("FAKE_SELINUX_CONTEXT", context, 1);
- }
- 
-+#ifdef SELINUX_CTX_CHAR_PTR
-+int setcon(const char *context)
-+#else
- int setcon(security_context_t context)
-+#endif
- {
-     return setcon_raw(context);
- }
- 
- 
-+#ifdef SELINUX_CTX_CHAR_PTR
-+int setfilecon_raw(const char *path, const char *con)
-+#else
- int setfilecon_raw(const char *path, security_context_t con)
-+#endif
- {
-     const char *constr = con;
-     if (STRPREFIX(path, abs_builddir "/securityselinuxlabeldata/nfs/")) {
-@@ -182,7 +194,11 @@ int setfilecon_raw(const char *path, sec
-                     constr, strlen(constr), 0);
- }
- 
-+#ifdef SELINUX_CTX_CHAR_PTR
-+int setfilecon(const char *path, const char *con)
-+#else
- int setfilecon(const char *path, security_context_t con)
-+#endif
- {
-     return setfilecon_raw(path, con);
- }
diff --git a/99f50208-managed-hostdev-iface.patch b/99f50208-managed-hostdev-iface.patch
deleted file mode 100644
index 6e7f16d..0000000
--- a/99f50208-managed-hostdev-iface.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 99f50208c9ff49bbb8b864407be02522976c1b4f
-Author: Chunyan Liu <cyliu@suse.com>
-Date:   Thu May 8 14:44:05 2014 +0800
-
-    update documentation of <interface type='hostdev'>
-    
-    <interface type='hostdev' managed='yes'> is supported, but
-    nowhere mentions 'managed' in <interface type='hostdev'> syntax.
-    Update documentation to cover it.
-    
-    Signed-off-by: Chunyan Liu <cyliu@suse.com>
-
-Index: libvirt-1.2.4/docs/formatdomain.html.in
-===================================================================
---- libvirt-1.2.4.orig/docs/formatdomain.html.in
-+++ libvirt-1.2.4/docs/formatdomain.html.in
-@@ -3507,10 +3507,22 @@
-       guest instead of &lt;interface type='hostdev'/&gt;.
-     </p>
- 
-+    <p>
-+      Similar to the functionality of a standard &lt;hostdev&gt; device,
-+      when <code>managed</code> is "yes", it is detached from the host
-+      before being passed on to the guest, and reattached to the host
-+      after the guest exits. If <code>managed</code> is omitted or "no",
-+      the user is responsible to call <code>virNodeDeviceDettach</code>
-+      (or <code>virsh nodedev-dettach</code>) before starting the guest
-+      or hot-plugging the device, and <code>virNodeDeviceReAttach</code>
-+      (or <code>virsh nodedev-reattach</code>) after hot-unplug or
-+      stopping the guest.
-+    </p>
-+
- <pre>
-   ...
-   &lt;devices&gt;
--    &lt;interface type='hostdev'&gt;
-+    &lt;interface type='hostdev' managed='yes'&gt;
-       &lt;driver name='vfio'/&gt;
-       &lt;source&gt;
-         &lt;address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/&gt;
diff --git a/add-nocow-to-vol-xml.patch b/add-nocow-to-vol-xml.patch
index ccf7ee5..c8ffd62 100644
--- a/add-nocow-to-vol-xml.patch
+++ b/add-nocow-to-vol-xml.patch
@@ -8,10 +8,10 @@ Date:   Wed May 7 12:45:40 2014 +0800
     
     Signed-off-by: Chunyan Liu <cyliu@suse.com>
 
-Index: libvirt-1.2.4/docs/schemas/storagevol.rng
+Index: libvirt-1.2.5/docs/schemas/storagevol.rng
 ===================================================================
---- libvirt-1.2.4.orig/docs/schemas/storagevol.rng
-+++ libvirt-1.2.4/docs/schemas/storagevol.rng
+--- libvirt-1.2.5.orig/docs/schemas/storagevol.rng
++++ libvirt-1.2.5/docs/schemas/storagevol.rng
 @@ -138,6 +138,11 @@
            <ref name='compat'/>
          </optional>
@@ -24,10 +24,10 @@ Index: libvirt-1.2.4/docs/schemas/storagevol.rng
            <ref name='fileFormatFeatures'/>
          </optional>
        </interleave>
-Index: libvirt-1.2.4/src/conf/storage_conf.c
+Index: libvirt-1.2.5/src/conf/storage_conf.c
 ===================================================================
---- libvirt-1.2.4.orig/src/conf/storage_conf.c
-+++ libvirt-1.2.4/src/conf/storage_conf.c
+--- libvirt-1.2.5.orig/src/conf/storage_conf.c
++++ libvirt-1.2.5/src/conf/storage_conf.c
 @@ -1395,6 +1395,9 @@ virStorageVolDefParseXML(virStoragePoolD
          virStringFreeList(version);
      }
@@ -38,10 +38,10 @@ Index: libvirt-1.2.4/src/conf/storage_conf.c
      if (options->featureFromString && virXPathNode("./target/features", ctxt)) {
          if ((n = virXPathNodeSet("./target/features/*", ctxt, &nodes)) < 0)
              goto error;
-Index: libvirt-1.2.4/src/storage/storage_backend.c
+Index: libvirt-1.2.5/src/storage/storage_backend.c
 ===================================================================
---- libvirt-1.2.4.orig/src/storage/storage_backend.c
-+++ libvirt-1.2.4/src/storage/storage_backend.c
+--- libvirt-1.2.5.orig/src/storage/storage_backend.c
++++ libvirt-1.2.5/src/storage/storage_backend.c
 @@ -37,6 +37,9 @@
  #ifdef __linux__
  # include <sys/ioctl.h>
@@ -99,12 +99,12 @@ Index: libvirt-1.2.4/src/storage/storage_backend.c
                                                 vol->target.features) < 0) {
              virCommandFree(cmd);
              return NULL;
-Index: libvirt-1.2.4/src/util/virstoragefile.h
+Index: libvirt-1.2.5/src/util/virstoragefile.h
 ===================================================================
---- libvirt-1.2.4.orig/src/util/virstoragefile.h
-+++ libvirt-1.2.4/src/util/virstoragefile.h
-@@ -228,6 +228,7 @@ struct _virStorageSource {
-     int format; /* enum virStorageFileFormat */
+--- libvirt-1.2.5.orig/src/util/virstoragefile.h
++++ libvirt-1.2.5/src/util/virstoragefile.h
+@@ -232,6 +232,7 @@ struct _virStorageSource {
+                  * pool-specific enum for storage volumes */
      virBitmapPtr features;
      char *compat;
 +    bool nocow;
diff --git a/b109c097-libselinux-build-fix2.patch b/b109c097-libselinux-build-fix2.patch
deleted file mode 100644
index 1e83c0a..0000000
--- a/b109c097-libselinux-build-fix2.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-commit b109c097654c4fe003e8535481191f37a35d5d7b
-Author: Jim Fehlig <jfehlig@suse.com>
-Date:   Wed May 28 13:48:21 2014 -0600
-
-    maint: cleanup detection of const'ness of selinux ctx
-    
-    Commit 292d3f2d fixed the build with libselinux 2.3, but missed
-    some suggestions by eblake
-    
-    https://www.redhat.com/archives/libvir-list/2014-May/msg00977.html
-    
-    This patch changes the macro introduced in 292d3f2d to either be
-    empty in the case of newer libselinux, or contain 'const' in the
-    case of older libselinux.  The macro is then used directly in
-    tests/securityselinuxhelper.c.
-
-Index: libvirt-1.2.4/m4/virt-selinux.m4
-===================================================================
---- libvirt-1.2.4.orig/m4/virt-selinux.m4
-+++ libvirt-1.2.4/m4/virt-selinux.m4
-@@ -29,19 +29,18 @@ AC_DEFUN([LIBVIRT_CHECK_SELINUX],[
- 
-   if test "$with_selinux" = "yes"; then
-     # libselinux changed signatures between 2.2 and 2.3
--    AC_CACHE_CHECK([for selinux setcon parameter type], [gt_cv_setcon_param],
-+    AC_CACHE_CHECK([for selinux setcon parameter type], [lv_cv_setcon_param],
-     [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[
- #include <selinux/selinux.h>
--int setcon(const security_context_t context);
-+int setcon(char *context);
-          ]])],
--         [gt_cv_setcon_param='security_context_t'],
--         [gt_cv_setcon_param='const char*'])])
--    if test "$gt_cv_setcon_param" = 'const char*'; then
--       AC_DEFINE_UNQUOTED([SELINUX_CTX_CHAR_PTR], 1,
--                          [SELinux uses newer char * for security context])
--    fi
-+         [lv_cv_setcon_const=''],
-+         [lv_cv_setcon_const='const'])])
-+    AC_DEFINE_UNQUOTED([VIR_SELINUX_CTX_CONST], [$lv_cv_setcon_const],
-+      [Define to empty or 'const' depending on how SELinux qualifies its
-+       security context parameters])
- 
-     AC_MSG_CHECKING([SELinux mount point])
-     if test "$with_selinux_mount" = "check" || test -z "$with_selinux_mount"; then
-Index: libvirt-1.2.4/tests/securityselinuxhelper.c
-===================================================================
---- libvirt-1.2.4.orig/tests/securityselinuxhelper.c
-+++ libvirt-1.2.4/tests/securityselinuxhelper.c
-@@ -156,11 +156,7 @@ int getpidcon(pid_t pid, security_contex
-     return getpidcon_raw(pid, context);
- }
- 
--#ifdef SELINUX_CTX_CHAR_PTR
--int setcon_raw(const char *context)
--#else
--int setcon_raw(security_context_t context)
--#endif
-+int setcon_raw(VIR_SELINUX_CTX_CONST char *context)
- {
-     if (!is_selinux_enabled()) {
-         errno = EINVAL;
-@@ -169,21 +165,13 @@ int setcon_raw(security_context_t contex
-     return setenv("FAKE_SELINUX_CONTEXT", context, 1);
- }
- 
--#ifdef SELINUX_CTX_CHAR_PTR
--int setcon(const char *context)
--#else
--int setcon(security_context_t context)
--#endif
-+int setcon(VIR_SELINUX_CTX_CONST char *context)
- {
-     return setcon_raw(context);
- }
- 
- 
--#ifdef SELINUX_CTX_CHAR_PTR
--int setfilecon_raw(const char *path, const char *con)
--#else
--int setfilecon_raw(const char *path, security_context_t con)
--#endif
-+int setfilecon_raw(const char *path, VIR_SELINUX_CTX_CONST char *con)
- {
-     const char *constr = con;
-     if (STRPREFIX(path, abs_builddir "/securityselinuxlabeldata/nfs/")) {
-@@ -194,11 +182,7 @@ int setfilecon_raw(const char *path, sec
-                     constr, strlen(constr), 0);
- }
- 
--#ifdef SELINUX_CTX_CHAR_PTR
--int setfilecon(const char *path, const char *con)
--#else
--int setfilecon(const char *path, security_context_t con)
--#endif
-+int setfilecon(const char *path, VIR_SELINUX_CTX_CONST char *con)
- {
-     return setfilecon_raw(path, con);
- }
diff --git a/b98bf811-add-paravirt-shutdown-flag.patch b/b98bf811-add-paravirt-shutdown-flag.patch
deleted file mode 100644
index 97a16a0..0000000
--- a/b98bf811-add-paravirt-shutdown-flag.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-commit b98bf81151446b34dde59217dec19f93981c8047
-Author: Jim Fehlig <jfehlig@suse.com>
-Date:   Thu May 1 11:42:54 2014 -0600
-
-    Introduce a new flag for controlling shutdown/reboot
-    
-    Add a new flag to virDomain{Reboot,Shutdown}FlagValues to allow
-    shutting down and rebooting a domain via the Xen paravirt control
-    interface.
-
-Index: libvirt-1.2.4/include/libvirt/libvirt.h.in
-===================================================================
---- libvirt-1.2.4.orig/include/libvirt/libvirt.h.in
-+++ libvirt-1.2.4/include/libvirt/libvirt.h.in
-@@ -1652,6 +1652,7 @@ typedef enum {
-     VIR_DOMAIN_SHUTDOWN_GUEST_AGENT    = (1 << 1), /* Use guest agent */
-     VIR_DOMAIN_SHUTDOWN_INITCTL        = (1 << 2), /* Use initctl */
-     VIR_DOMAIN_SHUTDOWN_SIGNAL         = (1 << 3), /* Send a signal */
-+    VIR_DOMAIN_SHUTDOWN_PARAVIRT       = (1 << 4), /* Use paravirt guest control */
- } virDomainShutdownFlagValues;
- 
- int                     virDomainShutdown       (virDomainPtr domain);
-@@ -1664,6 +1665,7 @@ typedef enum {
-     VIR_DOMAIN_REBOOT_GUEST_AGENT    = (1 << 1), /* Use guest agent */
-     VIR_DOMAIN_REBOOT_INITCTL        = (1 << 2), /* Use initctl */
-     VIR_DOMAIN_REBOOT_SIGNAL         = (1 << 3), /* Send a signal */
-+    VIR_DOMAIN_REBOOT_PARAVIRT       = (1 << 4), /* Use paravirt guest control */
- } virDomainRebootFlagValues;
- 
- int                     virDomainReboot         (virDomainPtr domain,
-Index: libvirt-1.2.4/tools/virsh-domain.c
-===================================================================
---- libvirt-1.2.4.orig/tools/virsh-domain.c
-+++ libvirt-1.2.4/tools/virsh-domain.c
-@@ -4837,7 +4837,7 @@ static const vshCmdOptDef opts_shutdown[
-     },
-     {.name = "mode",
-      .type = VSH_OT_STRING,
--     .help = N_("shutdown mode: acpi|agent|initctl|signal")
-+     .help = N_("shutdown mode: acpi|agent|initctl|signal|paravirt")
-     },
-     {.name = NULL}
- };
-@@ -4872,9 +4872,12 @@ cmdShutdown(vshControl *ctl, const vshCm
-             flags |= VIR_DOMAIN_SHUTDOWN_INITCTL;
-         } else if (STREQ(mode, "signal")) {
-             flags |= VIR_DOMAIN_SHUTDOWN_SIGNAL;
-+        } else if (STREQ(mode, "paravirt")) {
-+            flags |= VIR_DOMAIN_SHUTDOWN_PARAVIRT;
-         } else {
-             vshError(ctl, _("Unknown mode %s value, expecting "
--                            "'acpi', 'agent', 'initctl' or 'signal'"), mode);
-+                            "'acpi', 'agent', 'initctl', 'signal', "
-+                            "or 'paravirt'"), mode);
-             goto cleanup;
-         }
-         tmp++;
-@@ -4923,7 +4926,7 @@ static const vshCmdOptDef opts_reboot[]
-     },
-     {.name = "mode",
-      .type = VSH_OT_STRING,
--     .help = N_("shutdown mode: acpi|agent|initctl|signal")
-+     .help = N_("shutdown mode: acpi|agent|initctl|signal|paravirt")
-     },
-     {.name = NULL}
- };
-@@ -4957,9 +4960,12 @@ cmdReboot(vshControl *ctl, const vshCmd
-             flags |= VIR_DOMAIN_REBOOT_INITCTL;
-         } else if (STREQ(mode, "signal")) {
-             flags |= VIR_DOMAIN_REBOOT_SIGNAL;
-+        } else if (STREQ(mode, "paravirt")) {
-+            flags |= VIR_DOMAIN_REBOOT_PARAVIRT;
-         } else {
-             vshError(ctl, _("Unknown mode %s value, expecting "
--                            "'acpi', 'agent', 'initctl' or 'signal'"), mode);
-+                            "'acpi', 'agent', 'initctl', 'signal' "
-+                            "or 'paravirt'"), mode);
-             goto cleanup;
-         }
-         tmp++;
-Index: libvirt-1.2.4/tools/virsh.pod
-===================================================================
---- libvirt-1.2.4.orig/tools/virsh.pod
-+++ libvirt-1.2.4/tools/virsh.pod
-@@ -1302,8 +1302,8 @@ I<on_reboot> parameter in the domain's X
- By default the hypervisor will try to pick a suitable shutdown
- method. To specify an alternative method, the I<--mode> parameter
- can specify a comma separated list which includes C<acpi>, C<agent>,
--C<initctl> and C<signal>. The order in which drivers will try each
--mode is undefined, and not related to the order specified to virsh.
-+C<initctl>, C<signal> and C<paravirt>. The order in which drivers will
-+try each mode is undefined, and not related to the order specified to virsh.
- For strict control over ordering, use a single mode at a time and
- repeat the command.
- 
-@@ -1781,8 +1781,8 @@ snapshot metadata with B<snapshot-create
- By default the hypervisor will try to pick a suitable shutdown
- method. To specify an alternative method, the I<--mode> parameter
- can specify a comma separated list which includes C<acpi>, C<agent>,
--C<initctl> and C<signal>. The order in which drivers will try each
--mode is undefined, and not related to the order specified to virsh.
-+C<initctl>, C<signal> and C<paravirt>. The order in which drivers will
-+try each mode is undefined, and not related to the order specified to virsh.
- For strict control over ordering, use a single mode at a time and
- repeat the command.
- 
diff --git a/c4fe29f8-use-shutdown-flag.patch b/c4fe29f8-use-shutdown-flag.patch
deleted file mode 100644
index d8ee978..0000000
--- a/c4fe29f8-use-shutdown-flag.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-commit c4fe29f88c4c1d5f571941e95c26246c8c84ce45
-Author: Jim Fehlig <jfehlig@suse.com>
-Date:   Thu May 1 12:11:51 2014 -0600
-
-    libxl: support PARAVIRT and ACPI shutdown flags
-    
-    Add support for VIR_DOMAIN_SHUTDOWN_PARAVIRT and
-    VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN flags in
-    libxlDomainShutdownFlags().
-
-Index: libvirt-1.2.4/src/libxl/libxl_driver.c
-===================================================================
---- libvirt-1.2.4.orig/src/libxl/libxl_driver.c
-+++ libvirt-1.2.4/src/libxl/libxl_driver.c
-@@ -873,7 +873,11 @@ libxlDomainShutdownFlags(virDomainPtr do
-     int ret = -1;
-     libxlDomainObjPrivatePtr priv;
- 
--    virCheckFlags(0, -1);
-+    virCheckFlags(VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN |
-+                  VIR_DOMAIN_SHUTDOWN_PARAVIRT, -1);
-+    if (flags == 0)
-+        flags = VIR_DOMAIN_SHUTDOWN_PARAVIRT |
-+            VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN;
- 
-     if (!(vm = libxlDomObjFromDomain(dom)))
-         goto cleanup;
-@@ -888,18 +892,33 @@ libxlDomainShutdownFlags(virDomainPtr do
-     }
- 
-     priv = vm->privateData;
--    if (libxl_domain_shutdown(priv->ctx, vm->def->id) != 0) {
-+    if (flags & VIR_DOMAIN_SHUTDOWN_PARAVIRT) {
-+        ret = libxl_domain_shutdown(priv->ctx, vm->def->id);
-+        if (ret == 0)
-+            goto cleanup;
-+
-+        if (ret != ERROR_NOPARAVIRT) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Failed to shutdown domain '%d' with libxenlight"),
-+                           vm->def->id);
-+            ret = -1;
-+            goto cleanup;
-+        }
-+        ret = -1;
-+    }
-+
-+    if (flags & VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN) {
-+        ret = libxl_send_trigger(priv->ctx, vm->def->id,
-+                                 LIBXL_TRIGGER_POWER, 0);
-+        if (ret == 0)
-+            goto cleanup;
-+
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Failed to shutdown domain '%d' with libxenlight"),
-                        vm->def->id);
--        goto cleanup;
-+        ret = -1;
-     }
- 
--    /* vm is marked shutoff (or removed from domains list if not persistent)
--     * in shutdown event handler.
--     */
--    ret = 0;
--
-  cleanup:
-     if (vm)
-         virObjectUnlock(vm);
diff --git a/d6b27d3e-CVE-2014-0179.patch b/d6b27d3e-CVE-2014-0179.patch
deleted file mode 100644
index ef9e107..0000000
--- a/d6b27d3e-CVE-2014-0179.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit d6b27d3e4c40946efa79e91d134616b41b1666c4
-Author: Daniel P. Berrange <berrange@redhat.com>
-Date:   Tue Apr 15 11:20:29 2014 +0100
-
-    LSN-2014-0003: Don't expand entities when parsing XML
-    
-    If the XML_PARSE_NOENT flag is passed to libxml2, then any
-    entities in the input document will be fully expanded. This
-    allows the user to read arbitrary files on the host machine
-    by creating an entity pointing to a local file. Removing
-    the XML_PARSE_NOENT flag means that any entities are left
-    unchanged by the parser, or expanded to "" by the XPath
-    APIs.
-    
-    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-
-Index: libvirt-1.2.4/src/util/virxml.c
-===================================================================
---- libvirt-1.2.4.orig/src/util/virxml.c
-+++ libvirt-1.2.4/src/util/virxml.c
-@@ -746,11 +746,11 @@ virXMLParseHelper(int domcode,
- 
-     if (filename) {
-         xml = xmlCtxtReadFile(pctxt, filename, NULL,
--                              XML_PARSE_NOENT | XML_PARSE_NONET |
-+                              XML_PARSE_NONET |
-                               XML_PARSE_NOWARNING);
-     } else {
-         xml = xmlCtxtReadDoc(pctxt, BAD_CAST xmlStr, url, NULL,
--                             XML_PARSE_NOENT | XML_PARSE_NONET |
-+                             XML_PARSE_NONET |
-                              XML_PARSE_NOWARNING);
-     }
-     if (!xml)
diff --git a/da744120-use-reboot-flag.patch b/da744120-use-reboot-flag.patch
deleted file mode 100644
index db3a67f..0000000
--- a/da744120-use-reboot-flag.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit da7441204635f4692c729af089ad455365f37b2f
-Author: Jim Fehlig <jfehlig@suse.com>
-Date:   Thu May 1 15:00:47 2014 -0600
-
-    libxl: support PARAVIRT reboot flag
-    
-    Add support for the VIR_DOMAIN_REBOOT_PARAVIRT flag in
-    libxlDomainReboot().
-
-Index: libvirt-1.2.4/src/libxl/libxl_driver.c
-===================================================================
---- libvirt-1.2.4.orig/src/libxl/libxl_driver.c
-+++ libvirt-1.2.4/src/libxl/libxl_driver.c
-@@ -939,7 +939,9 @@ libxlDomainReboot(virDomainPtr dom, unsi
-     int ret = -1;
-     libxlDomainObjPrivatePtr priv;
- 
--    virCheckFlags(0, -1);
-+    virCheckFlags(VIR_DOMAIN_REBOOT_PARAVIRT, -1);
-+    if (flags == 0)
-+        flags = VIR_DOMAIN_REBOOT_PARAVIRT;
- 
-     if (!(vm = libxlDomObjFromDomain(dom)))
-         goto cleanup;
-@@ -954,13 +956,16 @@ libxlDomainReboot(virDomainPtr dom, unsi
-     }
- 
-     priv = vm->privateData;
--    if (libxl_domain_reboot(priv->ctx, vm->def->id) != 0) {
-+    if (flags & VIR_DOMAIN_REBOOT_PARAVIRT) {
-+        ret = libxl_domain_reboot(priv->ctx, vm->def->id);
-+        if (ret == 0)
-+            goto cleanup;
-+
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Failed to reboot domain '%d' with libxenlight"),
-                        vm->def->id);
--        goto cleanup;
-+        ret = -1;
-     }
--    ret = 0;
- 
-  cleanup:
-     if (vm)
diff --git a/disable-virCgroupGetPercpuStats-test.patch b/disable-virCgroupGetPercpuStats-test.patch
index d1fb56e..399616e 100644
--- a/disable-virCgroupGetPercpuStats-test.patch
+++ b/disable-virCgroupGetPercpuStats-test.patch
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.4/tests/vircgrouptest.c
+Index: libvirt-1.2.5/tests/vircgrouptest.c
 ===================================================================
---- libvirt-1.2.4.orig/tests/vircgrouptest.c
-+++ libvirt-1.2.4/tests/vircgrouptest.c
+--- libvirt-1.2.5.orig/tests/vircgrouptest.c
++++ libvirt-1.2.5/tests/vircgrouptest.c
 @@ -33,7 +33,6 @@
  # include "virlog.h"
  # include "virfile.h"
diff --git a/fd43d1f8-libxl-iface-hostdev.patch b/fd43d1f8-libxl-iface-hostdev.patch
deleted file mode 100644
index 24cf066..0000000
--- a/fd43d1f8-libxl-iface-hostdev.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-commit fd43d1f8bd3e8381d266f7c2a7e701568b29e2aa
-Author: Chunyan Liu <cyliu@suse.com>
-Date:   Thu May 8 14:44:04 2014 +0800
-
-    libxl: fix support for <interface type="hostdev"> syntax
-    
-    A VIR_DOMAIN_NET_TYPE_HOSTDEV interface device is really a hostdev
-    device, which is created by the libxl driver in libxlMakePCIList().
-    There is no need to create a libxl_device_nic for such hostdev
-    devices, so skip interfaces of type VIR_DOMAIN_NET_TYPE_HOSTDEV in
-    libxlMakeNicList().
-    
-    Signed-off-by: Chunyan Liu <cyliu@suse.com>
-
-Index: libvirt-1.2.4/src/libxl/libxl_conf.c
-===================================================================
---- libvirt-1.2.4.orig/src/libxl/libxl_conf.c
-+++ libvirt-1.2.4/src/libxl/libxl_conf.c
-@@ -921,25 +921,31 @@ static int
- libxlMakeNicList(virDomainDefPtr def,  libxl_domain_config *d_config)
- {
-     virDomainNetDefPtr *l_nics = def->nets;
--    int nnics = def->nnets;
-+    size_t nnics = def->nnets;
-     libxl_device_nic *x_nics;
--    size_t i;
-+    size_t i, nvnics = 0;
- 
-     if (VIR_ALLOC_N(x_nics, nnics) < 0)
-         return -1;
- 
-     for (i = 0; i < nnics; i++) {
--        if (libxlMakeNic(def, l_nics[i], &x_nics[i]))
-+        if (l_nics[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV)
-+            continue;
-+
-+        if (libxlMakeNic(def, l_nics[i], &x_nics[nvnics]))
-             goto error;
-         /*
-          * The devid (at least right now) will not get initialized by
-          * libxl in the setup case but is required for starting the
-          * device-model.
-          */
--        if (x_nics[i].devid < 0)
--            x_nics[i].devid = i;
-+        if (x_nics[nvnics].devid < 0)
-+            x_nics[nvnics].devid = nvnics;
-+
-+        nvnics++;
-     }
- 
-+    VIR_SHRINK_N(x_nics, nnics, nnics - nvnics);
-     d_config->nics = x_nics;
-     d_config->num_nics = nnics;
- 
diff --git a/fix-pci-attach-xen-driver.patch b/fix-pci-attach-xen-driver.patch
index b849e3b..5d0146a 100644
--- a/fix-pci-attach-xen-driver.patch
+++ b/fix-pci-attach-xen-driver.patch
@@ -8,10 +8,10 @@ uses the 'device_configure' RPC.
 This patch changes the xend driver to always call 'device_configure' for
 PCI devices to be consistent with the usage in the xen tools.
 
-Index: libvirt-1.2.4/src/xen/xend_internal.c
+Index: libvirt-1.2.5/src/xen/xend_internal.c
 ===================================================================
---- libvirt-1.2.4.orig/src/xen/xend_internal.c
-+++ libvirt-1.2.4/src/xen/xend_internal.c
+--- libvirt-1.2.5.orig/src/xen/xend_internal.c
++++ libvirt-1.2.5/src/xen/xend_internal.c
 @@ -2219,6 +2219,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr
      virBuffer buf = VIR_BUFFER_INITIALIZER;
      char class[8], ref[80];
diff --git a/ia64-clone.patch b/ia64-clone.patch
index f2c0986..d103da5 100644
--- a/ia64-clone.patch
+++ b/ia64-clone.patch
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.4/src/lxc/lxc_container.c
+Index: libvirt-1.2.5/src/lxc/lxc_container.c
 ===================================================================
---- libvirt-1.2.4.orig/src/lxc/lxc_container.c
-+++ libvirt-1.2.4/src/lxc/lxc_container.c
+--- libvirt-1.2.5.orig/src/lxc/lxc_container.c
++++ libvirt-1.2.5/src/lxc/lxc_container.c
 @@ -164,12 +164,19 @@ int lxcContainerHasReboot(void)
      VIR_FREE(buf);
      cmd = v ? LINUX_REBOOT_CMD_CAD_ON : LINUX_REBOOT_CMD_CAD_OFF;
diff --git a/install-apparmor-profiles.patch b/install-apparmor-profiles.patch
index 40bc42e..f0f2b5d 100644
--- a/install-apparmor-profiles.patch
+++ b/install-apparmor-profiles.patch
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.4/examples/apparmor/Makefile.am
+Index: libvirt-1.2.5/examples/apparmor/Makefile.am
 ===================================================================
---- libvirt-1.2.4.orig/examples/apparmor/Makefile.am
-+++ libvirt-1.2.4/examples/apparmor/Makefile.am
+--- libvirt-1.2.5.orig/examples/apparmor/Makefile.am
++++ libvirt-1.2.5/examples/apparmor/Makefile.am
 @@ -18,10 +18,22 @@ EXTRA_DIST=				\
  	TEMPLATE			\
  	libvirt-qemu			\
@@ -27,10 +27,10 @@ Index: libvirt-1.2.4/examples/apparmor/Makefile.am
  apparmordir = $(sysconfdir)/apparmor.d/
  apparmor_DATA = \
  	usr.lib.libvirt.virt-aa-helper \
-Index: libvirt-1.2.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+Index: libvirt-1.2.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
 ===================================================================
 --- /dev/null
-+++ libvirt-1.2.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
++++ libvirt-1.2.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
 @@ -0,0 +1,48 @@
 +# Last Modified: Mon Apr  5 15:10:27 2010
 +#include <tunables/global>
@@ -80,10 +80,10 @@ Index: libvirt-1.2.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
 +  /**.[iI][sS][oO] r,
 +  /**/disk{,.*} r,
 +}
-Index: libvirt-1.2.4/examples/apparmor/usr.sbin.libvirtd.in
+Index: libvirt-1.2.5/examples/apparmor/usr.sbin.libvirtd.in
 ===================================================================
 --- /dev/null
-+++ libvirt-1.2.4/examples/apparmor/usr.sbin.libvirtd.in
++++ libvirt-1.2.5/examples/apparmor/usr.sbin.libvirtd.in
 @@ -0,0 +1,67 @@
 +# Last Modified: Mon Apr  5 15:03:58 2010
 +#include <tunables/global>
@@ -152,9 +152,9 @@ Index: libvirt-1.2.4/examples/apparmor/usr.sbin.libvirtd.in
 +  change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
 +
 +}
-Index: libvirt-1.2.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+Index: libvirt-1.2.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 ===================================================================
---- libvirt-1.2.4.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+--- libvirt-1.2.5.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 +++ /dev/null
 @@ -1,48 +0,0 @@
 -# Last Modified: Mon Apr  5 15:10:27 2010
@@ -205,9 +205,9 @@ Index: libvirt-1.2.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 -  /**.[iI][sS][oO] r,
 -  /**/disk{,.*} r,
 -}
-Index: libvirt-1.2.4/examples/apparmor/usr.sbin.libvirtd
+Index: libvirt-1.2.5/examples/apparmor/usr.sbin.libvirtd
 ===================================================================
---- libvirt-1.2.4.orig/examples/apparmor/usr.sbin.libvirtd
+--- libvirt-1.2.5.orig/examples/apparmor/usr.sbin.libvirtd
 +++ /dev/null
 @@ -1,63 +0,0 @@
 -# Last Modified: Mon Apr  5 15:03:58 2010
diff --git a/libvirt-1.2.4.tar.bz2 b/libvirt-1.2.4.tar.bz2
deleted file mode 100644
index 3c6f201..0000000
--- a/libvirt-1.2.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:414b076d2de6c0e2f701b06ba2c6409caf017e46a40bd50bb359e4e012bbb3d1
-size 20655047
diff --git a/libvirt-1.2.5.tar.bz2 b/libvirt-1.2.5.tar.bz2
new file mode 100644
index 0000000..4d946f6
--- /dev/null
+++ b/libvirt-1.2.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab638db48934320857ba0693975520eb577686e655117d7a2a0f2da196f7c65b
+size 20703638
diff --git a/libvirt-guests-init-script.patch b/libvirt-guests-init-script.patch
index c6823c0..a7fc008 100644
--- a/libvirt-guests-init-script.patch
+++ b/libvirt-guests-init-script.patch
@@ -1,9 +1,9 @@
 Adjust libvirt-guests init files to conform to SUSE standards
 
-Index: libvirt-1.2.4/tools/libvirt-guests.init.in
+Index: libvirt-1.2.5/tools/libvirt-guests.init.in
 ===================================================================
---- libvirt-1.2.4.orig/tools/libvirt-guests.init.in
-+++ libvirt-1.2.4/tools/libvirt-guests.init.in
+--- libvirt-1.2.5.orig/tools/libvirt-guests.init.in
++++ libvirt-1.2.5/tools/libvirt-guests.init.in
 @@ -3,15 +3,15 @@
  # the following is the LSB init header
  #
@@ -28,10 +28,10 @@ Index: libvirt-1.2.4/tools/libvirt-guests.init.in
  ### END INIT INFO
  
  # the following is chkconfig init header
-Index: libvirt-1.2.4/tools/libvirt-guests.sh.in
+Index: libvirt-1.2.5/tools/libvirt-guests.sh.in
 ===================================================================
---- libvirt-1.2.4.orig/tools/libvirt-guests.sh.in
-+++ libvirt-1.2.4/tools/libvirt-guests.sh.in
+--- libvirt-1.2.5.orig/tools/libvirt-guests.sh.in
++++ libvirt-1.2.5/tools/libvirt-guests.sh.in
 @@ -16,14 +16,13 @@
  # License along with this library.  If not, see
  # <http://www.gnu.org/licenses/>.
@@ -189,10 +189,10 @@ Index: libvirt-1.2.4/tools/libvirt-guests.sh.in
  esac
 -exit $RETVAL
 +rc_exit
-Index: libvirt-1.2.4/tools/libvirt-guests.sysconf
+Index: libvirt-1.2.5/tools/libvirt-guests.sysconf
 ===================================================================
---- libvirt-1.2.4.orig/tools/libvirt-guests.sysconf
-+++ libvirt-1.2.4/tools/libvirt-guests.sysconf
+--- libvirt-1.2.5.orig/tools/libvirt-guests.sysconf
++++ libvirt-1.2.5/tools/libvirt-guests.sysconf
 @@ -1,19 +1,29 @@
 +## Path: System/Virtualization/libvirt-guests
 +
diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch
index b876e9f..cf7124e 100644
--- a/libvirt-suse-netcontrol.patch
+++ b/libvirt-suse-netcontrol.patch
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.4/configure.ac
+Index: libvirt-1.2.5/configure.ac
 ===================================================================
---- libvirt-1.2.4.orig/configure.ac
-+++ libvirt-1.2.4/configure.ac
+--- libvirt-1.2.5.orig/configure.ac
++++ libvirt-1.2.5/configure.ac
 @@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE
  LIBVIRT_CHECK_GLUSTER
  LIBVIRT_CHECK_HAL
@@ -26,7 +26,7 @@ Index: libvirt-1.2.4/configure.ac
  esac
  
  if test "$with_interface" = "yes" ; then
-@@ -2808,6 +2810,7 @@ LIBVIRT_RESULT_FUSE
+@@ -2815,6 +2817,7 @@ LIBVIRT_RESULT_FUSE
  LIBVIRT_RESULT_GLUSTER
  LIBVIRT_RESULT_HAL
  LIBVIRT_RESULT_NETCF
@@ -34,11 +34,11 @@ Index: libvirt-1.2.4/configure.ac
  LIBVIRT_RESULT_NUMACTL
  LIBVIRT_RESULT_OPENWSMAN
  LIBVIRT_RESULT_PCIACCESS
-Index: libvirt-1.2.4/src/Makefile.am
+Index: libvirt-1.2.5/src/Makefile.am
 ===================================================================
---- libvirt-1.2.4.orig/src/Makefile.am
-+++ libvirt-1.2.4/src/Makefile.am
-@@ -812,6 +812,10 @@ if WITH_NETCF
+--- libvirt-1.2.5.orig/src/Makefile.am
++++ libvirt-1.2.5/src/Makefile.am
+@@ -813,6 +813,10 @@ if WITH_NETCF
  INTERFACE_DRIVER_SOURCES +=					\
  		interface/interface_backend_netcf.c
  endif WITH_NETCF
@@ -49,7 +49,7 @@ Index: libvirt-1.2.4/src/Makefile.am
  if WITH_UDEV
  INTERFACE_DRIVER_SOURCES +=					\
  		interface/interface_backend_udev.c
-@@ -1402,10 +1406,15 @@ if WITH_NETCF
+@@ -1403,10 +1407,15 @@ if WITH_NETCF
  libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
  libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
  else ! WITH_NETCF
@@ -65,10 +65,10 @@ Index: libvirt-1.2.4/src/Makefile.am
  endif ! WITH_NETCF
  if WITH_DRIVER_MODULES
  libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
-Index: libvirt-1.2.4/tools/virsh.c
+Index: libvirt-1.2.5/tools/virsh.c
 ===================================================================
---- libvirt-1.2.4.orig/tools/virsh.c
-+++ libvirt-1.2.4/tools/virsh.c
+--- libvirt-1.2.5.orig/tools/virsh.c
++++ libvirt-1.2.5/tools/virsh.c
 @@ -3252,6 +3252,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
      vshPrint(ctl, " Interface");
  # if defined(WITH_NETCF)
@@ -78,10 +78,10 @@ Index: libvirt-1.2.4/tools/virsh.c
  # elif defined(WITH_UDEV)
      vshPrint(ctl, " udev");
  # endif
-Index: libvirt-1.2.4/src/interface/interface_backend_netcf.c
+Index: libvirt-1.2.5/src/interface/interface_backend_netcf.c
 ===================================================================
---- libvirt-1.2.4.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-1.2.4/src/interface/interface_backend_netcf.c
+--- libvirt-1.2.5.orig/src/interface/interface_backend_netcf.c
++++ libvirt-1.2.5/src/interface/interface_backend_netcf.c
 @@ -23,7 +23,12 @@
  
  #include <config.h>
@@ -165,10 +165,10 @@ Index: libvirt-1.2.4/src/interface/interface_backend_netcf.c
      return 0;
  }
  
-Index: libvirt-1.2.4/src/interface/interface_driver.c
+Index: libvirt-1.2.5/src/interface/interface_driver.c
 ===================================================================
---- libvirt-1.2.4.orig/src/interface/interface_driver.c
-+++ libvirt-1.2.4/src/interface/interface_driver.c
+--- libvirt-1.2.5.orig/src/interface/interface_driver.c
++++ libvirt-1.2.5/src/interface/interface_driver.c
 @@ -30,8 +30,15 @@ interfaceRegister(void)
      if (netcfIfaceRegister() == 0)
          return 0;
@@ -186,10 +186,10 @@ Index: libvirt-1.2.4/src/interface/interface_driver.c
      if (udevIfaceRegister() == 0)
          return 0;
  #endif /* WITH_UDEV */
-Index: libvirt-1.2.4/m4/virt-netcontrol.m4
+Index: libvirt-1.2.5/m4/virt-netcontrol.m4
 ===================================================================
 --- /dev/null
-+++ libvirt-1.2.4/m4/virt-netcontrol.m4
++++ libvirt-1.2.5/m4/virt-netcontrol.m4
 @@ -0,0 +1,35 @@
 +dnl The libnetcontrol library
 +dnl
diff --git a/libvirt.changes b/libvirt.changes
index 82952ac..e4d9afa 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Sun Jun  1 21:44:06 MDT 2014 - jfehlig@suse.com
+
+- Update to libvirt 1.2.5
+  - Introduce virDomain{Get,Set}Time APIs
+  - Introduce virDomainFSFreeze() and virDomainFSThaw() public API
+  - Many incremental improvements and bug fixes, see
+    http://libvirt.org/news.html
+  - Drop upstream patches:
+    b98bf811-add-paravirt-shutdown-flag.patch,
+    c4fe29f8-use-shutdown-flag.patch,
+    da744120-use-reboot-flag.patch,
+    d6b27d3e-CVE-2014-0179.patch,
+    fd43d1f8-libxl-iface-hostdev.patch,
+    99f50208-managed-hostdev-iface.patch,
+    292d3f2d-libselinux-build-fix1.patch,
+    b109c097-libselinux-build-fix2.patch
+
 -------------------------------------------------------------------
 Wed May 28 17:13:29 MDT 2014 - jfehlig@suse.com
 
diff --git a/libvirt.spec b/libvirt.spec
index dfd0ae9..8dfc41a 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -235,7 +235,7 @@
 
 Name:           libvirt
 Url:            http://libvirt.org/
-Version:        1.2.4
+Version:        1.2.5
 Release:        0
 Summary:        Library providing a simple virtualization API
 License:        LGPL-2.1+
@@ -428,14 +428,6 @@ Source1:        libvirtd.init
 Source2:        libvirtd-relocation-server.fw
 Source99:       baselibs.conf
 # Upstream patches
-Patch0:         b98bf811-add-paravirt-shutdown-flag.patch
-Patch1:         c4fe29f8-use-shutdown-flag.patch
-Patch2:         da744120-use-reboot-flag.patch
-Patch3:         d6b27d3e-CVE-2014-0179.patch
-Patch4:         fd43d1f8-libxl-iface-hostdev.patch
-Patch5:         99f50208-managed-hostdev-iface.patch
-Patch6:         292d3f2d-libselinux-build-fix1.patch
-Patch7:         b109c097-libselinux-build-fix2.patch
 # Need to go upstream
 Patch100:       xen-name-for-devid.patch
 Patch101:       ia64-clone.patch
@@ -954,14 +946,6 @@ namespaces.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
diff --git a/libvirtd-defaults.patch b/libvirtd-defaults.patch
index 19222d8..de420da 100644
--- a/libvirtd-defaults.patch
+++ b/libvirtd-defaults.patch
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.4/daemon/libvirtd.conf
+Index: libvirt-1.2.5/daemon/libvirtd.conf
 ===================================================================
---- libvirt-1.2.4.orig/daemon/libvirtd.conf
-+++ libvirt-1.2.4/daemon/libvirtd.conf
+--- libvirt-1.2.5.orig/daemon/libvirtd.conf
++++ libvirt-1.2.5/daemon/libvirtd.conf
 @@ -18,8 +18,8 @@
  # It is necessary to setup a CA and issue server certificates before
  # using this capability.
@@ -13,10 +13,10 @@ Index: libvirt-1.2.4/daemon/libvirtd.conf
  
  # Listen for unencrypted TCP connections on the public TCP/IP port.
  # NB, must pass the --listen flag to the libvirtd process for this to
-Index: libvirt-1.2.4/daemon/libvirtd-config.c
+Index: libvirt-1.2.5/daemon/libvirtd-config.c
 ===================================================================
---- libvirt-1.2.4.orig/daemon/libvirtd-config.c
-+++ libvirt-1.2.4/daemon/libvirtd-config.c
+--- libvirt-1.2.5.orig/daemon/libvirtd-config.c
++++ libvirt-1.2.5/daemon/libvirtd-config.c
 @@ -229,7 +229,7 @@ daemonConfigNew(bool privileged ATTRIBUT
      if (VIR_ALLOC(data) < 0)
          return NULL;
@@ -26,10 +26,10 @@ Index: libvirt-1.2.4/daemon/libvirtd-config.c
      data->listen_tcp = 0;
  
      if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
-Index: libvirt-1.2.4/daemon/test_libvirtd.aug.in
+Index: libvirt-1.2.5/daemon/test_libvirtd.aug.in
 ===================================================================
---- libvirt-1.2.4.orig/daemon/test_libvirtd.aug.in
-+++ libvirt-1.2.4/daemon/test_libvirtd.aug.in
+--- libvirt-1.2.5.orig/daemon/test_libvirtd.aug.in
++++ libvirt-1.2.5/daemon/test_libvirtd.aug.in
 @@ -2,7 +2,7 @@ module Test_libvirtd =
     ::CONFIG::
  
diff --git a/libvirtd-init-script.patch b/libvirtd-init-script.patch
index b2e659d..d797040 100644
--- a/libvirtd-init-script.patch
+++ b/libvirtd-init-script.patch
@@ -1,9 +1,9 @@
 Adjust libvirtd sysconfig file to conform to SUSE standards
 
-Index: libvirt-1.2.4/daemon/libvirtd.sysconf
+Index: libvirt-1.2.5/daemon/libvirtd.sysconf
 ===================================================================
---- libvirt-1.2.4.orig/daemon/libvirtd.sysconf
-+++ libvirt-1.2.4/daemon/libvirtd.sysconf
+--- libvirt-1.2.5.orig/daemon/libvirtd.sysconf
++++ libvirt-1.2.5/daemon/libvirtd.sysconf
 @@ -1,16 +1,25 @@
 +## Path: System/Virtualization/libvirt
 +
diff --git a/libxl-migration-support.patch b/libxl-migration-support.patch
index d2fe2e3..65f284c 100644
--- a/libxl-migration-support.patch
+++ b/libxl-migration-support.patch
@@ -18,11 +18,11 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
  src/libxl/libxl_migration.h |  78 ++++++
  7 files changed, 900 insertions(+), 1 deletion(-)
 
-Index: libvirt-1.2.4/po/POTFILES.in
+Index: libvirt-1.2.5/po/POTFILES.in
 ===================================================================
---- libvirt-1.2.4.orig/po/POTFILES.in
-+++ libvirt-1.2.4/po/POTFILES.in
-@@ -73,6 +73,7 @@ src/lxc/lxc_process.c
+--- libvirt-1.2.5.orig/po/POTFILES.in
++++ libvirt-1.2.5/po/POTFILES.in
+@@ -74,6 +74,7 @@ src/lxc/lxc_process.c
  src/libxl/libxl_domain.c
  src/libxl/libxl_driver.c
  src/libxl/libxl_conf.c
@@ -30,11 +30,11 @@ Index: libvirt-1.2.4/po/POTFILES.in
  src/network/bridge_driver.c
  src/network/bridge_driver_linux.c
  src/node_device/node_device_driver.c
-Index: libvirt-1.2.4/src/Makefile.am
+Index: libvirt-1.2.5/src/Makefile.am
 ===================================================================
---- libvirt-1.2.4.orig/src/Makefile.am
-+++ libvirt-1.2.4/src/Makefile.am
-@@ -706,7 +706,8 @@ XENAPI_DRIVER_SOURCES =						\
+--- libvirt-1.2.5.orig/src/Makefile.am
++++ libvirt-1.2.5/src/Makefile.am
+@@ -707,7 +707,8 @@ XENAPI_DRIVER_SOURCES =						\
  LIBXL_DRIVER_SOURCES =						\
  		libxl/libxl_conf.c libxl/libxl_conf.h		\
  		libxl/libxl_domain.c libxl/libxl_domain.h       \
@@ -44,10 +44,10 @@ Index: libvirt-1.2.4/src/Makefile.am
  
  UML_DRIVER_SOURCES =						\
  		uml/uml_conf.c uml/uml_conf.h			\
-Index: libvirt-1.2.4/src/libxl/libxl_conf.h
+Index: libvirt-1.2.5/src/libxl/libxl_conf.h
 ===================================================================
---- libvirt-1.2.4.orig/src/libxl/libxl_conf.h
-+++ libvirt-1.2.4/src/libxl/libxl_conf.h
+--- libvirt-1.2.5.orig/src/libxl/libxl_conf.h
++++ libvirt-1.2.5/src/libxl/libxl_conf.h
 @@ -43,6 +43,9 @@
  # define LIBXL_VNC_PORT_MIN  5900
  # define LIBXL_VNC_PORT_MAX  65535
@@ -68,10 +68,10 @@ Index: libvirt-1.2.4/src/libxl/libxl_conf.h
      /* Immutable pointer, lockless APIs*/
      virSysinfoDefPtr hostsysinfo;
  };
-Index: libvirt-1.2.4/src/libxl/libxl_domain.h
+Index: libvirt-1.2.5/src/libxl/libxl_domain.h
 ===================================================================
---- libvirt-1.2.4.orig/src/libxl/libxl_domain.h
-+++ libvirt-1.2.4/src/libxl/libxl_domain.h
+--- libvirt-1.2.5.orig/src/libxl/libxl_domain.h
++++ libvirt-1.2.5/src/libxl/libxl_domain.h
 @@ -69,6 +69,7 @@ struct _libxlDomainObjPrivate {
      virChrdevsPtr devs;
      libxl_evgen_domain_death *deathW;
@@ -80,10 +80,10 @@ Index: libvirt-1.2.4/src/libxl/libxl_domain.h
  
      struct libxlDomainJobObj job;
  };
-Index: libvirt-1.2.4/src/libxl/libxl_driver.c
+Index: libvirt-1.2.5/src/libxl/libxl_driver.c
 ===================================================================
---- libvirt-1.2.4.orig/src/libxl/libxl_driver.c
-+++ libvirt-1.2.4/src/libxl/libxl_driver.c
+--- libvirt-1.2.5.orig/src/libxl/libxl_driver.c
++++ libvirt-1.2.5/src/libxl/libxl_driver.c
 @@ -45,6 +45,7 @@
  #include "libxl_domain.h"
  #include "libxl_driver.h"
@@ -361,10 +361,10 @@ Index: libvirt-1.2.4/src/libxl/libxl_driver.c
  };
  
  static virStateDriver libxlStateDriver = {
-Index: libvirt-1.2.4/src/libxl/libxl_migration.c
+Index: libvirt-1.2.5/src/libxl/libxl_migration.c
 ===================================================================
 --- /dev/null
-+++ libvirt-1.2.4/src/libxl/libxl_migration.c
++++ libvirt-1.2.5/src/libxl/libxl_migration.c
 @@ -0,0 +1,577 @@
 +/*
 + * libxl_migration.c: methods for handling migration with libxenlight
@@ -943,10 +943,10 @@ Index: libvirt-1.2.4/src/libxl/libxl_migration.c
 +    virObjectUnref(cfg);
 +    return ret;
 +}
-Index: libvirt-1.2.4/src/libxl/libxl_migration.h
+Index: libvirt-1.2.5/src/libxl/libxl_migration.h
 ===================================================================
 --- /dev/null
-+++ libvirt-1.2.4/src/libxl/libxl_migration.h
++++ libvirt-1.2.5/src/libxl/libxl_migration.h
 @@ -0,0 +1,78 @@
 +/*
 + * libxl_migration.h: methods for handling migration with libxenlight
diff --git a/support-managed-pci-xen-driver.patch b/support-managed-pci-xen-driver.patch
index 137b542..09379de 100644
--- a/support-managed-pci-xen-driver.patch
+++ b/support-managed-pci-xen-driver.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] support managed pci devices in xen driver
  src/xenxs/xen_xm.c   |   28 +++++++++++++++++++++++++++-
  2 files changed, 35 insertions(+), 15 deletions(-)
 
-Index: libvirt-1.2.4/src/xenxs/xen_sxpr.c
+Index: libvirt-1.2.5/src/xenxs/xen_sxpr.c
 ===================================================================
---- libvirt-1.2.4.orig/src/xenxs/xen_sxpr.c
-+++ libvirt-1.2.4/src/xenxs/xen_sxpr.c
+--- libvirt-1.2.5.orig/src/xenxs/xen_sxpr.c
++++ libvirt-1.2.5/src/xenxs/xen_sxpr.c
 @@ -997,6 +997,7 @@ xenParseSxprPCI(virDomainDefPtr def,
          int busID;
          int slotID;
@@ -78,10 +78,10 @@ Index: libvirt-1.2.4/src/xenxs/xen_sxpr.c
              xenFormatSxprPCI(def->hostdevs[i], buf);
          }
      }
-Index: libvirt-1.2.4/src/xenxs/xen_xm.c
+Index: libvirt-1.2.5/src/xenxs/xen_xm.c
 ===================================================================
---- libvirt-1.2.4.orig/src/xenxs/xen_xm.c
-+++ libvirt-1.2.4/src/xenxs/xen_xm.c
+--- libvirt-1.2.5.orig/src/xenxs/xen_xm.c
++++ libvirt-1.2.5/src/xenxs/xen_xm.c
 @@ -807,6 +807,8 @@ xenParseXM(virConfPtr conf, int xendConf
              int busID;
              int slotID;
diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch
index 36ddb61..91445ea 100644
--- a/suse-qemu-conf.patch
+++ b/suse-qemu-conf.patch
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.4/src/qemu/qemu.conf
+Index: libvirt-1.2.5/src/qemu/qemu.conf
 ===================================================================
---- libvirt-1.2.4.orig/src/qemu/qemu.conf
-+++ libvirt-1.2.4/src/qemu/qemu.conf
+--- libvirt-1.2.5.orig/src/qemu/qemu.conf
++++ libvirt-1.2.5/src/qemu/qemu.conf
 @@ -200,7 +200,16 @@
  # a special value; security_driver can be set to that value in
  # isolation, but it cannot appear in a list of drivers.
diff --git a/systemd-service-xen.patch b/systemd-service-xen.patch
index 56cf0cc..3611d83 100644
--- a/systemd-service-xen.patch
+++ b/systemd-service-xen.patch
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.4/daemon/libvirtd.service.in
+Index: libvirt-1.2.5/daemon/libvirtd.service.in
 ===================================================================
---- libvirt-1.2.4.orig/daemon/libvirtd.service.in
-+++ libvirt-1.2.4/daemon/libvirtd.service.in
+--- libvirt-1.2.5.orig/daemon/libvirtd.service.in
++++ libvirt-1.2.5/daemon/libvirtd.service.in
 @@ -10,6 +10,8 @@ After=network.target
  After=dbus.service
  After=iscsid.service
diff --git a/virtlockd-init-script.patch b/virtlockd-init-script.patch
index bf2e409..3740fe5 100644
--- a/virtlockd-init-script.patch
+++ b/virtlockd-init-script.patch
@@ -1,9 +1,9 @@
 Adjust virtlockd init files to conform to SUSE standards
 
-Index: libvirt-1.2.4/src/locking/virtlockd.sysconf
+Index: libvirt-1.2.5/src/locking/virtlockd.sysconf
 ===================================================================
---- libvirt-1.2.4.orig/src/locking/virtlockd.sysconf
-+++ libvirt-1.2.4/src/locking/virtlockd.sysconf
+--- libvirt-1.2.5.orig/src/locking/virtlockd.sysconf
++++ libvirt-1.2.5/src/locking/virtlockd.sysconf
 @@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlockd
 +
@@ -12,10 +12,10 @@ Index: libvirt-1.2.4/src/locking/virtlockd.sysconf
  #
  # Pass extra arguments to virtlockd
  #VIRTLOCKD_ARGS=
-Index: libvirt-1.2.4/src/locking/virtlockd.init.in
+Index: libvirt-1.2.5/src/locking/virtlockd.init.in
 ===================================================================
---- libvirt-1.2.4.orig/src/locking/virtlockd.init.in
-+++ libvirt-1.2.4/src/locking/virtlockd.init.in
+--- libvirt-1.2.5.orig/src/locking/virtlockd.init.in
++++ libvirt-1.2.5/src/locking/virtlockd.init.in
 @@ -4,12 +4,14 @@
  # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV
  #
diff --git a/xen-name-for-devid.patch b/xen-name-for-devid.patch
index 77045be..5519504 100644
--- a/xen-name-for-devid.patch
+++ b/xen-name-for-devid.patch
@@ -14,10 +14,10 @@
     is inactive.  We obviously can't search xenstore when the domain is
     inactive.
 
-Index: libvirt-1.2.4/src/xen/xend_internal.c
+Index: libvirt-1.2.5/src/xen/xend_internal.c
 ===================================================================
---- libvirt-1.2.4.orig/src/xen/xend_internal.c
-+++ libvirt-1.2.4/src/xen/xend_internal.c
+--- libvirt-1.2.5.orig/src/xen/xend_internal.c
++++ libvirt-1.2.5/src/xen/xend_internal.c
 @@ -72,7 +72,7 @@ VIR_LOG_INIT("xen.xend_internal");
  #define XEND_RCV_BUF_MAX_LEN (256 * 1024)
  
diff --git a/xen-pv-cdrom.patch b/xen-pv-cdrom.patch
index ff925a7..e3c57dd 100644
--- a/xen-pv-cdrom.patch
+++ b/xen-pv-cdrom.patch
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.4/src/xenxs/xen_sxpr.c
+Index: libvirt-1.2.5/src/xenxs/xen_sxpr.c
 ===================================================================
---- libvirt-1.2.4.orig/src/xenxs/xen_sxpr.c
-+++ libvirt-1.2.4/src/xenxs/xen_sxpr.c
+--- libvirt-1.2.5.orig/src/xenxs/xen_sxpr.c
++++ libvirt-1.2.5/src/xenxs/xen_sxpr.c
 @@ -332,7 +332,7 @@ xenParseSxprChar(const char *value,
  static int
  xenParseSxprDisks(virDomainDefPtr def,