Accepting request 426208 from Virtualization

Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/426208 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=214
2016-09-12 11:26:52 +00:00 · 2016-09-12 11:26:52 +00:00 · 59299ce304
commit 59299ce304
parent c5d59c84eb a278eea708
36 changed files with 199 additions and 318 deletions
--- a/541e9ae6-cpu-vendor-crash-fix.patch
+++ b/541e9ae6-cpu-vendor-crash-fix.patch
@ -1,45 +0,0 @@
-commit 541e9ae6d4290b9004ed73648ea663563b329b3d
-Author: Jim Fehlig <jfehlig@suse.com>
-Date:   Fri Aug 5 15:23:47 2016 -0600
-
-    cpu_x86: fix libvirtd crash when host cpu vendor is not available
-    
-    When starting a guest and copying host vendor cpuid to the guest
-    cpu, libvirtd would crash if the host cpu contained a NULL vendor
-    field. Avoid the crash by checking for a valid vendor in the host
-    cpu before copying the cpuid to the guest cpu.
-    
-    For completeness, here is a backtrace from the crash
-    
-    (gdb) bt
-    f0  0x00007ffff739bf33 in x86DataCpuid (cpuid=0x8, cpuid=0x8,
-        data=data@entry=0x7fffb800ee78) at cpu/cpu_x86.c:287
-    f1  virCPUx86DataAddCPUID (data=data@entry=0x7fffb800ee78, cpuid=0x8)
-        at cpu/cpu_x86.c:355
-    f2  0x00007ffff739ef47 in x86Compute (host=<optimized out>, cpu=0x7fffb8000cc0,
-        guest=0x7fffecca7348, message=<optimized out>) at cpu/cpu_x86.c:1580
-    f3  0x00007fffd2b38e53 in qemuBuildCpuModelArgStr (migrating=false,
-        hasHwVirt=<synthetic pointer>, qemuCaps=0x7fffb8001040, buf=0x7fffecca7360,
-        def=0x7fffc400ce20, driver=0x1c) at qemu/qemu_command.c:6283
-    f4  qemuBuildCpuCommandLine (cmd=cmd@entry=0x7fffb8002f60,
-        driver=driver@entry=0x7fffc80882c0, def=def@entry=0x7fffc400ce20,
-        qemuCaps=qemuCaps@entry=0x7fffb8001040, migrating=<optimized out>)
-        at qemu/qemu_command.c:6445
-    (gdb) f2
-    (gdb) p *host_model
-    $23 = {name = 0x7fffb800ec50 "qemu64", vendor = 0x0, signature = 0, data = {
-        len = 2, data = 0x7fffb800e720}}
-
-Index: libvirt-2.1.0/src/cpu/cpu_x86.c
-===================================================================
--- libvirt-2.1.0.orig/src/cpu/cpu_x86.c
-+++ libvirt-2.1.0/src/cpu/cpu_x86.c
-@@ -1576,7 +1576,7 @@ x86Compute(virCPUDefPtr host,
-         if (!(guest_model = x86ModelCopy(host_model)))
-             goto error;
- 
-        if (cpu->vendor &&
-+        if (cpu->vendor && host_model->vendor &&
-             virCPUx86DataAddCPUID(&guest_model->data,
-                                   &host_model->vendor->cpuid) < 0)
-             goto error;
--- a/856965b3-qemu-secdriver.patch
+++ b/856965b3-qemu-secdriver.patch
@ -1,28 +0,0 @@
-commit 856965b36246b26002af409262846317477ea631
-Author: Cole Robinson <crobinso@redhat.com>
-Date:   Wed Aug 10 10:32:03 2016 -0400
-
-    qemu: fix qemu.conf security_driver
-    
-    Since a9331394 (first release v2.1.0), specifying a manual
-    security_driver setting in qemu.conf causes the daemon to fail to
-    start, erroring with 'Duplicate security driver X'.
-    
-    The duplicate checking was incorrectly comparing every entry
-    against itself, guaranteeing a false positive.
-    
-    https://bugzilla.redhat.com/show_bug.cgi?id=1365607
-
-Index: libvirt-2.1.0/src/qemu/qemu_conf.c
-===================================================================
--- libvirt-2.1.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-2.1.0/src/qemu/qemu_conf.c
-@@ -431,7 +431,7 @@ int virQEMUDriverConfigLoadFile(virQEMUD
-         goto cleanup;
- 
-     for (i = 0; cfg->securityDriverNames && cfg->securityDriverNames[i] != NULL; i++) {
-        for (j = i; cfg->securityDriverNames[j] != NULL; j++) {
-+        for (j = i + 1; cfg->securityDriverNames[j] != NULL; j++) {
-             if (STREQ(cfg->securityDriverNames[i],
-                       cfg->securityDriverNames[j])) {
-                 virReportError(VIR_ERR_CONF_SYNTAX,
--- a/apparmor-fixes.patch
+++ b/apparmor-fixes.patch
@ -1,7 +1,7 @@
-Index: libvirt-2.1.0/examples/apparmor/libvirt-qemu
+Index: libvirt-2.2.0/examples/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-2.1.0.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-2.1.0/examples/apparmor/libvirt-qemu
+--- libvirt-2.2.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-2.2.0/examples/apparmor/libvirt-qemu
@@ -143,6 +143,9 @@
   # for restore
   /bin/bash rmix,
--- a/apparmor-no-mount.patch
+++ b/apparmor-no-mount.patch
@ -1,7 +1,7 @@
-Index: libvirt-2.1.0/examples/apparmor/libvirt-lxc
+Index: libvirt-2.2.0/examples/apparmor/libvirt-lxc
 ===================================================================
--- libvirt-2.1.0.orig/examples/apparmor/libvirt-lxc
-+++ libvirt-2.1.0/examples/apparmor/libvirt-lxc
+--- libvirt-2.2.0.orig/examples/apparmor/libvirt-lxc
+++ libvirt-2.2.0/examples/apparmor/libvirt-lxc
@@ -2,39 +2,15 @@
 
   #include <abstractions/base>
--- a/apparmor-qemu-bridge-helper.patch
+++ b/apparmor-qemu-bridge-helper.patch
@ -10,10 +10,10 @@ from the qemu domain abstraction to the usr.sbin.libvirtd profile.
 examples/apparmor/usr.sbin.libvirtd | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 19 deletions(-)

-Index: libvirt-2.1.0/examples/apparmor/libvirt-qemu
+Index: libvirt-2.2.0/examples/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-2.1.0.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-2.1.0/examples/apparmor/libvirt-qemu
+--- libvirt-2.2.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-2.2.0/examples/apparmor/libvirt-qemu
@@ -151,22 +151,3 @@
   /etc/udev/udev.conf r,
   /sys/bus/ r,
@ -37,10 +37,10 @@ Index: libvirt-2.1.0/examples/apparmor/libvirt-qemu
 -
 -   /usr/{lib,libexec}/qemu-bridge-helper rmix,
 -  }
-Index: libvirt-2.1.0/examples/apparmor/usr.sbin.libvirtd
+Index: libvirt-2.2.0/examples/apparmor/usr.sbin.libvirtd
 ===================================================================
--- libvirt-2.1.0.orig/examples/apparmor/usr.sbin.libvirtd
-+++ libvirt-2.1.0/examples/apparmor/usr.sbin.libvirtd
+--- libvirt-2.2.0.orig/examples/apparmor/usr.sbin.libvirtd
+++ libvirt-2.2.0/examples/apparmor/usr.sbin.libvirtd
@@ -67,4 +67,22 @@
   # allow changing to our UUID-based named profiles
   change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
--- a/blockcopy-check-dst-identical-device.patch
+++ b/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-2.1.0/src/qemu/qemu_driver.c
+Index: libvirt-2.2.0/src/qemu/qemu_driver.c
 ===================================================================
--- libvirt-2.1.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-2.1.0/src/qemu/qemu_driver.c
-@@ -16327,6 +16327,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
+--- libvirt-2.2.0.orig/src/qemu/qemu_driver.c
+++ libvirt-2.2.0/src/qemu/qemu_driver.c
+@@ -16578,6 +16578,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
                        _("non-file destination not supported yet"));
         goto endjob;
     }
--- a/d53d4650-qemu-rbd-auth.patch
+++ b/d53d4650-qemu-rbd-auth.patch
@ -1,51 +0,0 @@
-commit d53d465083edeb64cc7b78249c030734c0d91c6b
-Author: John Ferlan <jferlan@redhat.com>
-Date:   Tue Aug 16 16:50:15 2016 -0400
-
-    qemu: Fix the command line generation for rbd auth using aes secrets
-    
-    https://bugzilla.redhat.com/show_bug.cgi?id=1182074
-    
-    Since libvirt still uses a legacy qemu arg format to add a disk, the
-    manner in which the 'password-secret' argument is passed to qemu needs
-    to change to prepend a 'file.' If in the future, usage of the more
-    modern disk format, then the prepended 'file.' can be removed.
-    
-    Fix based on Jim Fehlig <jfehlig@suse.com> posting and subsequent
-    upstream list followups, see:
-    
-    http://www.redhat.com/archives/libvir-list/2016-August/msg00777.html
-    
-    for details. Introduced by commit id 'a1344f70'.
-
-Index: libvirt-2.1.0/src/qemu/qemu_command.c
-===================================================================
--- libvirt-2.1.0.orig/src/qemu/qemu_command.c
-+++ libvirt-2.1.0/src/qemu/qemu_command.c
-@@ -1296,7 +1296,12 @@ qemuBuildDriveSourceStr(virDomainDiskDef
-     virBufferAddLit(buf, ",");
- 
-     if (secinfo && secinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES) {
-        virBufferAsprintf(buf, "password-secret=%s,",
-+        /* NB: If libvirt starts using the more modern option based
-+         *     syntax to build the command line (e.g., "-drive driver=rbd,
-+         *     filename=%s,...") instead of the legacy model (e.g."-drive
-+         *     file=%s,..."), then the "file." prefix can be removed
-+         */
-+        virBufferAsprintf(buf, "file.password-secret=%s,",
-                           secinfo->s.aes.alias);
-     }
- 
-Index: libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args
-===================================================================
--- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args
-+++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args
-@@ -26,7 +26,7 @@ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1
- keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
- -drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\
- mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:\
-6322,password-secret=virtio-disk0-secret0,format=raw,if=none,\
-+6322,file.password-secret=virtio-disk0-secret0,format=raw,if=none,\
- id=drive-virtio-disk0' \
- -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\
- id=virtio-disk0
--- a/libvirt-2.1.0.tar.xz
+++ b/libvirt-2.1.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a799562337472ab00f76aa30a53d54c623c96633070ec53286c9cc2a456316b
-size 13212368
--- a/libvirt-2.1.0.tar.xz.asc
+++ b/libvirt-2.1.0.tar.xz.asc
@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlegWv0ACgkQRga4pd6VvB/vGQCfejAVwz1SJ4U7YX8PmACZpvtd
-1ooAn0QkbzRWsIsMr7WINWK3pb2HELFy
-=NPFm
-----END PGP SIGNATURE-----
--- a/libvirt-2.2.0.tar.xz
+++ b/libvirt-2.2.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e315a8d66aeeb0e7b6459e20b8abae16a23764c3f5d24c7d9462465d26791699
+size 13209684
--- a/libvirt-2.2.0.tar.xz.asc
+++ b/libvirt-2.2.0.tar.xz.asc
@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iEYEABECAAYFAlfJfmsACgkQRga4pd6VvB9J1gCdGxdMVSocMiKYnKPh4sY3Gp3r
+kP8AnAgpRQ+Hn48/YIflP9dKacy+yEkF
+=x1Mw
+-----END PGP SIGNATURE-----
--- 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-2.1.0/tools/libvirt-guests.init.in
+Index: libvirt-2.2.0/tools/libvirt-guests.init.in
 ===================================================================
--- libvirt-2.1.0.orig/tools/libvirt-guests.init.in
-+++ libvirt-2.1.0/tools/libvirt-guests.init.in
+--- libvirt-2.2.0.orig/tools/libvirt-guests.init.in
+++ libvirt-2.2.0/tools/libvirt-guests.init.in
@@ -4,27 +4,27 @@
 # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
 #
@ -45,10 +45,10 @@ Index: libvirt-2.1.0/tools/libvirt-guests.init.in
 #
 
 exec @libexecdir@/libvirt-guests.sh "$@"
-Index: libvirt-2.1.0/tools/libvirt-guests.sh.in
+Index: libvirt-2.2.0/tools/libvirt-guests.sh.in
 ===================================================================
--- libvirt-2.1.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-2.1.0/tools/libvirt-guests.sh.in
+--- libvirt-2.2.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-2.2.0/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@
 # License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
@ -208,10 +208,10 @@ Index: libvirt-2.1.0/tools/libvirt-guests.sh.in
 esac
 -exit $RETVAL
 +rc_exit
-Index: libvirt-2.1.0/tools/libvirt-guests.sysconf
+Index: libvirt-2.2.0/tools/libvirt-guests.sysconf
 ===================================================================
--- libvirt-2.1.0.orig/tools/libvirt-guests.sysconf
-+++ libvirt-2.1.0/tools/libvirt-guests.sysconf
+--- libvirt-2.2.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-2.2.0/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
 +## Path: System/Virtualization/libvirt-guests
 +
--- a/libvirt-power8-models.patch
+++ b/libvirt-power8-models.patch
@ -1,7 +1,7 @@
-Index: libvirt-2.1.0/src/cpu/cpu_map.xml
+Index: libvirt-2.2.0/src/cpu/cpu_map.xml
 ===================================================================
--- libvirt-2.1.0.orig/src/cpu/cpu_map.xml
-+++ libvirt-2.1.0/src/cpu/cpu_map.xml
+--- libvirt-2.2.0.orig/src/cpu/cpu_map.xml
+++ libvirt-2.2.0/src/cpu/cpu_map.xml
@@ -1542,6 +1542,16 @@
       <pvr value='0x004d0000' mask='0xffff0000'/>
     </model>
--- a/libvirt-suse-netcontrol.patch
+++ b/libvirt-suse-netcontrol.patch
@ -1,7 +1,7 @@
-Index: libvirt-2.1.0/configure.ac
+Index: libvirt-2.2.0/configure.ac
 ===================================================================
--- libvirt-2.1.0.orig/configure.ac
-+++ libvirt-2.1.0/configure.ac
+--- libvirt-2.2.0.orig/configure.ac
+++ libvirt-2.2.0/configure.ac
@@ -248,6 +248,7 @@ LIBVIRT_CHECK_FUSE
 LIBVIRT_CHECK_GLUSTER
 LIBVIRT_CHECK_HAL
@ -34,11 +34,11 @@ Index: libvirt-2.1.0/configure.ac
 LIBVIRT_RESULT_NUMACTL
 LIBVIRT_RESULT_OPENWSMAN
 LIBVIRT_RESULT_PCIACCESS
-Index: libvirt-2.1.0/src/Makefile.am
+Index: libvirt-2.2.0/src/Makefile.am
 ===================================================================
--- libvirt-2.1.0.orig/src/Makefile.am
-+++ libvirt-2.1.0/src/Makefile.am
-@@ -945,6 +945,10 @@ if WITH_NETCF
+--- libvirt-2.2.0.orig/src/Makefile.am
+++ libvirt-2.2.0/src/Makefile.am
+@@ -952,6 +952,10 @@ if WITH_NETCF
 INTERFACE_DRIVER_SOURCES +=					\
 		interface/interface_backend_netcf.c
 endif WITH_NETCF
@ -49,7 +49,7 @@ Index: libvirt-2.1.0/src/Makefile.am
 if WITH_UDEV
 INTERFACE_DRIVER_SOURCES +=					\
 		interface/interface_backend_udev.c
-@@ -1590,6 +1594,10 @@ if WITH_NETCF
+@@ -1600,6 +1604,10 @@ if WITH_NETCF
 libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
 libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
 endif WITH_NETCF
@ -60,11 +60,11 @@ Index: libvirt-2.1.0/src/Makefile.am
 if WITH_UDEV
 libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
 libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)
-Index: libvirt-2.1.0/tools/virsh.c
+Index: libvirt-2.2.0/tools/virsh.c
 ===================================================================
--- libvirt-2.1.0.orig/tools/virsh.c
-+++ libvirt-2.1.0/tools/virsh.c
-@@ -636,6 +636,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
+--- libvirt-2.2.0.orig/tools/virsh.c
+++ libvirt-2.2.0/tools/virsh.c
+@@ -640,6 +640,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
     vshPrint(ctl, " Interface");
 # if defined(WITH_NETCF)
     vshPrint(ctl, " netcf");
@ -73,10 +73,10 @@ Index: libvirt-2.1.0/tools/virsh.c
 # elif defined(WITH_UDEV)
     vshPrint(ctl, " udev");
 # endif
-Index: libvirt-2.1.0/src/interface/interface_backend_netcf.c
+Index: libvirt-2.2.0/src/interface/interface_backend_netcf.c
 ===================================================================
--- libvirt-2.1.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-2.1.0/src/interface/interface_backend_netcf.c
+--- libvirt-2.2.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-2.2.0/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
 
 #include <config.h>
@ -160,10 +160,10 @@ Index: libvirt-2.1.0/src/interface/interface_backend_netcf.c
     if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
         return -1;
     if (virRegisterStateDriver(&interfaceStateDriver) < 0)
-Index: libvirt-2.1.0/src/interface/interface_driver.c
+Index: libvirt-2.2.0/src/interface/interface_driver.c
 ===================================================================
--- libvirt-2.1.0.orig/src/interface/interface_driver.c
-+++ libvirt-2.1.0/src/interface/interface_driver.c
+--- libvirt-2.2.0.orig/src/interface/interface_driver.c
+++ libvirt-2.2.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
     if (netcfIfaceRegister() == 0)
         return 0;
@ -181,10 +181,10 @@ Index: libvirt-2.1.0/src/interface/interface_driver.c
     if (udevIfaceRegister() == 0)
         return 0;
 #endif /* WITH_UDEV */
-Index: libvirt-2.1.0/m4/virt-netcontrol.m4
+Index: libvirt-2.2.0/m4/virt-netcontrol.m4
 ===================================================================
 --- /dev/null
-+++ libvirt-2.1.0/m4/virt-netcontrol.m4
+++ libvirt-2.2.0/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@
 +dnl The libnetcontrol library
 +dnl
--- a/libvirt.changes
+++ b/libvirt.changes
@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Sep  2 18:30:27 UTC 2016 - jfehlig@suse.com
+
+- Update to libvirt 2.2.0
+  - Many incremental improvements and bug fixes, see
+    http://libvirt.org/news.html
+  - Dropped patches:
+    856965b3-qemu-secdriver.patch,
+    541e9ae6-cpu-vendor-crash-fix.patch,
+    d53d4650-qemu-rbd-auth.patch
+
 -------------------------------------------------------------------
 Sat Aug 20 23:25:09 UTC 2016 - jfehlig@suse.com

--- a/libvirt.spec
+++ b/libvirt.spec
@ -174,7 +174,7 @@

 Name:           libvirt
 Url:            http://libvirt.org/
-Version:        2.1.0
+Version:        2.2.0
 Release:        0
 Summary:        Library providing a simple virtualization API
 License:        LGPL-2.1+
@ -314,9 +314,6 @@ Source4:        libvirtd-relocation-server.fw
 Source99:       baselibs.conf
 Source100:      %{name}-rpmlintrc
 # Upstream patches
-Patch0:         856965b3-qemu-secdriver.patch
-Patch1:         541e9ae6-cpu-vendor-crash-fix.patch
-Patch2:         d53d4650-qemu-rbd-auth.patch
 # Patches pending upstream review
 Patch100:       libxl-dom-reset.patch
 Patch101:       pci-use-driver-override-sysfs.patch
@ -789,9 +786,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.

 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
--- a/libvirtd-defaults.patch
+++ b/libvirtd-defaults.patch
@ -1,7 +1,7 @@
-Index: libvirt-2.1.0/daemon/libvirtd.conf
+Index: libvirt-2.2.0/daemon/libvirtd.conf
 ===================================================================
--- libvirt-2.1.0.orig/daemon/libvirtd.conf
-+++ libvirt-2.1.0/daemon/libvirtd.conf
+--- libvirt-2.2.0.orig/daemon/libvirtd.conf
+++ libvirt-2.2.0/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-2.1.0/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-2.1.0/daemon/libvirtd-config.c
+Index: libvirt-2.2.0/daemon/libvirtd-config.c
 ===================================================================
--- libvirt-2.1.0.orig/daemon/libvirtd-config.c
-+++ libvirt-2.1.0/daemon/libvirtd-config.c
+--- libvirt-2.2.0.orig/daemon/libvirtd-config.c
+++ libvirt-2.2.0/daemon/libvirtd-config.c
@@ -109,7 +109,7 @@ daemonConfigNew(bool privileged ATTRIBUT
     if (VIR_ALLOC(data) < 0)
         return NULL;
@ -26,10 +26,10 @@ Index: libvirt-2.1.0/daemon/libvirtd-config.c
     data->listen_tcp = 0;
 
     if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
-Index: libvirt-2.1.0/daemon/test_libvirtd.aug.in
+Index: libvirt-2.2.0/daemon/test_libvirtd.aug.in
 ===================================================================
--- libvirt-2.1.0.orig/daemon/test_libvirtd.aug.in
-+++ libvirt-2.1.0/daemon/test_libvirtd.aug.in
+--- libvirt-2.2.0.orig/daemon/test_libvirtd.aug.in
+++ libvirt-2.2.0/daemon/test_libvirtd.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd =
    ::CONFIG::
 
--- 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-2.1.0/daemon/libvirtd.sysconf
+Index: libvirt-2.2.0/daemon/libvirtd.sysconf
 ===================================================================
--- libvirt-2.1.0.orig/daemon/libvirtd.sysconf
-+++ libvirt-2.1.0/daemon/libvirtd.sysconf
+--- libvirt-2.2.0.orig/daemon/libvirtd.sysconf
+++ libvirt-2.2.0/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
 +## Path: System/Virtualization/libvirt
 +
--- a/libxl-dom-reset.patch
+++ b/libxl-dom-reset.patch
@ -8,11 +8,11 @@ Date:   Mon Jun 23 15:51:20 2014 -0600
    option, but domainReset can be implemented in the libxl driver by
    forcibly destroying the domain and starting it again.

-Index: libvirt-2.1.0/src/libxl/libxl_driver.c
+Index: libvirt-2.2.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-2.1.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-2.1.0/src/libxl/libxl_driver.c
-@@ -1348,6 +1348,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
+--- libvirt-2.2.0.orig/src/libxl/libxl_driver.c
+++ libvirt-2.2.0/src/libxl/libxl_driver.c
+@@ -1376,6 +1376,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
 }
 
 static int
@ -74,7 +74,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_driver.c
 libxlDomainDestroyFlags(virDomainPtr dom,
                         unsigned int flags)
 {
-@@ -6161,6 +6216,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6370,6 +6425,7 @@ static virHypervisorDriver libxlHypervis
     .domainShutdown = libxlDomainShutdown, /* 0.9.0 */
     .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */
     .domainReboot = libxlDomainReboot, /* 0.9.0 */
--- a/libxl-qemu-emulator-caps.patch
+++ b/libxl-qemu-emulator-caps.patch
@ -8,10 +8,10 @@ as the default <emulator>, instead of the qemu-xen one.

 See FATE#320638 for details.

-Index: libvirt-2.1.0/src/libxl/libxl_capabilities.c
+Index: libvirt-2.2.0/src/libxl/libxl_capabilities.c
 ===================================================================
--- libvirt-2.1.0.orig/src/libxl/libxl_capabilities.c
-+++ libvirt-2.1.0/src/libxl/libxl_capabilities.c
+--- libvirt-2.2.0.orig/src/libxl/libxl_capabilities.c
+++ libvirt-2.2.0/src/libxl/libxl_capabilities.c
@@ -36,6 +36,7 @@
 #include "domain_capabilities.h"
 #include "vircommand.h"
--- a/libxl-set-cach-mode.patch
+++ b/libxl-set-cach-mode.patch
@ -3,11 +3,11 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425
 src/libxl/libxl_conf.c |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

-Index: libvirt-2.1.0/src/libxl/libxl_conf.c
+Index: libvirt-2.2.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-2.1.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-2.1.0/src/libxl/libxl_conf.c
-@@ -562,6 +562,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
+--- libvirt-2.2.0.orig/src/libxl/libxl_conf.c
+++ libvirt-2.2.0/src/libxl/libxl_conf.c
+@@ -557,6 +557,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
 
@ -38,7 +38,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_conf.c
 static char *
 libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
                            const char *username,
-@@ -804,6 +828,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -799,6 +823,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
     x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
     if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
         return -1;
--- a/libxl-set-migration-constraints.patch
+++ b/libxl-set-migration-constraints.patch
@ -16,11 +16,11 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 tools/virsh.pod                  |    8 ++++++++
 6 files changed, 125 insertions(+), 6 deletions(-)

-Index: libvirt-2.1.0/include/libvirt/libvirt-domain.h
+Index: libvirt-2.2.0/include/libvirt/libvirt-domain.h
 ===================================================================
--- libvirt-2.1.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-2.1.0/include/libvirt/libvirt-domain.h
-@@ -873,6 +873,31 @@ typedef enum {
+--- libvirt-2.2.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-2.2.0/include/libvirt/libvirt-domain.h
+@@ -889,6 +889,31 @@ typedef enum {
  */
 # define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT  "auto_converge.increment"
 
@ -52,11 +52,11 @@ Index: libvirt-2.1.0/include/libvirt/libvirt-domain.h
 /* Domain migration. */
 virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
                                unsigned long flags, const char *dname,
-Index: libvirt-2.1.0/src/libxl/libxl_driver.c
+Index: libvirt-2.2.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-2.1.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-2.1.0/src/libxl/libxl_driver.c
-@@ -5826,6 +5826,9 @@ libxlDomainMigratePerform3Params(virDoma
+--- libvirt-2.2.0.orig/src/libxl/libxl_driver.c
+++ libvirt-2.2.0/src/libxl/libxl_driver.c
+@@ -6035,6 +6035,9 @@ libxlDomainMigratePerform3Params(virDoma
     const char *dname = NULL;
     const char *uri = NULL;
     int ret = -1;
@ -66,7 +66,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_driver.c
 
 #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
     virReportUnsupportedError();
-@@ -5842,6 +5845,18 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6051,6 +6054,18 @@ libxlDomainMigratePerform3Params(virDoma
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_DEST_NAME,
                                 &dname) < 0 ||
@ -85,7 +85,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_driver.c
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_URI,
                                 &uri) < 0)
-@@ -5856,11 +5871,11 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6065,11 +6080,11 @@ libxlDomainMigratePerform3Params(virDoma
 
     if (flags & VIR_MIGRATE_PEER2PEER) {
         if (libxlDomainMigrationPerformP2P(driver, vm, dom->conn, dom_xml,
@ -99,11 +99,11 @@ Index: libvirt-2.1.0/src/libxl/libxl_driver.c
             goto cleanup;
     }
 
-Index: libvirt-2.1.0/src/libxl/libxl_migration.c
+Index: libvirt-2.2.0/src/libxl/libxl_migration.c
 ===================================================================
--- libvirt-2.1.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-2.1.0/src/libxl/libxl_migration.c
-@@ -357,18 +357,39 @@ libxlMigrateReceive(virNetSocketPtr sock
+--- libvirt-2.2.0.orig/src/libxl/libxl_migration.c
+++ libvirt-2.2.0/src/libxl/libxl_migration.c
+@@ -358,18 +358,39 @@ libxlMigrateReceive(virNetSocketPtr sock
 static int
 libxlDoMigrateSend(libxlDriverPrivatePtr driver,
                    virDomainObjPtr vm,
@ -145,7 +145,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_migration.c
     if (ret != 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Failed to send migration data to destination host"));
-@@ -663,7 +684,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
+@@ -720,7 +741,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
                   const char *dconnuri ATTRIBUTE_UNUSED,
                   const char *dname,
                   const char *uri,
@ -154,7 +154,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_migration.c
 {
     virDomainPtr ddomain = NULL;
     virTypedParameterPtr params = NULL;
-@@ -700,7 +721,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
+@@ -757,7 +778,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
     /* We don't require the destination to have P2P support
      * as it looks to be normal migration from the receiver perpective.
      */
@ -163,7 +163,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_migration.c
 
     VIR_DEBUG("Prepare3");
     virObjectUnlock(vm);
-@@ -725,7 +746,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
+@@ -782,7 +803,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
 
     VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out));
     ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL,
@ -172,7 +172,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_migration.c
 
     if (ret < 0)
         orig_err = virSaveLastError();
-@@ -757,7 +778,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
+@@ -814,7 +835,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
         orig_err = virSaveLastError();
 
     VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm);
@ -181,7 +181,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_migration.c
 
     if (ret < 0)
         VIR_WARN("Guest %s probably left in 'paused' state on source",
-@@ -806,7 +827,7 @@ libxlDomainMigrationPerformP2P(libxlDriv
+@@ -863,7 +884,7 @@ libxlDomainMigrationPerformP2P(libxlDriv
                                const char *dconnuri,
                                const char *uri_str ATTRIBUTE_UNUSED,
                                const char *dname,
@ -190,7 +190,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_migration.c
 {
     int ret = -1;
     bool useParams;
-@@ -841,7 +862,7 @@ libxlDomainMigrationPerformP2P(libxlDriv
+@@ -898,7 +919,7 @@ libxlDomainMigrationPerformP2P(libxlDriv
     }
 
     ret = libxlDoMigrateP2P(driver, vm, sconn, xmlin, dconn, dconnuri,
@ -199,7 +199,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_migration.c
 
  cleanup:
     orig_err = virSaveLastError();
-@@ -863,7 +884,7 @@ libxlDomainMigrationPerform(libxlDriverP
+@@ -920,7 +941,7 @@ libxlDomainMigrationPerform(libxlDriverP
                             const char *dconnuri ATTRIBUTE_UNUSED,
                             const char *uri_str,
                             const char *dname ATTRIBUTE_UNUSED,
@ -208,7 +208,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_migration.c
 {
     libxlDomainObjPrivatePtr priv = vm->privateData;
     char *hostname = NULL;
-@@ -903,7 +924,7 @@ libxlDomainMigrationPerform(libxlDriverP
+@@ -960,7 +981,7 @@ libxlDomainMigrationPerform(libxlDriverP
 
     /* suspend vm and send saved data to dst through socket fd */
     virObjectUnlock(vm);
@ -217,10 +217,10 @@ Index: libvirt-2.1.0/src/libxl/libxl_migration.c
     virObjectLock(vm);
 
  cleanup:
-Index: libvirt-2.1.0/src/libxl/libxl_migration.h
+Index: libvirt-2.2.0/src/libxl/libxl_migration.h
 ===================================================================
--- libvirt-2.1.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-2.1.0/src/libxl/libxl_migration.h
+--- libvirt-2.2.0.orig/src/libxl/libxl_migration.h
+++ libvirt-2.2.0/src/libxl/libxl_migration.h
@@ -37,6 +37,10 @@
     VIR_MIGRATE_PARAM_URI,              VIR_TYPED_PARAM_STRING, \
     VIR_MIGRATE_PARAM_DEST_NAME,        VIR_TYPED_PARAM_STRING, \
@ -265,11 +265,11 @@ Index: libvirt-2.1.0/src/libxl/libxl_migration.h
 
 virDomainPtr
 libxlDomainMigrationFinish(virConnectPtr dconn,
-Index: libvirt-2.1.0/tools/virsh-domain.c
+Index: libvirt-2.2.0/tools/virsh-domain.c
 ===================================================================
--- libvirt-2.1.0.orig/tools/virsh-domain.c
-+++ libvirt-2.1.0/tools/virsh-domain.c
-@@ -9977,6 +9977,22 @@ static const vshCmdOptDef opts_migrate[]
+--- libvirt-2.2.0.orig/tools/virsh-domain.c
+++ libvirt-2.2.0/tools/virsh-domain.c
+@@ -9972,6 +9972,22 @@ static const vshCmdOptDef opts_migrate[]
      .type = VSH_OT_INT,
      .help = N_("CPU throttling rate increment for auto-convergence")
     },
@ -292,7 +292,7 @@ Index: libvirt-2.1.0/tools/virsh-domain.c
     {.name = NULL}
 };
 
-@@ -10000,6 +10016,7 @@ doMigrate(void *opaque)
+@@ -9995,6 +10011,7 @@ doMigrate(void *opaque)
     unsigned long long ullOpt = 0;
     int rv;
     virConnectPtr dconn = data->dconn;
@ -300,7 +300,7 @@ Index: libvirt-2.1.0/tools/virsh-domain.c
 
     sigemptyset(&sigmask);
     sigaddset(&sigmask, SIGINT);
-@@ -10119,6 +10136,27 @@ doMigrate(void *opaque)
+@@ -10114,6 +10131,27 @@ doMigrate(void *opaque)
             goto save_error;
     }
 
@ -328,10 +328,10 @@ Index: libvirt-2.1.0/tools/virsh-domain.c
     if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
         goto out;
     if (opt) {
-Index: libvirt-2.1.0/tools/virsh.pod
+Index: libvirt-2.2.0/tools/virsh.pod
 ===================================================================
--- libvirt-2.1.0.orig/tools/virsh.pod
-+++ libvirt-2.1.0/tools/virsh.pod
+--- libvirt-2.2.0.orig/tools/virsh.pod
+++ libvirt-2.2.0/tools/virsh.pod
@@ -1662,6 +1662,14 @@ compression. I<--comp-mt-threads> and I<
 of compress threads on source and the number of decompress threads on target
 respectively. I<--comp-xbzrle-cache> sets size of page cache in bytes.
--- a/libxl-support-block-script.patch
+++ b/libxl-support-block-script.patch
@ -7,11 +7,11 @@ and npiv.

 For more details, see bsc#954872 and FATE#319810

-Index: libvirt-2.1.0/src/libxl/libxl_conf.c
+Index: libvirt-2.2.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-2.1.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-2.1.0/src/libxl/libxl_conf.c
-@@ -562,6 +562,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
+--- libvirt-2.2.0.orig/src/libxl/libxl_conf.c
+++ libvirt-2.2.0/src/libxl/libxl_conf.c
+@@ -557,6 +557,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
 
@ -37,7 +37,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_conf.c
 static void
 libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
 {
-@@ -706,6 +725,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
+@@ -701,6 +720,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
 int
 libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
 {
@ -45,7 +45,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_conf.c
     const char *driver = virDomainDiskGetDriver(l_disk);
     int format = virDomainDiskGetFormat(l_disk);
     int actual_type = virStorageSourceGetActualType(l_disk->src);
-@@ -721,7 +741,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -716,7 +736,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
         if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
             return -1;
     } else {
@ -54,7 +54,7 @@ Index: libvirt-2.1.0/src/libxl/libxl_conf.c
         return -1;
     }
 
-@@ -829,6 +849,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -824,6 +844,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
     if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
         return -1;
     libxlDiskSetCacheMode(x_disk, l_disk->cachemode);
--- a/libxl-usb-vendor.patch
+++ b/libxl-usb-vendor.patch
@ -8,11 +8,11 @@ Date:   Fri Aug 5 09:10:50 2016 +0200
    Find the bus/device if the user only provided the vendor/product
    of the USB device.

-Index: libvirt-2.1.0/src/libxl/libxl_conf.c
+Index: libvirt-2.2.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-2.1.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-2.1.0/src/libxl/libxl_conf.c
-@@ -1483,23 +1483,36 @@ int
+--- libvirt-2.2.0.orig/src/libxl/libxl_conf.c
+++ libvirt-2.2.0/src/libxl/libxl_conf.c
+@@ -1559,23 +1559,36 @@ int
 libxlMakeUSB(virDomainHostdevDefPtr hostdev, libxl_device_usbdev *usbdev)
 {
     virDomainHostdevSubsysUSBPtr usbsrc = &hostdev->source.subsys.u.usb;
--- a/lxc-wait-after-eth-del.patch
+++ b/lxc-wait-after-eth-del.patch
@ -13,10 +13,10 @@ device with the same name that is being created.
 src/lxc/lxc_process.c    | 1 +
 3 files changed, 4 insertions(+)

-Index: libvirt-2.1.0/src/lxc/lxc_controller.c
+Index: libvirt-2.2.0/src/lxc/lxc_controller.c
 ===================================================================
--- libvirt-2.1.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-2.1.0/src/lxc/lxc_controller.c
+--- libvirt-2.2.0.orig/src/lxc/lxc_controller.c
+++ libvirt-2.2.0/src/lxc/lxc_controller.c
@@ -2009,6 +2009,7 @@ static int virLXCControllerDeleteInterfa
         if (virNetDevVethDelete(ctrl->veths[i]) < 0)
             ret = -1;
@ -25,10 +25,10 @@ Index: libvirt-2.1.0/src/lxc/lxc_controller.c
 
     return ret;
 }
-Index: libvirt-2.1.0/src/lxc/lxc_driver.c
+Index: libvirt-2.2.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-2.1.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-2.1.0/src/lxc/lxc_driver.c
+--- libvirt-2.2.0.orig/src/lxc/lxc_driver.c
+++ libvirt-2.2.0/src/lxc/lxc_driver.c
@@ -4025,6 +4025,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
         case VIR_DOMAIN_NET_TYPE_NETWORK:
         case VIR_DOMAIN_NET_TYPE_ETHERNET:
@ -45,10 +45,10 @@ Index: libvirt-2.1.0/src/lxc/lxc_driver.c
         break;
 
         /* It'd be nice to support this, but with macvlan
-Index: libvirt-2.1.0/src/lxc/lxc_process.c
+Index: libvirt-2.2.0/src/lxc/lxc_process.c
 ===================================================================
--- libvirt-2.1.0.orig/src/lxc/lxc_process.c
-+++ libvirt-2.1.0/src/lxc/lxc_process.c
+--- libvirt-2.2.0.orig/src/lxc/lxc_process.c
+++ libvirt-2.2.0/src/lxc/lxc_process.c
@@ -221,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD
         }
         networkReleaseActualDevice(vm->def, iface);
--- a/pci-use-driver-override-sysfs.patch
+++ b/pci-use-driver-override-sysfs.patch
@ -29,10 +29,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/util/virpci.c | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 149 insertions(+), 2 deletions(-)

-Index: libvirt-2.1.0/src/util/virpci.c
+Index: libvirt-2.2.0/src/util/virpci.c
 ===================================================================
--- libvirt-2.1.0.orig/src/util/virpci.c
-+++ libvirt-2.1.0/src/util/virpci.c
+--- libvirt-2.2.0.orig/src/util/virpci.c
+++ libvirt-2.2.0/src/util/virpci.c
@@ -1089,8 +1089,54 @@ virPCIDeviceUnbind(virPCIDevicePtr dev)
     return ret;
 }
--- a/ppc64le-canonical-name.patch
+++ b/ppc64le-canonical-name.patch
@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64

 See bnc#894956

-Index: libvirt-2.1.0/src/util/virarch.c
+Index: libvirt-2.2.0/src/util/virarch.c
 ===================================================================
--- libvirt-2.1.0.orig/src/util/virarch.c
-+++ libvirt-2.1.0/src/util/virarch.c
+--- libvirt-2.2.0.orig/src/util/virarch.c
+++ libvirt-2.2.0/src/util/virarch.c
@@ -169,6 +169,8 @@ virArch virArchFromHost(void)
         arch = VIR_ARCH_I686;
     } else if (STREQ(ut.machine, "amd64")) {
--- a/qemu-apparmor-screenshot.patch
+++ b/qemu-apparmor-screenshot.patch
@ -1,7 +1,7 @@
-Index: libvirt-2.1.0/examples/apparmor/libvirt-qemu
+Index: libvirt-2.2.0/examples/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-2.1.0.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-2.1.0/examples/apparmor/libvirt-qemu
+--- libvirt-2.2.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-2.2.0/examples/apparmor/libvirt-qemu
@@ -151,3 +151,6 @@
   /etc/udev/udev.conf r,
   /sys/bus/ r,
--- 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-2.1.0/src/xenconfig/xen_common.c
+Index: libvirt-2.2.0/src/xenconfig/xen_common.c
 ===================================================================
--- libvirt-2.1.0.orig/src/xenconfig/xen_common.c
-+++ libvirt-2.1.0/src/xenconfig/xen_common.c
+--- libvirt-2.2.0.orig/src/xenconfig/xen_common.c
+++ libvirt-2.2.0/src/xenconfig/xen_common.c
@@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe
 {
     virConfValuePtr list = virConfGetValue(conf, "pci");
@ -66,10 +66,10 @@ Index: libvirt-2.1.0/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-2.1.0/src/xenconfig/xen_sxpr.c
+Index: libvirt-2.2.0/src/xenconfig/xen_sxpr.c
 ===================================================================
--- libvirt-2.1.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-2.1.0/src/xenconfig/xen_sxpr.c
+--- libvirt-2.2.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-2.2.0/src/xenconfig/xen_sxpr.c
@@ -1062,6 +1062,7 @@ xenParseSxprPCI(virDomainDefPtr def,
         int busID;
         int slotID;
--- a/suse-qemu-conf.patch
+++ b/suse-qemu-conf.patch
@ -7,10 +7,10 @@ suse-qemu-conf-secdriver.patch, suse-qemu-conf-lockmgr.patch,
 etc.), but for now they are all lumped together in this
 single patch.

-Index: libvirt-2.1.0/src/qemu/qemu.conf
+Index: libvirt-2.2.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-2.1.0.orig/src/qemu/qemu.conf
-+++ libvirt-2.1.0/src/qemu/qemu.conf
+--- libvirt-2.2.0.orig/src/qemu/qemu.conf
+++ libvirt-2.2.0/src/qemu/qemu.conf
@@ -212,11 +212,20 @@
 # isolation, but it cannot appear in a list of drivers.
 #
@ -62,11 +62,12 @@ Index: libvirt-2.1.0/src/qemu/qemu.conf
 #
 #lock_manager = "lockd"
 
-@@ -523,8 +543,8 @@
+@@ -523,9 +543,8 @@
 # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
 # follows this scheme.
 #nvram = [
 -#   "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd",
+-#   "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd",
 -#   "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd"
 +#   "/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin",
 +#   "/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin"
--- a/systemd-service-xen.patch
+++ b/systemd-service-xen.patch
@ -1,7 +1,7 @@
-Index: libvirt-2.1.0/daemon/libvirtd.service.in
+Index: libvirt-2.2.0/daemon/libvirtd.service.in
 ===================================================================
--- libvirt-2.1.0.orig/daemon/libvirtd.service.in
-+++ libvirt-2.1.0/daemon/libvirtd.service.in
+--- libvirt-2.2.0.orig/daemon/libvirtd.service.in
+++ libvirt-2.2.0/daemon/libvirtd.service.in
@@ -12,6 +12,7 @@ After=iscsid.service
 After=apparmor.service
 After=local-fs.target
--- a/virHostdevFindUSBDevice-privsyms.patch
+++ b/virHostdevFindUSBDevice-privsyms.patch
@ -7,11 +7,11 @@ Date:   Fri Aug 5 09:10:49 2016 +0200
    Finding an USB device from the vendor/device values will be needed
    by libxl driver to convert from vendor/device to bus/dev addresses.

-Index: libvirt-2.1.0/src/libvirt_private.syms
+Index: libvirt-2.2.0/src/libvirt_private.syms
 ===================================================================
--- libvirt-2.1.0.orig/src/libvirt_private.syms
-+++ libvirt-2.1.0/src/libvirt_private.syms
-@@ -1641,6 +1641,7 @@ virHookPresent;
+--- libvirt-2.2.0.orig/src/libvirt_private.syms
+++ libvirt-2.2.0/src/libvirt_private.syms
+@@ -1648,6 +1648,7 @@ virHookPresent;
 
 
 # util/virhostdev.h
@ -19,10 +19,10 @@ Index: libvirt-2.1.0/src/libvirt_private.syms
 virHostdevManagerGetDefault;
 virHostdevPCINodeDeviceDetach;
 virHostdevPCINodeDeviceReAttach;
-Index: libvirt-2.1.0/src/util/virhostdev.c
+Index: libvirt-2.2.0/src/util/virhostdev.c
 ===================================================================
--- libvirt-2.1.0.orig/src/util/virhostdev.c
-+++ libvirt-2.1.0/src/util/virhostdev.c
+--- libvirt-2.2.0.orig/src/util/virhostdev.c
+++ libvirt-2.2.0/src/util/virhostdev.c
@@ -1178,7 +1178,7 @@ virHostdevMarkUSBDevices(virHostdevManag
 }
 
@ -32,10 +32,10 @@ Index: libvirt-2.1.0/src/util/virhostdev.c
 virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev,
                         bool mandatory,
                         virUSBDevicePtr *usb)
-Index: libvirt-2.1.0/src/util/virhostdev.h
+Index: libvirt-2.2.0/src/util/virhostdev.h
 ===================================================================
--- libvirt-2.1.0.orig/src/util/virhostdev.h
-+++ libvirt-2.1.0/src/util/virhostdev.h
+--- libvirt-2.2.0.orig/src/util/virhostdev.h
+++ libvirt-2.2.0/src/util/virhostdev.h
@@ -66,6 +66,12 @@ virHostdevPreparePCIDevices(virHostdevMa
                             unsigned int flags)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
--- 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-2.1.0/src/locking/virtlockd.sysconf
+Index: libvirt-2.2.0/src/locking/virtlockd.sysconf
 ===================================================================
--- libvirt-2.1.0.orig/src/locking/virtlockd.sysconf
-+++ libvirt-2.1.0/src/locking/virtlockd.sysconf
+--- libvirt-2.2.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-2.2.0/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlockd
 +
@ -12,10 +12,10 @@ Index: libvirt-2.1.0/src/locking/virtlockd.sysconf
 #
 # Pass extra arguments to virtlockd
 #VIRTLOCKD_ARGS=
-Index: libvirt-2.1.0/src/locking/virtlockd.init.in
+Index: libvirt-2.2.0/src/locking/virtlockd.init.in
 ===================================================================
--- libvirt-2.1.0.orig/src/locking/virtlockd.init.in
-+++ libvirt-2.1.0/src/locking/virtlockd.init.in
+--- libvirt-2.2.0.orig/src/locking/virtlockd.init.in
+++ libvirt-2.2.0/src/locking/virtlockd.init.in
@@ -4,59 +4,57 @@
 # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
 #
--- a/virtlogd-init-script.patch
+++ b/virtlogd-init-script.patch
@ -1,9 +1,9 @@
 Adjust virtlogd init files to conform to SUSE standards

-Index: libvirt-2.1.0/src/logging/virtlogd.init.in
+Index: libvirt-2.2.0/src/logging/virtlogd.init.in
 ===================================================================
--- libvirt-2.1.0.orig/src/logging/virtlogd.init.in
-+++ libvirt-2.1.0/src/logging/virtlogd.init.in
+--- libvirt-2.2.0.orig/src/logging/virtlogd.init.in
+++ libvirt-2.2.0/src/logging/virtlogd.init.in
@@ -4,59 +4,56 @@
 # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
 #
@ -126,10 +126,10 @@ Index: libvirt-2.1.0/src/logging/virtlogd.init.in
 esac
 -exit $RETVAL
 +rc_exit
-Index: libvirt-2.1.0/src/logging/virtlogd.sysconf
+Index: libvirt-2.2.0/src/logging/virtlogd.sysconf
 ===================================================================
--- libvirt-2.1.0.orig/src/logging/virtlogd.sysconf
-+++ libvirt-2.1.0/src/logging/virtlogd.sysconf
+--- libvirt-2.2.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-2.2.0/src/logging/virtlogd.sysconf
@@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlogd
 +
--- a/xen-pv-cdrom.patch
+++ b/xen-pv-cdrom.patch
@ -1,7 +1,7 @@
-Index: libvirt-2.1.0/src/xenconfig/xen_sxpr.c
+Index: libvirt-2.2.0/src/xenconfig/xen_sxpr.c
 ===================================================================
--- libvirt-2.1.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-2.1.0/src/xenconfig/xen_sxpr.c
+--- libvirt-2.2.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-2.2.0/src/xenconfig/xen_sxpr.c
@@ -392,7 +392,7 @@ xenParseSxprVifRate(const char *rate, un
 static int
 xenParseSxprDisks(virDomainDefPtr def,
--- a/xen-sxpr-disk-type.patch
+++ b/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-2.1.0/src/xenconfig/xen_sxpr.c
+Index: libvirt-2.2.0/src/xenconfig/xen_sxpr.c
 ===================================================================
--- libvirt-2.1.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-2.1.0/src/xenconfig/xen_sxpr.c
+--- libvirt-2.2.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-2.2.0/src/xenconfig/xen_sxpr.c
@@ -506,10 +506,11 @@ xenParseSxprDisks(virDomainDefPtr def,
                        omnipotent, we can revisit this, perhaps stat()'ing
                        the src file in question */