Hello community,

here is the log from the commit of package libvirt for openSUSE:Factory checked 
in at 2018-04-07 20:52:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvirt (Old)
 and      /work/SRC/openSUSE:Factory/.libvirt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libvirt"

Sat Apr  7 20:52:51 2018 rev:256 rq:593872 version:4.2.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes  2018-03-24 
16:08:40.637995018 +0100
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes     2018-04-07 
20:52:56.475328606 +0200
@@ -1,0 +2,37 @@
+Thu Apr  5 21:08:11 UTC 2018 - jfeh...@suse.com
+
+- util: improvements in error handling
+  09877303-virSocketAddrParseInternal.patch,
+  412afdb8-intro-virSocketAddrParseAny.patch
+  bsc#1080957
+
+-------------------------------------------------------------------
+Thu Apr  5 15:22:16 UTC 2018 - jfeh...@suse.com
+
+- Update to libvirt 4.2.0
+  - Many incremental improvements and bug fixes, see
+    http://libvirt.org/news.html
+  - Dropped patches:
+    6b3d716e-keycodemap-py3.patch,
+    33c6eb96-fix-libvirtd-reload-deadlock.patch,
+    464889ff-rpc-aquire-ref-dispatch.patch,
+    c6f1d519-rpc-simplify-dispatch.patch,
+    06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
+    86cae503-rpc-fix-pre-exec.patch,
+    eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
+    fbf31e1a-CVE-2018-1064.patch,
+    fb327ac2-virtlockd-admin-socket.patch,
+    64370c4b-libxl-MigrateBegin.patch,
+    99486799-libxl-MigrateConfirm.patch,
+    f5eacf2a-libxl-MigratePerform.patch,
+    4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
+    fe51dbda-libxl-use-FindByRef.patch,
+    60b3fcd9-libxl-MigratePrepare.patch,
+    3c89868c-libxl-lock-after-ListRemove.patch,
+    13e81fc6-libxl-EndJob-on-error.patch,
+    594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
+    c66e344e-libxl-dont-deref-NULL.patch,
+    83edaf44-libxl-dont-hardcode-sched-weight.patch,
+    apibuild-py3.patch
+
+-------------------------------------------------------------------

Old:
----
  06e7ebb6-rpc-invoke-dispatch-unlocked.patch
  13e81fc6-libxl-EndJob-on-error.patch
  33c6eb96-fix-libvirtd-reload-deadlock.patch
  3c89868c-libxl-lock-after-ListRemove.patch
  464889ff-rpc-aquire-ref-dispatch.patch
  4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch
  594b8b99-libxl-DefineXMLFlags-API-pattern.patch
  60b3fcd9-libxl-MigratePrepare.patch
  64370c4b-libxl-MigrateBegin.patch
  6b3d716e-keycodemap-py3.patch
  83edaf44-libxl-dont-hardcode-sched-weight.patch
  86cae503-rpc-fix-pre-exec.patch
  99486799-libxl-MigrateConfirm.patch
  apibuild-py3.patch
  c66e344e-libxl-dont-deref-NULL.patch
  c6f1d519-rpc-simplify-dispatch.patch
  eefabb38-rpc-virtlockd-virtlogd-single-thread.patch
  f5eacf2a-libxl-MigratePerform.patch
  fb327ac2-virtlockd-admin-socket.patch
  fbf31e1a-CVE-2018-1064.patch
  fe51dbda-libxl-use-FindByRef.patch
  libvirt-4.1.0.tar.xz
  libvirt-4.1.0.tar.xz.asc

New:
----
  09877303-virSocketAddrParseInternal.patch
  412afdb8-intro-virSocketAddrParseAny.patch
  libvirt-4.2.0.tar.xz
  libvirt-4.2.0.tar.xz.asc

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.147268093 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.151267947 +0200
@@ -175,7 +175,7 @@
 
 Name:           libvirt
 Url:            http://libvirt.org/
-Version:        4.1.0
+Version:        4.2.0
 Release:        0
 Summary:        Library providing a simple virtualization API
 License:        LGPL-2.1-or-later
@@ -270,7 +270,6 @@
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  ebtables
 BuildRequires:  polkit >= 0.93
-BuildRequires:  polkit-devel >= 0.93
 BuildRequires:  radvd
 # For mount/umount in FS driver
 BuildRequires:  util-linux
@@ -325,26 +324,8 @@
 Source99:       baselibs.conf
 Source100:      %{name}-rpmlintrc
 # Upstream patches
-Patch0:         6b3d716e-keycodemap-py3.patch
-Patch1:         33c6eb96-fix-libvirtd-reload-deadlock.patch
-Patch2:         464889ff-rpc-aquire-ref-dispatch.patch
-Patch3:         c6f1d519-rpc-simplify-dispatch.patch
-Patch4:         06e7ebb6-rpc-invoke-dispatch-unlocked.patch
-Patch5:         86cae503-rpc-fix-pre-exec.patch
-Patch6:         eefabb38-rpc-virtlockd-virtlogd-single-thread.patch
-Patch7:         fbf31e1a-CVE-2018-1064.patch
-Patch8:         fb327ac2-virtlockd-admin-socket.patch
-Patch9:         64370c4b-libxl-MigrateBegin.patch
-Patch10:        99486799-libxl-MigrateConfirm.patch
-Patch11:        f5eacf2a-libxl-MigratePerform.patch
-Patch12:        4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch
-Patch13:        fe51dbda-libxl-use-FindByRef.patch
-Patch14:        60b3fcd9-libxl-MigratePrepare.patch
-Patch15:        3c89868c-libxl-lock-after-ListRemove.patch
-Patch16:        13e81fc6-libxl-EndJob-on-error.patch
-Patch17:        594b8b99-libxl-DefineXMLFlags-API-pattern.patch
-Patch18:        c66e344e-libxl-dont-deref-NULL.patch
-Patch19:        83edaf44-libxl-dont-hardcode-sched-weight.patch
+Patch0:         09877303-virSocketAddrParseInternal.patch
+Patch1:         412afdb8-intro-virSocketAddrParseAny.patch
 # Patches pending upstream review
 Patch100:       libxl-dom-reset.patch
 Patch101:       network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@@ -357,7 +338,6 @@
 Patch155:       libxl-set-cach-mode.patch
 Patch156:       0001-Extract-stats-functions-from-the-qemu-driver.patch
 Patch157:       0002-lxc-implement-connectGetAllDomainStats.patch
-Patch158:       apibuild-py3.patch
 # Our patches
 Patch200:       suse-libvirtd-disable-tls.patch
 Patch201:       suse-libvirtd-sysconfig-settings.patch
@@ -947,29 +927,8 @@
 
 %prep
 %setup -q
-# 6b3d716e-keycodemap-py3.patch patches the keycodemapdb git submodule
-pushd src/keycodemapdb
 %patch0 -p1
-popd
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
 %patch100 -p1
 %patch101 -p1
 %patch150 -p1
@@ -980,7 +939,6 @@
 %patch155 -p1
 %patch156 -p1
 %patch157 -p1
-%patch158 -p1
 %patch200 -p1
 %patch201 -p1
 %patch202 -p1

++++++ 0001-Extract-stats-functions-from-the-qemu-driver.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.207265921 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.207265921 +0200
@@ -18,22 +18,10 @@
  create mode 100644 src/conf/domain_stats.c
  create mode 100644 src/conf/domain_stats.h
 
-Index: libvirt-4.1.0/src/Makefile.am
-===================================================================
---- libvirt-4.1.0.orig/src/Makefile.am
-+++ libvirt-4.1.0/src/Makefile.am
-@@ -441,6 +441,7 @@ DOMAIN_CONF_SOURCES = \
-               conf/domain_conf.c conf/domain_conf.h \
-               conf/domain_audit.c conf/domain_audit.h \
-               conf/domain_nwfilter.c conf/domain_nwfilter.h \
-+              conf/domain_stats.c conf/domain_stats.h \
-               conf/virsavecookie.c conf/virsavecookie.h \
-               conf/snapshot_conf.c conf/snapshot_conf.h \
-               conf/numa_conf.c conf/numa_conf.h \
-Index: libvirt-4.1.0/src/conf/domain_stats.c
+Index: libvirt-4.2.0/src/conf/domain_stats.c
 ===================================================================
 --- /dev/null
-+++ libvirt-4.1.0/src/conf/domain_stats.c
++++ libvirt-4.2.0/src/conf/domain_stats.c
 @@ -0,0 +1,139 @@
 +/*
 + * domain_stats.c: domain stats extraction helpers
@@ -174,10 +162,10 @@
 +}
 +
 +#undef STATS_ADD_NET_PARAM
-Index: libvirt-4.1.0/src/conf/domain_stats.h
+Index: libvirt-4.2.0/src/conf/domain_stats.h
 ===================================================================
 --- /dev/null
-+++ libvirt-4.1.0/src/conf/domain_stats.h
++++ libvirt-4.2.0/src/conf/domain_stats.h
 @@ -0,0 +1,64 @@
 +/*
 + * domain_stats.h: domain stats extraction helpers
@@ -243,11 +231,11 @@
 +                               int *maxparams);
 +
 +#endif /* __DOMAIN_STATS_H */
