Rediff patches

Dropped
  Link-xen-driver-against-libxl.patch: Applied upstream
  qemu-support-virt-2.6-machine-type-on-arm.patch: Fixed upstream

debian/patches/Link-xen-driver-against-libxl.patch

-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Thu, 31 Mar 2016 14:57:24 +0200
-Subject: Link xen driver against libxl
-
-to avoid the test failure
-
- 7) Test driver "xen"  ... 2016-03-31 12:53:26.950+0000: 22430: debug : virDriverLoadModule:54 : Module load xen
- 2016-03-31 12:53:26.950+0000: 22430: error : virDriverLoadModule:73 : failed to load module /build/libvirt-1.3.3~rc1/debian/build/src/.libs/libvirt_driver_xen.so /build/libvirt-1.3.3~rc1/debian/build/src/.libs/libvirt_driver_xen.so: undefined symbol: xlu_cfg_destroy
-FAILED
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b96a55d..52eecf0 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1134,7 +1134,7 @@ endif WITH_VMX
- if WITH_XENCONFIG
- noinst_LTLIBRARIES += libvirt_xenconfig.la
- libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la
--libvirt_la_LIBADD += $(LIBXL_LIBS)
-+libvirt_xenconfig_la_LIBADD = $(LIBXL_LIBS)
- libvirt_xenconfig_la_CFLAGS = \
- 		-I$(srcdir)/conf $(AM_CFLAGS)
- libvirt_xenconfig_la_SOURCES = $(XENCONFIG_SOURCES)

debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch

@@ -10,10 +10,10 @@ Closes: #663931
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/util/virutil.c b/src/util/virutil.c
-index b401f8d..ea4801c 100644
+index d80d994..3b32865 100644
 --- a/src/util/virutil.c
 +++ b/src/util/virutil.c
-@@ -1535,7 +1535,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
+@@ -1542,7 +1542,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
  void virFileWaitForDevices(void)
  {
  # ifdef UDEVADM

debian/patches/debian/Debianize-systemd-service-files.patch

@@ -8,10 +8,10 @@ Subject: Debianize systemd service files
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
-index 608221c..fb81712 100644
+index 1616e7a..5a2f001 100644
 --- a/daemon/libvirtd.service.in
 +++ b/daemon/libvirtd.service.in
-@@ -12,8 +12,8 @@ Documentation=http://libvirt.org
+@@ -17,8 +17,8 @@ Documentation=http://libvirt.org
  
  [Service]
  Type=notify

debian/patches/debian/Don-t-enable-default-network-on-boot.patch

@@ -4,35 +4,35 @@ Subject: Don't enable default network on boot
 
 to not interfere with existing network configurations
 ---
- src/Makefile.am | 3 ---
- src/Makefile.in | 3 ---
- 2 files changed, 6 deletions(-)
+ src/Makefile.am | 3 +--
+ src/Makefile.in | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 1726d06..b96a55d 100644
+index 314f6df..82afbad 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -3053,9 +3053,6 @@ if WITH_NETWORK
- 	    cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
+@@ -3092,8 +3092,7 @@ if WITH_NETWORK
  	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
--	test -e $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml || \
--	   ln -s ../default.xml \
--	    $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
+ 	( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
+-	  rm -f default.xml && \
+-	  $(LN_S) ../default.xml default.xml )
++	  rm -f default.xml )
  endif WITH_NETWORK
  
  uninstall-local:: uninstall-init uninstall-systemd
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 784c49e..2230f6d 100644
+index 5d2311f..bbc7914 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -11201,9 +11201,6 @@ install-data-local: install-init install-systemd
- @WITH_NETWORK_TRUE@	    cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
+@@ -11319,8 +11319,7 @@ install-data-local: install-init install-systemd
  @WITH_NETWORK_TRUE@	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
--@WITH_NETWORK_TRUE@	test -e $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml || \
--@WITH_NETWORK_TRUE@	   ln -s ../default.xml \
--@WITH_NETWORK_TRUE@	    $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
+ @WITH_NETWORK_TRUE@	( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
+-@WITH_NETWORK_TRUE@	  rm -f default.xml && \
+-@WITH_NETWORK_TRUE@	  $(LN_S) ../default.xml default.xml )
++@WITH_NETWORK_TRUE@	  rm -f default.xml )
  
  uninstall-local:: uninstall-init uninstall-systemd
  @WITH_LIBVIRTD_TRUE@	rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||:

debian/patches/debian/Use-upstreams-polkit-rule.patch

@@ -8,10 +8,10 @@ As of 1.2.16 upstream ships a Polkit rule like Debian does.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index 2dbe81b..39bed47 100644
+index 927d16f..4cb8f05 100644
 --- a/daemon/Makefile.am
 +++ b/daemon/Makefile.am
