Dropped patches applied upstram

    lxc-Don-t-crash-on-NULL-ifname_guest_actual.patch
    lxc-Move-setting-ifname_guest_actual-to-virLXCSetupI.patch

Rediff remaining patches.

debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch

@@ -57,7 +57,7 @@ index 39e6a02..5f6bd64 100644
                                               1,
                                               machines)) == NULL) {
 diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml
-index 7cde6df..cf1953d 100644
+index 435c141..a33d65d 100644
 --- a/tests/xencapsdata/xen-i686-pae-hvm.xml
 +++ b/tests/xencapsdata/xen-i686-pae-hvm.xml
 @@ -20,7 +20,7 @@
@@ -67,9 +67,9 @@ index 7cde6df..cf1953d 100644
 -      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
-@@ -34,8 +34,8 @@
+       <domain type='xen'/>
+     </arch>
+@@ -33,8 +33,8 @@
      <os_type>hvm</os_type>
      <arch name='i686'>
        <wordsize>32</wordsize>
@@ -78,10 +78,10 @@ index 7cde6df..cf1953d 100644
 +      <emulator>qemu-dm</emulator>
 +      <loader>hvmloader</loader>
        <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
+       <domain type='xen'/>
+     </arch>
 diff --git a/tests/xencapsdata/xen-i686-pae.xml b/tests/xencapsdata/xen-i686-pae.xml
-index 3dba6eb..c774d6c 100644
+index c917fbe..d211163 100644
 --- a/tests/xencapsdata/xen-i686-pae.xml
 +++ b/tests/xencapsdata/xen-i686-pae.xml
 @@ -20,7 +20,7 @@
@@ -91,10 +91,10 @@ index 3dba6eb..c774d6c 100644
 -      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
+       <domain type='xen'/>
+     </arch>
 diff --git a/tests/xencapsdata/xen-i686.xml b/tests/xencapsdata/xen-i686.xml
-index 22d7685..bc36cbf 100644
+index 5771e2b..c540996 100644
 --- a/tests/xencapsdata/xen-i686.xml
 +++ b/tests/xencapsdata/xen-i686.xml
 @@ -17,7 +17,7 @@
@@ -104,10 +104,10 @@ index 22d7685..bc36cbf 100644
 -      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
+       <domain type='xen'/>
+     </arch>
 diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml
-index e56e306..ddab377 100644
+index 5d60dc2..00bdcf9 100644
 --- a/tests/xencapsdata/xen-ia64-be-hvm.xml
 +++ b/tests/xencapsdata/xen-ia64-be-hvm.xml
 @@ -17,7 +17,7 @@
@@ -117,9 +117,9 @@ index e56e306..ddab377 100644
 -      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
-@@ -31,8 +31,8 @@
+       <domain type='xen'/>
+     </arch>
+@@ -30,8 +30,8 @@
      <os_type>hvm</os_type>
      <arch name='ia64'>
        <wordsize>64</wordsize>
@@ -128,10 +128,10 @@ index e56e306..ddab377 100644
 +      <emulator>qemu-dm</emulator>
 +      <loader>hvmloader</loader>
        <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
+       <domain type='xen'/>
+     </arch>
 diff --git a/tests/xencapsdata/xen-ia64-be.xml b/tests/xencapsdata/xen-ia64-be.xml
-index 017816c..4a548c6 100644
+index 78fa77e..77f0acb 100644
 --- a/tests/xencapsdata/xen-ia64-be.xml
 +++ b/tests/xencapsdata/xen-ia64-be.xml
 @@ -17,7 +17,7 @@
@@ -141,10 +141,10 @@ index 017816c..4a548c6 100644
 -      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
+       <domain type='xen'/>
+     </arch>
 diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml
-index 25617fc..32a0056 100644
+index b6f788e..6a5b299 100644
 --- a/tests/xencapsdata/xen-ia64-hvm.xml
 +++ b/tests/xencapsdata/xen-ia64-hvm.xml
 @@ -17,7 +17,7 @@
@@ -154,9 +154,9 @@ index 25617fc..32a0056 100644
 -      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
-@@ -28,8 +28,8 @@
+       <domain type='xen'/>
+     </arch>
+@@ -27,8 +27,8 @@
      <os_type>hvm</os_type>
      <arch name='ia64'>
        <wordsize>64</wordsize>
@@ -165,10 +165,10 @@ index 25617fc..32a0056 100644
 +      <emulator>qemu-dm</emulator>
 +      <loader>hvmloader</loader>
        <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
+       <domain type='xen'/>
+     </arch>
 diff --git a/tests/xencapsdata/xen-ia64.xml b/tests/xencapsdata/xen-ia64.xml
-index 82ce965..e48b29b 100644
+index 9e3eaf4..79eabf1 100644
 --- a/tests/xencapsdata/xen-ia64.xml
 +++ b/tests/xencapsdata/xen-ia64.xml
 @@ -17,7 +17,7 @@
@@ -178,10 +178,10 @@ index 82ce965..e48b29b 100644
 -      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
+       <domain type='xen'/>
+     </arch>
 diff --git a/tests/xencapsdata/xen-ppc64.xml b/tests/xencapsdata/xen-ppc64.xml
-index 91401b9..2799fe8 100644
+index 0132c45..3445bfa 100644
 --- a/tests/xencapsdata/xen-ppc64.xml
 +++ b/tests/xencapsdata/xen-ppc64.xml
 @@ -17,7 +17,7 @@
@@ -191,10 +191,10 @@ index 91401b9..2799fe8 100644
 -      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
+       <domain type='xen'/>
+     </arch>
 diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml
-index 493d1ea..9e79899 100644
+index 6371e86..2c5ab2e 100644
 --- a/tests/xencapsdata/xen-x86_64-hvm.xml
 +++ b/tests/xencapsdata/xen-x86_64-hvm.xml
 @@ -20,7 +20,7 @@
@@ -204,9 +204,9 @@ index 493d1ea..9e79899 100644
 -      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
-@@ -31,8 +31,8 @@
+       <domain type='xen'/>
+     </arch>
+@@ -30,8 +30,8 @@
      <os_type>hvm</os_type>
      <arch name='i686'>
        <wordsize>32</wordsize>
@@ -215,9 +215,9 @@ index 493d1ea..9e79899 100644
 +      <emulator>qemu-dm</emulator>
 +      <loader>hvmloader</loader>
        <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
-@@ -49,8 +49,8 @@
+       <domain type='xen'/>
+     </arch>
+@@ -47,8 +47,8 @@
      <os_type>hvm</os_type>
      <arch name='x86_64'>
        <wordsize>64</wordsize>
@@ -226,10 +226,10 @@ index 493d1ea..9e79899 100644
 +      <emulator>qemu-dm</emulator>
 +      <loader>hvmloader</loader>
        <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
+       <domain type='xen'/>
+     </arch>
 diff --git a/tests/xencapsdata/xen-x86_64.xml b/tests/xencapsdata/xen-x86_64.xml
-index 0c3279b..73e232e 100644
+index b686432..2cdae7c 100644
 --- a/tests/xencapsdata/xen-x86_64.xml
 +++ b/tests/xencapsdata/xen-x86_64.xml
 @@ -20,7 +20,7 @@
@@ -239,5 +239,5 @@ index 0c3279b..73e232e 100644
 -      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
 +      <emulator>qemu-dm</emulator>
        <machine>xenpv</machine>
-       <domain type='xen'>
-       </domain>
+       <domain type='xen'/>
+     </arch>

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

@@ -9,10 +9,10 @@ to not interfere with existing network configurations
  2 files changed, 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 550362c..b117fb2 100644
+index 4bba536..218d853 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -2766,9 +2766,6 @@ if WITH_NETWORK
+@@ -2778,9 +2778,6 @@ if WITH_NETWORK
  	    cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
  	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
@@ -23,10 +23,10 @@ index 550362c..b117fb2 100644
  
  uninstall-local:: uninstall-init uninstall-systemd
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 8021344..d42d2c3 100644
+index 67ecbd1..75b0d08 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -10636,9 +10636,6 @@ install-data-local: install-init install-systemd
+@@ -10664,9 +10664,6 @@ install-data-local: install-init install-systemd
  @WITH_NETWORK_TRUE@	    cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
  @WITH_NETWORK_TRUE@	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }

debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch

@@ -25,63 +25,63 @@ index 2473532..39e6a02 100644
                                               1,
                                               machines)) == NULL) {
 diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml
-index 872e5f6..7cde6df 100644
+index cf6a1de..435c141 100644
 --- a/tests/xencapsdata/xen-i686-pae-hvm.xml
 +++ b/tests/xencapsdata/xen-i686-pae-hvm.xml
-@@ -35,7 +35,7 @@
+@@ -34,7 +34,7 @@
      <arch name='i686'>
        <wordsize>32</wordsize>
        <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 -      <loader>/usr/lib/xen/boot/hvmloader</loader>
 +      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
        <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
+       <domain type='xen'/>
+     </arch>
 diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml
-index 222de1d..e56e306 100644
+index 19d23e9..5d60dc2 100644
 --- a/tests/xencapsdata/xen-ia64-be-hvm.xml
 +++ b/tests/xencapsdata/xen-ia64-be-hvm.xml
-@@ -32,7 +32,7 @@
+@@ -31,7 +31,7 @@
      <arch name='ia64'>
        <wordsize>64</wordsize>
        <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 -      <loader>/usr/lib/xen/boot/hvmloader</loader>
 +      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
        <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
+       <domain type='xen'/>
+     </arch>
 diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml
-index 33c4946..25617fc 100644
+index 6e22372..b6f788e 100644
 --- a/tests/xencapsdata/xen-ia64-hvm.xml
 +++ b/tests/xencapsdata/xen-ia64-hvm.xml
-@@ -29,7 +29,7 @@
+@@ -28,7 +28,7 @@
      <arch name='ia64'>
        <wordsize>64</wordsize>
        <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 -      <loader>/usr/lib/xen/boot/hvmloader</loader>
 +      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
        <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
+       <domain type='xen'/>
+     </arch>
 diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml
-index 8de8cf4..493d1ea 100644
+index 7458f0b..6371e86 100644
 --- a/tests/xencapsdata/xen-x86_64-hvm.xml
 +++ b/tests/xencapsdata/xen-x86_64-hvm.xml
-@@ -32,7 +32,7 @@
+@@ -31,7 +31,7 @@
      <arch name='i686'>
        <wordsize>32</wordsize>
        <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
 -      <loader>/usr/lib/xen/boot/hvmloader</loader>
 +      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
        <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
-@@ -50,7 +50,7 @@
+       <domain type='xen'/>
+     </arch>
+@@ -48,7 +48,7 @@
      <arch name='x86_64'>
        <wordsize>64</wordsize>
        <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
 -      <loader>/usr/lib/xen/boot/hvmloader</loader>
 +      <loader>/usr/lib/xen-default/boot/hvmloader</loader>
        <machine>xenfv</machine>
-       <domain type='xen'>
-       </domain>
+       <domain type='xen'/>
+     </arch>

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 0eba2c1..d5ce7e3 100644
+index abe80c2..ea34d45 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/lxc-Don-t-crash-on-NULL-ifname_guest_actual.patch

-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Fri, 19 Dec 2014 10:11:42 +0100
-Subject: lxc: Don't crash on NULL ifname_guest_actual
-
----
- src/lxc/lxc_container.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
-index 1b9e2f2..f986f71 100644
---- a/src/lxc/lxc_container.c
-+++ b/src/lxc/lxc_container.c
-@@ -472,7 +472,7 @@ lxcContainerGetNetDef(virDomainDefPtr vmDef, const char *devName)
- 
-     for (i = 0; i < vmDef->nnets; i++) {
-         netDef = vmDef->nets[i];
--        if (STREQ(netDef->ifname_guest_actual, devName))
-+        if (netDef->ifname_guest_actual && STREQ(netDef->ifname_guest_actual, devName))
-             return netDef;
-     }
- 

debian/patches/lxc-Move-setting-ifname_guest_actual-to-virLXCSetupI.patch

-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Fri, 19 Dec 2014 10:08:38 +0100
-Subject: lxc: Move setting ifname_guest_actual to virLXCSetupInterfaces
-
-so it applies to interfaces of type 'direct' too.
----
- src/lxc/lxc_process.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
-index 1c0d4e5..c3818a5 100644
---- a/src/lxc/lxc_process.c
-+++ b/src/lxc/lxc_process.c
-@@ -260,8 +260,6 @@ char *virLXCProcessSetupInterfaceBridged(virConnectPtr conn,
- 
-     if (virNetDevSetMAC(containerVeth, &net->mac) < 0)
-         goto cleanup;
--    if (VIR_STRDUP(net->ifname_guest_actual, containerVeth) < 0)
--        goto cleanup;
- 
-     if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) {
-         if (virNetDevOpenvswitchAddPort(brname, parentVeth, &net->mac,
-@@ -432,6 +430,9 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn,
- 
-         (*veths)[(*nveths)-1] = veth;
- 
-+        if (VIR_STRDUP(def->nets[i]->ifname_guest_actual, veth) < 0)
-+            goto cleanup;
-+
-         /* Make sure all net definitions will have a name in the container */
-         if (!net->ifname_guest) {
-             if (virAsprintf(&net->ifname_guest, "eth%zu", niface) < 0)

debian/patches/series

@@ -11,5 +11,3 @@ debian/Debianize-systemd-service-files.patch
 Allow-xen-toolstack-to-find-it-s-binaries.patch
 Skip-vircgrouptest.patch
 debian/Debianize-virtlockd.patch
-lxc-Move-setting-ifname_guest_actual-to-virLXCSetupI.patch
-lxc-Don-t-crash-on-NULL-ifname_guest_actual.patch