-Index: libvirt-4.1.0/src/libvirt_private.syms
+Index: libvirt-4.2.0/src/libvirt_private.syms
 ===================================================================
---- libvirt-4.1.0.orig/src/libvirt_private.syms
-+++ libvirt-4.1.0/src/libvirt_private.syms
-@@ -644,6 +644,9 @@ virDomainConfNWFilterRegister;
+--- libvirt-4.2.0.orig/src/libvirt_private.syms
++++ libvirt-4.2.0/src/libvirt_private.syms
+@@ -646,6 +646,9 @@ virDomainConfNWFilterRegister;
  virDomainConfNWFilterTeardown;
  virDomainConfVMNWFilterTeardown;
  
@@ -257,7 +245,7 @@
  
  # conf/interface_conf.h
  virInterfaceDefFormat;
-@@ -1500,6 +1503,7 @@ virCgroupGetMemoryUsage;
+@@ -1507,6 +1510,7 @@ virCgroupGetMemoryUsage;
  virCgroupGetMemSwapHardLimit;
  virCgroupGetMemSwapUsage;
  virCgroupGetPercpuStats;
@@ -265,19 +253,19 @@
  virCgroupHasController;
  virCgroupHasEmptyTasks;
  virCgroupKill;
-Index: libvirt-4.1.0/src/qemu/qemu_driver.c
+Index: libvirt-4.2.0/src/qemu/qemu_driver.c
 ===================================================================
---- libvirt-4.1.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-4.1.0/src/qemu/qemu_driver.c
-@@ -72,6 +72,7 @@
- #include "viralloc.h"
+--- libvirt-4.2.0.orig/src/qemu/qemu_driver.c
++++ libvirt-4.2.0/src/qemu/qemu_driver.c
+@@ -73,6 +73,7 @@
+ #include "virarptable.h"
  #include "viruuid.h"
  #include "domain_conf.h"
 +#include "domain_stats.h"
  #include "domain_audit.h"
  #include "node_device_conf.h"
  #include "virpci.h"
-@@ -19518,21 +19519,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
+@@ -19528,21 +19529,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
                          int *maxparams,
                          unsigned int privflags ATTRIBUTE_UNUSED)
  {
@@ -300,7 +288,7 @@
  }
  
  
-@@ -19555,37 +19542,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d
+@@ -19565,37 +19552,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d
                        unsigned int privflags ATTRIBUTE_UNUSED)
  {
      qemuDomainObjPrivatePtr priv = dom->privateData;
@@ -339,7 +327,7 @@
  }
  
  static int
-@@ -19764,44 +19721,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
+@@ -19774,44 +19731,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
      return ret;
  }
  
@@ -384,7 +372,7 @@
  static int
  qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
                              virDomainObjPtr dom,
