Accepting request 922671 from home:jfehlig:branches:Virtualization

- Update to libvirt 7.8.0
  - jsc#SLE-18260
  - Many incremental improvements and bug fixes, see
    https://libvirt.org/news.html
  - Dropped patches:
    b75a16ae-libxl-improve-die-id.patch,
    65fab900-libxl-fix-driver-reload.patch,
    51eb680b-libxl-dont-autostart-on-reload.patch

- spec: Fix hangs during package update
  bsc#1177902, bsc#1190693
- spec: Don't add --timeout arg to /etc/sysconfig/libvirtd when
  running in traditional mode without socket activation
  bsc#1190695

OBS-URL: https://build.opensuse.org/request/show/922671
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=905

0001-Extract-stats-functions-from-the-qemu-driver.patch

@@ -18,10 +18,10 @@ them.
  create mode 100644 src/conf/domain_stats.c
  create mode 100644 src/conf/domain_stats.h
 
-Index: libvirt-7.7.0/src/conf/domain_stats.c
+Index: libvirt-7.8.0/src/conf/domain_stats.c
 ===================================================================
 --- /dev/null
-+++ libvirt-7.7.0/src/conf/domain_stats.c
++++ libvirt-7.8.0/src/conf/domain_stats.c
 @@ -0,0 +1,117 @@
 +/*
 + * domain_stats.c: domain stats extraction helpers
@@ -140,10 +140,10 @@ Index: libvirt-7.7.0/src/conf/domain_stats.c
 +}
 +
 +#undef STATS_ADD_NET_PARAM
-Index: libvirt-7.7.0/src/conf/domain_stats.h
+Index: libvirt-7.8.0/src/conf/domain_stats.h
 ===================================================================
 --- /dev/null
-+++ libvirt-7.7.0/src/conf/domain_stats.h
++++ libvirt-7.8.0/src/conf/domain_stats.h
 @@ -0,0 +1,60 @@
 +/*
 + * domain_stats.h: domain stats extraction helpers
@@ -205,11 +205,11 @@ Index: libvirt-7.7.0/src/conf/domain_stats.h
 +                           virTypedParamList *params);
 +
 +#endif /* __DOMAIN_STATS_H */
-Index: libvirt-7.7.0/src/libvirt_private.syms
+Index: libvirt-7.8.0/src/libvirt_private.syms
 ===================================================================
---- libvirt-7.7.0.orig/src/libvirt_private.syms
+--- libvirt-7.8.0.orig/src/libvirt_private.syms
-+++ libvirt-7.7.0/src/libvirt_private.syms
++++ libvirt-7.8.0/src/libvirt_private.syms
-@@ -763,12 +763,16 @@ virDomainConfNWFilterTeardown;
+@@ -763,6 +763,11 @@ virDomainConfNWFilterTeardown;
  virDomainConfVMNWFilterTeardown;
  
  
@@ -221,13 +221,7 @@ Index: libvirt-7.7.0/src/libvirt_private.syms
  # conf/domain_validate.h
  virDomainActualNetDefValidate;
  virDomainDefValidate;
- virDomainDeviceValidateAliasForHotplug;
+@@ -1939,6 +1944,7 @@ virCgroupGetMemoryUsage;
- 
--
- # conf/interface_conf.h
- virInterfaceDefFormat;
- virInterfaceDefFree;
-@@ -1933,6 +1937,7 @@ virCgroupGetMemoryUsage;
  virCgroupGetMemSwapHardLimit;
  virCgroupGetMemSwapUsage;
  virCgroupGetPercpuStats;
@@ -235,10 +229,10 @@ Index: libvirt-7.7.0/src/libvirt_private.syms
  virCgroupHasController;
  virCgroupHasEmptyTasks;
  virCgroupKillPainfully;
-Index: libvirt-7.7.0/src/qemu/qemu_driver.c
+Index: libvirt-7.8.0/src/qemu/qemu_driver.c
 ===================================================================
---- libvirt-7.7.0.orig/src/qemu/qemu_driver.c
+--- libvirt-7.8.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-7.7.0/src/qemu/qemu_driver.c
++++ libvirt-7.8.0/src/qemu/qemu_driver.c
 @@ -68,6 +68,7 @@
  #include "virarptable.h"
  #include "viruuid.h"
@@ -247,7 +241,7 @@ Index: libvirt-7.7.0/src/qemu/qemu_driver.c
  #include "domain_audit.h"
  #include "domain_cgroup.h"
  #include "domain_driver.h"
-@@ -17448,13 +17449,7 @@ qemuDomainGetStatsState(virQEMUDriver *d
+@@ -17323,13 +17324,7 @@ qemuDomainGetStatsState(virQEMUDriver *d
                          virTypedParamList *params,
                          unsigned int privflags G_GNUC_UNUSED)
  {
@@ -262,7 +256,7 @@ Index: libvirt-7.7.0/src/qemu/qemu_driver.c
  }
  
  
-@@ -17746,25 +17741,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
+@@ -17621,25 +17616,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
                              virTypedParamList *params)
  {
      qemuDomainObjPrivate *priv = dom->privateData;
@@ -289,7 +283,7 @@ Index: libvirt-7.7.0/src/qemu/qemu_driver.c
  }
  
  static int
-@@ -17957,76 +17938,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr
+@@ -17832,76 +17813,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr
      return ret;
  }
  
@@ -367,10 +361,10 @@ Index: libvirt-7.7.0/src/qemu/qemu_driver.c
  
  /* refresh information by opening images on the disk */
  static int
-Index: libvirt-7.7.0/src/util/vircgroup.c
+Index: libvirt-7.8.0/src/util/vircgroup.c
 ===================================================================
---- libvirt-7.7.0.orig/src/util/vircgroup.c
+--- libvirt-7.8.0.orig/src/util/vircgroup.c
-+++ libvirt-7.7.0/src/util/vircgroup.c
++++ libvirt-7.8.0/src/util/vircgroup.c
 @@ -3036,6 +3036,31 @@ virCgroupGetInode(virCgroup *cgroup)
      return st.st_ino;
  }
@@ -418,10 +412,10 @@ Index: libvirt-7.7.0/src/util/vircgroup.c
  int
  virCgroupNewPartition(const char *path G_GNUC_UNUSED,
                        bool create G_GNUC_UNUSED,
-Index: libvirt-7.7.0/src/util/vircgroup.h
+Index: libvirt-7.8.0/src/util/vircgroup.h
 ===================================================================
---- libvirt-7.7.0.orig/src/util/vircgroup.h
+--- libvirt-7.8.0.orig/src/util/vircgroup.h
-+++ libvirt-7.7.0/src/util/vircgroup.h
++++ libvirt-7.8.0/src/util/vircgroup.h
 @@ -23,6 +23,7 @@
  
  #include "virbitmap.h"
@@ -438,10 +432,10 @@ Index: libvirt-7.7.0/src/util/vircgroup.h
 +                         virTypedParamList *params);
 +
  int virCgroupGetInode(virCgroup *cgroup);
