Accepting request 342483 from Virtualization

1

OBS-URL: https://build.opensuse.org/request/show/342483
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=192

703ec1b7-qemu-bridge-helper-fix.patch

@@ -0,0 +1,24 @@
+commit 703ec1b73da3560374cba65017d9eaf58f92c695
+Author: Michel Normand <normand@linux.vnet.ibm.com>
+Date:   Wed Nov 4 10:01:24 2015 +0100
+
+    qemu: add /usr/lib to AC_PATH_PROG for qemu-bridge-helper
+    
+    For openSUSE the qemu-bridge-helper is installed in /usr/lib
+    So libvirt has to search it in this directory.
+    
+    Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
+
+diff --git a/configure.ac b/configure.ac
+index f01bb40..f481c50 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2520,7 +2520,7 @@ AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account])
+ AC_DEFINE_UNQUOTED([QEMU_GROUP], ["$QEMU_GROUP"], [QEMU group account])
+ 
+ AC_PATH_PROG([QEMU_BRIDGE_HELPER], [qemu-bridge-helper], [/usr/libexec/qemu-bridge-helper],
+-                  [/usr/libexec:/usr/lib/qemu])
++                  [/usr/libexec:/usr/lib/qemu:/usr/lib])
+ AC_DEFINE_UNQUOTED([QEMU_BRIDGE_HELPER], ["$QEMU_BRIDGE_HELPER"], [QEMU bridge helper])
+ 
+ AC_ARG_WITH([macvtap],

apparmor-fixes.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/examples/apparmor/libvirt-qemu
+Index: libvirt-1.2.21/examples/apparmor/libvirt-qemu
 ===================================================================
---- libvirt-1.2.20.orig/examples/apparmor/libvirt-qemu
+--- libvirt-1.2.21.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-1.2.20/examples/apparmor/libvirt-qemu
++++ libvirt-1.2.21/examples/apparmor/libvirt-qemu
 @@ -124,6 +124,9 @@
    # for restore
    /bin/bash rmix,

apparmor-no-mount.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/examples/apparmor/libvirt-lxc
+Index: libvirt-1.2.21/examples/apparmor/libvirt-lxc
 ===================================================================
---- libvirt-1.2.20.orig/examples/apparmor/libvirt-lxc
+--- libvirt-1.2.21.orig/examples/apparmor/libvirt-lxc
-+++ libvirt-1.2.20/examples/apparmor/libvirt-lxc
++++ libvirt-1.2.21/examples/apparmor/libvirt-lxc
 @@ -2,39 +2,15 @@
  
    #include <abstractions/base>

blockcopy-check-dst-identical-device.patch

@@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu <cyliu@suse.com>
  src/qemu/qemu_driver.c | 7 +++++++
  1 file changed, 7 insertions(+)
 
-Index: libvirt-1.2.20/src/qemu/qemu_driver.c
+Index: libvirt-1.2.21/src/qemu/qemu_driver.c
 ===================================================================
---- libvirt-1.2.20.orig/src/qemu/qemu_driver.c
+--- libvirt-1.2.21.orig/src/qemu/qemu_driver.c
-+++ libvirt-1.2.20/src/qemu/qemu_driver.c
++++ libvirt-1.2.21/src/qemu/qemu_driver.c
-@@ -16715,6 +16715,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
+@@ -16720,6 +16720,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
                         _("non-file destination not supported yet"));
          goto endjob;
      }

disable-virCgroupGetPercpuStats-test.patch