-@@ -19809,68 +19728,9 @@ qemuDomainGetStatsInterface(virQEMUDrive
+@@ -19819,68 +19738,9 @@ qemuDomainGetStatsInterface(virQEMUDrive
                              int *maxparams,
                              unsigned int privflags ATTRIBUTE_UNUSED)
  {
@@ -454,7 +442,7 @@
  #define QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, num, name, value) \
      do { \
          char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
-@@ -19992,10 +19852,10 @@ qemuDomainGetStatsOneBlock(virQEMUDriver
+@@ -20002,10 +19862,10 @@ qemuDomainGetStatsOneBlock(virQEMUDriver
      if (disk->info.alias)
          alias = qemuDomainStorageAlias(disk->info.alias, backing_idx);
  
@@ -467,7 +455,7 @@
                              block_idx, src->path);
      if (backing_idx)
          QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, block_idx, "backingIndex",
-@@ -20111,7 +19971,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
+@@ -20121,7 +19981,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
       * after the iteration than it is to iterate twice; but we still
       * want count listed first.  */
      count_index = record->nparams;
@@ -476,7 +464,7 @@
  
      for (i = 0; i < dom->def->ndisks; i++) {
          virDomainDiskDefPtr disk = dom->def->disks[i];
-@@ -20145,10 +20005,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
+@@ -20155,10 +20015,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
  
  #undef QEMU_ADD_BLOCK_PARAM_ULL
  
@@ -487,10 +475,10 @@
  static int
  qemuDomainGetStatsPerfOneEvent(virPerfPtr perf,
                                 virPerfEventType type,
-Index: libvirt-4.1.0/src/util/vircgroup.c
+Index: libvirt-4.2.0/src/util/vircgroup.c
 ===================================================================
---- libvirt-4.1.0.orig/src/util/vircgroup.c
-+++ libvirt-4.1.0/src/util/vircgroup.c
+--- libvirt-4.2.0.orig/src/util/vircgroup.c
++++ libvirt-4.2.0/src/util/vircgroup.c
 @@ -4122,6 +4122,44 @@ virCgroupControllerAvailable(int control
      return ret;
  }
@@ -551,10 +539,10 @@
  #endif /* !VIR_CGROUP_SUPPORTED */
  
  
-Index: libvirt-4.1.0/src/util/vircgroup.h
+Index: libvirt-4.2.0/src/util/vircgroup.h
 ===================================================================
---- libvirt-4.1.0.orig/src/util/vircgroup.h
-+++ libvirt-4.1.0/src/util/vircgroup.h
+--- libvirt-4.2.0.orig/src/util/vircgroup.h
++++ libvirt-4.2.0/src/util/vircgroup.h
 @@ -297,4 +297,8 @@ int virCgroupSetOwner(virCgroupPtr cgrou
  int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller);
  
@@ -564,3 +552,16 @@
 +                         virDomainStatsRecordPtr record,
 +                         int *maxparams);
  #endif /* __VIR_CGROUP_H__ */
+Index: libvirt-4.2.0/src/conf/Makefile.inc.am
+===================================================================
+--- libvirt-4.2.0.orig/src/conf/Makefile.inc.am
++++ libvirt-4.2.0/src/conf/Makefile.inc.am
+@@ -20,6 +20,8 @@ DOMAIN_CONF_SOURCES = \
+       conf/domain_audit.h \
+       conf/domain_nwfilter.c \
+       conf/domain_nwfilter.h \
++      conf/domain_stats.c \
++      conf/domain_stats.h \
+       conf/virsavecookie.c \
+       conf/virsavecookie.h \
+       conf/snapshot_conf.c \

++++++ 0002-lxc-implement-connectGetAllDomainStats.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.215265631 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.219265487 +0200
@@ -9,10 +9,10 @@
  src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 138 insertions(+)
 
-Index: libvirt-4.1.0/src/lxc/lxc_driver.c
+Index: libvirt-4.2.0/src/lxc/lxc_driver.c
 ===================================================================
---- libvirt-4.1.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-4.1.0/src/lxc/lxc_driver.c
+--- libvirt-4.2.0.orig/src/lxc/lxc_driver.c
++++ libvirt-4.2.0/src/lxc/lxc_driver.c
 @@ -80,6 +80,7 @@
  #include "viraccessapichecklxc.h"
  #include "virhostdev.h"
@@ -21,7 +21,7 @@
  
  #define VIR_FROM_THIS VIR_FROM_LXC
  
-@@ -5514,6 +5515,142 @@ lxcDomainHasManagedSaveImage(virDomainPt
+@@ -5528,6 +5529,142 @@ lxcDomainHasManagedSaveImage(virDomainPt
      return ret;
  }
  
@@ -164,7 +164,7 @@
  
  /* Function Tables */
  static virHypervisorDriver lxcHypervisorDriver = {
-@@ -5608,6 +5745,7 @@ static virHypervisorDriver lxcHypervisor
+@@ -5622,6 +5759,7 @@ static virHypervisorDriver lxcHypervisor
      .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */
      .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */
      .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */

++++++ 09877303-virSocketAddrParseInternal.patch ++++++
commit 09877303014e0297d2c2707be5167d932cc3f425
Author: Jim Fehlig <jfeh...@suse.com>
Date:   Mon Mar 26 13:00:25 2018 -0600

    util: honor reportError parameter in virSocketAddrParseInternal
    
    Signed-off-by: Jim Fehlig <jfeh...@suse.com>
    Reviewed-by: John Ferlan <jfer...@redhat.com>

Index: libvirt-4.2.0/src/util/virsocketaddr.c
===================================================================
--- libvirt-4.2.0.orig/src/util/virsocketaddr.c
+++ libvirt-4.2.0/src/util/virsocketaddr.c
@@ -107,7 +107,8 @@ virSocketAddrParseInternal(struct addrin
     int err;
 
     if (val == NULL) {
-        virReportError(VIR_ERR_INVALID_ARG, "%s", _("Missing address"));
+        if (reportError)
+            virReportError(VIR_ERR_INVALID_ARG, "%s", _("Missing address"));
         return -1;
     }
 
++++++ 412afdb8-intro-virSocketAddrParseAny.patch ++++++
commit 412afdb8f4f3f097d6baad3acaeb9e26dfd15836
Author: Jim Fehlig <jfeh...@suse.com>
Date:   Mon Mar 26 12:53:05 2018 -0600

    util: introduce virSocketAddrParseAny
    
    When preparing for migration, the libxl driver creates a new TCP listen
    socket for the incoming migration by calling virNetSocketNewListenTCP,
    passing the destination host name. virNetSocketNewListenTCP calls
    virSocketAddrParse to check if the host name is a wildcard address, in
    which case it avoids adding the AI_ADDRCONFIG flag to the hints passed to
    getaddrinfo. If the host name is not an IP address, virSocketAddrParse
    reports an error
    
    error : virSocketAddrParseInternal:121 : Cannot parse socket address
    'myhost.example.com': Name or service not known
    
    But virNetSocketNewListenTCP succeeds regardless and the overall migration
    operation succeeds.
    
    Introduce virSocketAddrParseAny and use it when simply testing if a host
    name/addr is parsable.
    
    Signed-off-by: Jim Fehlig <jfeh...@suse.com>
    Reviewed-by: John Ferlan <jfer...@redhat.com>

Index: libvirt-4.2.0/src/libvirt_private.syms
===================================================================
--- libvirt-4.2.0.orig/src/libvirt_private.syms
+++ libvirt-4.2.0/src/libvirt_private.syms
@@ -2725,6 +2725,7 @@ virSocketAddrMask;
 virSocketAddrMaskByPrefix;
 virSocketAddrNumericFamily;
 virSocketAddrParse;
+virSocketAddrParseAny;
 virSocketAddrParseIPv4;
 virSocketAddrParseIPv6;
 virSocketAddrPrefixToNetmask;
Index: libvirt-4.2.0/src/rpc/virnetsocket.c
===================================================================
--- libvirt-4.2.0.orig/src/rpc/virnetsocket.c
+++ libvirt-4.2.0/src/rpc/virnetsocket.c
@@ -333,7 +333,7 @@ int virNetSocketNewListenTCP(const char
      * startup in most cases.
      */
     if (nodename &&
-        !(virSocketAddrParse(&tmp_addr, nodename, AF_UNSPEC) > 0 &&
+        !(virSocketAddrParseAny(&tmp_addr, nodename, AF_UNSPEC, false) > 0 &&
           virSocketAddrIsWildcard(&tmp_addr)))
         hints.ai_flags |= AI_ADDRCONFIG;
 
Index: libvirt-4.2.0/src/util/virsocketaddr.c
===================================================================
--- libvirt-4.2.0.orig/src/util/virsocketaddr.c
+++ libvirt-4.2.0/src/util/virsocketaddr.c
@@ -101,6 +101,7 @@ static int
 virSocketAddrParseInternal(struct addrinfo **res,
                            const char *val,
                            int family,
+                           int ai_flags,
                            bool reportError)
 {
     struct addrinfo hints;
@@ -114,7 +115,7 @@ virSocketAddrParseInternal(struct addrin
 
     memset(&hints, 0, sizeof(hints));
     hints.ai_family = family;
-    hints.ai_flags = AI_NUMERICHOST;
+    hints.ai_flags = ai_flags;
     if ((err = getaddrinfo(val, NULL, &hints, res)) != 0) {
         if (reportError)
             virReportError(VIR_ERR_SYSTEM_ERROR,
@@ -143,7 +144,7 @@ int virSocketAddrParse(virSocketAddrPtr
     int len;
     struct addrinfo *res;
 
-    if (virSocketAddrParseInternal(&res, val, family, true) < 0)
+    if (virSocketAddrParseInternal(&res, val, family, AI_NUMERICHOST, true) < 
0)
         return -1;
 
     if (res == NULL) {
@@ -163,6 +164,52 @@ int virSocketAddrParse(virSocketAddrPtr
     return len;
 }
 
+/**
+ * virSocketAddrParseAny:
+ * @addr: where to store the return value, optional.
+ * @val: a network host name or a numeric network address IPv4 or IPv6
+ * @family: address family to pass down to getaddrinfo
+ * @reportError: boolean to control error reporting
+ *
+ * Mostly a wrapper for getaddrinfo() extracting the address storage
+ * from a host name like acme.example.com or a numeric string like 1.2.3.4
+ * or 2001:db8:85a3:0:0:8a2e:370:7334.
+ *
+ * When @val is a network host name, this function may be susceptible to a
+ * delay due to potentially lengthy netork host address lookups.
+ *
+ * Returns the length of the network address or -1 in case of error.
+ */
+int virSocketAddrParseAny(virSocketAddrPtr addr,
+                          const char *val,
+                          int family,
+                          bool reportError)
+{
+    int len;
+    struct addrinfo *res;
+
+    if (virSocketAddrParseInternal(&res, val, family, 0, reportError) < 0)
+        return -1;
+
+    if (res == NULL) {
+        if (reportError) {
+            virReportError(VIR_ERR_SYSTEM_ERROR,
+                           _("No socket addresses found for '%s'"),
+                           val);
+        }
+        return -1;
+    }
+
+    len = res->ai_addrlen;
+    if (addr != NULL) {
+        memcpy(&addr->data.stor, res->ai_addr, len);
+        addr->len = res->ai_addrlen;
+    }
+
+    freeaddrinfo(res);
+    return len;
+}
+
 /*
  * virSocketAddrParseIPv4:
  * @val: an IPv4 numeric address
@@ -1105,7 +1152,7 @@ virSocketAddrNumericFamily(const char *a
     struct addrinfo *res;
     unsigned short family;
 
-    if (virSocketAddrParseInternal(&res, address, AF_UNSPEC, false) < 0)
+    if (virSocketAddrParseInternal(&res, address, AF_UNSPEC, AI_NUMERICHOST, 
false) < 0)
         return -1;
 
     family = res->ai_addr->sa_family;
Index: libvirt-4.2.0/src/util/virsocketaddr.h
===================================================================
--- libvirt-4.2.0.orig/src/util/virsocketaddr.h
+++ libvirt-4.2.0/src/util/virsocketaddr.h
@@ -92,6 +92,11 @@ int virSocketAddrParse(virSocketAddrPtr
                        const char *val,
                        int family);
 
+int virSocketAddrParseAny(virSocketAddrPtr addr,
+                          const char *val,
+                          int family,
+                          bool reportError);
+
 int virSocketAddrParseIPv4(virSocketAddrPtr addr,
                            const char *val);
 
++++++ apparmor-no-mount.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.243264618 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.243264618 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-4.1.0/examples/apparmor/libvirt-lxc
+Index: libvirt-4.2.0/examples/apparmor/libvirt-lxc
 ===================================================================
---- libvirt-4.1.0.orig/examples/apparmor/libvirt-lxc
-+++ libvirt-4.1.0/examples/apparmor/libvirt-lxc
+--- libvirt-4.2.0.orig/examples/apparmor/libvirt-lxc
++++ libvirt-4.2.0/examples/apparmor/libvirt-lxc
 @@ -2,39 +2,15 @@
  
    #include <abstractions/base>

++++++ blockcopy-check-dst-identical-device.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.267263749 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.267263749 +0200
@@ -11,11 +11,11 @@
  src/qemu/qemu_driver.c | 7 +++++++
  1 file changed, 7 insertions(+)
 
-Index: libvirt-4.1.0/src/qemu/qemu_driver.c
+Index: libvirt-4.2.0/src/qemu/qemu_driver.c
 ===================================================================
---- libvirt-4.1.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-4.1.0/src/qemu/qemu_driver.c
-@@ -17275,6 +17275,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt
+--- libvirt-4.2.0.orig/src/qemu/qemu_driver.c
++++ libvirt-4.2.0/src/qemu/qemu_driver.c
+@@ -17285,6 +17285,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt
          goto endjob;
      }
  

++++++ libvirt-4.1.0.tar.xz -> libvirt-4.2.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/libvirt/libvirt-4.1.0.tar.xz 
/work/SRC/openSUSE:Factory/.libvirt.new/libvirt-4.2.0.tar.xz differ: char 15, 
line 1

++++++ libvirt-power8-models.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.303262446 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.303262446 +0200
@@ -2,10 +2,10 @@
 
 From: <r...@suse.de>
 
-Index: libvirt-4.1.0/src/cpu/cpu_map.xml
+Index: libvirt-4.2.0/src/cpu/cpu_map.xml
 ===================================================================
---- libvirt-4.1.0.orig/src/cpu/cpu_map.xml
-+++ libvirt-4.1.0/src/cpu/cpu_map.xml
+--- libvirt-4.2.0.orig/src/cpu/cpu_map.xml
++++ libvirt-4.2.0/src/cpu/cpu_map.xml
 @@ -2349,6 +2349,8 @@
        <pvr value='0x004b0000' mask='0xffff0000'/>
        <pvr value='0x004c0000' mask='0xffff0000'/>

++++++ libvirt-suse-netcontrol.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.331261433 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.335261288 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-4.1.0/configure.ac
+Index: libvirt-4.2.0/configure.ac
 ===================================================================
---- libvirt-4.1.0.orig/configure.ac
-+++ libvirt-4.1.0/configure.ac
+--- libvirt-4.2.0.orig/configure.ac
++++ libvirt-4.2.0/configure.ac
 @@ -258,6 +258,7 @@ LIBVIRT_ARG_LIBSSH
  LIBVIRT_ARG_LIBXML
  LIBVIRT_ARG_MACVTAP
@@ -18,7 +18,7 @@
  LIBVIRT_CHECK_NUMACTL
  LIBVIRT_CHECK_NWFILTER
  LIBVIRT_CHECK_OPENWSMAN
-@@ -996,6 +998,7 @@ LIBVIRT_RESULT_LIBXL
+@@ -994,6 +996,7 @@ LIBVIRT_RESULT_LIBXL
  LIBVIRT_RESULT_LIBXML
  LIBVIRT_RESULT_MACVTAP
  LIBVIRT_RESULT_NETCF
@@ -26,36 +26,10 @@
  LIBVIRT_RESULT_NSS
  LIBVIRT_RESULT_NUMACTL
  LIBVIRT_RESULT_OPENWSMAN
-Index: libvirt-4.1.0/src/Makefile.am
+Index: libvirt-4.2.0/tools/virsh.c
 ===================================================================
---- libvirt-4.1.0.orig/src/Makefile.am
-+++ libvirt-4.1.0/src/Makefile.am
-@@ -857,6 +857,10 @@ if WITH_NETCF
- INTERFACE_DRIVER_SOURCES += \
-               interface/interface_backend_netcf.c
- endif WITH_NETCF
-+if WITH_NETCONTROL
-+INTERFACE_DRIVER_SOURCES += \
-+              interface/interface_backend_netcf.c
-+endif WITH_NETCONTROL
- if WITH_UDEV
- INTERFACE_DRIVER_SOURCES += \
-               interface/interface_backend_udev.c
-@@ -1228,6 +1232,10 @@ if WITH_NETCF
- libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
- libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
- endif WITH_NETCF
-+if WITH_NETCONTROL
-+libvirt_driver_interface_la_CFLAGS += $(NETCONTROL_CFLAGS)
-+libvirt_driver_interface_la_LIBADD += $(NETCONTROL_LIBS)
-+endif WITH_NETCONTROL
- if WITH_UDEV
- libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
- libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)
-Index: libvirt-4.1.0/tools/virsh.c
-===================================================================
---- libvirt-4.1.0.orig/tools/virsh.c
-+++ libvirt-4.1.0/tools/virsh.c
+--- libvirt-4.2.0.orig/tools/virsh.c
++++ libvirt-4.2.0/tools/virsh.c
 @@ -578,6 +578,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
      vshPrint(ctl, " Interface");
  # if defined(WITH_NETCF)
@@ -65,10 +39,10 @@
  # elif defined(WITH_UDEV)
      vshPrint(ctl, " udev");
  # endif
-Index: libvirt-4.1.0/src/interface/interface_backend_netcf.c
+Index: libvirt-4.2.0/src/interface/interface_backend_netcf.c
 ===================================================================
---- libvirt-4.1.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-4.1.0/src/interface/interface_backend_netcf.c
+--- libvirt-4.2.0.orig/src/interface/interface_backend_netcf.c
++++ libvirt-4.2.0/src/interface/interface_backend_netcf.c
 @@ -23,7 +23,12 @@
  
  #include <config.h>
@@ -152,10 +126,10 @@
      if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
          return -1;
      if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-4.1.0/src/interface/interface_driver.c
+Index: libvirt-4.2.0/src/interface/interface_driver.c
 ===================================================================
---- libvirt-4.1.0.orig/src/interface/interface_driver.c
-+++ libvirt-4.1.0/src/interface/interface_driver.c
+--- libvirt-4.2.0.orig/src/interface/interface_driver.c
++++ libvirt-4.2.0/src/interface/interface_driver.c
 @@ -30,8 +30,15 @@ interfaceRegister(void)
      if (netcfIfaceRegister() == 0)
          return 0;
@@ -173,10 +147,10 @@
      if (udevIfaceRegister() == 0)
          return 0;
  #endif /* WITH_UDEV */
-Index: libvirt-4.1.0/m4/virt-netcontrol.m4
+Index: libvirt-4.2.0/m4/virt-netcontrol.m4
 ===================================================================
 --- /dev/null
-+++ libvirt-4.1.0/m4/virt-netcontrol.m4
++++ libvirt-4.2.0/m4/virt-netcontrol.m4
 @@ -0,0 +1,39 @@
 +dnl The libnetcontrol library
 +dnl
@@ -217,3 +191,27 @@
 +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[
 +  LIBVIRT_RESULT_LIB([NETCONTROL])
 +])
+Index: libvirt-4.2.0/src/interface/Makefile.inc.am
+===================================================================
+--- libvirt-4.2.0.orig/src/interface/Makefile.inc.am
++++ libvirt-4.2.0/src/interface/Makefile.inc.am
+@@ -4,6 +4,7 @@ INTERFACE_DRIVER_SOURCES = \
+       $(NULL)
+ 
+ INTERFACE_DRIVER_NETCF_SOURCES = interface/interface_backend_netcf.c
++INTERFACE_DRIVER_NETCONTROL_SOURCES = interface/interface_backend_netcf.c
+ INTERFACE_DRIVER_UDEV_SOURCES = interface/interface_backend_udev.c
+ 
+ DRIVER_SOURCE_FILES += $(INTERFACE_DRIVER_SOURCES)
+@@ -33,6 +34,11 @@ libvirt_driver_interface_la_CFLAGS += $(
+ libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
+ libvirt_driver_interface_la_SOURCES += $(INTERFACE_DRIVER_NETCF_SOURCES)
+ endif WITH_NETCF
++if WITH_NETCONTROL
++libvirt_driver_interface_la_CFLAGS += $(NETCONTROL_CFLAGS)
++libvirt_driver_interface_la_LIBADD += $(NETCONTROL_LIBS)
++libvirt_driver_interface_la_SOURCES += $(INTERFACE_DRIVER_NETCONTROL_SOURCES)
++endif WITH_NETCONTROL
+ if WITH_UDEV
+ libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
+ libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)

++++++ libxl-dom-reset.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.391259262 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.391259262 +0200
@@ -8,10 +8,10 @@
     option, but domainReset can be implemented in the libxl driver by
     forcibly destroying the domain and starting it again.
 
-Index: libvirt-4.1.0/src/libxl/libxl_driver.c
+Index: libvirt-4.2.0/src/libxl/libxl_driver.c
 ===================================================================
---- libvirt-4.1.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-4.1.0/src/libxl/libxl_driver.c
+--- libvirt-4.2.0.orig/src/libxl/libxl_driver.c
++++ libvirt-4.2.0/src/libxl/libxl_driver.c
 @@ -1375,6 +1375,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
  }
  
@@ -74,7 +74,7 @@
  libxlDomainDestroyFlags(virDomainPtr dom,
                          unsigned int flags)
  {
-@@ -6476,6 +6531,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6487,6 +6542,7 @@ static virHypervisorDriver libxlHypervis
      .domainShutdown = libxlDomainShutdown, /* 0.9.0 */
      .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */
      .domainReboot = libxlDomainReboot, /* 0.9.0 */

++++++ libxl-qemu-emulator-caps.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.407258682 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.411258538 +0200
@@ -8,10 +8,10 @@
 
 See FATE#320638 for details.
 
-Index: libvirt-4.1.0/src/libxl/libxl_capabilities.c
+Index: libvirt-4.2.0/src/libxl/libxl_capabilities.c
 ===================================================================
---- libvirt-4.1.0.orig/src/libxl/libxl_capabilities.c
-+++ libvirt-4.1.0/src/libxl/libxl_capabilities.c
+--- libvirt-4.2.0.orig/src/libxl/libxl_capabilities.c
++++ libvirt-4.2.0/src/libxl/libxl_capabilities.c
 @@ -38,6 +38,7 @@
  #include "libxl_capabilities.h"
  #include "cpu/cpu_x86.h"

++++++ libxl-set-cach-mode.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.427257958 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.427257958 +0200
@@ -3,10 +3,10 @@
  src/libxl/libxl_conf.c |   25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
 
-Index: libvirt-4.1.0/src/libxl/libxl_conf.c
+Index: libvirt-4.2.0/src/libxl/libxl_conf.c
 ===================================================================
---- libvirt-4.1.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-4.1.0/src/libxl/libxl_conf.c
+--- libvirt-4.2.0.orig/src/libxl/libxl_conf.c
++++ libvirt-4.2.0/src/libxl/libxl_conf.c
 @@ -771,6 +771,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
  #endif
  }

++++++ libxl-set-migration-constraints.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.443257380 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.447257234 +0200
@@ -16,10 +16,10 @@
  tools/virsh.pod                  |    8 ++++++++
  6 files changed, 125 insertions(+), 6 deletions(-)
 
-Index: libvirt-4.1.0/include/libvirt/libvirt-domain.h
+Index: libvirt-4.2.0/include/libvirt/libvirt-domain.h
 ===================================================================
---- libvirt-4.1.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-4.1.0/include/libvirt/libvirt-domain.h
+--- libvirt-4.2.0.orig/include/libvirt/libvirt-domain.h
++++ libvirt-4.2.0/include/libvirt/libvirt-domain.h
 @@ -1008,6 +1008,31 @@ typedef enum {
   */
  # define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT  "auto_converge.increment"
@@ -52,11 +52,11 @@
  /* Domain migration. */
  virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
                                 unsigned long flags, const char *dname,
-Index: libvirt-4.1.0/src/libxl/libxl_driver.c
+Index: libvirt-4.2.0/src/libxl/libxl_driver.c
 ===================================================================
---- libvirt-4.1.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-4.1.0/src/libxl/libxl_driver.c
-@@ -6076,6 +6076,9 @@ libxlDomainMigratePerform3Params(virDoma
+--- libvirt-4.2.0.orig/src/libxl/libxl_driver.c
++++ libvirt-4.2.0/src/libxl/libxl_driver.c
+@@ -6087,6 +6087,9 @@ libxlDomainMigratePerform3Params(virDoma
      const char *dname = NULL;
      const char *uri = NULL;
      int ret = -1;
@@ -66,7 +66,7 @@
  
  #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
      virReportUnsupportedError();
-@@ -6092,6 +6095,18 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6103,6 +6106,18 @@ libxlDomainMigratePerform3Params(virDoma
          virTypedParamsGetString(params, nparams,
                                  VIR_MIGRATE_PARAM_DEST_NAME,
                                  &dname) < 0 ||
@@ -85,31 +85,31 @@
          virTypedParamsGetString(params, nparams,
                                  VIR_MIGRATE_PARAM_URI,
                                  &uri) < 0)
-@@ -6106,11 +6121,11 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6117,11 +6132,11 @@ libxlDomainMigratePerform3Params(virDoma
  
      if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
-         if (libxlDomainMigrationPerformP2P(driver, vm, dom->conn, dom_xml,
--                                           dconnuri, uri, dname, flags) < 0)
-+                                           dconnuri, uri, dname, &props) < 0)
+         if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml,
+-                                              dconnuri, uri, dname, flags) < 
0)
++                                              dconnuri, uri, dname, &props) < 
0)
              goto cleanup;
      } else {
-         if (libxlDomainMigrationPerform(driver, vm, dom_xml, dconnuri,
--                                        uri, dname, flags) < 0)
-+                                        uri, dname, &props) < 0)
+         if (libxlDomainMigrationSrcPerform(driver, vm, dom_xml, dconnuri,
+-                                           uri, dname, flags) < 0)
++                                           uri, dname, &props) < 0)
              goto cleanup;
      }
  
-Index: libvirt-4.1.0/src/libxl/libxl_migration.c
+Index: libvirt-4.2.0/src/libxl/libxl_migration.c
 ===================================================================
---- libvirt-4.1.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-4.1.0/src/libxl/libxl_migration.c
-@@ -359,18 +359,39 @@ libxlMigrateReceive(virNetSocketPtr sock
+--- libvirt-4.2.0.orig/src/libxl/libxl_migration.c
++++ libvirt-4.2.0/src/libxl/libxl_migration.c
+@@ -359,18 +359,39 @@ libxlMigrateDstReceive(virNetSocketPtr s
  static int
- libxlDoMigrateSend(libxlDriverPrivatePtr driver,
-                    virDomainObjPtr vm,
--                   unsigned long flags,
-+                   const libxlDomainMigrationProps *props,
-                    int sockfd)
+ libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver,
+                       virDomainObjPtr vm,
+-                      unsigned long flags,
++                      const libxlDomainMigrationProps *props,
+                       int sockfd)
  {
      libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
 +#ifdef LIBXL_HAVE_DOMAIN_SUSPEND_SUSE
@@ -145,34 +145,34 @@
      if (ret != 0) {
          virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                         _("Failed to send migration data to destination 
host"));
-@@ -908,7 +929,7 @@ struct libxlTunnelControl {
+@@ -906,7 +927,7 @@ struct libxlTunnelControl {
  static int
- libxlMigrationStartTunnel(libxlDriverPrivatePtr driver,
-                           virDomainObjPtr vm,
--                          unsigned long flags,
-+                          const libxlDomainMigrationProps *props,
-                           virStreamPtr st,
-                           struct libxlTunnelControl **tnl)
+ libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver,
+                              virDomainObjPtr vm,
+-                             unsigned long flags,
++                             const libxlDomainMigrationProps *props,
+                              virStreamPtr st,
+                              struct libxlTunnelControl **tnl)
  {
-@@ -941,7 +962,7 @@ libxlMigrationStartTunnel(libxlDriverPri
+@@ -939,7 +960,7 @@ libxlMigrationSrcStartTunnel(libxlDriver
  
      virObjectUnlock(vm);
      /* Send data to pipe */
--    ret = libxlDoMigrateSend(driver, vm, flags, tc->dataFD[1]);
-+    ret = libxlDoMigrateSend(driver, vm, props, tc->dataFD[1]);
+-    ret = libxlDoMigrateSrcSend(driver, vm, flags, tc->dataFD[1]);
++    ret = libxlDoMigrateSrcSend(driver, vm, props, tc->dataFD[1]);
      virObjectLock(vm);
  
   out:
-@@ -976,7 +997,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
-                   const char *dconnuri ATTRIBUTE_UNUSED,
-                   const char *dname,
-                   const char *uri,
--                  unsigned int flags)
-+                  const libxlDomainMigrationProps *props)
+@@ -975,7 +996,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+                      const char *dconnuri ATTRIBUTE_UNUSED,
+                      const char *dname,
+                      const char *uri,
+-                     unsigned int flags)
++                     const libxlDomainMigrationProps *props)
  {
      virDomainPtr ddomain = NULL;
      virTypedParameterPtr params = NULL;
-@@ -1016,11 +1037,11 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
+@@ -1015,11 +1036,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
      /* We don't require the destination to have P2P support
       * as it looks to be normal migration from the receiver perpective.
       */
@@ -186,7 +186,7 @@
          if (!(st = virStreamNew(dconn, 0)))
              goto cleanup;
          ret = dconn->driver->domainMigratePrepareTunnel3Params
-@@ -1034,7 +1055,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
+@@ -1033,7 +1054,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
      if (ret == -1)
          goto cleanup;
  
@@ -195,27 +195,27 @@
          if (uri_out) {
              if (virTypedParamsReplaceString(&params, &nparams,
                                              VIR_MIGRATE_PARAM_URI, uri_out) < 
0) {
-@@ -1049,11 +1070,11 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
+@@ -1048,11 +1069,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
      }
  
      VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out));
 -    if (flags & VIR_MIGRATE_TUNNELLED)
--        ret = libxlMigrationStartTunnel(driver, vm, flags, st, &tc);
+-        ret = libxlMigrationSrcStartTunnel(driver, vm, flags, st, &tc);
 +    if (props->virFlags & VIR_MIGRATE_TUNNELLED)
-+        ret = libxlMigrationStartTunnel(driver, vm, props, st, &tc);
++        ret = libxlMigrationSrcStartTunnel(driver, vm, props, st, &tc);
      else
-         ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL,
--                                          uri_out, NULL, flags);
-+                                          uri_out, NULL, props);
+         ret = libxlDomainMigrationSrcPerform(driver, vm, NULL, NULL,
+-                                             uri_out, NULL, flags);
++                                             uri_out, NULL, props);
      if (ret < 0)
          orig_err = virSaveLastError();
  
-@@ -1084,14 +1105,14 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr
+@@ -1083,14 +1104,14 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
          orig_err = virSaveLastError();
  
      VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm);
--    ret = libxlDomainMigrationConfirm(driver, vm, flags, cancelled);
-+    ret = libxlDomainMigrationConfirm(driver, vm, props->virFlags, cancelled);
+-    ret = libxlDomainMigrationSrcConfirm(driver, vm, flags, cancelled);
++    ret = libxlDomainMigrationSrcConfirm(driver, vm, props->virFlags, 
cancelled);
  
      if (ret < 0)
          VIR_WARN("Guest %s probably left in 'paused' state on source",
@@ -224,49 +224,49 @@
   cleanup:
 -    if (flags & VIR_MIGRATE_TUNNELLED) {
 +    if (props->virFlags & VIR_MIGRATE_TUNNELLED) {
-         libxlMigrationStopTunnel(tc);
+         libxlMigrationSrcStopTunnel(tc);
          virObjectUnref(st);
      }
-@@ -1138,7 +1159,7 @@ libxlDomainMigrationPerformP2P(libxlDriv
-                                const char *dconnuri,
-                                const char *uri_str ATTRIBUTE_UNUSED,
-                                const char *dname,
--                               unsigned int flags)
-+                               const libxlDomainMigrationProps *props)
+@@ -1137,7 +1158,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
+                                   const char *dconnuri,
+                                   const char *uri_str ATTRIBUTE_UNUSED,
+                                   const char *dname,
+-                                  unsigned int flags)
++                                  const libxlDomainMigrationProps *props)
  {
      int ret = -1;
      bool useParams;
-@@ -1173,7 +1194,7 @@ libxlDomainMigrationPerformP2P(libxlDriv
+@@ -1172,7 +1193,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
      }
  
-     ret = libxlDoMigrateP2P(driver, vm, sconn, xmlin, dconn, dconnuri,
--                            dname, uri_str, flags);
-+                            dname, uri_str, props);
+     ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri,
+-                               dname, uri_str, flags);
++                               dname, uri_str, props);
  
   cleanup:
      orig_err = virSaveLastError();
-@@ -1195,7 +1216,7 @@ libxlDomainMigrationPerform(libxlDriverP
-                             const char *dconnuri ATTRIBUTE_UNUSED,
-                             const char *uri_str,
-                             const char *dname ATTRIBUTE_UNUSED,
--                            unsigned int flags)
-+                            const libxlDomainMigrationProps *props)
+@@ -1194,7 +1215,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
+                                const char *dconnuri ATTRIBUTE_UNUSED,
+                                const char *uri_str,
+                                const char *dname ATTRIBUTE_UNUSED,
+-                               unsigned int flags)
++                               const libxlDomainMigrationProps *props)
  {
      libxlDomainObjPrivatePtr priv = vm->privateData;
      char *hostname = NULL;
-@@ -1235,7 +1256,7 @@ libxlDomainMigrationPerform(libxlDriverP
+@@ -1234,7 +1255,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
  
      /* suspend vm and send saved data to dst through socket fd */
      virObjectUnlock(vm);
--    ret = libxlDoMigrateSend(driver, vm, flags, sockfd);
-+    ret = libxlDoMigrateSend(driver, vm, props, sockfd);
+-    ret = libxlDoMigrateSrcSend(driver, vm, flags, sockfd);
++    ret = libxlDoMigrateSrcSend(driver, vm, props, sockfd);
      virObjectLock(vm);
  
      if (ret < 0)
-Index: libvirt-4.1.0/src/libxl/libxl_migration.h
+Index: libvirt-4.2.0/src/libxl/libxl_migration.h
 ===================================================================
---- libvirt-4.1.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-4.1.0/src/libxl/libxl_migration.h
+--- libvirt-4.2.0.orig/src/libxl/libxl_migration.h
++++ libvirt-4.2.0/src/libxl/libxl_migration.h
 @@ -39,6 +39,10 @@
      VIR_MIGRATE_PARAM_URI,              VIR_TYPED_PARAM_STRING, \
      VIR_MIGRATE_PARAM_DEST_NAME,        VIR_TYPED_PARAM_STRING, \
@@ -278,9 +278,9 @@
      NULL
  
  char *
-@@ -70,6 +74,14 @@ libxlDomainMigrationPrepare(virConnectPt
-                             int cookieinlen,
-                             unsigned int flags);
+@@ -70,6 +74,14 @@ libxlDomainMigrationDstPrepare(virConnec
+                                int cookieinlen,
+                                unsigned int flags);
  
 +typedef struct {
 +    unsigned int virFlags;
@@ -291,31 +291,31 @@
 +} libxlDomainMigrationProps;
 +
  int
- libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver,
-                                virDomainObjPtr vm,
-@@ -78,7 +90,7 @@ libxlDomainMigrationPerformP2P(libxlDriv
+ libxlDomainMigrationSrcPerformP2P(libxlDriverPrivatePtr driver,
+                                   virDomainObjPtr vm,
+@@ -78,7 +90,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
+                                   const char *dconnuri,
+                                   const char *uri_str,
+                                   const char *dname,
+-                                  unsigned int flags);
++                                  const libxlDomainMigrationProps *props);
+ 
+ int
+ libxlDomainMigrationSrcPerform(libxlDriverPrivatePtr driver,
+@@ -87,7 +99,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
                                 const char *dconnuri,
                                 const char *uri_str,
                                 const char *dname,
 -                               unsigned int flags);
 +                               const libxlDomainMigrationProps *props);
  
- int
- libxlDomainMigrationPerform(libxlDriverPrivatePtr driver,
-@@ -87,7 +99,7 @@ libxlDomainMigrationPerform(libxlDriverP
-                             const char *dconnuri,
-                             const char *uri_str,
-                             const char *dname,
--                            unsigned int flags);
-+                            const libxlDomainMigrationProps *props);
- 
  virDomainPtr
- libxlDomainMigrationFinish(virConnectPtr dconn,
-Index: libvirt-4.1.0/tools/virsh-domain.c
+ libxlDomainMigrationDstFinish(virConnectPtr dconn,
+Index: libvirt-4.2.0/tools/virsh-domain.c
 ===================================================================
---- libvirt-4.1.0.orig/tools/virsh-domain.c
-+++ libvirt-4.1.0/tools/virsh-domain.c
-@@ -10540,6 +10540,22 @@ static const vshCmdOptDef opts_migrate[]
+--- libvirt-4.2.0.orig/tools/virsh-domain.c
++++ libvirt-4.2.0/tools/virsh-domain.c
+@@ -10545,6 +10545,22 @@ static const vshCmdOptDef opts_migrate[]
       .type = VSH_OT_BOOL,
       .help = N_("use TLS for migration")
      },
@@ -338,7 +338,7 @@
      {.name = NULL}
  };
  
-@@ -10563,6 +10579,7 @@ doMigrate(void *opaque)
+@@ -10568,6 +10584,7 @@ doMigrate(void *opaque)
      unsigned long long ullOpt = 0;
      int rv;
      virConnectPtr dconn = data->dconn;
@@ -346,7 +346,7 @@
  
      sigemptyset(&sigmask);
      sigaddset(&sigmask, SIGINT);
-@@ -10682,6 +10699,27 @@ doMigrate(void *opaque)
+@@ -10687,6 +10704,27 @@ doMigrate(void *opaque)
              goto save_error;
      }
  
@@ -374,11 +374,11 @@
      if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
          goto out;
      if (opt) {
-Index: libvirt-4.1.0/tools/virsh.pod
+Index: libvirt-4.2.0/tools/virsh.pod
 ===================================================================
---- libvirt-4.1.0.orig/tools/virsh.pod
-+++ libvirt-4.1.0/tools/virsh.pod
-@@ -1849,6 +1849,14 @@ Providing I<--tls> causes the migration
+--- libvirt-4.2.0.orig/tools/virsh.pod
++++ libvirt-4.2.0/tools/virsh.pod
+@@ -1850,6 +1850,14 @@ Providing I<--tls> causes the migration
  the migration of the domain. Usage requires proper TLS setup for both source
  and target.
  

++++++ libxl-support-block-script.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.467256511 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.471256366 +0200
@@ -7,10 +7,10 @@
 
 For more details, see bsc#954872 and FATE#319810
 
-Index: libvirt-4.1.0/src/libxl/libxl_conf.c
+Index: libvirt-4.2.0/src/libxl/libxl_conf.c
 ===================================================================
---- libvirt-4.1.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-4.1.0/src/libxl/libxl_conf.c
+--- libvirt-4.2.0.orig/src/libxl/libxl_conf.c
++++ libvirt-4.2.0/src/libxl/libxl_conf.c
 @@ -771,6 +771,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
  #endif
  }

++++++ lxc-wait-after-eth-del.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.483255932 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.483255932 +0200
@@ -13,10 +13,10 @@
  src/lxc/lxc_process.c    | 1 +
  3 files changed, 4 insertions(+)
 
-Index: libvirt-4.1.0/src/lxc/lxc_controller.c
+Index: libvirt-4.2.0/src/lxc/lxc_controller.c
 ===================================================================
---- libvirt-4.1.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-4.1.0/src/lxc/lxc_controller.c
+--- libvirt-4.2.0.orig/src/lxc/lxc_controller.c
++++ libvirt-4.2.0/src/lxc/lxc_controller.c
 @@ -73,6 +73,7 @@
  #include "rpc/virnetdaemon.h"
  #include "virstring.h"
@@ -33,10 +33,10 @@
  
      return ret;
  }
