Hello community,

here is the log from the commit of package libvirt for openSUSE:Factory checked 
in at 2020-12-05 20:35:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvirt (Old)
 and      /work/SRC/openSUSE:Factory/.libvirt.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libvirt"

Sat Dec  5 20:35:48 2020 rev:318 rq:852456 version:6.10.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes  2020-11-23 
18:50:12.081350430 +0100
+++ /work/SRC/openSUSE:Factory/.libvirt.new.5913/libvirt.changes        
2020-12-05 20:35:58.998635752 +0100
@@ -1,0 +2,10 @@
+Tue Dec  1 23:55:16 UTC 2020 - James Fehlig <jfeh...@suse.com>
+
+- Update to libvirt 6.10.0
+  - jsc#SLE-13688
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html
+  - Dropped patches:
+    f035f53b-virt-guest-shutdown.patch
+
+-------------------------------------------------------------------

Old:
----
  f035f53b-virt-guest-shutdown.patch
  libvirt-6.9.0.tar.xz
  libvirt-6.9.0.tar.xz.asc

New:
----
  libvirt-6.10.0.tar.xz
  libvirt-6.10.0.tar.xz.asc

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

Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:00.738637518 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:00.742637522 +0100
@@ -47,16 +47,16 @@
 %define with_apparmor      0%{!?_without_apparmor:1}
 
 # Optional bits on by default
-%define with_sanlock       0%{!?_without_sanlock:1}
+%define with_sanlock       1
 %define with_polkit_rules  1
-%define with_wireshark     0%{!?_without_wireshark:1}
-%define with_libssh2       0%{!?_without_libssh2:1}
-%define with_numactl       0%{!?_without_numactl:1}
+%define with_wireshark     1
+%define with_libssh2       1
+%define with_numactl       1
 
 # A few optional bits off by default, we enable later
-%define with_numad         0%{!?_without_numad:0}
-%define with_firewalld_zone 0%{!?_without_firewalld_zone:0}
-%define with_libssh        0%{!?_without_libssh:0}
+%define with_numad         0
+%define with_firewalld_zone 0
+%define with_libssh        0
 
 # Set the OS / architecture specific special cases
 
@@ -141,7 +141,7 @@
 
 Name:           libvirt
 URL:            http://libvirt.org/
-Version:        6.9.0
+Version:        6.10.0
 Release:        0
 Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
@@ -271,7 +271,7 @@
 BuildRequires:  numad
 %endif
 %if %{with_wireshark}
-BuildRequires:  wireshark-devel >= 2.4.0
+BuildRequires:  wireshark-devel
 %endif
 %if %{with_libssh}
 BuildRequires:  libssh-devel >= 0.7.0
@@ -291,7 +291,6 @@
 Source99:       baselibs.conf
 Source100:      %{name}-rpmlintrc
 # Upstream patches
-Patch0:         f035f53b-virt-guest-shutdown.patch
 # Patches pending upstream review
 Patch100:       libxl-dom-reset.patch
 Patch101:       network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@@ -809,7 +808,7 @@
 Summary:        Wireshark plugin for libvirt RPC protocol
 Group:          Productivity/Networking/Diagnostic
 Requires:       %{name}-libs = %{version}-%{release}
-Requires:       wireshark >= 2.4.0
+Requires:       wireshark
 
 %description -n wireshark-plugin-libvirt
 Wireshark dissector plugin for better analysis of libvirt RPC traffic.
@@ -823,33 +822,7 @@
 libvirt plugin for NSS for translating domain names into IP addresses.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch100 -p1
-%patch101 -p1
-%patch150 -p1
-%patch151 -p1
-%patch152 -p1
-%patch153 -p1
-%patch154 -p1
-%patch155 -p1
-%patch156 -p1
-%patch200 -p1
-%patch201 -p1
-%patch202 -p1
-%patch203 -p1
-%patch204 -p1
-%patch205 -p1
-%patch206 -p1
-%patch207 -p1
-%patch208 -p1
-%patch209 -p1
-%patch210 -p1
-%patch211 -p1
-%patch212 -p1
-%patch213 -p1
-%patch214 -p1
-%patch215 -p1
+%autosetup -p1
 
 %build
 %if %{with_qemu}
@@ -873,9 +846,9 @@
     %define arg_vbox -Ddriver_vbox=disabled
 %endif
 %if %{with_esx}
-    %define arg_esx -Ddriver_esx=enabled
+    %define arg_esx -Ddriver_esx=enabled -Dcurl=enabled
 %else
-    %define arg_esx -Ddriver_esx=disabled
+    %define arg_esx -Ddriver_esx=disabled -Dcurl=disabled
 %endif
 %if %{with_vmware}
     %define arg_vmware -Ddriver_vmware=enabled
@@ -883,11 +856,9 @@
     %define arg_vmware -Ddriver_vmware=disabled
 %endif
 %if %{with_hyperv}
-    %define arg_hyperv -Ddriver_hyperv=enabled
-    %define arg_openwsman -Dopenwsman=enabled
+    %define arg_hyperv -Ddriver_hyperv=enabled -Dopenwsman=enabled
 %else
-    %define arg_hyperv -Ddriver_hyperv=disabled
-    %define arg_openwsman -Dopenwsman=disabled
+    %define arg_hyperv -Ddriver_hyperv=disabled -Dopenwsman=disabled
 %endif
 %if %{with_libxl}
     %define arg_libxl -Ddriver_libxl=enabled
@@ -905,14 +876,14 @@
     %define arg_storage_sheepdog -Dstorage_sheepdog=disabled
 %endif
 %if %{with_storage_gluster}
-    %define arg_storage_gluster -Dstorage_gluster=enabled
+    %define arg_storage_gluster -Dstorage_gluster=enabled -Dglusterfs=enabled
 %else
-    %define arg_storage_gluster -Dstorage_gluster=disabled
+    %define arg_storage_gluster -Dstorage_gluster=disabled -Dglusterfs=disabled
 %endif
 %if %{with_storage_iscsi_direct}
-    %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=enabled
+    %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=enabled 
-Dlibiscsi=enabled
 %else
-    %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=disabled
+    %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=disabled 
-Dlibiscsi=disabled
 %endif
 %if %{with_libssh}
     %define arg_libssh -Dlibssh=enabled
@@ -992,7 +963,6 @@
            -Ddriver_libvirtd=enabled \
            %{?arg_esx} \
            %{?arg_hyperv} \
-           %{?arg_openwsman} \
            %{?arg_vmware} \
            -Ddriver_vz=disabled \
            -Ddriver_bhyve=disabled \
@@ -1077,8 +1047,6 @@
    %{buildroot}/%{_datadir}/%{name}/networks/default.xml
 rm -f %{buildroot}/%{_sysconfdir}/%{name}/qemu/networks/default.xml
 rm -f %{buildroot}/%{_sysconfdir}/%{name}/qemu/networks/autostart/default.xml
-# Strip auto-generated UUID - we need it generated per-install
-sed -i -e "/<uuid>/d" %{buildroot}/%{_datadir}/%{name}/networks/default.xml
 %if ! %{with_lxc}
 rm -rf %{buildroot}/%{_sysconfdir}/%{name}/lxc.conf
 rm -f %{buildroot}/%{_datadir}/augeas/lenses/libvirtd_lxc.aug
@@ -1247,12 +1215,9 @@
 %post daemon-config-network
 # Install the default network if one doesn't exist
 if test $1 -eq 1 && test ! -f %{_sysconfdir}/%{name}/qemu/networks/default.xml 