@@ -1,113 +0,0 @@
-Index: libvirt-1.2.20/tests/vircgrouptest.c
-===================================================================
---- libvirt-1.2.20.orig/tests/vircgrouptest.c
-+++ libvirt-1.2.20/tests/vircgrouptest.c
-@@ -34,7 +34,6 @@
- # include "virfile.h"
- # include "virbuffer.h"
- # include "testutilslxc.h"
--# include "nodeinfo.h"
- 
- # define VIR_FROM_THIS VIR_FROM_NONE
- 
-@@ -607,90 +606,6 @@ static int testCgroupControllerAvailable
-     return ret;
- }
- 
--static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED)
--{
--    virCgroupPtr cgroup = NULL;
--    size_t i;
--    int rv, ret = -1;
--    virTypedParameterPtr params = NULL;
--# define EXPECTED_NCPUS 160
--
--    unsigned long long expected[EXPECTED_NCPUS] = {
--        0, 0, 0, 0, 0, 0, 0, 0,
--        7059492996ULL, 0, 0, 0, 0, 0, 0, 0,
--        4180532496ULL, 0, 0, 0, 0, 0, 0, 0,
--        0, 0, 0, 0, 0, 0, 0, 0,
--        0, 0, 0, 0, 0, 0, 0, 0,
--        0, 0, 0, 0, 0, 0, 0, 0,
--        1957541268ULL, 0, 0, 0, 0, 0, 0, 0,
--        2065932204ULL, 0, 0, 0, 0, 0, 0, 0,
--        18228689414ULL, 0, 0, 0, 0, 0, 0, 0,
--        4245525148ULL, 0, 0, 0, 0, 0, 0, 0,
--        2911161568ULL, 0, 0, 0, 0, 0, 0, 0,
--        1407758136ULL, 0, 0, 0, 0, 0, 0, 0,
--        1836807700ULL, 0, 0, 0, 0, 0, 0, 0,
--        1065296618ULL, 0, 0, 0, 0, 0, 0, 0,
--        2046213266ULL, 0, 0, 0, 0, 0, 0, 0,
--        747889778ULL, 0, 0, 0, 0, 0, 0, 0,
--        709566900ULL, 0, 0, 0, 0, 0, 0, 0,
--        444777342ULL, 0, 0, 0, 0, 0, 0, 0,
--        5683512916ULL, 0, 0, 0, 0, 0, 0, 0,
--        635751356ULL, 0, 0, 0, 0, 0, 0, 0,
--    };
--
--    if (VIR_ALLOC_N(params, EXPECTED_NCPUS) < 0)
--        goto cleanup;
--
--    if ((rv = virCgroupNewPartition("/virtualmachines", true,
--                                    (1 << VIR_CGROUP_CONTROLLER_CPU) |
--                                    (1 << VIR_CGROUP_CONTROLLER_CPUACCT),
--                                    &cgroup)) < 0) {
--        fprintf(stderr, "Could not create /virtualmachines cgroup: %d\n", -rv);
--        goto cleanup;
--    }
--
--    if (nodeGetCPUCount(NULL) != EXPECTED_NCPUS) {
--        fprintf(stderr, "Unexpected: nodeGetCPUCount() yields: %d\n", nodeGetCPUCount(NULL));
--        goto cleanup;
--    }
--
--    if ((rv = virCgroupGetPercpuStats(cgroup,
--                                      params,
--                                      1, 0, EXPECTED_NCPUS, 0)) < 0) {
--        fprintf(stderr, "Failed call to virCgroupGetPercpuStats for /virtualmachines cgroup: %d\n", -rv);
--        goto cleanup;
--    }
--
--    for (i = 0; i < EXPECTED_NCPUS; i++) {
--        if (!STREQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) {
--            fprintf(stderr,
--                    "Wrong parameter name value from virCgroupGetPercpuStats at %zu (is: %s)\n",
--                    i, params[i].field);
--            goto cleanup;
--        }
--
--        if (params[i].type != VIR_TYPED_PARAM_ULLONG) {
--            fprintf(stderr,
--                    "Wrong parameter value type from virCgroupGetPercpuStats at %zu (is: %d)\n",
--                    i, params[i].type);
--            goto cleanup;
--        }
--
--        if (params[i].value.ul != expected[i]) {
--            fprintf(stderr,
--                    "Wrong value from virCgroupGetMemoryUsage at %zu (expected %llu)\n",
--                    i, params[i].value.ul);
--            goto cleanup;
--        }
--    }
--
--    ret = 0;
--
-- cleanup:
--    virCgroupFree(&cgroup);
--    VIR_FREE(params);
--    return ret;
--}
- 
- static int testCgroupGetMemoryUsage(const void *args ATTRIBUTE_UNUSED)
- {
-@@ -919,9 +834,6 @@ mymain(void)
-     if (virtTestRun("virCgroupGetMemoryUsage works", testCgroupGetMemoryUsage, NULL) < 0)
-         ret = -1;
- 
--    if (virtTestRun("virCgroupGetPercpuStats works", testCgroupGetPercpuStats, NULL) < 0)
--        ret = -1;
--
-     setenv("VIR_CGROUP_MOCK_MODE", "allinone", 1);
-     if (virtTestRun("New cgroup for self (allinone)", testCgroupNewForSelfAllInOne, NULL) < 0)
-         ret = -1;

libvirt-1.2.20.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df0b5d8a150863a86b98cf809a586c91b2d49af25b74a354049ea416b0b27d30
-size 29725368

libvirt-1.2.20.tar.gz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlYOZogACgkQRga4pd6VvB81/gCfUzhmlAupEd/nodU/igjSLW4f
-Aj8AnA0otXxndyGQY54umen+urYrINrJ
-=900+
------END PGP SIGNATURE-----

libvirt-1.2.21.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d406582f5fe88d739d1d83e0ba7ac7f91f5a8da4be82162ab85631744d8925b
+size 29848954

libvirt-1.2.21.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlY5cxIACgkQRga4pd6VvB+57ACggaUKRQGC2f4SjR7yjRHl0xwF
+QooAnjkqwZET0DNHixm+FA71UQ+mCn+1
+=sIXv
+-----END PGP SIGNATURE-----

libvirt-guests-init-script.patch

@@ -1,9 +1,9 @@
 Adjust libvirt-guests init files to conform to SUSE standards
 
-Index: libvirt-1.2.20/tools/libvirt-guests.init.in
+Index: libvirt-1.2.21/tools/libvirt-guests.init.in
 ===================================================================
---- libvirt-1.2.20.orig/tools/libvirt-guests.init.in
+--- libvirt-1.2.21.orig/tools/libvirt-guests.init.in
-+++ libvirt-1.2.20/tools/libvirt-guests.init.in
++++ libvirt-1.2.21/tools/libvirt-guests.init.in
 @@ -3,15 +3,15 @@
  # the following is the LSB init header
  #
@@ -28,10 +28,10 @@ Index: libvirt-1.2.20/tools/libvirt-guests.init.in
  ### END INIT INFO
  
  # the following is chkconfig init header
-Index: libvirt-1.2.20/tools/libvirt-guests.sh.in
+Index: libvirt-1.2.21/tools/libvirt-guests.sh.in
 ===================================================================
---- libvirt-1.2.20.orig/tools/libvirt-guests.sh.in
+--- libvirt-1.2.21.orig/tools/libvirt-guests.sh.in
-+++ libvirt-1.2.20/tools/libvirt-guests.sh.in
++++ libvirt-1.2.21/tools/libvirt-guests.sh.in
 @@ -16,14 +16,13 @@
  # License along with this library.  If not, see
  # <http://www.gnu.org/licenses/>.
@@ -191,10 +191,10 @@ Index: libvirt-1.2.20/tools/libvirt-guests.sh.in
  esac
 -exit $RETVAL
 +rc_exit
-Index: libvirt-1.2.20/tools/libvirt-guests.sysconf
+Index: libvirt-1.2.21/tools/libvirt-guests.sysconf
 ===================================================================
---- libvirt-1.2.20.orig/tools/libvirt-guests.sysconf
+--- libvirt-1.2.21.orig/tools/libvirt-guests.sysconf
-+++ libvirt-1.2.20/tools/libvirt-guests.sysconf
++++ libvirt-1.2.21/tools/libvirt-guests.sysconf
 @@ -1,19 +1,29 @@
 +## Path: System/Virtualization/libvirt-guests
 +

libvirt-power8-models.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/src/cpu/cpu_map.xml
+Index: libvirt-1.2.21/src/cpu/cpu_map.xml
 ===================================================================
---- libvirt-1.2.20.orig/src/cpu/cpu_map.xml
+--- libvirt-1.2.21.orig/src/cpu/cpu_map.xml
-+++ libvirt-1.2.20/src/cpu/cpu_map.xml
++++ libvirt-1.2.21/src/cpu/cpu_map.xml
 @@ -1424,6 +1424,16 @@
        <pvr value='0x004d0000' mask='0xffff0000'/>
      </model>

libvirt-suse-netcontrol.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/configure.ac
+Index: libvirt-1.2.21/configure.ac
 ===================================================================
---- libvirt-1.2.20.orig/configure.ac
+--- libvirt-1.2.21.orig/configure.ac
-+++ libvirt-1.2.20/configure.ac
++++ libvirt-1.2.21/configure.ac
 @@ -242,6 +242,7 @@ LIBVIRT_CHECK_FUSE
  LIBVIRT_CHECK_GLUSTER
  LIBVIRT_CHECK_HAL
@@ -34,11 +34,11 @@ Index: libvirt-1.2.20/configure.ac
  LIBVIRT_RESULT_NUMACTL
  LIBVIRT_RESULT_OPENWSMAN
  LIBVIRT_RESULT_PCIACCESS
-Index: libvirt-1.2.20/src/Makefile.am
+Index: libvirt-1.2.21/src/Makefile.am
 ===================================================================
---- libvirt-1.2.20.orig/src/Makefile.am
+--- libvirt-1.2.21.orig/src/Makefile.am
-+++ libvirt-1.2.20/src/Makefile.am
++++ libvirt-1.2.21/src/Makefile.am
-@@ -880,6 +880,10 @@ if WITH_NETCF
+@@ -878,6 +878,10 @@ if WITH_NETCF
  INTERFACE_DRIVER_SOURCES +=					\
  		interface/interface_backend_netcf.c
  endif WITH_NETCF
@@ -49,7 +49,7 @@ Index: libvirt-1.2.20/src/Makefile.am
  if WITH_UDEV
  INTERFACE_DRIVER_SOURCES +=					\
  		interface/interface_backend_udev.c
-@@ -1505,6 +1509,10 @@ if WITH_NETCF
+@@ -1503,6 +1507,10 @@ if WITH_NETCF
  libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
  libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
  endif WITH_NETCF
@@ -60,10 +60,10 @@ Index: libvirt-1.2.20/src/Makefile.am
  if WITH_UDEV
  libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
  libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)