-Index: libvirt-4.1.0/src/lxc/lxc_driver.c
+Index: libvirt-4.2.0/src/lxc/lxc_driver.c
 ===================================================================
---- libvirt-4.1.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-4.1.0/src/lxc/lxc_driver.c
+--- libvirt-4.2.0.orig/src/lxc/lxc_driver.c
++++ libvirt-4.2.0/src/lxc/lxc_driver.c
 @@ -75,6 +75,7 @@
  #include "virtime.h"
  #include "virtypedparam.h"
@@ -45,7 +45,7 @@
  #include "virstring.h"
  #include "viraccessapicheck.h"
  #include "viraccessapichecklxc.h"
-@@ -4021,6 +4022,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
+@@ -4035,6 +4036,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
          case VIR_DOMAIN_NET_TYPE_NETWORK:
          case VIR_DOMAIN_NET_TYPE_ETHERNET:
              ignore_value(virNetDevVethDelete(veth));
@@ -53,7 +53,7 @@
              break;
  
          case VIR_DOMAIN_NET_TYPE_DIRECT:
-@@ -4464,6 +4466,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
+@@ -4478,6 +4480,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
              virDomainAuditNet(vm, detach, NULL, "detach", false);
              goto cleanup;
          }
@@ -61,10 +61,10 @@
          break;
  
          /* It'd be nice to support this, but with macvlan
-Index: libvirt-4.1.0/src/lxc/lxc_process.c
+Index: libvirt-4.2.0/src/lxc/lxc_process.c
 ===================================================================
---- libvirt-4.1.0.orig/src/lxc/lxc_process.c
-+++ libvirt-4.1.0/src/lxc/lxc_process.c
+--- libvirt-4.2.0.orig/src/lxc/lxc_process.c
++++ libvirt-4.2.0/src/lxc/lxc_process.c
 @@ -51,6 +51,7 @@
  #include "viratomic.h"
  #include "virprocess.h"

++++++ network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.495255497 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.495255497 +0200
@@ -17,10 +17,10 @@
  tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 -
  2 files changed, 8 insertions(+), 2 deletions(-)
 
-Index: libvirt-4.1.0/src/network/bridge_driver.c
+Index: libvirt-4.2.0/src/network/bridge_driver.c
 ===================================================================
---- libvirt-4.1.0.orig/src/network/bridge_driver.c
-+++ libvirt-4.1.0/src/network/bridge_driver.c
+--- libvirt-4.2.0.orig/src/network/bridge_driver.c
++++ libvirt-4.2.0/src/network/bridge_driver.c
 @@ -1470,7 +1470,14 @@ networkDnsmasqConfContents(virNetworkObj
          if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
              if (ipdef->nranges || ipdef->nhosts) {
@@ -37,10 +37,10 @@
              }
  
              if (ipdef->tftproot) {
-Index: libvirt-4.1.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-4.2.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
 ===================================================================
---- libvirt-4.1.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-4.1.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+--- libvirt-4.2.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
++++ libvirt-4.2.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
 @@ -10,7 +10,6 @@ bind-dynamic
  interface=virbr1
  dhcp-range=192.168.122.1,static

++++++ ppc64le-canonical-name.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.507255063 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.507255063 +0200
@@ -2,10 +2,10 @@
 
 See bnc#894956
 
-Index: libvirt-4.1.0/src/util/virarch.c
+Index: libvirt-4.2.0/src/util/virarch.c
 ===================================================================
---- libvirt-4.1.0.orig/src/util/virarch.c
-+++ libvirt-4.1.0/src/util/virarch.c
+--- libvirt-4.2.0.orig/src/util/virarch.c
++++ libvirt-4.2.0/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 ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.519254629 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.523254484 +0200
@@ -1,11 +1,11 @@
-Index: libvirt-4.1.0/examples/apparmor/libvirt-qemu
+Index: libvirt-4.2.0/examples/apparmor/libvirt-qemu
 ===================================================================
---- libvirt-4.1.0.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-4.1.0/examples/apparmor/libvirt-qemu
-@@ -193,3 +193,6 @@
-   # silence refusals to open lttng files (see LP: #1432644)
-   deny /dev/shm/lttng-ust-wait-* r,
-   deny /run/shm/lttng-ust-wait-* r,
+--- libvirt-4.2.0.orig/examples/apparmor/libvirt-qemu
++++ libvirt-4.2.0/examples/apparmor/libvirt-qemu
+@@ -197,3 +197,6 @@
+   # required for sasl GSSAPI plugin
+   /etc/gss/mech.d/ r,
+   /etc/gss/mech.d/* r,
 +
 +  # Temporary screendump rule -- See bsc#904426
 +  /var/cache/libvirt/qemu/qemu.screendump.* rw,

++++++ support-managed-pci-xen-driver.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.535254050 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.539253905 +0200
@@ -8,10 +8,10 @@
  src/xenxs/xen_xm.c   |   28 +++++++++++++++++++++++++++-
  2 files changed, 35 insertions(+), 15 deletions(-)
 
-Index: libvirt-4.1.0/src/xenconfig/xen_common.c
+Index: libvirt-4.2.0/src/xenconfig/xen_common.c
 ===================================================================
---- libvirt-4.1.0.orig/src/xenconfig/xen_common.c
-+++ libvirt-4.1.0/src/xenconfig/xen_common.c
+--- libvirt-4.2.0.orig/src/xenconfig/xen_common.c
++++ libvirt-4.2.0/src/xenconfig/xen_common.c
 @@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe
  {
      virConfValuePtr list = virConfGetValue(conf, "pci");
@@ -66,10 +66,10 @@
              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-4.1.0/src/xenconfig/xen_sxpr.c
+Index: libvirt-4.2.0/src/xenconfig/xen_sxpr.c
 ===================================================================
---- libvirt-4.1.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-4.1.0/src/xenconfig/xen_sxpr.c
+--- libvirt-4.2.0.orig/src/xenconfig/xen_sxpr.c
++++ libvirt-4.2.0/src/xenconfig/xen_sxpr.c
 @@ -1057,6 +1057,7 @@ xenParseSxprPCI(virDomainDefPtr def,
          int busID;
          int slotID;

++++++ suse-apparmor-libnl-paths.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.547253615 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.547253615 +0200
@@ -8,10 +8,10 @@
 to squelch a denial when starting confined domains.
 
 Found while investigating bsc#1058847
-Index: libvirt-4.1.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+Index: libvirt-4.2.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 ===================================================================
---- libvirt-4.1.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ libvirt-4.1.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+--- libvirt-4.2.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
++++ libvirt-4.2.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 @@ -17,7 +17,7 @@ profile virt-aa-helper /usr/{lib,lib64}/
    owner @{PROC}/[0-9]*/status r,
    @{PROC}/filesystems r,