; then
-    UUID=`/usr/bin/uuidgen`
-    sed -e "s,</name>,</name>\n  <uuid>$UUID</uuid>," \
-         < %{_datadir}/%{name}/networks/default.xml \
-         > %{_sysconfdir}/%{name}/qemu/networks/default.xml
+    cp %{_datadir}/%{name}/networks/default.xml 
%{_sysconfdir}/%{name}/qemu/networks/default.xml
     # libvirt saves this file with mode 0600
-    chmod 0600 %{_sysconfdir}/libvirt/qemu/networks/default.xml
+    chmod 0600 %{_sysconfdir}/%{name}/qemu/networks/default.xml
 fi
 
 %pre daemon-driver-nwfilter

++++++ 0001-Extract-stats-functions-from-the-qemu-driver.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:00.786637567 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:00.790637570 +0100
@@ -18,10 +18,10 @@
  create mode 100644 src/conf/domain_stats.c
  create mode 100644 src/conf/domain_stats.h
 
-Index: libvirt-6.9.0/src/conf/domain_stats.c
+Index: libvirt-6.10.0/src/conf/domain_stats.c
 ===================================================================
 --- /dev/null
-+++ libvirt-6.9.0/src/conf/domain_stats.c
++++ libvirt-6.10.0/src/conf/domain_stats.c
 @@ -0,0 +1,119 @@
 +/*
 + * domain_stats.c: domain stats extraction helpers
@@ -142,10 +142,10 @@
 +}
 +
 +#undef STATS_ADD_NET_PARAM
-Index: libvirt-6.9.0/src/conf/domain_stats.h
+Index: libvirt-6.10.0/src/conf/domain_stats.h
 ===================================================================
 --- /dev/null
-+++ libvirt-6.9.0/src/conf/domain_stats.h
++++ libvirt-6.10.0/src/conf/domain_stats.h
 @@ -0,0 +1,62 @@
 +/*
 + * domain_stats.h: domain stats extraction helpers
@@ -209,11 +209,11 @@
 +                           virTypedParamListPtr params);
 +
 +#endif /* __DOMAIN_STATS_H */
-Index: libvirt-6.9.0/src/libvirt_private.syms
+Index: libvirt-6.10.0/src/libvirt_private.syms
 ===================================================================
---- libvirt-6.9.0.orig/src/libvirt_private.syms
-+++ libvirt-6.9.0/src/libvirt_private.syms
-@@ -743,6 +743,9 @@ virDomainConfNWFilterInstantiate;
+--- libvirt-6.10.0.orig/src/libvirt_private.syms
++++ libvirt-6.10.0/src/libvirt_private.syms
+@@ -744,6 +744,9 @@ virDomainConfNWFilterInstantiate;
  virDomainConfNWFilterTeardown;
  virDomainConfVMNWFilterTeardown;
  
@@ -223,7 +223,7 @@
  
  # conf/interface_conf.h
  virInterfaceDefFormat;
-@@ -1787,6 +1790,7 @@ virCgroupGetMemoryUsage;
+@@ -1793,6 +1796,7 @@ virCgroupGetMemoryUsage;
  virCgroupGetMemSwapHardLimit;
  virCgroupGetMemSwapUsage;
  virCgroupGetPercpuStats;
@@ -231,10 +231,10 @@
  virCgroupHasController;
  virCgroupHasEmptyTasks;
  virCgroupKillPainfully;
-Index: libvirt-6.9.0/src/qemu/qemu_driver.c
+Index: libvirt-6.10.0/src/qemu/qemu_driver.c
 ===================================================================
---- libvirt-6.9.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-6.9.0/src/qemu/qemu_driver.c
+--- libvirt-6.10.0.orig/src/qemu/qemu_driver.c
++++ libvirt-6.10.0/src/qemu/qemu_driver.c
 @@ -67,6 +67,7 @@
  #include "virarptable.h"
  #include "viruuid.h"
@@ -243,7 +243,7 @@
  #include "domain_audit.h"
  #include "domain_cgroup.h"
  #include "domain_driver.h"
-@@ -17623,13 +17624,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
+@@ -17597,13 +17598,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
                          virTypedParamListPtr params,
                          unsigned int privflags G_GNUC_UNUSED)
  {
@@ -258,7 +258,7 @@
  }
  
  
-@@ -17923,25 +17918,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
+@@ -17897,25 +17892,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
                              virTypedParamListPtr params)
  {
      qemuDomainObjPrivatePtr priv = dom->privateData;
@@ -285,7 +285,7 @@
  }
  
  
-@@ -18108,76 +18089,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
+@@ -18082,76 +18063,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
      return ret;
  }
  
@@ -363,11 +363,11 @@
  
  /* refresh information by opening images on the disk */
  static int
-Index: libvirt-6.9.0/src/util/vircgroup.c
+Index: libvirt-6.10.0/src/util/vircgroup.c
 ===================================================================
---- libvirt-6.9.0.orig/src/util/vircgroup.c
-+++ libvirt-6.9.0/src/util/vircgroup.c
-@@ -2719,6 +2719,31 @@ virCgroupControllerAvailable(int control
+--- libvirt-6.10.0.orig/src/util/vircgroup.c
++++ libvirt-6.10.0/src/util/vircgroup.c
+@@ -2799,6 +2799,31 @@ virCgroupControllerAvailable(int control
      return virCgroupHasController(cgroup, controller);
  }
  
@@ -399,7 +399,7 @@
  #else /* !__linux__ */
  
  bool
-@@ -2728,6 +2753,14 @@ virCgroupAvailable(void)
+@@ -2808,6 +2833,14 @@ virCgroupAvailable(void)
  }
  
  