-Index: libvirt-1.2.20/tools/virsh.c
+Index: libvirt-1.2.21/tools/virsh.c
 ===================================================================
---- libvirt-1.2.20.orig/tools/virsh.c
+--- libvirt-1.2.21.orig/tools/virsh.c
-+++ libvirt-1.2.20/tools/virsh.c
++++ libvirt-1.2.21/tools/virsh.c
 @@ -588,6 +588,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
      vshPrint(ctl, " Interface");
  # if defined(WITH_NETCF)
@@ -73,10 +73,10 @@ Index: libvirt-1.2.20/tools/virsh.c
  # elif defined(WITH_UDEV)
      vshPrint(ctl, " udev");
  # endif
-Index: libvirt-1.2.20/src/interface/interface_backend_netcf.c
+Index: libvirt-1.2.21/src/interface/interface_backend_netcf.c
 ===================================================================
---- libvirt-1.2.20.orig/src/interface/interface_backend_netcf.c
+--- libvirt-1.2.21.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-1.2.20/src/interface/interface_backend_netcf.c
++++ libvirt-1.2.21/src/interface/interface_backend_netcf.c
 @@ -23,7 +23,12 @@
  
  #include <config.h>
@@ -140,7 +140,7 @@ Index: libvirt-1.2.20/src/interface/interface_backend_netcf.c
      /* open netcf */
      if (ncf_init(&driver->netcf, NULL) != 0) {
          virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-@@ -1146,6 +1186,19 @@ static virStateDriver interfaceStateDriv
+@@ -1140,6 +1180,19 @@ static virStateDriver interfaceStateDriv
  
  int netcfIfaceRegister(void)
  {
@@ -160,10 +160,10 @@ Index: libvirt-1.2.20/src/interface/interface_backend_netcf.c
      if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
          return -1;
      if (virRegisterStateDriver(&interfaceStateDriver) < 0)
-Index: libvirt-1.2.20/src/interface/interface_driver.c
+Index: libvirt-1.2.21/src/interface/interface_driver.c
 ===================================================================
---- libvirt-1.2.20.orig/src/interface/interface_driver.c
+--- libvirt-1.2.21.orig/src/interface/interface_driver.c
-+++ libvirt-1.2.20/src/interface/interface_driver.c
++++ libvirt-1.2.21/src/interface/interface_driver.c
 @@ -30,8 +30,15 @@ interfaceRegister(void)
      if (netcfIfaceRegister() == 0)
          return 0;
@@ -181,10 +181,10 @@ Index: libvirt-1.2.20/src/interface/interface_driver.c
      if (udevIfaceRegister() == 0)
          return 0;
  #endif /* WITH_UDEV */
-Index: libvirt-1.2.20/m4/virt-netcontrol.m4
+Index: libvirt-1.2.21/m4/virt-netcontrol.m4
 ===================================================================
 --- /dev/null
-+++ libvirt-1.2.20/m4/virt-netcontrol.m4
++++ libvirt-1.2.21/m4/virt-netcontrol.m4
 @@ -0,0 +1,35 @@
 +dnl The libnetcontrol library
 +dnl

libvirt.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Wed Nov  4 20:05:21 UTC 2015 - normand@linux.vnet.ibm.com
+
+- Detect path of qemu-bridge-helper during %configure
+  - add qemu-tools as BuildRequires for suse_version > 1130
+  - add upstream patch 703ec1b7-qemu-bridge-helper-fix.patch
+
+-------------------------------------------------------------------
+Wed Nov  4 14:52:41 UTC 2015 - jfehlig@suse.com
+
+- Update to libvirt 1.2.21
+  - Many incremental improvements and bug fixes, see
+    http://libvirt.org/news.html
+  - Dropped patches:
+    disable-virCgroupGetPercpuStats-test.patch
+
+-------------------------------------------------------------------
+Mon Nov  2 21:14:10 UTC 2015 - jfehlig@suse.com
+
+- spec: some minor wireshark fixups. Essentially a backport of
+  commit 7c8250d7.
+
 -------------------------------------------------------------------
 Fri Oct 16 08:51:24 UTC 2015 - cbosdonnat@suse.com
 

libvirt.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libvirt
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -240,7 +240,7 @@
 
 Name:           libvirt
 Url:            http://libvirt.org/
-Version:        1.2.20
+Version:        1.2.21
 Release:        0
 Summary:        Library providing a simple virtualization API
 License:        LGPL-2.1+
@@ -436,6 +436,13 @@ BuildRequires:  numad
 %if %{with_wireshark}
 BuildRequires:  wireshark-devel
 %endif
+%if %{with_qemu}
+    %if 0%{?suse_version} > 1130
+# BuildRequire qemu-tools so configure can detect qemu-bridge-helper
+# path. Ignore SLE11, which predates the qemu-tools package.
+BuildRequires:  qemu-tools
+    %endif
+%endif
 
 %global systemd_version %(pkg-config --modversion systemd)
 
@@ -446,6 +453,7 @@ Source3:        libvirtd.init
 Source4:        libvirtd-relocation-server.fw
 Source99:       baselibs.conf
 # Upstream patches
+Patch0:         703ec1b7-qemu-bridge-helper-fix.patch
 # Patches pending upstream review
 # Need to go upstream
 Patch150:       xen-pv-cdrom.patch
@@ -462,11 +470,9 @@ Patch204:       suse-qemu-conf.patch
 Patch205:       support-managed-pci-xen-driver.patch
 Patch206:       systemd-service-xen.patch
 Patch207:       xen-sxpr-disk-type.patch
-# Disable failing virCgroupGetPercpuStats unit test
+Patch208:       apparmor-no-mount.patch
-Patch208:       disable-virCgroupGetPercpuStats-test.patch
+Patch209:       qemu-apparmor-screenshot.patch
-Patch209:       apparmor-no-mount.patch
+Patch210:       libvirt-suse-netcontrol.patch
-Patch210:       qemu-apparmor-screenshot.patch
-Patch211:       libvirt-suse-netcontrol.patch
 # SocketUser and SocketGroup settings were added to systemd.socket in
 # version 214.  Patch the setting away in earlier systemd
 %if 0%{systemd_version} < 214
@@ -964,16 +970,18 @@ namespaces.
 %if %{with_wireshark}
 
 %package -n wireshark-plugin-libvirt
-Summary:        Wireshark plugin for Libvirt RPC protocol
+Summary:        Wireshark plugin for libvirt RPC protocol
 Group:          Productivity/Networking/Diagnostic
+Requires:       %{name}-client = %{version}-%{release}
 Requires:       wireshark
 
 %description -n wireshark-plugin-libvirt
-Provides a dissector for the libvirt RPC protocol to help debugging it.
+Wireshark dissector plugin for better analysis of libvirt RPC traffic.
 %endif
 
 %prep
 %setup -q
+%patch0 -p1
 %patch150 -p1
 %patch151 -p1
 %patch152 -p1
@@ -990,7 +998,6 @@ Provides a dissector for the libvirt RPC protocol to help debugging it.
 %patch208 -p1
 %patch209 -p1
 %patch210 -p1
-%patch211 -p1
 %if 0%{systemd_version} < 214
 %patch300 -p1
 %endif
@@ -1217,6 +1224,8 @@ cp examples/lxcconvert/virt-lxc-convert $RPM_BUILD_ROOT%{_bindir}
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %if %{with_wireshark}
 rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la
+mv $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.so \
+   $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.so
 %endif
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lock-driver/*.la
@@ -1892,7 +1901,7 @@ fi
 
 %files -n wireshark-plugin-libvirt
 %defattr(-, root, root)
-%{_libdir}/wireshark/plugins/*/libvirt.so
+%{_libdir}/wireshark/plugins/libvirt.so
 %endif
 
 %changelog

libvirtd-defaults.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/daemon/libvirtd.conf
+Index: libvirt-1.2.21/daemon/libvirtd.conf
 ===================================================================
---- libvirt-1.2.20.orig/daemon/libvirtd.conf
+--- libvirt-1.2.21.orig/daemon/libvirtd.conf
-+++ libvirt-1.2.20/daemon/libvirtd.conf
++++ libvirt-1.2.21/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.20/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.20/daemon/libvirtd-config.c
+Index: libvirt-1.2.21/daemon/libvirtd-config.c
 ===================================================================
---- libvirt-1.2.20.orig/daemon/libvirtd-config.c
+--- libvirt-1.2.21.orig/daemon/libvirtd-config.c
-+++ libvirt-1.2.20/daemon/libvirtd-config.c
++++ libvirt-1.2.21/daemon/libvirtd-config.c
 @@ -242,7 +242,7 @@ daemonConfigNew(bool privileged ATTRIBUT
      if (VIR_ALLOC(data) < 0)
          return NULL;
@@ -26,10 +26,10 @@ Index: libvirt-1.2.20/daemon/libvirtd-config.c
      data->listen_tcp = 0;
  
      if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
-Index: libvirt-1.2.20/daemon/test_libvirtd.aug.in
+Index: libvirt-1.2.21/daemon/test_libvirtd.aug.in
 ===================================================================
---- libvirt-1.2.20.orig/daemon/test_libvirtd.aug.in
+--- libvirt-1.2.21.orig/daemon/test_libvirtd.aug.in
-+++ libvirt-1.2.20/daemon/test_libvirtd.aug.in
++++ libvirt-1.2.21/daemon/test_libvirtd.aug.in
 @@ -2,7 +2,7 @@ module Test_libvirtd =
     ::CONFIG::
  

libvirtd-init-script.patch

@@ -1,9 +1,9 @@
 Adjust libvirtd sysconfig file to conform to SUSE standards
 
-Index: libvirt-1.2.20/daemon/libvirtd.sysconf
+Index: libvirt-1.2.21/daemon/libvirtd.sysconf
 ===================================================================
---- libvirt-1.2.20.orig/daemon/libvirtd.sysconf
+--- libvirt-1.2.21.orig/daemon/libvirtd.sysconf
-+++ libvirt-1.2.20/daemon/libvirtd.sysconf
++++ libvirt-1.2.21/daemon/libvirtd.sysconf
 @@ -1,16 +1,25 @@
 +## Path: System/Virtualization/libvirt
 +

libvirtd-systemd-socket.patch

@@ -9,10 +9,10 @@ as
 
 See bsc#933043
 
-Index: libvirt-1.2.20/daemon/libvirtd.socket.in
+Index: libvirt-1.2.21/daemon/libvirtd.socket.in
 ===================================================================
---- libvirt-1.2.20.orig/daemon/libvirtd.socket.in
+--- libvirt-1.2.21.orig/daemon/libvirtd.socket.in
-+++ libvirt-1.2.20/daemon/libvirtd.socket.in
++++ libvirt-1.2.21/daemon/libvirtd.socket.in
 @@ -2,10 +2,8 @@
  ListenStream=@runstatedir@/libvirt/libvirt-sock
  ListenStream=@runstatedir@/libvirt/libvirt-sock-ro

ppc64le-canonical-name.patch

@@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64
 
 See bnc#894956
 
-Index: libvirt-1.2.20/src/util/virarch.c
+Index: libvirt-1.2.21/src/util/virarch.c
 ===================================================================
---- libvirt-1.2.20.orig/src/util/virarch.c
+--- libvirt-1.2.21.orig/src/util/virarch.c
-+++ libvirt-1.2.20/src/util/virarch.c
++++ libvirt-1.2.21/src/util/virarch.c
 @@ -169,6 +169,8 @@ virArch virArchFromHost(void)
          arch = VIR_ARCH_I686;
      } else if (STREQ(ut.machine, "amd64")) {

qemu-apparmor-screenshot.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/examples/apparmor/libvirt-qemu
+Index: libvirt-1.2.21/examples/apparmor/libvirt-qemu
 ===================================================================
---- libvirt-1.2.20.orig/examples/apparmor/libvirt-qemu
+--- libvirt-1.2.21.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-1.2.20/examples/apparmor/libvirt-qemu
++++ libvirt-1.2.21/examples/apparmor/libvirt-qemu
 @@ -133,6 +133,9 @@
    /sys/bus/ r,
    /sys/class/ r,

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.20/src/xenconfig/xen_common.c
+Index: libvirt-1.2.21/src/xenconfig/xen_common.c
 ===================================================================
---- libvirt-1.2.20.orig/src/xenconfig/xen_common.c
+--- libvirt-1.2.21.orig/src/xenconfig/xen_common.c
-+++ libvirt-1.2.20/src/xenconfig/xen_common.c
++++ libvirt-1.2.21/src/xenconfig/xen_common.c
 @@ -403,6 +403,8 @@ xenParsePCI(virConfPtr conf, virDomainDe
  {
      virConfValuePtr list = virConfGetValue(conf, "pci");
@@ -66,10 +66,10 @@ Index: libvirt-1.2.20/src/xenconfig/xen_common.c
              hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
              hostdev->source.subsys.u.pci.addr.domain = domainID;
              hostdev->source.subsys.u.pci.addr.bus = busID;
-Index: libvirt-1.2.20/src/xenconfig/xen_sxpr.c
+Index: libvirt-1.2.21/src/xenconfig/xen_sxpr.c
 ===================================================================
---- libvirt-1.2.20.orig/src/xenconfig/xen_sxpr.c
+--- libvirt-1.2.21.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-1.2.20/src/xenconfig/xen_sxpr.c
++++ libvirt-1.2.21/src/xenconfig/xen_sxpr.c
 @@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def,
          int busID;
          int slotID;

suse-qemu-conf.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/src/qemu/qemu.conf
+Index: libvirt-1.2.21/src/qemu/qemu.conf
 ===================================================================
---- libvirt-1.2.20.orig/src/qemu/qemu.conf
+--- libvirt-1.2.21.orig/src/qemu/qemu.conf
-+++ libvirt-1.2.20/src/qemu/qemu.conf
++++ libvirt-1.2.21/src/qemu/qemu.conf
 @@ -201,11 +201,20 @@
  # isolation, but it cannot appear in a list of drivers.
  #

systemd-service-xen.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/daemon/libvirtd.service.in
+Index: libvirt-1.2.21/daemon/libvirtd.service.in
 ===================================================================
---- libvirt-1.2.20.orig/daemon/libvirtd.service.in
+--- libvirt-1.2.21.orig/daemon/libvirtd.service.in
-+++ libvirt-1.2.20/daemon/libvirtd.service.in
++++ libvirt-1.2.21/daemon/libvirtd.service.in
 @@ -7,6 +7,7 @@ After=iscsid.service
  After=apparmor.service
  After=local-fs.target

virtlockd-init-script.patch

@@ -1,9 +1,9 @@
 Adjust virtlockd init files to conform to SUSE standards
 
-Index: libvirt-1.2.20/src/locking/virtlockd.sysconf
+Index: libvirt-1.2.21/src/locking/virtlockd.sysconf
 ===================================================================
---- libvirt-1.2.20.orig/src/locking/virtlockd.sysconf
+--- libvirt-1.2.21.orig/src/locking/virtlockd.sysconf
-+++ libvirt-1.2.20/src/locking/virtlockd.sysconf
++++ libvirt-1.2.21/src/locking/virtlockd.sysconf
 @@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlockd
 +
@@ -12,10 +12,10 @@ Index: libvirt-1.2.20/src/locking/virtlockd.sysconf
  #
  # Pass extra arguments to virtlockd
  #VIRTLOCKD_ARGS=
-Index: libvirt-1.2.20/src/locking/virtlockd.init.in
+Index: libvirt-1.2.21/src/locking/virtlockd.init.in
 ===================================================================
---- libvirt-1.2.20.orig/src/locking/virtlockd.init.in
+--- libvirt-1.2.21.orig/src/locking/virtlockd.init.in
-+++ libvirt-1.2.20/src/locking/virtlockd.init.in
++++ libvirt-1.2.21/src/locking/virtlockd.init.in
 @@ -4,12 +4,14 @@
  # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV
  #

xen-pv-cdrom.patch

@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/src/xenconfig/xen_sxpr.c
+Index: libvirt-1.2.21/src/xenconfig/xen_sxpr.c
 ===================================================================
---- libvirt-1.2.20.orig/src/xenconfig/xen_sxpr.c
+--- libvirt-1.2.21.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-1.2.20/src/xenconfig/xen_sxpr.c
++++ libvirt-1.2.21/src/xenconfig/xen_sxpr.c
 @@ -334,7 +334,7 @@ xenParseSxprChar(const char *value,
  static int
  xenParseSxprDisks(virDomainDefPtr def,

xen-sxpr-disk-type.patch

@@ -6,10 +6,10 @@ and 'file'. This was implicitly done prior to commit 9673418c.
 
 https://bugzilla.suse.com/show_bug.cgi?id=938228
 
-Index: libvirt-1.2.20/src/xenconfig/xen_sxpr.c
+Index: libvirt-1.2.21/src/xenconfig/xen_sxpr.c
 ===================================================================
---- libvirt-1.2.20.orig/src/xenconfig/xen_sxpr.c
+--- libvirt-1.2.21.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-1.2.20/src/xenconfig/xen_sxpr.c
++++ libvirt-1.2.21/src/xenconfig/xen_sxpr.c
 @@ -449,10 +449,11 @@ xenParseSxprDisks(virDomainDefPtr def,
                         omnipotent, we can revisit this, perhaps stat()'ing
                         the src file in question */