@@ -21,10 +21,10 @@
  
    # for hostdev
    /sys/devices/ r,
-Index: libvirt-4.1.0/examples/apparmor/libvirt-qemu
+Index: libvirt-4.2.0/examples/apparmor/libvirt-qemu
 ===================================================================
---- libvirt-4.1.0.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-4.1.0/examples/apparmor/libvirt-qemu
+--- libvirt-4.2.0.orig/examples/apparmor/libvirt-qemu
++++ libvirt-4.2.0/examples/apparmor/libvirt-qemu
 @@ -62,6 +62,7 @@
    #/dev/fb* rw,
  

++++++ suse-libvirt-guests-service.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.559253181 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.559253181 +0200
@@ -1,9 +1,9 @@
 Adjust libvirt-guests service to conform to SUSE standards
 
-Index: libvirt-4.1.0/tools/libvirt-guests.init.in
+Index: libvirt-4.2.0/tools/libvirt-guests.init.in
 ===================================================================
---- libvirt-4.1.0.orig/tools/libvirt-guests.init.in
-+++ libvirt-4.1.0/tools/libvirt-guests.init.in
+--- libvirt-4.2.0.orig/tools/libvirt-guests.init.in
++++ libvirt-4.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
  #
@@ -46,10 +46,10 @@
 +
  
  exec @libexecdir@/libvirt-guests.sh "$@"