@@ -414,10 +414,10 @@
  int
  virCgroupNewPartition(const char *path G_GNUC_UNUSED,
                        bool create G_GNUC_UNUSED,
-Index: libvirt-6.9.0/src/util/vircgroup.h
+Index: libvirt-6.10.0/src/util/vircgroup.h
 ===================================================================
---- libvirt-6.9.0.orig/src/util/vircgroup.h
-+++ libvirt-6.9.0/src/util/vircgroup.h
+--- libvirt-6.10.0.orig/src/util/vircgroup.h
++++ libvirt-6.10.0/src/util/vircgroup.h
 @@ -23,6 +23,7 @@
  
  #include "virbitmap.h"
@@ -426,17 +426,17 @@
  
  struct _virCgroup;
  typedef struct _virCgroup virCgroup;
-@@ -273,3 +274,6 @@ int virCgroupSetOwner(virCgroupPtr cgrou
+@@ -277,3 +278,6 @@ int virCgroupSetOwner(virCgroupPtr cgrou
  int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller);
  
  bool virCgroupControllerAvailable(int controller);
 +
 +int virCgroupGetStatsCpu(virCgroupPtr cgroup,
 +                         virTypedParamListPtr params);
-Index: libvirt-6.9.0/src/conf/meson.build
+Index: libvirt-6.10.0/src/conf/meson.build
 ===================================================================
---- libvirt-6.9.0.orig/src/conf/meson.build
-+++ libvirt-6.9.0/src/conf/meson.build
+--- libvirt-6.10.0.orig/src/conf/meson.build
++++ libvirt-6.10.0/src/conf/meson.build
 @@ -14,6 +14,7 @@ domain_conf_sources = [
    'domain_capabilities.c',
    'domain_conf.c',

++++++ 0001-libxl-add-support-for-BlockResize-API.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:00.798637578 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:00.798637578 +0100
@@ -19,11 +19,11 @@
  src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 91 insertions(+)
 
-Index: libvirt-6.9.0/src/libxl/libxl_driver.c
+Index: libvirt-6.10.0/src/libxl/libxl_driver.c
 ===================================================================
---- libvirt-6.9.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-6.9.0/src/libxl/libxl_driver.c
-@@ -5327,6 +5327,96 @@ libxlDomainMemoryStats(virDomainPtr dom,
+--- libvirt-6.10.0.orig/src/libxl/libxl_driver.c
++++ libvirt-6.10.0/src/libxl/libxl_driver.c
+@@ -5322,6 +5322,96 @@ libxlDomainMemoryStats(virDomainPtr dom,
  
  #undef LIBXL_SET_MEMSTAT
  
@@ -120,7 +120,7 @@
  static int
  libxlDomainGetJobInfo(virDomainPtr dom,
                        virDomainJobInfoPtr info)
-@@ -6799,6 +6889,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6794,6 +6884,7 @@ static virHypervisorDriver libxlHypervis
  #endif
      .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */
      .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */

++++++ 0002-lxc-implement-connectGetAllDomainStats.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:00.806637586 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:00.810637591 +0100
@@ -9,10 +9,10 @@
  src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 138 insertions(+)
 
-Index: libvirt-6.9.0/src/lxc/lxc_driver.c
+Index: libvirt-6.10.0/src/lxc/lxc_driver.c
 ===================================================================
---- libvirt-6.9.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-6.9.0/src/lxc/lxc_driver.c
+--- libvirt-6.10.0.orig/src/lxc/lxc_driver.c
++++ libvirt-6.10.0/src/lxc/lxc_driver.c
 @@ -73,6 +73,8 @@
  #include "netdev_bandwidth_conf.h"
  #include "virsocket.h"
@@ -22,7 +22,7 @@
  
  #define VIR_FROM_THIS VIR_FROM_LXC
  
-@@ -5069,6 +5071,128 @@ lxcDomainHasManagedSaveImage(virDomainPt
+@@ -5068,6 +5070,128 @@ lxcDomainHasManagedSaveImage(virDomainPt
      return ret;
  }
  
@@ -151,7 +151,7 @@
  
  /* Function Tables */
  static virHypervisorDriver lxcHypervisorDriver = {
-@@ -5166,6 +5290,7 @@ static virHypervisorDriver lxcHypervisor
+@@ -5165,6 +5289,7 @@ static virHypervisorDriver lxcHypervisor
      .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */
      .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */
      .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */

++++++ libvirt-6.9.0.tar.xz -> libvirt-6.10.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/libvirt/libvirt-6.9.0.tar.xz 
/work/SRC/openSUSE:Factory/.libvirt.new.5913/libvirt-6.10.0.tar.xz differ: char 
27, line 1

++++++ libvirt-power8-models.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:00.858637640 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:00.862637643 +0100
@@ -2,10 +2,10 @@
 
 From: <r...@suse.de>
 
-Index: libvirt-6.9.0/src/cpu_map/ppc64_POWER8.xml
+Index: libvirt-6.10.0/src/cpu_map/ppc64_POWER8.xml
 ===================================================================
---- libvirt-6.9.0.orig/src/cpu_map/ppc64_POWER8.xml
-+++ libvirt-6.9.0/src/cpu_map/ppc64_POWER8.xml
+--- libvirt-6.10.0.orig/src/cpu_map/ppc64_POWER8.xml
++++ libvirt-6.10.0/src/cpu_map/ppc64_POWER8.xml
 @@ -4,5 +4,7 @@
      <pvr value='0x004b0000' mask='0xffff0000'/>
      <pvr value='0x004c0000' mask='0xffff0000'/>

++++++ libvirt-suse-netcontrol.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:00.890637672 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:00.894637676 +0100
@@ -1,8 +1,8 @@
-Index: libvirt-6.9.0/tools/virsh.c
+Index: libvirt-6.10.0/tools/virsh.c
 ===================================================================
---- libvirt-6.9.0.orig/tools/virsh.c
-+++ libvirt-6.9.0/tools/virsh.c
-@@ -542,6 +542,8 @@ virshShowVersion(vshControl *ctl G_GNUC_
+--- libvirt-6.10.0.orig/tools/virsh.c
++++ libvirt-6.10.0/tools/virsh.c
+@@ -543,6 +543,8 @@ virshShowVersion(vshControl *ctl G_GNUC_
      vshPrint(ctl, " Interface");
  # if defined(WITH_NETCF)
      vshPrint(ctl, " netcf");
@@ -11,10 +11,10 @@
  # elif defined(WITH_UDEV)
      vshPrint(ctl, " udev");
  # endif
-Index: libvirt-6.9.0/src/interface/interface_backend_netcf.c
+Index: libvirt-6.10.0/src/interface/interface_backend_netcf.c
 ===================================================================
---- libvirt-6.9.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-6.9.0/src/interface/interface_backend_netcf.c
+--- libvirt-6.10.0.orig/src/interface/interface_backend_netcf.c
++++ libvirt-6.10.0/src/interface/interface_backend_netcf.c
 @@ -21,7 +21,12 @@
  
  #include <config.h>
@@ -126,10 +126,10 @@
      if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
          return -1;
      if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-6.9.0/src/interface/interface_driver.c
+Index: libvirt-6.10.0/src/interface/interface_driver.c
 ===================================================================
---- libvirt-6.9.0.orig/src/interface/interface_driver.c
-+++ libvirt-6.9.0/src/interface/interface_driver.c
+--- libvirt-6.10.0.orig/src/interface/interface_driver.c
++++ libvirt-6.10.0/src/interface/interface_driver.c
 @@ -30,8 +30,15 @@ interfaceRegister(void)
      if (netcfIfaceRegister() == 0)
          return 0;
@@ -147,11 +147,11 @@
      if (udevIfaceRegister() == 0)
          return 0;
  #endif /* WITH_UDEV */
-Index: libvirt-6.9.0/meson.build
+Index: libvirt-6.10.0/meson.build
 ===================================================================
---- libvirt-6.9.0.orig/meson.build
-+++ libvirt-6.9.0/meson.build
-@@ -1173,6 +1173,12 @@ if netcf_dep.found()
+--- libvirt-6.10.0.orig/meson.build
++++ libvirt-6.10.0/meson.build
+@@ -1159,6 +1159,12 @@ if netcf_dep.found()
    conf.set('WITH_NETCF', 1)
  endif
  
@@ -164,7 +164,7 @@
  have_gnu_gettext_tools = false
  if not get_option('nls').disabled()
    have_gettext = cc.has_function('gettext')
-@@ -1589,10 +1595,10 @@ elif get_option('driver_hyperv').enabled
+@@ -1548,10 +1554,10 @@ elif get_option('driver_hyperv').enabled
    error('openwsman is required for the Hyper-V driver')
  endif
  
@@ -177,7 +177,7 @@
  endif
  
  if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD')
-@@ -2402,6 +2408,7 @@ libs_summary = {
+@@ -2361,6 +2367,7 @@ libs_summary = {
    'libssh2': libssh2_dep.found(),
    'libutil': libutil_dep.found(),
    'netcf': netcf_dep.found(),
@@ -185,10 +185,10 @@
    'NLS': have_gnu_gettext_tools,
    'numactl': numactl_dep.found(),
    'openwsman': openwsman_dep.found(),
-Index: libvirt-6.9.0/src/interface/meson.build
+Index: libvirt-6.10.0/src/interface/meson.build
 ===================================================================
---- libvirt-6.9.0.orig/src/interface/meson.build
-+++ libvirt-6.9.0/src/interface/meson.build
+--- libvirt-6.10.0.orig/src/interface/meson.build
++++ libvirt-6.10.0/src/interface/meson.build
 @@ -2,7 +2,7 @@ interface_driver_sources = [
    'interface_driver.c',
  ]
@@ -206,10 +206,10 @@
        udev_dep,
      ],
      'link_args': [
-Index: libvirt-6.9.0/meson_options.txt
+Index: libvirt-6.10.0/meson_options.txt
 ===================================================================
---- libvirt-6.9.0.orig/meson_options.txt
-+++ libvirt-6.9.0/meson_options.txt
+--- libvirt-6.10.0.orig/meson_options.txt
++++ libvirt-6.10.0/meson_options.txt
 @@ -28,6 +28,7 @@ option('libpcap', type: 'feature', value
  option('libssh', type: 'feature', value: 'auto', description: 'libssh 
support')
  option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 
support')

++++++ libxl-dom-reset.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:00.942637725 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:00.946637729 +0100
@@ -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-6.9.0/src/libxl/libxl_driver.c
+Index: libvirt-6.10.0/src/libxl/libxl_driver.c
 ===================================================================
---- libvirt-6.9.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-6.9.0/src/libxl/libxl_driver.c
+--- libvirt-6.10.0.orig/src/libxl/libxl_driver.c
++++ libvirt-6.10.0/src/libxl/libxl_driver.c
 @@ -1374,6 +1374,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
  }
  
@@ -74,7 +74,7 @@
  libxlDomainDestroyFlags(virDomainPtr dom,
                          unsigned int flags)
  {
-@@ -6674,6 +6729,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6669,6 +6724,7 @@ static virHypervisorDriver libxlHypervis
      .domainShutdown = libxlDomainShutdown, /* 0.9.0 */
      .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */
      .domainReboot = libxlDomainReboot, /* 0.9.0 */

++++++ libxl-set-cach-mode.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:00.954637737 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:00.954637737 +0100
@@ -3,10 +3,10 @@
  src/libxl/libxl_conf.c |   25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
 
-Index: libvirt-6.9.0/src/libxl/libxl_conf.c
+Index: libvirt-6.10.0/src/libxl/libxl_conf.c
 ===================================================================
---- libvirt-6.9.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.9.0/src/libxl/libxl_conf.c
+--- libvirt-6.10.0.orig/src/libxl/libxl_conf.c
++++ libvirt-6.10.0/src/libxl/libxl_conf.c
 @@ -921,6 +921,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
  #endif
  }

++++++ libxl-set-migration-constraints.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:00.966637749 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:00.966637749 +0100
@@ -16,10 +16,10 @@
  tools/virsh.pod                  |    8 ++++++++
  6 files changed, 125 insertions(+), 6 deletions(-)
 
-Index: libvirt-6.9.0/include/libvirt/libvirt-domain.h
+Index: libvirt-6.10.0/include/libvirt/libvirt-domain.h
 ===================================================================
---- libvirt-6.9.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-6.9.0/include/libvirt/libvirt-domain.h
+--- libvirt-6.10.0.orig/include/libvirt/libvirt-domain.h
++++ libvirt-6.10.0/include/libvirt/libvirt-domain.h
 @@ -1078,6 +1078,31 @@ typedef enum {
   */
  # define VIR_MIGRATE_PARAM_TLS_DESTINATION          "tls.destination"
@@ -52,11 +52,11 @@
  /* Domain migration. */
  virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
                                 unsigned long flags, const char *dname,
-Index: libvirt-6.9.0/src/libxl/libxl_driver.c
+Index: libvirt-6.10.0/src/libxl/libxl_driver.c
 ===================================================================
---- libvirt-6.9.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-6.9.0/src/libxl/libxl_driver.c
-@@ -6236,6 +6236,9 @@ libxlDomainMigratePerform3Params(virDoma
+--- libvirt-6.10.0.orig/src/libxl/libxl_driver.c
++++ libvirt-6.10.0/src/libxl/libxl_driver.c
+@@ -6231,6 +6231,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();
-@@ -6252,6 +6255,18 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6247,6 +6250,18 @@ libxlDomainMigratePerform3Params(virDoma
          virTypedParamsGetString(params, nparams,
                                  VIR_MIGRATE_PARAM_DEST_NAME,
                                  &dname) < 0 ||
@@ -85,7 +85,7 @@
          virTypedParamsGetString(params, nparams,
                                  VIR_MIGRATE_PARAM_URI,
                                  &uri) < 0)
-@@ -6266,11 +6281,11 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6261,11 +6276,11 @@ libxlDomainMigratePerform3Params(virDoma
  
      if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
          if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml,
@@ -99,10 +99,10 @@
              goto cleanup;
      }
  
-Index: libvirt-6.9.0/src/libxl/libxl_migration.c
+Index: libvirt-6.10.0/src/libxl/libxl_migration.c
 ===================================================================
---- libvirt-6.9.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-6.9.0/src/libxl/libxl_migration.c
+--- libvirt-6.10.0.orig/src/libxl/libxl_migration.c
++++ libvirt-6.10.0/src/libxl/libxl_migration.c
 @@ -341,18 +341,39 @@ libxlMigrateDstReceive(virNetSocketPtr s
  static int
  libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver,
@@ -264,10 +264,10 @@
      virObjectLock(vm);
  
      if (ret == 0) {
-Index: libvirt-6.9.0/src/libxl/libxl_migration.h
+Index: libvirt-6.10.0/src/libxl/libxl_migration.h
 ===================================================================
---- libvirt-6.9.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-6.9.0/src/libxl/libxl_migration.h
+--- libvirt-6.10.0.orig/src/libxl/libxl_migration.h
++++ libvirt-6.10.0/src/libxl/libxl_migration.h
 @@ -35,6 +35,10 @@
      VIR_MIGRATE_PARAM_URI,              VIR_TYPED_PARAM_STRING, \
      VIR_MIGRATE_PARAM_DEST_NAME,        VIR_TYPED_PARAM_STRING, \
@@ -312,11 +312,11 @@
  
  virDomainPtr
  libxlDomainMigrationDstFinish(virConnectPtr dconn,
-Index: libvirt-6.9.0/tools/virsh-domain.c
+Index: libvirt-6.10.0/tools/virsh-domain.c
 ===================================================================
---- libvirt-6.9.0.orig/tools/virsh-domain.c
-+++ libvirt-6.9.0/tools/virsh-domain.c
-@@ -10713,6 +10713,22 @@ static const vshCmdOptDef opts_migrate[]
+--- libvirt-6.10.0.orig/tools/virsh-domain.c
++++ libvirt-6.10.0/tools/virsh-domain.c
+@@ -10707,6 +10707,22 @@ static const vshCmdOptDef opts_migrate[]
       .type = VSH_OT_STRING,
       .help = N_("override the destination host name used for TLS 
verification")
      },
@@ -339,7 +339,7 @@
      {.name = NULL}
  };
  
-@@ -10733,6 +10749,7 @@ doMigrate(void *opaque)
+@@ -10727,6 +10743,7 @@ doMigrate(void *opaque)
      unsigned long long ullOpt = 0;
      int rv;
      virConnectPtr dconn = data->dconn;
@@ -347,7 +347,7 @@
  #ifndef WIN32
      sigset_t sigmask, oldsigmask;
  
-@@ -10863,6 +10880,27 @@ doMigrate(void *opaque)
+@@ -10857,6 +10874,27 @@ doMigrate(void *opaque)
              goto save_error;
      }
  
@@ -375,11 +375,11 @@
      if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
          goto out;
      if (opt) {
-Index: libvirt-6.9.0/docs/manpages/virsh.rst
+Index: libvirt-6.10.0/docs/manpages/virsh.rst
 ===================================================================
---- libvirt-6.9.0.orig/docs/manpages/virsh.rst
-+++ libvirt-6.9.0/docs/manpages/virsh.rst
-@@ -3117,7 +3117,8 @@ migrate
+--- libvirt-6.10.0.orig/docs/manpages/virsh.rst
++++ libvirt-6.10.0/docs/manpages/virsh.rst
+@@ -3134,7 +3134,8 @@ migrate
        [--postcopy-bandwidth bandwidth]
        [--parallel [--parallel-connections connections]]
        [--bandwidth bandwidth] [--tls-destination hostname]
@@ -389,7 +389,7 @@
  
  Migrate domain to another host.  Add *--live* for live migration; <--p2p>
  for peer-2-peer migration; *--direct* for direct migration; or *--tunnelled*
-@@ -3223,6 +3224,14 @@ parallel connections. The number of such
+@@ -3240,6 +3241,14 @@ parallel connections. The number of such
  network link between the source and the target and thus speeding up the
  migration.
  

++++++ libxl-support-block-script.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:00.978637761 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:00.978637761 +0100
@@ -7,10 +7,10 @@
 
 For more details, see bsc#954872 and FATE#319810
 
-Index: libvirt-6.9.0/src/libxl/libxl_conf.c
+Index: libvirt-6.10.0/src/libxl/libxl_conf.c
 ===================================================================
---- libvirt-6.9.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.9.0/src/libxl/libxl_conf.c
+--- libvirt-6.10.0.orig/src/libxl/libxl_conf.c
++++ libvirt-6.10.0/src/libxl/libxl_conf.c
 @@ -921,6 +921,22 @@ libxlDiskSetDiscard(libxl_device_disk *x
  #endif
  }

++++++ lxc-wait-after-eth-del.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:00.986637769 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:00.990637774 +0100
@@ -13,11 +13,11 @@
  src/lxc/lxc_process.c    | 1 +
  3 files changed, 4 insertions(+)
 
-Index: libvirt-6.9.0/src/lxc/lxc_controller.c
+Index: libvirt-6.10.0/src/lxc/lxc_controller.c
 ===================================================================
---- libvirt-6.9.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-6.9.0/src/lxc/lxc_controller.c
-@@ -2024,6 +2024,7 @@ static int virLXCControllerDeleteInterfa
+--- libvirt-6.10.0.orig/src/lxc/lxc_controller.c
++++ libvirt-6.10.0/src/lxc/lxc_controller.c
+@@ -2015,6 +2015,7 @@ static int virLXCControllerDeleteInterfa
          if (virNetDevVethDelete(ctrl->veths[i]) < 0)
              ret = -1;
      }
@@ -25,10 +25,10 @@
  
      return ret;
  }
-Index: libvirt-6.9.0/src/lxc/lxc_driver.c
+Index: libvirt-6.10.0/src/lxc/lxc_driver.c
 ===================================================================
---- libvirt-6.9.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-6.9.0/src/lxc/lxc_driver.c
+--- libvirt-6.10.0.orig/src/lxc/lxc_driver.c
++++ libvirt-6.10.0/src/lxc/lxc_driver.c
 @@ -66,6 +66,7 @@
  #include "virtime.h"
  #include "virtypedparam.h"
@@ -37,7 +37,7 @@
  #include "virstring.h"
  #include "viraccessapicheck.h"
  #include "viraccessapichecklxc.h"
-@@ -3547,6 +3548,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive
+@@ -3546,6 +3547,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive
          case VIR_DOMAIN_NET_TYPE_NETWORK:
          case VIR_DOMAIN_NET_TYPE_ETHERNET:
              ignore_value(virNetDevVethDelete(veth));
@@ -45,7 +45,7 @@
              break;
  
          case VIR_DOMAIN_NET_TYPE_DIRECT:
-@@ -3986,6 +3988,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
+@@ -3985,6 +3987,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
              virDomainAuditNet(vm, detach, NULL, "detach", false);
              goto cleanup;
          }
@@ -53,10 +53,10 @@
          break;
  
          /* It'd be nice to support this, but with macvlan
-Index: libvirt-6.9.0/src/lxc/lxc_process.c
+Index: libvirt-6.10.0/src/lxc/lxc_process.c
 ===================================================================
---- libvirt-6.9.0.orig/src/lxc/lxc_process.c
-+++ libvirt-6.9.0/src/lxc/lxc_process.c
+--- libvirt-6.10.0.orig/src/lxc/lxc_process.c
++++ libvirt-6.10.0/src/lxc/lxc_process.c
 @@ -50,6 +50,7 @@
  #include "virstring.h"
  #include "virprocess.h"

++++++ network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:00.998637782 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:00.998637782 +0100
@@ -17,11 +17,11 @@
  tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 -
  2 files changed, 8 insertions(+), 2 deletions(-)
 
-Index: libvirt-6.9.0/src/network/bridge_driver.c
+Index: libvirt-6.10.0/src/network/bridge_driver.c
 ===================================================================
---- libvirt-6.9.0.orig/src/network/bridge_driver.c
-+++ libvirt-6.9.0/src/network/bridge_driver.c
-@@ -1445,7 +1445,14 @@ networkDnsmasqConfContents(virNetworkObj
+--- libvirt-6.10.0.orig/src/network/bridge_driver.c
++++ libvirt-6.10.0/src/network/bridge_driver.c
+@@ -1447,7 +1447,14 @@ networkDnsmasqConfContents(virNetworkObj
          if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
              if (ipdef->nranges || ipdef->nhosts) {
                  virBufferAddLit(&configbuf, "dhcp-no-override\n");
@@ -37,10 +37,10 @@
              }
  
              if (ipdef->tftproot) {
-Index: libvirt-6.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-6.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
 ===================================================================
---- libvirt-6.9.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-6.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+--- libvirt-6.10.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
++++ libvirt-6.10.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.X2YvDo/_old  2020-12-05 20:36:01.010637793 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:01.010637793 +0100
@@ -2,10 +2,10 @@
 
 See bnc#894956
 
-Index: libvirt-6.9.0/src/util/virarch.c
+Index: libvirt-6.10.0/src/util/virarch.c
 ===================================================================
---- libvirt-6.9.0.orig/src/util/virarch.c
-+++ libvirt-6.9.0/src/util/virarch.c
+--- libvirt-6.10.0.orig/src/util/virarch.c
++++ libvirt-6.10.0/src/util/virarch.c
 @@ -220,6 +220,8 @@ virArch virArchFromHost(void)
          arch = VIR_ARCH_I686;
      } else if (STREQ(ut.machine, "amd64")) {

++++++ qemu-apparmor-screenshot.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:01.018637801 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:01.022637806 +0100
@@ -1,8 +1,8 @@
-Index: libvirt-6.9.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-6.10.0/src/security/apparmor/libvirt-qemu
 ===================================================================
---- libvirt-6.9.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-6.9.0/src/security/apparmor/libvirt-qemu
-@@ -243,3 +243,6 @@
+--- libvirt-6.10.0.orig/src/security/apparmor/libvirt-qemu
++++ libvirt-6.10.0/src/security/apparmor/libvirt-qemu
+@@ -244,3 +244,6 @@
    # /sys/bus/nd/devices
    / r, # harmless on any lsb compliant system
    /sys/bus/nd/devices/{,**/} r,

++++++ suse-apparmor-libnl-paths.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:01.034637818 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:01.034637818 +0100
@@ -8,10 +8,10 @@
 to squelch a denial when starting confined domains.
 
 Found while investigating bsc#1058847
-Index: libvirt-6.9.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-6.10.0/src/security/apparmor/libvirt-qemu
 ===================================================================
---- libvirt-6.9.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-6.9.0/src/security/apparmor/libvirt-qemu
+--- libvirt-6.10.0.orig/src/security/apparmor/libvirt-qemu
++++ libvirt-6.10.0/src/security/apparmor/libvirt-qemu
 @@ -64,6 +64,7 @@
    #/dev/fb* rw,
  
@@ -20,10 +20,10 @@
    @{HOME}/.pulse-cookie rwk,
    owner /root/.pulse-cookie rwk,
    owner /root/.pulse/ rw,
-Index: libvirt-6.9.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+Index: libvirt-6.10.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
 ===================================================================
---- libvirt-6.9.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-+++ libvirt-6.9.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+--- libvirt-6.10.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
++++ libvirt-6.10.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
 @@ -19,7 +19,7 @@ profile virt-aa-helper @libexecdir@/virt
    # Used when internally running another command (namely apparmor_parser)
    @{PROC}/@{pid}/fd/ r,

++++++ suse-bump-xen-version.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:01.046637830 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:01.046637830 +0100
@@ -9,10 +9,10 @@
 c3999835df makes it hard to upstream this patch.
 
 See bsc#1157490 and bsc#1167007 for more details
-Index: libvirt-6.9.0/src/libxl/libxl_conf.c
+Index: libvirt-6.10.0/src/libxl/libxl_conf.c
 ===================================================================
---- libvirt-6.9.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.9.0/src/libxl/libxl_conf.c
+--- libvirt-6.10.0.orig/src/libxl/libxl_conf.c
++++ libvirt-6.10.0/src/libxl/libxl_conf.c
 @@ -1826,7 +1826,7 @@ libxlDriverConfigNew(void)
  int
  libxlDriverConfigInit(libxlDriverConfigPtr cfg)
@@ -22,11 +22,11 @@
  
      if (virFileMakePath(cfg->logDir) < 0) {
          virReportError(VIR_ERR_INTERNAL_ERROR,
-Index: libvirt-6.9.0/src/libxl/libxl_domain.c
+Index: libvirt-6.10.0/src/libxl/libxl_domain.c
 ===================================================================
---- libvirt-6.9.0.orig/src/libxl/libxl_domain.c
-+++ libvirt-6.9.0/src/libxl/libxl_domain.c
-@@ -1013,8 +1013,8 @@ libxlDomainSetVcpuAffinities(libxlDriver
+--- libvirt-6.10.0.orig/src/libxl/libxl_domain.c
++++ libvirt-6.10.0/src/libxl/libxl_domain.c
+@@ -1012,8 +1012,8 @@ libxlDomainSetVcpuAffinities(libxlDriver
  static int
  libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_config *d_config)
  {
@@ -37,7 +37,7 @@
      int32_t target_mem;
      int tries = 3;
      int wait_secs = 10;
-@@ -1408,7 +1408,7 @@ libxlDomainStart(libxlDriverPrivatePtr d
+@@ -1407,7 +1407,7 @@ libxlDomainStart(libxlDriverPrivatePtr d
          params.stream_version = restore_ver;
  #endif
          ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid,
@@ -46,10 +46,10 @@
                                            &aop_console_how);
          libxl_domain_restore_params_dispose(&params);
      }
-Index: libvirt-6.9.0/tests/libxlmock.c
+Index: libvirt-6.10.0/tests/libxlmock.c
 ===================================================================
---- libvirt-6.9.0.orig/tests/libxlmock.c
-+++ libvirt-6.9.0/tests/libxlmock.c
+--- libvirt-6.10.0.orig/tests/libxlmock.c
++++ libvirt-6.10.0/tests/libxlmock.c
 @@ -67,7 +67,7 @@ VIR_MOCK_IMPL_RET_ARGS(libxl_get_version
  VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory,
                         int, 0,
@@ -59,11 +59,11 @@
  
  VIR_MOCK_STUB_RET_ARGS(xc_interface_close,
                         int, 0,
-Index: libvirt-6.9.0/meson.build
+Index: libvirt-6.10.0/meson.build
 ===================================================================
---- libvirt-6.9.0.orig/meson.build
-+++ libvirt-6.9.0/meson.build
-@@ -1602,7 +1602,7 @@ elif get_option('driver_interface').enab
+--- libvirt-6.10.0.orig/meson.build
++++ libvirt-6.10.0/meson.build
+@@ -1561,7 +1561,7 @@ elif get_option('driver_interface').enab
  endif
  
  if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD')
@@ -72,7 +72,7 @@
    libxl_dep = dependency('xenlight', version: '>=' + libxl_version, required: 
get_option('driver_libxl'))
  
    if libxl_dep.found()
-@@ -1632,7 +1632,7 @@ if not get_option('driver_libxl').disabl
+@@ -1591,7 +1591,7 @@ if not get_option('driver_libxl').disabl
      endif
  
      libxl_dep = declare_dependency(

++++++ suse-libvirt-guests-service.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:01.054637838 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:01.054637838 +0100
@@ -1,9 +1,9 @@
 Adjust libvirt-guests service to conform to SUSE standards
 
-Index: libvirt-6.9.0/tools/libvirt-guests.sh.in
+Index: libvirt-6.10.0/tools/libvirt-guests.sh.in
 ===================================================================
---- libvirt-6.9.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-6.9.0/tools/libvirt-guests.sh.in
+--- libvirt-6.10.0.orig/tools/libvirt-guests.sh.in
++++ libvirt-6.10.0/tools/libvirt-guests.sh.in
 @@ -16,14 +16,13 @@
  # License along with this library.  If not, see
  # <http://www.gnu.org/licenses/>.
@@ -163,10 +163,10 @@
  esac
 -exit $RETVAL
 +rc_exit
-Index: libvirt-6.9.0/tools/libvirt-guests.sysconf
+Index: libvirt-6.10.0/tools/libvirt-guests.sysconf
 ===================================================================
---- libvirt-6.9.0.orig/tools/libvirt-guests.sysconf
-+++ libvirt-6.9.0/tools/libvirt-guests.sysconf
+--- libvirt-6.10.0.orig/tools/libvirt-guests.sysconf
++++ libvirt-6.10.0/tools/libvirt-guests.sysconf
 @@ -1,9 +1,14 @@
 +## Path: System/Virtualization/libvirt-guests
  # Customizations for the libvirt-guests.service systemd unit

++++++ suse-libvirtd-disable-tls.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:01.066637851 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:01.066637851 +0100
@@ -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-6.9.0/src/remote/remote_daemon_config.c
+Index: libvirt-6.10.0/src/remote/remote_daemon_config.c
 ===================================================================
---- libvirt-6.9.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-6.9.0/src/remote/remote_daemon_config.c
+--- libvirt-6.10.0.orig/src/remote/remote_daemon_config.c
++++ libvirt-6.10.0/src/remote/remote_daemon_config.c
 @@ -98,7 +98,7 @@ daemonConfigNew(bool privileged G_GNUC_U
  
  #ifdef WITH_IP
@@ -16,10 +16,10 @@
  # else /* ! LIBVIRTD */
      data->listen_tls = false; /* Always honoured, --listen doesn't exist. */
  # endif /* ! LIBVIRTD */
-Index: libvirt-6.9.0/src/remote/libvirtd.conf.in
+Index: libvirt-6.10.0/src/remote/libvirtd.conf.in
 ===================================================================
---- libvirt-6.9.0.orig/src/remote/libvirtd.conf.in
-+++ libvirt-6.9.0/src/remote/libvirtd.conf.in
+--- libvirt-6.10.0.orig/src/remote/libvirtd.conf.in
++++ libvirt-6.10.0/src/remote/libvirtd.conf.in
 @@ -17,8 +17,8 @@
  # It is necessary to setup a CA and issue server certificates before
  # using this capability.
@@ -31,10 +31,10 @@
  
  # Listen for unencrypted TCP connections on the public TCP/IP port.
  # NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to
-Index: libvirt-6.9.0/src/remote/test_libvirtd.aug.in
+Index: libvirt-6.10.0/src/remote/test_libvirtd.aug.in
 ===================================================================
---- libvirt-6.9.0.orig/src/remote/test_libvirtd.aug.in
-+++ libvirt-6.9.0/src/remote/test_libvirtd.aug.in
+--- libvirt-6.10.0.orig/src/remote/test_libvirtd.aug.in
++++ libvirt-6.10.0/src/remote/test_libvirtd.aug.in
 @@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ =
  
     test @DAEMON_NAME_UC@.lns get conf =

++++++ suse-libvirtd-sysconfig-settings.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:01.078637863 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:01.078637863 +0100
@@ -1,9 +1,9 @@
 Adjust libvirtd sysconfig file to conform to SUSE standards
 
-Index: libvirt-6.9.0/src/remote/libvirtd.sysconf
+Index: libvirt-6.10.0/src/remote/libvirtd.sysconf
 ===================================================================
---- libvirt-6.9.0.orig/src/remote/libvirtd.sysconf
-+++ libvirt-6.9.0/src/remote/libvirtd.sysconf
+--- libvirt-6.10.0.orig/src/remote/libvirtd.sysconf
++++ libvirt-6.10.0/src/remote/libvirtd.sysconf
 @@ -1,5 +1,9 @@
 +## Path: System/Virtualization/libvirt
  # Customizations for the libvirtd.service systemd unit

++++++ suse-libxl-disable-autoballoon.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:01.090637875 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:01.094637879 +0100
@@ -6,10 +6,10 @@
 by default. It can only be enabled with the 'autoballoon' setting in
 libxl.conf. See jsc#SLE-3059 for more details.
 
-Index: libvirt-6.9.0/src/libxl/libxl.conf
+Index: libvirt-6.10.0/src/libxl/libxl.conf
 ===================================================================
---- libvirt-6.9.0.orig/src/libxl/libxl.conf
-+++ libvirt-6.9.0/src/libxl/libxl.conf
+--- libvirt-6.10.0.orig/src/libxl/libxl.conf
++++ libvirt-6.10.0/src/libxl/libxl.conf
 @@ -4,12 +4,11 @@
  
  # Enable autoballooning of domain0
@@ -27,10 +27,10 @@
  
  
  # In order to prevent accidentally starting two domains that
-Index: libvirt-6.9.0/src/libxl/libxl_conf.c
+Index: libvirt-6.10.0/src/libxl/libxl_conf.c
 ===================================================================
---- libvirt-6.9.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.9.0/src/libxl/libxl_conf.c
+--- libvirt-6.10.0.orig/src/libxl/libxl_conf.c
++++ libvirt-6.10.0/src/libxl/libxl_conf.c
 @@ -1743,15 +1743,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
  /*
   * Get domain0 autoballoon configuration.  Honor user-specified
@@ -66,10 +66,10 @@
      return 0;
  }
  
-Index: libvirt-6.9.0/src/libxl/test_libvirtd_libxl.aug.in
+Index: libvirt-6.10.0/src/libxl/test_libvirtd_libxl.aug.in
 ===================================================================
---- libvirt-6.9.0.orig/src/libxl/test_libvirtd_libxl.aug.in
-+++ libvirt-6.9.0/src/libxl/test_libvirtd_libxl.aug.in
+--- libvirt-6.10.0.orig/src/libxl/test_libvirtd_libxl.aug.in
++++ libvirt-6.10.0/src/libxl/test_libvirtd_libxl.aug.in
 @@ -2,7 +2,7 @@ module Test_libvirtd_libxl =
    @CONFIG@
  

++++++ suse-ovmf-paths.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:01.102637887 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:01.106637891 +0100
@@ -1,10 +1,10 @@
 Adjust paths of OVMF firmwares on SUSE distros
 
-Index: libvirt-6.9.0/src/qemu/qemu.conf
+Index: libvirt-6.10.0/src/qemu/qemu.conf
 ===================================================================
---- libvirt-6.9.0.orig/src/qemu/qemu.conf
-+++ libvirt-6.9.0/src/qemu/qemu.conf
-@@ -840,10 +840,9 @@
+--- libvirt-6.10.0.orig/src/qemu/qemu.conf
++++ libvirt-6.10.0/src/qemu/qemu.conf
+@@ -858,10 +858,9 @@
  # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
  # follows this scheme.
  #nvram = [
@@ -18,11 +18,11 @@
  #]
  
  # The backend to use for handling stdout/stderr output from
-Index: libvirt-6.9.0/src/qemu/qemu_conf.c
+Index: libvirt-6.10.0/src/qemu/qemu_conf.c
 ===================================================================
---- libvirt-6.9.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-6.9.0/src/qemu/qemu_conf.c
-@@ -97,10 +97,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver
+--- libvirt-6.10.0.orig/src/qemu/qemu_conf.c
++++ libvirt-6.10.0/src/qemu/qemu_conf.c
+@@ -98,10 +98,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver
  
  #ifndef DEFAULT_LOADER_NVRAM
  # define DEFAULT_LOADER_NVRAM \
@@ -36,10 +36,10 @@
  #endif
  
  
-Index: libvirt-6.9.0/src/security/virt-aa-helper.c
+Index: libvirt-6.10.0/src/security/virt-aa-helper.c
 ===================================================================
---- libvirt-6.9.0.orig/src/security/virt-aa-helper.c
-+++ libvirt-6.9.0/src/security/virt-aa-helper.c
+--- libvirt-6.10.0.orig/src/security/virt-aa-helper.c
++++ libvirt-6.10.0/src/security/virt-aa-helper.c
 @@ -479,7 +479,8 @@ valid_path(const char *path, const bool
          "/usr/share/ovmf/",              /* for OVMF images */
          "/usr/share/AAVMF/",             /* for AAVMF images */
@@ -50,11 +50,11 @@
      };
      /* override the above with these */
      const char * const override[] = {
-Index: libvirt-6.9.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-6.10.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
---- libvirt-6.9.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-6.9.0/src/qemu/test_libvirtd_qemu.aug.in
-@@ -95,10 +95,9 @@ module Test_libvirtd_qemu =
+--- libvirt-6.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in
++++ libvirt-6.10.0/src/qemu/test_libvirtd_qemu.aug.in
+@@ -96,10 +96,9 @@ module Test_libvirtd_qemu =
  { "migration_port_max" = "49215" }
  { "log_timestamp" = "0" }
  { "nvram"

++++++ suse-qemu-conf.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:01.114637900 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:01.114637900 +0100
@@ -7,11 +7,11 @@
 etc.), but for now they are all lumped together in this
 single patch.
 
-Index: libvirt-6.9.0/src/qemu/qemu.conf
+Index: libvirt-6.10.0/src/qemu/qemu.conf
 ===================================================================
---- libvirt-6.9.0.orig/src/qemu/qemu.conf
-+++ libvirt-6.9.0/src/qemu/qemu.conf
-@@ -473,10 +473,19 @@
+--- libvirt-6.10.0.orig/src/qemu/qemu.conf
++++ libvirt-6.10.0/src/qemu/qemu.conf
+@@ -491,10 +491,19 @@
  # isolation, but it cannot appear in a list of drivers.
  #
  #security_driver = "selinux"
@@ -32,7 +32,7 @@
  #security_default_confined = 1
  
  # If set to non-zero, then attempts to create unconfined
-@@ -711,11 +720,22 @@
+@@ -729,11 +738,22 @@
  #relaxed_acs_check = 1
  
  
@@ -60,11 +60,11 @@
  #
  #lock_manager = "lockd"
  
-Index: libvirt-6.9.0/src/qemu/qemu_conf.c
+Index: libvirt-6.10.0/src/qemu/qemu_conf.c
 ===================================================================
---- libvirt-6.9.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-6.9.0/src/qemu/qemu_conf.c
-@@ -267,7 +267,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
+--- libvirt-6.10.0.orig/src/qemu/qemu_conf.c
++++ libvirt-6.10.0/src/qemu/qemu_conf.c
+@@ -272,7 +272,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
      cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER);
      cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON);
  
@@ -73,11 +73,11 @@
      cfg->securityRequireConfined = false;
  
      cfg->keepAliveInterval = 5;
-Index: libvirt-6.9.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-6.10.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
---- libvirt-6.9.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-6.9.0/src/qemu/test_libvirtd_qemu.aug.in
-@@ -44,6 +44,7 @@ module Test_libvirtd_qemu =
+--- libvirt-6.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in
++++ libvirt-6.10.0/src/qemu/test_libvirtd_qemu.aug.in
+@@ -45,6 +45,7 @@ module Test_libvirtd_qemu =
  { "remote_websocket_port_min" = "5700" }
  { "remote_websocket_port_max" = "65535" }
  { "security_driver" = "selinux" }

++++++ suse-virtlockd-sysconfig-settings.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:01.138637924 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:01.142637927 +0100
@@ -1,9 +1,9 @@
 Adjust virtlockd sysconfig file to conform to SUSE standards
 
-Index: libvirt-6.9.0/src/locking/virtlockd.sysconf
+Index: libvirt-6.10.0/src/locking/virtlockd.sysconf
 ===================================================================
---- libvirt-6.9.0.orig/src/locking/virtlockd.sysconf
-+++ libvirt-6.9.0/src/locking/virtlockd.sysconf
+--- libvirt-6.10.0.orig/src/locking/virtlockd.sysconf
++++ libvirt-6.10.0/src/locking/virtlockd.sysconf
 @@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlockd
 +

++++++ suse-virtlogd-sysconfig-settings.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:01.150637935 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:01.154637940 +0100
@@ -1,9 +1,9 @@
 Adjust virtlogd sysconfig file to conform to SUSE standards
 
-Index: libvirt-6.9.0/src/logging/virtlogd.sysconf
+Index: libvirt-6.10.0/src/logging/virtlogd.sysconf
 ===================================================================
---- libvirt-6.9.0.orig/src/logging/virtlogd.sysconf
-+++ libvirt-6.9.0/src/logging/virtlogd.sysconf
+--- libvirt-6.10.0.orig/src/logging/virtlogd.sysconf
++++ libvirt-6.10.0/src/logging/virtlogd.sysconf
 @@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlogd
 +

++++++ suse-xen-ovmf-loaders.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:01.162637948 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:01.166637952 +0100
@@ -5,10 +5,10 @@
 upstream efforts to improve firmware handling in the qemu driver broke
 the firmware handling in the xen driver.
 
-Index: libvirt-6.9.0/src/libxl/libxl_conf.c
+Index: libvirt-6.10.0/src/libxl/libxl_conf.c
 ===================================================================
---- libvirt-6.9.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.9.0/src/libxl/libxl_conf.c
+--- libvirt-6.10.0.orig/src/libxl/libxl_conf.c
++++ libvirt-6.10.0/src/libxl/libxl_conf.c
 @@ -1783,6 +1783,15 @@ libxlDriverConfigNew(void)
      cfg->autoDumpDir = g_strdup(LIBXL_DUMP_DIR);
      cfg->channelDir = g_strdup(LIBXL_CHANNEL_DIR);

++++++ virt-create-rootfs.patch ++++++
--- /var/tmp/diff_new_pack.X2YvDo/_old  2020-12-05 20:36:01.178637964 +0100
+++ /var/tmp/diff_new_pack.X2YvDo/_new  2020-12-05 20:36:01.178637964 +0100
@@ -1,7 +1,7 @@
-Index: libvirt-6.9.0/tools/virt-create-rootfs
+Index: libvirt-6.10.0/tools/virt-create-rootfs
 ===================================================================
 --- /dev/null
-+++ libvirt-6.9.0/tools/virt-create-rootfs
++++ libvirt-6.10.0/tools/virt-create-rootfs
 @@ -0,0 +1,231 @@
 +#!/bin/sh
 +set -e
@@ -234,10 +234,10 @@
 +    echo "pts/0" >> "$ROOT/etc/securetty"
 +    chroot "$ROOT" /usr/bin/passwd
 +fi
-Index: libvirt-6.9.0/docs/manpages/virt-create-rootfs.rst
+Index: libvirt-6.10.0/docs/manpages/virt-create-rootfs.rst
 ===================================================================
 --- /dev/null
-+++ libvirt-6.9.0/docs/manpages/virt-create-rootfs.rst
++++ libvirt-6.10.0/docs/manpages/virt-create-rootfs.rst
 @@ -0,0 +1,88 @@
 +==================
 +virt-create-rootfs
@@ -327,10 +327,10 @@
 +========
 +
 +virsh(1), `https://libvirt.org/ <https://libvirt.org/>`_
-Index: libvirt-6.9.0/docs/manpages/meson.build
+Index: libvirt-6.10.0/docs/manpages/meson.build
 ===================================================================
---- libvirt-6.9.0.orig/docs/manpages/meson.build
-+++ libvirt-6.9.0/docs/manpages/meson.build
+--- libvirt-6.10.0.orig/docs/manpages/meson.build
++++ libvirt-6.10.0/docs/manpages/meson.build
 @@ -19,6 +19,7 @@ docs_man_files = [
    { 'name': 'virt-pki-validate', 'section': '1', 'install': true },
    { 'name': 'virt-qemu-run', 'section': '1', 'install': conf.has('WITH_QEMU') 
},
@@ -339,10 +339,10 @@
  
    { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') 
},
    { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': 
conf.has('WITH_SANLOCK') },
-Index: libvirt-6.9.0/tools/meson.build
+Index: libvirt-6.10.0/tools/meson.build
 ===================================================================
---- libvirt-6.9.0.orig/tools/meson.build
-+++ libvirt-6.9.0/tools/meson.build
+--- libvirt-6.10.0.orig/tools/meson.build
++++ libvirt-6.10.0/tools/meson.build
 @@ -149,6 +149,8 @@ else
    virsh_icon_res = []
  endif
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives: 
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org

Reply via email to