-@@ -301,14 +301,14 @@ install-data-polkit::
+@@ -305,14 +305,14 @@ install-data-polkit::
  	$(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
  if ! WITH_POLKIT0
  	$(MKDIR_P) $(DESTDIR)$(rulesdir)

debian/patches/debian/remove-RHism.diff.patch

@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/virsh.pod b/tools/virsh.pod
-index d2cc5b2..3fb9733 100644
+index 90ab47d..c633399 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.

debian/patches/qemu-support-virt-2.6-machine-type-on-arm.patch

-From: =?utf-8?q?J=C3=A1n_Tomko?= <jtomko@redhat.com>
-Date: Fri, 8 Apr 2016 10:46:41 +0200
-Subject: qemu: support virt-2.6 machine type on arm
-
-Some places already check for "virt-" prefix as well as plain "virt".
-virQEMUCapsHasPCIMultiBus did not, resulting in multiple PCI devices
-having assigned the same unnumbered "pci" alias.
-
-Add a test for the "virt-2.6" machine type which also omits the
-<model type='virtio'/> in <interface>, to check if
-qemuDomainDefaultNetModel works too.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1325085
-
-Closes: #820952
----
- src/qemu/qemu_capabilities.c                       |  3 +-
- src/qemu/qemu_domain.c                             |  3 +-
- ...l2argv-aarch64-virt-2.6-virtio-pci-default.args | 37 +++++++++++++++++
- ...ml2argv-aarch64-virt-2.6-virtio-pci-default.xml | 47 ++++++++++++++++++++++
- tests/qemuxml2argvtest.c                           |  6 +++
- 5 files changed, 94 insertions(+), 2 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 2823843..57e2056 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2172,7 +2172,8 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
-         /* If 'virt' supports PCI, it supports multibus.
-          * No extra conditions here for simplicity.
-          */
--        if (STREQ(def->os.machine, "virt"))
-+        if (STREQ(def->os.machine, "virt") ||
-+            STRPREFIX(def->os.machine, "virt-"))
-             return true;
-     }
- 
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index f38b0f3..d9d5041 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -1479,7 +1479,8 @@ qemuDomainDefaultNetModel(const virDomainDef *def,
-         if (STREQ(def->os.machine, "versatilepb"))
-             return "smc91c111";
- 
--        if (STREQ(def->os.machine, "virt"))
-+        if (STREQ(def->os.machine, "virt") ||
-+            STRPREFIX(def->os.machine, "virt-"))
-             return "virtio";
- 
-         /* Incomplete. vexpress (and a few others) use this, but not all
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args
-new file mode 100644
-index 0000000..93c181d
---- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args
-@@ -0,0 +1,37 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-aarch64 \
-+-name aarch64test \
-+-S \
-+-M virt-2.6 \
-+-cpu cortex-a53 \
-+-m 1024 \
-+-smp 1 \
-+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-+-nographic \
-+-nodefconfig \
-+-nodefaults \
-+-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-+-boot c \
-+-kernel /aarch64.kernel \
-+-initrd /aarch64.initrd \
-+-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
-+-dtb /aarch64.dtb \
-+-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \
-+-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
-+-device virtio-serial-device,id=virtio-serial0 \
-+-usb \
-+-drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-+-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-+-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
-+-net user,vlan=0,name=hostnet0 \
-+-serial pty \
-+-chardev pty,id=charconsole1 \
-+-device virtconsole,chardev=charconsole1,id=console1 \
-+-device virtio-balloon-device,id=balloon0 \
-+-object rng-random,id=objrng0,filename=/dev/random \
-+-device virtio-rng-device,rng=objrng0,id=rng0
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml
-new file mode 100644
-index 0000000..e745101
---- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml
-@@ -0,0 +1,47 @@
-+<domain type="qemu">
-+  <name>aarch64test</name>
-+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
-+  <memory>1048576</memory>
-+  <currentMemory>1048576</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch="aarch64" machine="virt-2.6">hvm</type>
-+    <kernel>/aarch64.kernel</kernel>
-+    <initrd>/aarch64.initrd</initrd>
-+    <dtb>/aarch64.dtb</dtb>
-+    <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline>
-+  </os>
-+  <features>
-+    <acpi/>
-+    <apic/>
-+    <pae/>
-+  </features>
-+  <cpu match='exact'>
-+    <model>cortex-a53</model>
-+  </cpu>
-+  <clock offset="utc"/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>restart</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
-+    <disk type='file' device='disk'>
-+      <source file='/aarch64.raw'/>
-+      <target dev='vda' bus='virtio'/>
-+    </disk>
-+    <interface type='user'>
-+      <mac address='52:54:00:09:a4:37'/>
-+    </interface>
-+    <console type='pty'/>
-+    <console type='pty'>
-+      <target type='virtio' port='0'/>
-+    </console>
-+    <memballoon model='virtio'/>
-+    <!--
-+      This actually doesn't work in practice because vexpress only has
-+      4 virtio slots available, rng makes 5 -->
-+    <rng model='virtio'>
-+      <backend model='random'>/dev/random</backend>
-+    </rng>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index e9b8d64..d1b9e98 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1661,6 +1661,12 @@ mymain(void)
-             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
-             QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
-             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE);
-+    DO_TEST("aarch64-virt-2.6-virtio-pci-default",
-+            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
-+            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
-+            QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
-+            QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
-+            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE);
-     /* Example of using virtio-pci with no explicit PCI controller
-        but with manual PCI addresses */
-     DO_TEST("aarch64-virtio-pci-manual-addresses",

debian/patches/series

@@ -14,5 +14,3 @@ Allow-access-to-libnl-3-config-files.patch
 debian/apparmor_profiles_local_include.patch
 debian/libsystemd.patch
 virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
-Link-xen-driver-against-libxl.patch
-qemu-support-virt-2.6-machine-type-on-arm.patch

debian/patches/virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch

@@ -24,7 +24,7 @@ index efb4873..9f996ab 100644
    # access PKI infrastructure
    /etc/pki/libvirt-vnc/** r,
 diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
-index 50d2a08..5e62daa 100644
+index 7eeb4ef..a445a61 100644
 --- a/src/security/virt-aa-helper.c
 +++ b/src/security/virt-aa-helper.c
 @@ -570,6 +570,7 @@ valid_path(const char *path, const bool readonly)