-Index: libvirt-4.1.0/tools/libvirt-guests.sh.in
+Index: libvirt-4.2.0/tools/libvirt-guests.sh.in
 ===================================================================
---- libvirt-4.1.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-4.1.0/tools/libvirt-guests.sh.in
+--- libvirt-4.2.0.orig/tools/libvirt-guests.sh.in
++++ libvirt-4.2.0/tools/libvirt-guests.sh.in
 @@ -16,14 +16,13 @@
  # License along with this library.  If not, see
  # <http://www.gnu.org/licenses/>.
@@ -209,10 +209,10 @@
  esac
 -exit $RETVAL
 +rc_exit
-Index: libvirt-4.1.0/tools/libvirt-guests.sysconf
+Index: libvirt-4.2.0/tools/libvirt-guests.sysconf
 ===================================================================
---- libvirt-4.1.0.orig/tools/libvirt-guests.sysconf
-+++ libvirt-4.1.0/tools/libvirt-guests.sysconf
+--- libvirt-4.2.0.orig/tools/libvirt-guests.sysconf
++++ libvirt-4.2.0/tools/libvirt-guests.sysconf
 @@ -1,19 +1,29 @@
 +## Path: System/Virtualization/libvirt-guests
 +

++++++ suse-libvirtd-disable-tls.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.571252747 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.571252747 +0200
@@ -3,10 +3,10 @@
 On SUSE distros, the default is for libvirtd to listen only on the
 Unix Domain Socket. The libvirt client still provides remote access
 via a SSH tunnel.