-Index: libvirt-7.7.0/src/conf/meson.build
+Index: libvirt-7.8.0/src/conf/meson.build
 ===================================================================
---- libvirt-7.7.0.orig/src/conf/meson.build
+--- libvirt-7.8.0.orig/src/conf/meson.build
-+++ libvirt-7.7.0/src/conf/meson.build
++++ libvirt-7.8.0/src/conf/meson.build
 @@ -15,6 +15,7 @@ domain_conf_sources = [
    'domain_conf.c',
    'domain_nwfilter.c',

0001-libxl-add-support-for-BlockResize-API.patch

@@ -19,10 +19,10 @@ reworking this patch and submitting it to upstream libvirt.
  src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 91 insertions(+)
 
-Index: libvirt-7.7.0/src/libxl/libxl_driver.c
+Index: libvirt-7.8.0/src/libxl/libxl_driver.c
 ===================================================================
---- libvirt-7.7.0.orig/src/libxl/libxl_driver.c
+--- libvirt-7.8.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-7.7.0/src/libxl/libxl_driver.c
++++ libvirt-7.8.0/src/libxl/libxl_driver.c
 @@ -5265,6 +5265,95 @@ libxlDomainMemoryStats(virDomainPtr dom,
  
  #undef LIBXL_SET_MEMSTAT
@@ -127,10 +127,10 @@ Index: libvirt-7.7.0/src/libxl/libxl_driver.c
      .domainGetJobInfo = libxlDomainGetJobInfo, /* 1.3.1 */
      .domainGetJobStats = libxlDomainGetJobStats, /* 1.3.1 */
      .domainMemoryStats = libxlDomainMemoryStats, /* 1.3.0 */
-Index: libvirt-7.7.0/src/libxl/libxl_api_wrapper.h
+Index: libvirt-7.8.0/src/libxl/libxl_api_wrapper.h
 ===================================================================
---- libvirt-7.7.0.orig/src/libxl/libxl_api_wrapper.h
+--- libvirt-7.8.0.orig/src/libxl/libxl_api_wrapper.h
-+++ libvirt-7.7.0/src/libxl/libxl_api_wrapper.h
++++ libvirt-7.8.0/src/libxl/libxl_api_wrapper.h
 @@ -215,3 +215,18 @@ libxlSetMemoryTargetWrapper(libxl_ctx *c
  
      return ret;

0002-lxc-implement-connectGetAllDomainStats.patch

@@ -9,10 +9,10 @@ them using the existing API.
  src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 138 insertions(+)
 
-Index: libvirt-7.7.0/src/lxc/lxc_driver.c
+Index: libvirt-7.8.0/src/lxc/lxc_driver.c
 ===================================================================
---- libvirt-7.7.0.orig/src/lxc/lxc_driver.c
+--- libvirt-7.8.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-7.7.0/src/lxc/lxc_driver.c
++++ libvirt-7.8.0/src/lxc/lxc_driver.c
 @@ -74,6 +74,8 @@
  #include "netdev_bandwidth_conf.h"
  #include "virsocket.h"

51eb680b-libxl-dont-autostart-on-reload.patch

@@ -1,28 +0,0 @@
-commit 51eb680b2647a8c0520ec5da3bb32d711d59f81b
-Author: Jim Fehlig <jfehlig@suse.com>
-Date:   Tue Sep 14 11:11:11 2021 -0600
-
-    libxl: Don't autostart domains on driver reload
-    
-    When libxlAutostartDomain was introduced with commit fb92307f0d, one hunk
-    mistakenly added a call site in libxlStateReload. Domains should not be
-    autostarted when reloading the driver, so remove the offending hunk.
-    
-    Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-    Reviewed-by: Ján Tomko <jtomko@redhat.com>
-
-Index: libvirt-7.7.0/src/libxl/libxl_driver.c
-===================================================================
---- libvirt-7.7.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-7.7.0/src/libxl/libxl_driver.c
-@@ -825,10 +825,6 @@ libxlStateReload(void)
-                                    libxl_driver->xmlopt,
-                                    NULL, libxl_driver);
- 
--    virDomainObjListForEach(libxl_driver->domains, false,
--                            libxlAutostartDomain,
--                            libxl_driver);
--
-     virObjectUnref(cfg);
-     return 0;
- }

65fab900-libxl-fix-driver-reload.patch

@@ -1,32 +0,0 @@
-commit 65fab900c5206700f728de5dec72886832b5328f
-Author: Jim Fehlig <jfehlig@suse.com>
-Date:   Mon Sep 13 16:04:41 2021 -0600
-
-    libxl: Fix driver reload
-    
-    On reload, the libxl driver calls virDomainObjListLoadAllConfigs to load
-    all configs from /etc/libvirt/libxl/ but incorrectly passes 'true' for
-    the liveStatus parameter, resulting in error messages such as
-    
-    libvirtd[21053]: XML error: unexpected root element <domain>, expecting <domstatus>
-    libvirtd[21053]: Failed to load config for domain 'sles15sp3'
-    
-    Fix by not requesting live status when re-reading the persistent VM config
-    files.
-    
-    Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-    Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-
-Index: libvirt-7.7.0/src/libxl/libxl_driver.c
-===================================================================
---- libvirt-7.7.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-7.7.0/src/libxl/libxl_driver.c
-@@ -821,7 +821,7 @@ libxlStateReload(void)
-     virDomainObjListLoadAllConfigs(libxl_driver->domains,
-                                    cfg->configDir,
-                                    cfg->autostartDir,
--                                   true,
-+                                   false,
-                                    libxl_driver->xmlopt,
-                                    NULL, libxl_driver);
- 

b75a16ae-libxl-improve-die-id.patch

@@ -1,35 +0,0 @@
-commit b75a16ae5e8d9bc9d1b917e20a6d85db3cbc7b82
-Author: Jim Fehlig <jfehlig@suse.com>
-Date:   Fri Sep 10 14:34:09 2021 -0600
-
-    libxl: Improve reporting of die_id in capabilities
-    
-    On Xen, libvirt runs in a VM (typically dom0) and does not have an accurate
-    picture of numa and cpu topology of the underlying physical machine using
-    the "usual" mechanisms. numa info and cpu toplogy are retrieved from libxl
-    and used to populate the libvirt conterparts. Commit 7b79ee2f78b introduced
-    support for reporting die_id in capabilities, but did not account for
-    special handling of numa and cpu topology in libxl.
-    
-    Currently, Xen does not report die_id in the libxl_cputopology structure.
-    In the meantime, set die_id to 0, which was suggested by the Xen developers
-    and is slightly better than random garbage such as
-    
-    <cpu id='1' socket_id='0' die_id='-1073069552' core_id='0' siblings='0-1'/>
-    
-    Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-    Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-
-Index: libvirt-7.7.0/src/libxl/libxl_capabilities.c
-===================================================================
---- libvirt-7.7.0.orig/src/libxl/libxl_capabilities.c
-+++ libvirt-7.7.0/src/libxl/libxl_capabilities.c
-@@ -292,6 +292,8 @@ libxlCapsInitNuma(libxl_ctx *ctx, virCap
-         cpus[node][nr_cpus_node[node]-1].id = i;
-         cpus[node][nr_cpus_node[node]-1].socket_id = cpu_topo[i].socket;
-         cpus[node][nr_cpus_node[node]-1].core_id = cpu_topo[i].core;
-+        /* Until Xen reports die_id, 0 is better than random garbage */
-+        cpus[node][nr_cpus_node[node]-1].die_id = 0;
-         /* Allocate the siblings maps. We will be filling them later */
-         cpus[node][nr_cpus_node[node]-1].siblings = virBitmapNew(nr_cpus);
-     }

libvirt-7.7.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b616099c18d14b9424a622f2a0bd3e0cfa286414f3416bd1a8173621b2252b2
-size 8670212

libvirt-7.7.0.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmEvaDQACgkQymi+gBAI
-TJwpKA//aaK59E+5/3s4vWpbhc5bPJdfR3lJh5Zyr0pJwrjCo+e8e5vYhGWxnaNw
-7mSIy5yB1qktD3z1x+g/lG7ig28a3479HdjMXLXYaFSO/vrJqA2yBRuC34XFvoww
-3rKKQkD4xneFF9VWDsWLFjlnhWLAfQbQszbcCDM/EIELWT9okE2Wz8jY7xMJV8NT
-nSz2uLB7djcGuUn+IF6snEtL7Crr+YTeR6SoAvGpLCldu2dSWcUwGYBXJy6Up86k
-z4ITVFx+MV2tO5Mp0NHoinNwa2f8KQJ9PqkepcIeCvhDMiT87cQyjcH1sT9nW2cB
-am3svLGim6rFrEisKwyptcYy6XLr5XTu2veQhTgXfz+iSzCXJ6KuttLS8WK1LGkF
-iqCphPNji32/APmw9WPDnE49Zk38GgCsBVmx/M2dA5DgDwHxdts4YkiteOvbxmKN
-bdc9Vwkc7aGGzXhCBHBbDcbWm715ks6k8uELZB9h0hE9OFodNCWc8b3bn9EnPGUp
-ng3nrqotIzaQl381RCmzblChvoufj0aIvIQnUhNMptZvtoGhCe6kNKBERVP8JICZ
-OeAZmVTRxIGf9262ooxZVSjVzGVlX6p51wLYwPi2RFOQEG8/Ic89ECa4vTZttyEd
-vasxYrb5H9fHlvCkW3eBYOaRBlknlI3AtB2s4LqevH9kpN6S4U0=
-=OGVq
------END PGP SIGNATURE-----

libvirt-7.8.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a727cd0a47bfa24fa7de2874d23f3a9f9f02ceb6b49ba15288f6d9a098b19921
+size 8735184

libvirt-7.8.0.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmFWyW0ACgkQymi+gBAI
+TJxSiA/+Lt9iZo/y8WIlIToXz9al62I+cInoQpUUFx8xIntn1Ubs5Gu8bltL7R24
+1jwrHZDj33obR2IH2CzRbIXyu9ehW8/fP0mO5fusJozZOW3n8oJh4p1yIoq8AVkC
+WVIS0JZci7GTKjBqpA2vkea2mDmIRzK1oi0p2JoMdpIrhPuSfWwcj4SKPurQ7gEa
+sjc3wsG6dj+m6p2v5T5Kzf5eD4/XUbIRovfFUohAODkBczNyyUyxVEG4vS6Ug3U7
+5mNNNjHeX6lB0nvY5KiWDKR2clvgA6OXIWhnZAZk6jF4Szhgh5cBCFSZ35r1FEWN
+Dg6o/UT9I0q2fU13Cnx1KHpAOHbiJt0ZdmM8GwJrBB/kbtunikDwdR4nYZ3TN3QU
+jcHtDkKJspXSwY7Szi+bOry8LzyH8NUcQeYF4Yrr+ywhMp/gkK9OGj1EkKbBWWIB
+LlQIqmmwigJcqd3DzopKGbO/87CQvQwAWjxCG2v5IXtTk2s9MtMshEQfsuqM0FOr
+HEBQUzUcMpSAHxycnia4mznXE4xUyGOXIbbHOG33Oelk0bVBIrC0unmwKMZiIkwX
+DbOGy86cTQb7pIDlOo+Z2RNK9IJkNXEoDg0Qq9UgrZL/3MDjTw0j4sxGzSjeqpC9
+6JcjtIXCwVnQbsBpVBK5DRO0widgkU6yCfIOI7u4ZM62fndgWY4=
+=g05u
+-----END PGP SIGNATURE-----

libvirt-power8-models.patch

@@ -2,10 +2,10 @@ Add POWER8 v2.0 and v2.1 to cpu map XML
 
 From: <ro@suse.de>
 
-Index: libvirt-7.7.0/src/cpu_map/ppc64_POWER8.xml
+Index: libvirt-7.8.0/src/cpu_map/ppc64_POWER8.xml
 ===================================================================
---- libvirt-7.7.0.orig/src/cpu_map/ppc64_POWER8.xml
+--- libvirt-7.8.0.orig/src/cpu_map/ppc64_POWER8.xml
-+++ libvirt-7.7.0/src/cpu_map/ppc64_POWER8.xml
++++ libvirt-7.8.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

@@ -1,8 +1,8 @@
-Index: libvirt-7.7.0/tools/virsh.c
+Index: libvirt-7.8.0/tools/virsh.c
 ===================================================================
---- libvirt-7.7.0.orig/tools/virsh.c
+--- libvirt-7.8.0.orig/tools/virsh.c
-+++ libvirt-7.7.0/tools/virsh.c
++++ libvirt-7.8.0/tools/virsh.c
-@@ -544,6 +544,8 @@ virshShowVersion(vshControl *ctl G_GNUC_
+@@ -546,6 +546,8 @@ virshShowVersion(vshControl *ctl G_GNUC_
      vshPrint(ctl, " Interface");
  # if defined(WITH_NETCF)
      vshPrint(ctl, " netcf");
@@ -11,10 +11,10 @@ Index: libvirt-7.7.0/tools/virsh.c
  # elif defined(WITH_UDEV)
      vshPrint(ctl, " udev");
  # endif
-Index: libvirt-7.7.0/src/interface/interface_backend_netcf.c
+Index: libvirt-7.8.0/src/interface/interface_backend_netcf.c
 ===================================================================
---- libvirt-7.7.0.orig/src/interface/interface_backend_netcf.c
+--- libvirt-7.8.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-7.7.0/src/interface/interface_backend_netcf.c
++++ libvirt-7.8.0/src/interface/interface_backend_netcf.c
 @@ -21,7 +21,12 @@
  
  #include <config.h>
@@ -126,10 +126,10 @@ Index: libvirt-7.7.0/src/interface/interface_backend_netcf.c
      if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
          return -1;
      if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-7.7.0/src/interface/interface_driver.c
+Index: libvirt-7.8.0/src/interface/interface_driver.c
 ===================================================================
---- libvirt-7.7.0.orig/src/interface/interface_driver.c
+--- libvirt-7.8.0.orig/src/interface/interface_driver.c
-+++ libvirt-7.7.0/src/interface/interface_driver.c
++++ libvirt-7.8.0/src/interface/interface_driver.c
 @@ -30,8 +30,15 @@ interfaceRegister(void)
      if (netcfIfaceRegister() == 0)
          return 0;
@@ -147,11 +147,11 @@ Index: libvirt-7.7.0/src/interface/interface_driver.c
      if (udevIfaceRegister() == 0)
          return 0;
  #endif /* WITH_UDEV */
-Index: libvirt-7.7.0/meson.build
+Index: libvirt-7.8.0/meson.build
 ===================================================================
---- libvirt-7.7.0.orig/meson.build
+--- libvirt-7.8.0.orig/meson.build
-+++ libvirt-7.7.0/meson.build
++++ libvirt-7.8.0/meson.build
-@@ -1088,6 +1088,12 @@ else
+@@ -1086,6 +1086,12 @@ else
    netcf_dep = dependency('', required: false)
  endif
  
@@ -164,7 +164,7 @@ Index: libvirt-7.7.0/meson.build
  have_gnu_gettext_tools = false
  if not get_option('nls').disabled()
    have_gettext = cc.has_function('gettext')
-@@ -1484,10 +1490,10 @@ elif get_option('driver_hyperv').enabled
+@@ -1482,10 +1488,10 @@ elif get_option('driver_hyperv').enabled
    error('openwsman is required for the Hyper-V driver')
  endif
  
@@ -177,7 +177,7 @@ Index: libvirt-7.7.0/meson.build
  endif
  
  if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD')
-@@ -2334,6 +2340,7 @@ libs_summary = {
+@@ -2332,6 +2338,7 @@ libs_summary = {
    'libssh2': libssh2_dep.found(),
    'libutil': libutil_dep.found(),
    'netcf': conf.has('WITH_NETCF'),
@@ -185,10 +185,10 @@ Index: libvirt-7.7.0/meson.build
    'NLS': have_gnu_gettext_tools,
    'numactl': numactl_dep.found(),
    'openwsman': openwsman_dep.found(),
-Index: libvirt-7.7.0/src/interface/meson.build
+Index: libvirt-7.8.0/src/interface/meson.build
 ===================================================================
---- libvirt-7.7.0.orig/src/interface/meson.build
+--- libvirt-7.8.0.orig/src/interface/meson.build
-+++ libvirt-7.7.0/src/interface/meson.build
++++ libvirt-7.8.0/src/interface/meson.build
 @@ -2,7 +2,7 @@ interface_driver_sources = [
    'interface_driver.c',
  ]
@@ -206,10 +206,10 @@ Index: libvirt-7.7.0/src/interface/meson.build
        udev_dep,
      ],
      'link_args': [
-Index: libvirt-7.7.0/meson_options.txt
+Index: libvirt-7.8.0/meson_options.txt
 ===================================================================
---- libvirt-7.7.0.orig/meson_options.txt
+--- libvirt-7.8.0.orig/meson_options.txt
-+++ libvirt-7.7.0/meson_options.txt
++++ libvirt-7.8.0/meson_options.txt
 @@ -29,6 +29,7 @@ option('libpcap', type: 'feature', value
  option('libssh', type: 'feature', value: 'auto', description: 'libssh support')
  option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support')

libvirt.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Fri Oct  1 15:22:44 UTC 2021 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 7.8.0
+  - jsc#SLE-18260
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html
+  - Dropped patches:
+    b75a16ae-libxl-improve-die-id.patch,
+    65fab900-libxl-fix-driver-reload.patch,
+    51eb680b-libxl-dont-autostart-on-reload.patch
+
+-------------------------------------------------------------------
+Thu Sep 23 21:28:27 UTC 2021 - James Fehlig <jfehlig@suse.com>
+
+- spec: Fix hangs during package update
+  bsc#1177902, bsc#1190693
+- spec: Don't add --timeout arg to /etc/sysconfig/libvirtd when
+  running in traditional mode without socket activation
+  bsc#1190695
+
 -------------------------------------------------------------------
 Tue Sep 14 20:16:34 UTC 2021 - James Fehlig <jfehlig@suse.com>
 

libvirt.spec

@@ -136,7 +136,7 @@
 
 Name:           libvirt
 URL:            http://libvirt.org/
-Version:        7.7.0
+Version:        7.8.0
 Release:        0
 Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
@@ -285,9 +285,6 @@ Source6:        libvirtd-relocation-server.xml
 Source99:       baselibs.conf
 Source100:      %{name}-rpmlintrc
 # Upstream patches
-Patch0:         b75a16ae-libxl-improve-die-id.patch
-Patch1:         65fab900-libxl-fix-driver-reload.patch
-Patch2:         51eb680b-libxl-dont-autostart-on-reload.patch
 # Patches pending upstream review
 Patch100:       libxl-dom-reset.patch
 Patch101:       network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@@ -1129,17 +1126,17 @@ mv %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
 VIR_TEST_DEBUG=1 %meson_test -t 5 --no-suite syntax-check
 
 %pre daemon
-%service_add_pre libvirtd.service libvirtd.socket libvirtd-ro.socket libvirt-guests.service libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket virt-guest-shutdown.target
+%service_add_pre libvirtd.service libvirtd.socket libvirtd-ro.socket libvirt-guests.service libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket
 
 %post daemon
 /sbin/ldconfig
 %if %{with_apparmor}
 %apparmor_reload /etc/apparmor.d/usr.sbin.libvirtd
 %endif
-%service_add_post libvirtd.service libvirtd.socket libvirtd-ro.socket libvirt-guests.service libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket virt-guest-shutdown.target
+%service_add_post libvirtd.service libvirtd.socket libvirtd-ro.socket libvirt-guests.service libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket
 
 %preun daemon
-%service_del_preun libvirtd.service libvirtd.socket libvirtd-ro.socket libvirt-guests.service libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket virt-guest-shutdown.target
+%service_del_preun libvirtd.service libvirtd.socket libvirtd-ro.socket libvirt-guests.service libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket
 if [ $1 = 0 ]; then
     rm -f /var/lib/%{name}/libvirt-guests
 fi
@@ -1147,7 +1144,7 @@ fi
 %postun daemon
 /sbin/ldconfig
 # Handle restart/reload in posttrans
-%service_del_postun_without_restart libvirtd.service libvirtd.socket libvirtd-ro.socket libvirt-guests.service libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket virt-guest-shutdown.target
+%service_del_postun_without_restart libvirtd.service libvirtd.socket libvirtd-ro.socket libvirt-guests.service libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket
 
 %posttrans daemon
 # virtlockd and virtlogd must not be restarted, particularly virtlockd since the
@@ -1161,17 +1158,11 @@ if test -f %{_sysconfdir}/sysconfig/libvirtd; then
     if grep -q -E '^LIBVIRTD_ARGS=.*--listen' %{_sysconfdir}/sysconfig/libvirtd; then
         listen_mode=yes
     fi
-    if test "$listen_mode" = yes; then
+    # A benefit of socket activation is libvirtd doesn't need to be running
-        # Keep honouring --listen and *not* use systemd socket activation.
+    # when unused. If sockets are enabled, set a timeout value if it doesn't
-        # Switching things might confuse management tools that expect the old
+    # already exist
-        # style libvirtd
+    if test "$listen_mode" = no && \
-        %{_bindir}/systemctl mask \
+            %{_bindir}/systemctl -q is-enabled libvirtd.socket; then
-                   libvirtd.socket \
-                   libvirtd-ro.socket \
-                   libvirtd-admin.socket >/dev/null 2>&1 || :
-    else
-        # A benefit of socket activation is libvirtd doesn't need to be running
-        # when unused. Set a timeout value if it doesn't already exist
         awk -i inplace "
         /^LIBVIRTD_ARGS=/ {
             gsub(\"^LIBVIRTD_ARGS=\", \"\")
@@ -1214,6 +1205,15 @@ test -f %{_sysconfdir}/sysconfig/services -a \
 if test "$DISABLE_RESTART_ON_UPDATE" != yes -a \
   "$DISABLE_RESTART_ON_UPDATE" != 1; then
     if test "$listen_mode" = yes; then
+        # Keep honouring --listen and *not* use systemd socket activation.
+        # Switching things might confuse management tools that expect the old
+        # style libvirtd
+        %{_bindir}/systemctl mask \
+                   libvirtd.socket \
+                   libvirtd-ro.socket \
+                   libvirtd-admin.socket \
+                   libvirtd-tls.socket \
+                   libvirtd-tcp.socket >/dev/null 2>&1 || :
         %{_bindir}/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
     else
         # Old libvirtd owns the sockets and will delete them on

libxl-dom-reset.patch

@@ -8,10 +8,10 @@ Date:   Mon Jun 23 15:51:20 2014 -0600
     option, but domainReset can be implemented in the libxl driver by
     forcibly destroying the domain and starting it again.
 
-Index: libvirt-7.7.0/src/libxl/libxl_driver.c
+Index: libvirt-7.8.0/src/libxl/libxl_driver.c
 ===================================================================
---- libvirt-7.7.0.orig/src/libxl/libxl_driver.c
+--- libvirt-7.8.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-7.7.0/src/libxl/libxl_driver.c
++++ libvirt-7.8.0/src/libxl/libxl_driver.c
 @@ -1343,6 +1343,63 @@ libxlDomainReboot(virDomainPtr dom, unsi
  }
  

libxl-set-cach-mode.patch

@@ -3,10 +3,10 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425
  src/libxl/libxl_conf.c |   25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
 
-Index: libvirt-7.7.0/src/libxl/libxl_conf.c
+Index: libvirt-7.8.0/src/libxl/libxl_conf.c
 ===================================================================
---- libvirt-7.7.0.orig/src/libxl/libxl_conf.c
+--- libvirt-7.8.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-7.7.0/src/libxl/libxl_conf.c
++++ libvirt-7.8.0/src/libxl/libxl_conf.c
 @@ -941,6 +941,28 @@ libxlDiskSetDiscard(libxl_device_disk *x
      }
  }

libxl-set-migration-constraints.patch

@@ -16,10 +16,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
  tools/virsh.pod                  |    8 ++++++++
  6 files changed, 125 insertions(+), 6 deletions(-)
 
-Index: libvirt-7.7.0/docs/manpages/virsh.rst
+Index: libvirt-7.8.0/docs/manpages/virsh.rst
 ===================================================================
---- libvirt-7.7.0.orig/docs/manpages/virsh.rst
+--- libvirt-7.8.0.orig/docs/manpages/virsh.rst
-+++ libvirt-7.7.0/docs/manpages/virsh.rst
++++ libvirt-7.8.0/docs/manpages/virsh.rst
 @@ -3167,7 +3167,8 @@ migrate
        [--postcopy-bandwidth bandwidth]
        [--parallel [--parallel-connections connections]]
@@ -43,10 +43,10 @@ Index: libvirt-7.7.0/docs/manpages/virsh.rst
  Running migration can be canceled by interrupting virsh (usually using
  ``Ctrl-C``) or by ``domjobabort`` command sent from another virsh instance.
  
-Index: libvirt-7.7.0/include/libvirt/libvirt-domain.h
+Index: libvirt-7.8.0/include/libvirt/libvirt-domain.h
 ===================================================================
---- libvirt-7.7.0.orig/include/libvirt/libvirt-domain.h
+--- libvirt-7.8.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-7.7.0/include/libvirt/libvirt-domain.h
++++ libvirt-7.8.0/include/libvirt/libvirt-domain.h
 @@ -1079,6 +1079,25 @@ typedef enum {
   */
  # define VIR_MIGRATE_PARAM_TLS_DESTINATION          "tls.destination"
@@ -73,10 +73,10 @@ Index: libvirt-7.7.0/include/libvirt/libvirt-domain.h
  /* Domain migration. */
  virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
                                 unsigned long flags, const char *dname,
-Index: libvirt-7.7.0/src/libxl/libxl_driver.c
+Index: libvirt-7.8.0/src/libxl/libxl_driver.c
 ===================================================================
---- libvirt-7.7.0.orig/src/libxl/libxl_driver.c
+--- libvirt-7.8.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-7.7.0/src/libxl/libxl_driver.c
++++ libvirt-7.8.0/src/libxl/libxl_driver.c
 @@ -6005,6 +6005,9 @@ libxlDomainMigratePerform3Params(virDoma
      const char *dname = NULL;
      const char *uri = NULL;
@@ -117,10 +117,10 @@ Index: libvirt-7.7.0/src/libxl/libxl_driver.c
              goto cleanup;
      }
  
-Index: libvirt-7.7.0/src/libxl/libxl_migration.c
+Index: libvirt-7.8.0/src/libxl/libxl_migration.c
 ===================================================================
---- libvirt-7.7.0.orig/src/libxl/libxl_migration.c
+--- libvirt-7.8.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-7.7.0/src/libxl/libxl_migration.c
++++ libvirt-7.8.0/src/libxl/libxl_migration.c
 @@ -334,18 +334,38 @@ libxlMigrateDstReceive(virNetSocket *soc
  static int
  libxlDoMigrateSrcSend(libxlDriverPrivate *driver,
@@ -281,10 +281,10 @@ Index: libvirt-7.7.0/src/libxl/libxl_migration.c
      virObjectLock(vm);
  
      if (ret == 0) {
-Index: libvirt-7.7.0/src/libxl/libxl_migration.h
+Index: libvirt-7.8.0/src/libxl/libxl_migration.h
 ===================================================================
---- libvirt-7.7.0.orig/src/libxl/libxl_migration.h
+--- libvirt-7.8.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-7.7.0/src/libxl/libxl_migration.h
++++ libvirt-7.8.0/src/libxl/libxl_migration.h
 @@ -35,6 +35,9 @@
      VIR_MIGRATE_PARAM_URI,              VIR_TYPED_PARAM_STRING, \
      VIR_MIGRATE_PARAM_DEST_NAME,        VIR_TYPED_PARAM_STRING, \
@@ -327,12 +327,12 @@ Index: libvirt-7.7.0/src/libxl/libxl_migration.h
  
  virDomainPtr
  libxlDomainMigrationDstFinish(virConnectPtr dconn,
-Index: libvirt-7.7.0/tools/virsh-domain.c
+Index: libvirt-7.8.0/tools/virsh-domain.c
 ===================================================================
---- libvirt-7.7.0.orig/tools/virsh-domain.c
+--- libvirt-7.8.0.orig/tools/virsh-domain.c
-+++ libvirt-7.7.0/tools/virsh-domain.c
++++ libvirt-7.8.0/tools/virsh-domain.c
-@@ -10439,6 +10439,18 @@ static const vshCmdOptDef opts_migrate[]
+@@ -10457,6 +10457,18 @@ static const vshCmdOptDef opts_migrate[]
-      .type = VSH_OT_STRING,
+      .completer = virshCompleteEmpty,
       .help = N_("override the destination host name used for TLS verification")
      },
 +    {.name = "max_iters",
@@ -350,7 +350,7 @@ Index: libvirt-7.7.0/tools/virsh-domain.c
      {.name = NULL}
  };
  
-@@ -10459,6 +10471,7 @@ doMigrate(void *opaque)
+@@ -10477,6 +10489,7 @@ doMigrate(void *opaque)
      unsigned long long ullOpt = 0;
      int rv;
      virConnectPtr dconn = data->dconn;
@@ -358,7 +358,7 @@ Index: libvirt-7.7.0/tools/virsh-domain.c
  #ifndef WIN32
      sigset_t sigmask, oldsigmask;
  
-@@ -10589,6 +10602,22 @@ doMigrate(void *opaque)
+@@ -10607,6 +10620,22 @@ doMigrate(void *opaque)
              goto save_error;
      }
  

libxl-support-block-script.patch

@@ -7,10 +7,10 @@ and npiv.
 
 For more details, see bsc#954872 and FATE#319810
 
-Index: libvirt-7.7.0/src/libxl/libxl_conf.c
+Index: libvirt-7.8.0/src/libxl/libxl_conf.c
 ===================================================================
---- libvirt-7.7.0.orig/src/libxl/libxl_conf.c
+--- libvirt-7.8.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-7.7.0/src/libxl/libxl_conf.c
++++ libvirt-7.8.0/src/libxl/libxl_conf.c
 @@ -942,6 +942,20 @@ libxlDiskSetDiscard(libxl_device_disk *x
  }
  

lxc-wait-after-eth-del.patch

@@ -13,10 +13,10 @@ device with the same name that is being created.
  src/lxc/lxc_process.c    | 1 +
  3 files changed, 4 insertions(+)
 
-Index: libvirt-7.7.0/src/lxc/lxc_controller.c
+Index: libvirt-7.8.0/src/lxc/lxc_controller.c
 ===================================================================
---- libvirt-7.7.0.orig/src/lxc/lxc_controller.c
+--- libvirt-7.8.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-7.7.0/src/lxc/lxc_controller.c
++++ libvirt-7.8.0/src/lxc/lxc_controller.c
 @@ -2012,6 +2012,7 @@ static int virLXCControllerDeleteInterfa
          if (virNetDevVethDelete(ctrl->veths[i]) < 0)
              ret = -1;
@@ -25,10 +25,10 @@ Index: libvirt-7.7.0/src/lxc/lxc_controller.c
  
      return ret;
  }
-Index: libvirt-7.7.0/src/lxc/lxc_driver.c
+Index: libvirt-7.8.0/src/lxc/lxc_driver.c
 ===================================================================
---- libvirt-7.7.0.orig/src/lxc/lxc_driver.c
+--- libvirt-7.8.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-7.7.0/src/lxc/lxc_driver.c
++++ libvirt-7.8.0/src/lxc/lxc_driver.c
 @@ -67,6 +67,7 @@
  #include "virtime.h"
  #include "virtypedparam.h"
@@ -53,10 +53,10 @@ Index: libvirt-7.7.0/src/lxc/lxc_driver.c
          break;
  
          /* It'd be nice to support this, but with macvlan
-Index: libvirt-7.7.0/src/lxc/lxc_process.c
+Index: libvirt-7.8.0/src/lxc/lxc_process.c
 ===================================================================
---- libvirt-7.7.0.orig/src/lxc/lxc_process.c
+--- libvirt-7.8.0.orig/src/lxc/lxc_process.c
-+++ libvirt-7.7.0/src/lxc/lxc_process.c
++++ libvirt-7.8.0/src/lxc/lxc_process.c
 @@ -51,6 +51,7 @@
  #include "virstring.h"
  #include "virprocess.h"

network-don-t-use-dhcp-authoritative-on-static-netwo.patch

@@ -17,10 +17,10 @@ Signed-off-by: Martin Wilck <mwilck@suse.com>
  tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 -
  2 files changed, 8 insertions(+), 2 deletions(-)
 
-Index: libvirt-7.7.0/src/network/bridge_driver.c
+Index: libvirt-7.8.0/src/network/bridge_driver.c
 ===================================================================
---- libvirt-7.7.0.orig/src/network/bridge_driver.c
+--- libvirt-7.8.0.orig/src/network/bridge_driver.c
-+++ libvirt-7.7.0/src/network/bridge_driver.c
++++ libvirt-7.8.0/src/network/bridge_driver.c
 @@ -1480,7 +1480,14 @@ networkDnsmasqConfContents(virNetworkObj
          if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
              if (ipdef->nranges || ipdef->nhosts) {
@@ -37,10 +37,10 @@ Index: libvirt-7.7.0/src/network/bridge_driver.c
              }
  
              if (ipdef->tftproot) {
-Index: libvirt-7.7.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-7.8.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
 ===================================================================
---- libvirt-7.7.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+--- libvirt-7.8.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-7.7.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
++++ libvirt-7.8.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

@@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64
 
 See bnc#894956
 
-Index: libvirt-7.7.0/src/util/virarch.c
+Index: libvirt-7.8.0/src/util/virarch.c
 ===================================================================
---- libvirt-7.7.0.orig/src/util/virarch.c
+--- libvirt-7.8.0.orig/src/util/virarch.c
-+++ libvirt-7.7.0/src/util/virarch.c
++++ libvirt-7.8.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

@@ -1,7 +1,7 @@
-Index: libvirt-7.7.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-7.8.0/src/security/apparmor/libvirt-qemu
 ===================================================================
---- libvirt-7.7.0.orig/src/security/apparmor/libvirt-qemu
+--- libvirt-7.8.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-7.7.0/src/security/apparmor/libvirt-qemu
++++ libvirt-7.8.0/src/security/apparmor/libvirt-qemu
 @@ -248,3 +248,6 @@
    # /sys/bus/nd/devices
    / r, # harmless on any lsb compliant system

suse-libvirt-guests-service.patch

@@ -1,9 +1,9 @@
 Adjust libvirt-guests service to conform to SUSE standards
 
-Index: libvirt-7.7.0/tools/libvirt-guests.sh.in
+Index: libvirt-7.8.0/tools/libvirt-guests.sh.in
 ===================================================================
---- libvirt-7.7.0.orig/tools/libvirt-guests.sh.in
+--- libvirt-7.8.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-7.7.0/tools/libvirt-guests.sh.in
++++ libvirt-7.8.0/tools/libvirt-guests.sh.in
 @@ -20,10 +20,6 @@ sysconfdir="@sysconfdir@"
  localstatedir="@localstatedir@"
  libvirtd="@sbindir@"/libvirtd

suse-libvirtd-disable-tls.patch

@@ -3,10 +3,10 @@ Disable TLS by default
 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-7.7.0/src/remote/remote_daemon_config.c
+Index: libvirt-7.8.0/src/remote/remote_daemon_config.c
 ===================================================================
---- libvirt-7.7.0.orig/src/remote/remote_daemon_config.c
+--- libvirt-7.8.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-7.7.0/src/remote/remote_daemon_config.c
++++ libvirt-7.8.0/src/remote/remote_daemon_config.c
 @@ -98,7 +98,7 @@ daemonConfigNew(bool privileged G_GNUC_U
  
  #ifdef WITH_IP
@@ -16,10 +16,10 @@ Index: libvirt-7.7.0/src/remote/remote_daemon_config.c
  # else /* ! LIBVIRTD */
      data->listen_tls = false; /* Always honoured, --listen doesn't exist. */
  # endif /* ! LIBVIRTD */
-Index: libvirt-7.7.0/src/remote/libvirtd.conf.in
+Index: libvirt-7.8.0/src/remote/libvirtd.conf.in
 ===================================================================
---- libvirt-7.7.0.orig/src/remote/libvirtd.conf.in
+--- libvirt-7.8.0.orig/src/remote/libvirtd.conf.in
-+++ libvirt-7.7.0/src/remote/libvirtd.conf.in
++++ libvirt-7.8.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 @@ Index: libvirt-7.7.0/src/remote/libvirtd.conf.in
  
  # 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-7.7.0/src/remote/test_libvirtd.aug.in
+Index: libvirt-7.8.0/src/remote/test_libvirtd.aug.in
 ===================================================================
---- libvirt-7.7.0.orig/src/remote/test_libvirtd.aug.in
+--- libvirt-7.8.0.orig/src/remote/test_libvirtd.aug.in
-+++ libvirt-7.7.0/src/remote/test_libvirtd.aug.in
++++ libvirt-7.8.0/src/remote/test_libvirtd.aug.in
 @@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ =
  
     test @DAEMON_NAME_UC@.lns get conf =

suse-libxl-disable-autoballoon.patch

@@ -6,10 +6,10 @@ autoballooning. This patch changes libvirt to also disable autoballooning
 by default. It can only be enabled with the 'autoballoon' setting in
 libxl.conf. See jsc#SLE-3059 for more details.
 
-Index: libvirt-7.7.0/src/libxl/libxl.conf
+Index: libvirt-7.8.0/src/libxl/libxl.conf
 ===================================================================
---- libvirt-7.7.0.orig/src/libxl/libxl.conf
+--- libvirt-7.8.0.orig/src/libxl/libxl.conf
-+++ libvirt-7.7.0/src/libxl/libxl.conf
++++ libvirt-7.8.0/src/libxl/libxl.conf
 @@ -4,12 +4,11 @@
  
  # Enable autoballooning of domain0
@@ -27,10 +27,10 @@ Index: libvirt-7.7.0/src/libxl/libxl.conf
  
  
  # In order to prevent accidentally starting two domains that
-Index: libvirt-7.7.0/src/libxl/libxl_conf.c
+Index: libvirt-7.8.0/src/libxl/libxl_conf.c
 ===================================================================
---- libvirt-7.7.0.orig/src/libxl/libxl_conf.c
+--- libvirt-7.8.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-7.7.0/src/libxl/libxl_conf.c
++++ libvirt-7.8.0/src/libxl/libxl_conf.c
 @@ -1746,15 +1746,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
  /*
   * Get domain0 autoballoon configuration.  Honor user-specified
@@ -66,10 +66,10 @@ Index: libvirt-7.7.0/src/libxl/libxl_conf.c
      return 0;
  }
  
-Index: libvirt-7.7.0/src/libxl/test_libvirtd_libxl.aug.in
+Index: libvirt-7.8.0/src/libxl/test_libvirtd_libxl.aug.in
 ===================================================================
---- libvirt-7.7.0.orig/src/libxl/test_libvirtd_libxl.aug.in
+--- libvirt-7.8.0.orig/src/libxl/test_libvirtd_libxl.aug.in
-+++ libvirt-7.7.0/src/libxl/test_libvirtd_libxl.aug.in
++++ libvirt-7.8.0/src/libxl/test_libvirtd_libxl.aug.in
 @@ -2,7 +2,7 @@ module Test_libvirtd_libxl =
    @CONFIG@
  

suse-qemu-conf.patch

@@ -7,10 +7,10 @@ suse-qemu-conf-secdriver.patch, suse-qemu-conf-lockmgr.patch,
 etc.), but for now they are all lumped together in this
 single patch.
 
-Index: libvirt-7.7.0/src/qemu/qemu.conf
+Index: libvirt-7.8.0/src/qemu/qemu.conf
 ===================================================================
---- libvirt-7.7.0.orig/src/qemu/qemu.conf
+--- libvirt-7.8.0.orig/src/qemu/qemu.conf
-+++ libvirt-7.7.0/src/qemu/qemu.conf
++++ libvirt-7.8.0/src/qemu/qemu.conf
 @@ -491,10 +491,19 @@
  # isolation, but it cannot appear in a list of drivers.
  #
@@ -60,10 +60,10 @@ Index: libvirt-7.7.0/src/qemu/qemu.conf
  #
  #lock_manager = "lockd"
  
-Index: libvirt-7.7.0/src/qemu/qemu_conf.c
+Index: libvirt-7.8.0/src/qemu/qemu_conf.c
 ===================================================================
---- libvirt-7.7.0.orig/src/qemu/qemu_conf.c
+--- libvirt-7.8.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-7.7.0/src/qemu/qemu_conf.c
++++ libvirt-7.8.0/src/qemu/qemu_conf.c
 @@ -272,7 +272,7 @@ virQEMUDriverConfig *virQEMUDriverConfig
      cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER);
      cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON);
@@ -73,10 +73,10 @@ Index: libvirt-7.7.0/src/qemu/qemu_conf.c
      cfg->securityRequireConfined = false;
  
      cfg->keepAliveInterval = 5;
-Index: libvirt-7.7.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-7.8.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
---- libvirt-7.7.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-7.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-7.7.0/src/qemu/test_libvirtd_qemu.aug.in
++++ libvirt-7.8.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" }

suse-qemu-ovmf-paths.patch

@@ -5,11 +5,11 @@ advertised and used by libvirt are automatically detected. Until upstream
 removes the old DEFAULT_LOADER_NVRAM approach and associated code, this
 patch will stay.
 
-Index: libvirt-7.7.0/src/qemu/qemu.conf
+Index: libvirt-7.8.0/src/qemu/qemu.conf
 ===================================================================
---- libvirt-7.7.0.orig/src/qemu/qemu.conf
+--- libvirt-7.8.0.orig/src/qemu/qemu.conf
-+++ libvirt-7.7.0/src/qemu/qemu.conf
++++ libvirt-7.8.0/src/qemu/qemu.conf
-@@ -858,10 +858,9 @@
+@@ -857,10 +857,9 @@
  # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
  # follows this scheme.
  #nvram = [
@@ -23,10 +23,10 @@ Index: libvirt-7.7.0/src/qemu/qemu.conf
  #]
  
  # The backend to use for handling stdout/stderr output from
-Index: libvirt-7.7.0/src/qemu/qemu_conf.c
+Index: libvirt-7.8.0/src/qemu/qemu_conf.c
 ===================================================================
---- libvirt-7.7.0.orig/src/qemu/qemu_conf.c
+--- libvirt-7.8.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-7.7.0/src/qemu/qemu_conf.c
++++ libvirt-7.8.0/src/qemu/qemu_conf.c
 @@ -98,10 +98,9 @@ qemuDriverUnlock(virQEMUDriver *driver)
  
  #ifndef DEFAULT_LOADER_NVRAM
@@ -41,10 +41,10 @@ Index: libvirt-7.7.0/src/qemu/qemu_conf.c
  #endif
  
  
-Index: libvirt-7.7.0/src/security/virt-aa-helper.c
+Index: libvirt-7.8.0/src/security/virt-aa-helper.c
 ===================================================================
---- libvirt-7.7.0.orig/src/security/virt-aa-helper.c
+--- libvirt-7.8.0.orig/src/security/virt-aa-helper.c
-+++ libvirt-7.7.0/src/security/virt-aa-helper.c
++++ libvirt-7.8.0/src/security/virt-aa-helper.c
 @@ -480,7 +480,8 @@ valid_path(const char *path, const bool
          "/usr/share/ovmf/",              /* for OVMF images */
          "/usr/share/AAVMF/",             /* for AAVMF images */
@@ -55,10 +55,10 @@ Index: libvirt-7.7.0/src/security/virt-aa-helper.c
      };
      /* override the above with these */
      const char * const override[] = {
-Index: libvirt-7.7.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-7.8.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
---- libvirt-7.7.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-7.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-7.7.0/src/qemu/test_libvirtd_qemu.aug.in
++++ libvirt-7.8.0/src/qemu/test_libvirtd_qemu.aug.in
 @@ -96,10 +96,9 @@ module Test_libvirtd_qemu =
  { "migration_port_max" = "49215" }
  { "log_timestamp" = "0" }

suse-xen-ovmf-paths.patch

@@ -5,10 +5,10 @@ June 2021 ovmf only supports one firmware for Xen. This patch adjusts
 the firmware path to match the one provided by the ovmf package.
 
 
-Index: libvirt-7.7.0/src/libxl/libxl_conf.c
+Index: libvirt-7.8.0/src/libxl/libxl_conf.c
 ===================================================================
---- libvirt-7.7.0.orig/src/libxl/libxl_conf.c
+--- libvirt-7.8.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-7.7.0/src/libxl/libxl_conf.c
++++ libvirt-7.8.0/src/libxl/libxl_conf.c
 @@ -1797,7 +1797,7 @@ libxlDriverConfigNew(void)
      cfg->firmwares = g_new0(virFirmware *, 1);
      cfg->nfirmwares = 1;

virt-create-rootfs.patch

@@ -1,7 +1,7 @@
-Index: libvirt-7.7.0/tools/virt-create-rootfs
+Index: libvirt-7.8.0/tools/virt-create-rootfs
 ===================================================================
 --- /dev/null
-+++ libvirt-7.7.0/tools/virt-create-rootfs
++++ libvirt-7.8.0/tools/virt-create-rootfs
 @@ -0,0 +1,231 @@
 +#!/bin/sh
 +set -e
@@ -234,10 +234,10 @@ Index: libvirt-7.7.0/tools/virt-create-rootfs
 +    echo "pts/0" >> "$ROOT/etc/securetty"
 +    chroot "$ROOT" /usr/bin/passwd
 +fi
-Index: libvirt-7.7.0/docs/manpages/virt-create-rootfs.rst
+Index: libvirt-7.8.0/docs/manpages/virt-create-rootfs.rst
 ===================================================================
 --- /dev/null
-+++ libvirt-7.7.0/docs/manpages/virt-create-rootfs.rst
++++ libvirt-7.8.0/docs/manpages/virt-create-rootfs.rst
 @@ -0,0 +1,88 @@
 +==================
 +virt-create-rootfs
@@ -327,10 +327,10 @@ Index: libvirt-7.7.0/docs/manpages/virt-create-rootfs.rst
 +========
 +
 +virsh(1), `https://libvirt.org/ <https://libvirt.org/>`_
-Index: libvirt-7.7.0/docs/manpages/meson.build
+Index: libvirt-7.8.0/docs/manpages/meson.build
 ===================================================================
---- libvirt-7.7.0.orig/docs/manpages/meson.build
+--- libvirt-7.8.0.orig/docs/manpages/meson.build
-+++ libvirt-7.7.0/docs/manpages/meson.build
++++ libvirt-7.8.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 @@ Index: libvirt-7.7.0/docs/manpages/meson.build
  
    { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') },
    { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': conf.has('WITH_SANLOCK') },
-Index: libvirt-7.7.0/tools/meson.build
+Index: libvirt-7.8.0/tools/meson.build
 ===================================================================
---- libvirt-7.7.0.orig/tools/meson.build
+--- libvirt-7.8.0.orig/tools/meson.build
-+++ libvirt-7.7.0/tools/meson.build
++++ libvirt-7.8.0/tools/meson.build
 @@ -149,6 +149,8 @@ else
    virsh_icon_res = []
  endif