-Index: libvirt-4.1.0/src/remote/libvirtd.conf
+Index: libvirt-4.2.0/src/remote/libvirtd.conf
 ===================================================================
---- libvirt-4.1.0.orig/src/remote/libvirtd.conf
-+++ libvirt-4.1.0/src/remote/libvirtd.conf
+--- libvirt-4.2.0.orig/src/remote/libvirtd.conf
++++ libvirt-4.2.0/src/remote/libvirtd.conf
 @@ -18,8 +18,8 @@
  # It is necessary to setup a CA and issue server certificates before
  # using this capability.
@@ -18,10 +18,10 @@
  
  # 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-4.1.0/src/remote/remote_daemon_config.c
+Index: libvirt-4.2.0/src/remote/remote_daemon_config.c
 ===================================================================
---- libvirt-4.1.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-4.1.0/src/remote/remote_daemon_config.c
+--- libvirt-4.2.0.orig/src/remote/remote_daemon_config.c
++++ libvirt-4.2.0/src/remote/remote_daemon_config.c
 @@ -110,7 +110,7 @@ daemonConfigNew(bool privileged ATTRIBUT
      if (VIR_ALLOC(data) < 0)
          return NULL;
@@ -31,10 +31,10 @@
      data->listen_tcp = 0;
  
      if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
-Index: libvirt-4.1.0/src/remote/test_libvirtd.aug.in
+Index: libvirt-4.2.0/src/remote/test_libvirtd.aug.in
 ===================================================================
---- libvirt-4.1.0.orig/src/remote/test_libvirtd.aug.in
-+++ libvirt-4.1.0/src/remote/test_libvirtd.aug.in
+--- libvirt-4.2.0.orig/src/remote/test_libvirtd.aug.in
++++ libvirt-4.2.0/src/remote/test_libvirtd.aug.in
 @@ -2,7 +2,7 @@ module Test_libvirtd =
     ::CONFIG::
  

++++++ suse-libvirtd-service-xen.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.579252457 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.579252457 +0200
@@ -7,10 +7,10 @@
 tools. If a user installs libvirt on their SUSE Xen host, then
 libvirt should be king and override xendomains. See bsc#1015348
 
-Index: libvirt-4.1.0/src/remote/libvirtd.service.in
+Index: libvirt-4.2.0/src/remote/libvirtd.service.in
 ===================================================================
---- libvirt-4.1.0.orig/src/remote/libvirtd.service.in
-+++ libvirt-4.1.0/src/remote/libvirtd.service.in
+--- libvirt-4.2.0.orig/src/remote/libvirtd.service.in
++++ libvirt-4.2.0/src/remote/libvirtd.service.in
 @@ -16,6 +16,8 @@ After=apparmor.service
  After=local-fs.target
  After=remote-fs.target

++++++ suse-libvirtd-sysconfig-settings.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.587252168 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.587252168 +0200
@@ -1,9 +1,9 @@
 Adjust libvirtd sysconfig file to conform to SUSE standards
 
-Index: libvirt-4.1.0/src/remote/libvirtd.sysconf
+Index: libvirt-4.2.0/src/remote/libvirtd.sysconf
 ===================================================================
---- libvirt-4.1.0.orig/src/remote/libvirtd.sysconf
-+++ libvirt-4.1.0/src/remote/libvirtd.sysconf
+--- libvirt-4.2.0.orig/src/remote/libvirtd.sysconf
++++ libvirt-4.2.0/src/remote/libvirtd.sysconf
 @@ -1,16 +1,25 @@
 +## Path: System/Virtualization/libvirt
 +

++++++ suse-ovmf-paths.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.595251878 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.599251733 +0200
@@ -1,9 +1,9 @@
 Adjust paths of OVMF firmwares on SUSE distros
 
-Index: libvirt-4.1.0/src/qemu/qemu.conf
+Index: libvirt-4.2.0/src/qemu/qemu.conf
 ===================================================================
---- libvirt-4.1.0.orig/src/qemu/qemu.conf
-+++ libvirt-4.1.0/src/qemu/qemu.conf
+--- libvirt-4.2.0.orig/src/qemu/qemu.conf
++++ libvirt-4.2.0/src/qemu/qemu.conf
 @@ -743,10 +743,9 @@ security_default_confined = 0
  # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
  # follows this scheme.
@@ -18,10 +18,10 @@
  #]
  
  # The backend to use for handling stdout/stderr output from
-Index: libvirt-4.1.0/src/qemu/qemu_conf.c
+Index: libvirt-4.2.0/src/qemu/qemu_conf.c
 ===================================================================
---- libvirt-4.1.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-4.1.0/src/qemu/qemu_conf.c
+--- libvirt-4.2.0.orig/src/qemu/qemu_conf.c
++++ libvirt-4.2.0/src/qemu/qemu_conf.c
 @@ -127,10 +127,9 @@ void qemuDomainCmdlineDefFree(qemuDomain
  
  #ifndef DEFAULT_LOADER_NVRAM

++++++ suse-qemu-conf.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.607251444 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.607251444 +0200
@@ -7,10 +7,10 @@
 etc.), but for now they are all lumped together in this
 single patch.
 
-Index: libvirt-4.1.0/src/qemu/qemu.conf
+Index: libvirt-4.2.0/src/qemu/qemu.conf
 ===================================================================
---- libvirt-4.1.0.orig/src/qemu/qemu.conf
-+++ libvirt-4.1.0/src/qemu/qemu.conf
+--- libvirt-4.2.0.orig/src/qemu/qemu.conf
++++ libvirt-4.2.0/src/qemu/qemu.conf
 @@ -380,11 +380,20 @@
  # isolation, but it cannot appear in a list of drivers.
  #

++++++ suse-virtlockd-sysconfig-settings.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.623250865 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.627250720 +0200
@@ -1,9 +1,9 @@
 Adjust virtlockd sysconfig file to conform to SUSE standards
 
-Index: libvirt-4.1.0/src/locking/virtlockd.sysconf
+Index: libvirt-4.2.0/src/locking/virtlockd.sysconf
 ===================================================================
---- libvirt-4.1.0.orig/src/locking/virtlockd.sysconf
-+++ libvirt-4.1.0/src/locking/virtlockd.sysconf
+--- libvirt-4.2.0.orig/src/locking/virtlockd.sysconf
++++ libvirt-4.2.0/src/locking/virtlockd.sysconf
 @@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlockd
 +

++++++ suse-virtlogd-sysconfig-settings.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.635250431 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.635250431 +0200
@@ -1,9 +1,9 @@
 Adjust virtlogd sysconfig file to conform to SUSE standards
 
-Index: libvirt-4.1.0/src/logging/virtlogd.sysconf
+Index: libvirt-4.2.0/src/logging/virtlogd.sysconf
 ===================================================================
---- libvirt-4.1.0.orig/src/logging/virtlogd.sysconf
-+++ libvirt-4.1.0/src/logging/virtlogd.sysconf
+--- libvirt-4.2.0.orig/src/logging/virtlogd.sysconf
++++ libvirt-4.2.0/src/logging/virtlogd.sysconf
 @@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlogd
 +

++++++ xen-pv-cdrom.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.647249996 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.647249996 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-4.1.0/src/xenconfig/xen_sxpr.c
+Index: libvirt-4.2.0/src/xenconfig/xen_sxpr.c
 ===================================================================
---- libvirt-4.1.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-4.1.0/src/xenconfig/xen_sxpr.c
+--- libvirt-4.2.0.orig/src/xenconfig/xen_sxpr.c
++++ libvirt-4.2.0/src/xenconfig/xen_sxpr.c
 @@ -387,7 +387,7 @@ xenParseSxprVifRate(const char *rate, un
  static int
  xenParseSxprDisks(virDomainDefPtr def,

++++++ xen-sxpr-disk-type.patch ++++++
--- /var/tmp/diff_new_pack.nIdK9C/_old  2018-04-07 20:52:58.655249707 +0200
+++ /var/tmp/diff_new_pack.nIdK9C/_new  2018-04-07 20:52:58.659249562 +0200
@@ -6,10 +6,10 @@
 
 https://bugzilla.suse.com/show_bug.cgi?id=938228
 
-Index: libvirt-4.1.0/src/xenconfig/xen_sxpr.c
+Index: libvirt-4.2.0/src/xenconfig/xen_sxpr.c
 ===================================================================
---- libvirt-4.1.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-4.1.0/src/xenconfig/xen_sxpr.c
+--- libvirt-4.2.0.orig/src/xenconfig/xen_sxpr.c
++++ libvirt-4.2.0/src/xenconfig/xen_sxpr.c
 @@ -501,10 +501,11 @@ xenParseSxprDisks(virDomainDefPtr def,
                         omnipotent, we can revisit this, perhaps stat()'ing
                         the src file in question */


Reply via email to