Accepting request 980401 from home:jfehlig:branches:Virtualization

- Update to libvirt 8.4.0 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v8-4-0-2022-06-01 OBS-URL: https://build.opensuse.org/request/show/980401 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=931
2022-06-01 21:11:24 +00:00 · 2022-06-01 21:11:24 +00:00 · 545c89cc72
commit 545c89cc72
parent d3a98ced02
27 changed files with 207 additions and 200 deletions
--- a/0001-Extract-stats-functions-from-the-qemu-driver.patch
+++ b/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-8.3.0/src/conf/domain_stats.c
+Index: libvirt-8.4.0/src/conf/domain_stats.c
 ===================================================================
 --- /dev/null
-+++ libvirt-8.3.0/src/conf/domain_stats.c
+++ libvirt-8.4.0/src/conf/domain_stats.c
@@ -0,0 +1,117 @@
 +/*
 + * domain_stats.c: domain stats extraction helpers
@ -140,10 +140,10 @@ Index: libvirt-8.3.0/src/conf/domain_stats.c
 +}
 +
 +#undef STATS_ADD_NET_PARAM
-Index: libvirt-8.3.0/src/conf/domain_stats.h
+Index: libvirt-8.4.0/src/conf/domain_stats.h
 ===================================================================
 --- /dev/null
-+++ libvirt-8.3.0/src/conf/domain_stats.h
+++ libvirt-8.4.0/src/conf/domain_stats.h
@@ -0,0 +1,60 @@
 +/*
 + * domain_stats.h: domain stats extraction helpers
@ -205,11 +205,11 @@ Index: libvirt-8.3.0/src/conf/domain_stats.h
 +                           virTypedParamList *params);
 +
 +#endif /* __DOMAIN_STATS_H */
-Index: libvirt-8.3.0/src/libvirt_private.syms
+Index: libvirt-8.4.0/src/libvirt_private.syms
 ===================================================================
--- libvirt-8.3.0.orig/src/libvirt_private.syms
-+++ libvirt-8.3.0/src/libvirt_private.syms
-@@ -774,6 +774,11 @@ virDomainConfNWFilterTeardown;
+--- libvirt-8.4.0.orig/src/libvirt_private.syms
+++ libvirt-8.4.0/src/libvirt_private.syms
+@@ -772,6 +772,11 @@ virDomainConfNWFilterTeardown;
 virDomainConfVMNWFilterTeardown;
 
 
@ -221,7 +221,7 @@ Index: libvirt-8.3.0/src/libvirt_private.syms
 # conf/domain_validate.h
 virDomainActualNetDefValidate;
 virDomainDefValidate;
-@@ -1966,6 +1971,7 @@ virCgroupGetMemoryUsage;
+@@ -1973,6 +1978,7 @@ virCgroupGetMemoryUsage;
 virCgroupGetMemSwapHardLimit;
 virCgroupGetMemSwapUsage;
 virCgroupGetPercpuStats;
@ -229,10 +229,10 @@ Index: libvirt-8.3.0/src/libvirt_private.syms
 virCgroupHasController;
 virCgroupHasEmptyTasks;
 virCgroupKillPainfully;
-Index: libvirt-8.3.0/src/qemu/qemu_driver.c
+Index: libvirt-8.4.0/src/qemu/qemu_driver.c
 ===================================================================
--- libvirt-8.3.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-8.3.0/src/qemu/qemu_driver.c
+--- libvirt-8.4.0.orig/src/qemu/qemu_driver.c
+++ libvirt-8.4.0/src/qemu/qemu_driver.c
@@ -68,6 +68,7 @@
 #include "virarptable.h"
 #include "viruuid.h"
@ -241,7 +241,7 @@ Index: libvirt-8.3.0/src/qemu/qemu_driver.c
 #include "domain_audit.h"
 #include "domain_cgroup.h"
 #include "domain_driver.h"
-@@ -17442,13 +17443,7 @@ qemuDomainGetStatsState(virQEMUDriver *d
+@@ -17561,13 +17562,7 @@ qemuDomainGetStatsState(virQEMUDriver *d
                         virTypedParamList *params,
                         unsigned int privflags G_GNUC_UNUSED)
 {
@ -256,7 +256,7 @@ Index: libvirt-8.3.0/src/qemu/qemu_driver.c
 }
 
 
-@@ -17740,25 +17735,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
+@@ -17859,25 +17854,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
                             virTypedParamList *params)
 {
     qemuDomainObjPrivate *priv = dom->privateData;
@ -283,7 +283,7 @@ Index: libvirt-8.3.0/src/qemu/qemu_driver.c
 }
 
 static int
-@@ -17951,76 +17932,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr
+@@ -18070,76 +18051,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr
     return ret;
 }
 
@ -361,10 +361,10 @@ Index: libvirt-8.3.0/src/qemu/qemu_driver.c
 
 /* refresh information by opening images on the disk */
 static int
-Index: libvirt-8.3.0/src/util/vircgroup.c
+Index: libvirt-8.4.0/src/util/vircgroup.c
 ===================================================================
--- libvirt-8.3.0.orig/src/util/vircgroup.c
-+++ libvirt-8.3.0/src/util/vircgroup.c
+--- libvirt-8.4.0.orig/src/util/vircgroup.c
+++ libvirt-8.4.0/src/util/vircgroup.c
@@ -3022,6 +3022,31 @@ virCgroupGetInode(virCgroup *cgroup)
     return st.st_ino;
 }
@ -412,10 +412,10 @@ Index: libvirt-8.3.0/src/util/vircgroup.c
 int
 virCgroupNewPartition(const char *path G_GNUC_UNUSED,
                       bool create G_GNUC_UNUSED,
-Index: libvirt-8.3.0/src/util/vircgroup.h
+Index: libvirt-8.4.0/src/util/vircgroup.h
 ===================================================================
--- libvirt-8.3.0.orig/src/util/vircgroup.h
-+++ libvirt-8.3.0/src/util/vircgroup.h
+--- libvirt-8.4.0.orig/src/util/vircgroup.h
+++ libvirt-8.4.0/src/util/vircgroup.h
@@ -23,6 +23,7 @@
 
 #include "virbitmap.h"
@ -432,10 +432,10 @@ Index: libvirt-8.3.0/src/util/vircgroup.h
 +                         virTypedParamList *params);
 +
 int virCgroupGetInode(virCgroup *cgroup);
-Index: libvirt-8.3.0/src/conf/meson.build
+Index: libvirt-8.4.0/src/conf/meson.build
 ===================================================================
--- libvirt-8.3.0.orig/src/conf/meson.build
-+++ libvirt-8.3.0/src/conf/meson.build
+--- libvirt-8.4.0.orig/src/conf/meson.build
+++ libvirt-8.4.0/src/conf/meson.build
@@ -15,6 +15,7 @@ domain_conf_sources = [
   'domain_conf.c',
   'domain_nwfilter.c',
--- a/0001-libxl-add-support-for-BlockResize-API.patch
+++ b/0001-libxl-add-support-for-BlockResize-API.patch
@ -19,11 +19,11 @@ reworking this patch and submitting it to upstream libvirt.
 src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

-Index: libvirt-8.3.0/src/libxl/libxl_driver.c
+Index: libvirt-8.4.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-8.3.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-8.3.0/src/libxl/libxl_driver.c
-@@ -5259,6 +5259,95 @@ libxlDomainMemoryStats(virDomainPtr dom,
+--- libvirt-8.4.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.4.0/src/libxl/libxl_driver.c
+@@ -5260,6 +5260,95 @@ libxlDomainMemoryStats(virDomainPtr dom,
 
 #undef LIBXL_SET_MEMSTAT
 
@ -119,7 +119,7 @@ Index: libvirt-8.3.0/src/libxl/libxl_driver.c
 static int
 libxlDomainGetJobInfo(virDomainPtr dom,
                       virDomainJobInfoPtr info)
-@@ -6585,6 +6674,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6586,6 +6675,7 @@ static virHypervisorDriver libxlHypervis
     .domainGetNumaParameters = libxlDomainGetNumaParameters, /* 1.1.1 */
     .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */
     .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */
@ -127,10 +127,10 @@ Index: libvirt-8.3.0/src/libxl/libxl_driver.c
     .domainGetJobInfo = libxlDomainGetJobInfo, /* 1.3.1 */
     .domainGetJobStats = libxlDomainGetJobStats, /* 1.3.1 */
     .domainMemoryStats = libxlDomainMemoryStats, /* 1.3.0 */
-Index: libvirt-8.3.0/src/libxl/libxl_api_wrapper.h
+Index: libvirt-8.4.0/src/libxl/libxl_api_wrapper.h
 ===================================================================
--- libvirt-8.3.0.orig/src/libxl/libxl_api_wrapper.h
-+++ libvirt-8.3.0/src/libxl/libxl_api_wrapper.h
+--- libvirt-8.4.0.orig/src/libxl/libxl_api_wrapper.h
+++ libvirt-8.4.0/src/libxl/libxl_api_wrapper.h
@@ -215,3 +215,18 @@ libxlSetMemoryTargetWrapper(libxl_ctx *c
 
     return ret;
--- a/0001-util-Don-t-spawn-pkttyagent-when-stdin-is-not-a-tty.patch
+++ b/0001-util-Don-t-spawn-pkttyagent-when-stdin-is-not-a-tty.patch
@ -18,10 +18,10 @@ Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
 src/util/virpolkit.c | 3 +++
 1 file changed, 3 insertions(+)

-Index: libvirt-8.3.0/src/util/virpolkit.c
+Index: libvirt-8.4.0/src/util/virpolkit.c
 ===================================================================
--- libvirt-8.3.0.orig/src/util/virpolkit.c
-+++ libvirt-8.3.0/src/util/virpolkit.c
+--- libvirt-8.4.0.orig/src/util/virpolkit.c
+++ libvirt-8.4.0/src/util/virpolkit.c
@@ -237,6 +237,9 @@ virPolkitAgentAvailable(void)
     const char *termid = ctermid(NULL);
     VIR_AUTOCLOSE fd = -1;
--- a/0002-lxc-implement-connectGetAllDomainStats.patch
+++ b/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-8.3.0/src/lxc/lxc_driver.c
+Index: libvirt-8.4.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-8.3.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-8.3.0/src/lxc/lxc_driver.c
+--- libvirt-8.4.0.orig/src/lxc/lxc_driver.c
+++ libvirt-8.4.0/src/lxc/lxc_driver.c
@@ -74,6 +74,8 @@
 #include "netdev_bandwidth_conf.h"
 #include "virsocket.h"
--- a/libvirt-8.3.0.tar.xz
+++ b/libvirt-8.3.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be229b9ad1d48be7007e7bf341fc990c65e24aea624c16db6b36d02c820df5eb
-size 8829288
--- a/libvirt-8.3.0.tar.xz.asc
+++ b/libvirt-8.3.0.tar.xz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmJvwqIACgkQymi+gBAI
-TJyKhA//TkyV2t5TBzklSeTBIiOK5HP5GMgZIBGtp2IpGW87uIkEsARngyaJe8jZ
-BRx4FCOEOxeNbwNucXgyLh8E4BOtEC60H5ob/5OmuImS7fI/kvLHHoNkNuo4/E5O
-z/fAcOIajtuDNT8GRR/Rv7p5IsBpqgQ1+9C1j3uWS70ODbhtje4rhcnl1MtbBYm+
-Mydb/FAXo/8BFWeC18HX+o/PoQlGnJaMp4Kmqcs/DBfZmxSQAiZBecjLxLfUsYZV
-VZKjxATWT1fRjUwiL9RYgYtgLapU3fiiR1xVcipnrIei7oqIXvJ1yMhbv5AwAp2Y
-m4g2sF3KHfe6lp29Tp5wf3YF2AkLjzz8LDUrVqH+wjGtS29tc0A3zh29GC+ENbWU
-c1RzVG9f/vABBshzm+vbBdb4urL04POZVkS9PovjINmoPI7r/95RSsW00b4NP3pZ
-/VhCdz3pa3+wJPhSgSHFch6eiNr2/10Vp0LGIhTl9VQFo2KXBT50qDKxsvkvyI9q
-BrT3hEZYExANIOO/EknkZ2JlbuMC0o4GXY9i3Et6n6dgpgC+uesHkAW5aGbYg6ku
-/4KNX1PxC9CLT4uFP10WCCnV/yNeaul8nhWBjp1opGgKRFObwf5j90seqY7UdCCw
-xbIoxdRlM3ai63l0AsHOsqqsF4NDywcfg2Fon/JAc6lupUY59EU=
-=XUWH
-----END PGP SIGNATURE-----
--- a/libvirt-8.4.0.tar.xz
+++ b/libvirt-8.4.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:601a6e9bb03a43d05659f63e4a403df253ab0975b4a973f10a5607f3bbc018dd
+size 8846528
--- a/libvirt-8.4.0.tar.xz.asc
+++ b/libvirt-8.4.0.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmKXFdUACgkQymi+gBAI
+TJy0yQ//XG2qm1TW9WVReEbA6UNelcn19Lnz6lP5dD4X68JULYKvGUXBhaRyNogo
+88b/t7DeVTZE/gl7gt9bkCOsRwrxL/egZbI9W3tSPOLbTtuMvDecMZoeVEwfuC/x
+VVYDjXza6CWNzoo4aO5NRfBiZBdHjNw2zfKbDw2LIopw4jLtFxIlarZFJqY5TJ6T
+oxIaWN4ydqTwELB/jIeJVPB3vCeGKOPlvrcPjkxxQ6tWjSU7ayzcaclDVbEAgSzP
+M2DPlWje39uvFPVfs8AjZ8KgCFRM7PX6XaFUm+qYWfUXH2vcc6G0ysVZzlxXaBlx
+GqEL8K5lWIYExOkI5noSeEuaMjlc1D6p/cmP6kdSaHndPmfPBOoyCrElwwT68cnH
+Y+aFvQWUOosRSYT8KNBkR80+TQcvKT5WorjtTrtUe/3FXqFZ8sXXrmVGHd+xYuAY
+UuIUROVFK24YbjvFNRrxXFk/ryFxF/xeEPYdC8bJQtQ1fQnP7uHUDpYRHCkxZN6/
+gg7P5/S5GUJIL8WeVNZU9o15VYoiQdw4cyvK3csaXLWmqinpmdp49LkyiwfwWSLn
+dqf7ouRHwpwQa6BHEHyttu7I0ECLkUh0cFEk1TVOMVNtXU/S6qGHA1zh6X+visPm
+34AWYgWhqMaD6IRAJcBPOz1P0lw1ohtvCBxfMuhFo5iVxvYwaXY=
+=KaJQ
+-----END PGP SIGNATURE-----
--- a/libvirt-power8-models.patch
+++ b/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-8.3.0/src/cpu_map/ppc64_POWER8.xml
+Index: libvirt-8.4.0/src/cpu_map/ppc64_POWER8.xml
 ===================================================================
--- libvirt-8.3.0.orig/src/cpu_map/ppc64_POWER8.xml
-+++ libvirt-8.3.0/src/cpu_map/ppc64_POWER8.xml
+--- libvirt-8.4.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-8.4.0/src/cpu_map/ppc64_POWER8.xml
@@ -4,5 +4,7 @@
     <pvr value='0x004b0000' mask='0xffff0000'/>
     <pvr value='0x004c0000' mask='0xffff0000'/>
--- a/libvirt-suse-netcontrol.patch
+++ b/libvirt-suse-netcontrol.patch
@ -1,7 +1,7 @@
-Index: libvirt-8.3.0/tools/virsh.c
+Index: libvirt-8.4.0/tools/virsh.c
 ===================================================================
--- libvirt-8.3.0.orig/tools/virsh.c
-+++ libvirt-8.3.0/tools/virsh.c
+--- libvirt-8.4.0.orig/tools/virsh.c
+++ libvirt-8.4.0/tools/virsh.c
@@ -552,6 +552,8 @@ virshShowVersion(vshControl *ctl G_GNUC_
     vshPrint(ctl, " Interface");
 # if defined(WITH_NETCF)
@ -11,10 +11,10 @@ Index: libvirt-8.3.0/tools/virsh.c
 # elif defined(WITH_UDEV)
     vshPrint(ctl, " udev");
 # endif
-Index: libvirt-8.3.0/src/interface/interface_backend_netcf.c
+Index: libvirt-8.4.0/src/interface/interface_backend_netcf.c
 ===================================================================
--- libvirt-8.3.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-8.3.0/src/interface/interface_backend_netcf.c
+--- libvirt-8.4.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-8.4.0/src/interface/interface_backend_netcf.c
@@ -21,7 +21,12 @@
 
 #include <config.h>
@ -126,10 +126,10 @@ Index: libvirt-8.3.0/src/interface/interface_backend_netcf.c
     if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
         return -1;
     if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-8.3.0/src/interface/interface_driver.c
+Index: libvirt-8.4.0/src/interface/interface_driver.c
 ===================================================================
--- libvirt-8.3.0.orig/src/interface/interface_driver.c
-+++ libvirt-8.3.0/src/interface/interface_driver.c
+--- libvirt-8.4.0.orig/src/interface/interface_driver.c
+++ libvirt-8.4.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
     if (netcfIfaceRegister() == 0)
         return 0;
@ -147,10 +147,10 @@ Index: libvirt-8.3.0/src/interface/interface_driver.c
     if (udevIfaceRegister() == 0)
         return 0;
 #endif /* WITH_UDEV */
-Index: libvirt-8.3.0/meson.build
+Index: libvirt-8.4.0/meson.build
 ===================================================================
--- libvirt-8.3.0.orig/meson.build
-+++ libvirt-8.3.0/meson.build
+--- libvirt-8.4.0.orig/meson.build
+++ libvirt-8.4.0/meson.build
@@ -1073,6 +1073,12 @@ else
   netcf_dep = dependency('', required: false)
 endif
@ -185,10 +185,10 @@ Index: libvirt-8.3.0/meson.build
   'NLS': have_gnu_gettext_tools,
   'numactl': numactl_dep.found(),
   'openwsman': openwsman_dep.found(),
-Index: libvirt-8.3.0/src/interface/meson.build
+Index: libvirt-8.4.0/src/interface/meson.build
 ===================================================================
--- libvirt-8.3.0.orig/src/interface/meson.build
-+++ libvirt-8.3.0/src/interface/meson.build
+--- libvirt-8.4.0.orig/src/interface/meson.build
+++ libvirt-8.4.0/src/interface/meson.build
@@ -2,7 +2,7 @@ interface_driver_sources = [
   'interface_driver.c',
 ]
@ -206,10 +206,10 @@ Index: libvirt-8.3.0/src/interface/meson.build
       udev_dep,
     ],
     'link_args': [
-Index: libvirt-8.3.0/meson_options.txt
+Index: libvirt-8.4.0/meson_options.txt
 ===================================================================
--- libvirt-8.3.0.orig/meson_options.txt
-+++ libvirt-8.3.0/meson_options.txt
+--- libvirt-8.4.0.orig/meson_options.txt
+++ libvirt-8.4.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')
--- a/libvirt.changes
+++ b/libvirt.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun  1 14:10:53 UTC 2022 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 8.4.0
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v8-4-0-2022-06-01
+
 -------------------------------------------------------------------
 Mon May  9 13:49:51 UTC 2022 - James Fehlig <jfehlig@suse.com>

--- a/libvirt.spec
+++ b/libvirt.spec
@ -158,7 +158,7 @@

 Name:           libvirt
 URL:            http://libvirt.org/
-Version:        8.3.0
+Version:        8.4.0
 Release:        0
 Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
--- a/libxl-dom-reset.patch
+++ b/libxl-dom-reset.patch
@ -8,11 +8,11 @@ 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-8.3.0/src/libxl/libxl_driver.c
+Index: libvirt-8.4.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-8.3.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-8.3.0/src/libxl/libxl_driver.c
-@@ -1356,6 +1356,63 @@ libxlDomainReboot(virDomainPtr dom, unsi
+--- libvirt-8.4.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.4.0/src/libxl/libxl_driver.c
+@@ -1357,6 +1357,63 @@ libxlDomainReboot(virDomainPtr dom, unsi
 }
 
 static int
@ -76,7 +76,7 @@ Index: libvirt-8.3.0/src/libxl/libxl_driver.c
 libxlDomainDestroyFlags(virDomainPtr dom,
                         unsigned int flags)
 {
-@@ -6463,6 +6520,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6464,6 +6521,7 @@ static virHypervisorDriver libxlHypervis
     .domainShutdown = libxlDomainShutdown, /* 0.9.0 */
     .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */
     .domainReboot = libxlDomainReboot, /* 0.9.0 */
--- a/libxl-set-cach-mode.patch
+++ b/libxl-set-cach-mode.patch
@ -3,11 +3,11 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425
 src/libxl/libxl_conf.c |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

-Index: libvirt-8.3.0/src/libxl/libxl_conf.c
+Index: libvirt-8.4.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-8.3.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-8.3.0/src/libxl/libxl_conf.c
-@@ -943,6 +943,28 @@ libxlDiskSetDiscard(libxl_device_disk *x
+--- libvirt-8.4.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.4.0/src/libxl/libxl_conf.c
+@@ -944,6 +944,28 @@ libxlDiskSetDiscard(libxl_device_disk *x
     }
 }
 
@ -36,7 +36,7 @@ Index: libvirt-8.3.0/src/libxl/libxl_conf.c
 static char *
 libxlMakeNetworkDiskSrcStr(virStorageSource *src,
                            const char *username,
-@@ -1182,6 +1204,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
+@@ -1183,6 +1205,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
     x_disk->readwrite = !l_disk->src->readonly;
     x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
     libxlDiskSetDiscard(x_disk, l_disk->discard);
--- a/libxl-set-migration-constraints.patch
+++ b/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-8.3.0/docs/manpages/virsh.rst
+Index: libvirt-8.4.0/docs/manpages/virsh.rst
 ===================================================================
--- libvirt-8.3.0.orig/docs/manpages/virsh.rst
-+++ libvirt-8.3.0/docs/manpages/virsh.rst
+--- libvirt-8.4.0.orig/docs/manpages/virsh.rst
+++ libvirt-8.4.0/docs/manpages/virsh.rst
@@ -3258,6 +3258,7 @@ migrate
       [--parallel [--parallel-connections connections]]
       [--bandwidth bandwidth] [--tls-destination hostname]
@ -41,10 +41,10 @@ Index: libvirt-8.3.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-8.3.0/include/libvirt/libvirt-domain.h
+Index: libvirt-8.4.0/include/libvirt/libvirt-domain.h
 ===================================================================
--- libvirt-8.3.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-8.3.0/include/libvirt/libvirt-domain.h
+--- libvirt-8.4.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-8.4.0/include/libvirt/libvirt-domain.h
@@ -1352,6 +1352,31 @@ typedef enum {
  */
 # define VIR_MIGRATE_PARAM_TLS_DESTINATION          "tls.destination"
@ -54,7 +54,7 @@ Index: libvirt-8.3.0/include/libvirt/libvirt-domain.h
 + *
 + * virDomainMigrate* params field: xc_domain_save max_iters
 + *
-+ * Since: v1.2.5
+ * Since: 1.2.5
 + */
 +#define VIR_MIGRATE_PARAM_SUSE_MAX_ITERS     "max_iters"
 +/**
@ -62,7 +62,7 @@ Index: libvirt-8.3.0/include/libvirt/libvirt-domain.h
 + *
 + * virDomainMigrate* params field: xc_domain_save min_remaining
 + *
-+ * Since: v1.2.5
+ * Since: 1.2.5
 + */
 +#define VIR_MIGRATE_PARAM_SUSE_MIN_REMAINING "min_remaining"
 +/**
@ -70,18 +70,18 @@ Index: libvirt-8.3.0/include/libvirt/libvirt-domain.h
 + *
 + * virDomainMigrate* params field: xc_domain_save abort_if_busy
 + *
-+ * Since: v1.2.5
+ * Since: 1.2.5
 + */
 +#define VIR_MIGRATE_PARAM_SUSE_ABORT_IF_BUSY "abort_if_busy"
 +
 /* Domain migration. */
 virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
                                unsigned long flags, const char *dname,
-Index: libvirt-8.3.0/src/libxl/libxl_driver.c
+Index: libvirt-8.4.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-8.3.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-8.3.0/src/libxl/libxl_driver.c
-@@ -6004,6 +6004,9 @@ libxlDomainMigratePerform3Params(virDoma
+--- libvirt-8.4.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.4.0/src/libxl/libxl_driver.c
+@@ -6005,6 +6005,9 @@ libxlDomainMigratePerform3Params(virDoma
     const char *dname = NULL;
     const char *uri = NULL;
     int ret = -1;
@ -91,7 +91,7 @@ Index: libvirt-8.3.0/src/libxl/libxl_driver.c
 
 #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
     virReportUnsupportedError();
-@@ -6020,6 +6023,15 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6021,6 +6024,15 @@ libxlDomainMigratePerform3Params(virDoma
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_DEST_NAME,
                                 &dname) < 0 ||
@ -107,7 +107,7 @@ Index: libvirt-8.3.0/src/libxl/libxl_driver.c
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_URI,
                                 &uri) < 0)
-@@ -6034,11 +6046,11 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6035,11 +6047,11 @@ libxlDomainMigratePerform3Params(virDoma
 
     if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
         if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml,
@ -121,10 +121,10 @@ Index: libvirt-8.3.0/src/libxl/libxl_driver.c
             goto cleanup;
     }
 
-Index: libvirt-8.3.0/src/libxl/libxl_migration.c
+Index: libvirt-8.4.0/src/libxl/libxl_migration.c
 ===================================================================
--- libvirt-8.3.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-8.3.0/src/libxl/libxl_migration.c
+--- libvirt-8.4.0.orig/src/libxl/libxl_migration.c
+++ libvirt-8.4.0/src/libxl/libxl_migration.c
@@ -332,18 +332,38 @@ libxlMigrateDstReceive(virNetSocket *soc
 static int
 libxlDoMigrateSrcSend(libxlDriverPrivate *driver,
@ -285,10 +285,10 @@ Index: libvirt-8.3.0/src/libxl/libxl_migration.c
     virObjectLock(vm);
 
     if (ret == 0) {
-Index: libvirt-8.3.0/src/libxl/libxl_migration.h
+Index: libvirt-8.4.0/src/libxl/libxl_migration.h
 ===================================================================
--- libvirt-8.3.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-8.3.0/src/libxl/libxl_migration.h
+--- libvirt-8.4.0.orig/src/libxl/libxl_migration.h
+++ libvirt-8.4.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, \
@ -331,10 +331,10 @@ Index: libvirt-8.3.0/src/libxl/libxl_migration.h
 
 virDomainPtr
 libxlDomainMigrationDstFinish(virConnectPtr dconn,
-Index: libvirt-8.3.0/tools/virsh-domain.c
+Index: libvirt-8.4.0/tools/virsh-domain.c
 ===================================================================
--- libvirt-8.3.0.orig/tools/virsh-domain.c
-+++ libvirt-8.3.0/tools/virsh-domain.c
+--- libvirt-8.4.0.orig/tools/virsh-domain.c
+++ libvirt-8.4.0/tools/virsh-domain.c
@@ -10918,6 +10918,18 @@ static const vshCmdOptDef opts_migrate[]
      .completer = virshCompleteEmpty,
      .help = N_("override the destination host name used for TLS verification")
--- a/libxl-support-block-script.patch
+++ b/libxl-support-block-script.patch
@ -7,11 +7,11 @@ and npiv.

 For more details, see bsc#954872 and FATE#319810

-Index: libvirt-8.3.0/src/libxl/libxl_conf.c
+Index: libvirt-8.4.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-8.3.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-8.3.0/src/libxl/libxl_conf.c
-@@ -944,6 +944,20 @@ libxlDiskSetDiscard(libxl_device_disk *x
+--- libvirt-8.4.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.4.0/src/libxl/libxl_conf.c
+@@ -945,6 +945,20 @@ libxlDiskSetDiscard(libxl_device_disk *x
 }
 
 static void
@ -32,7 +32,7 @@ Index: libvirt-8.3.0/src/libxl/libxl_conf.c
 libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
 {
     switch (cachemode) {
-@@ -1086,6 +1100,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
+@@ -1087,6 +1101,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
 int
 libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk)
 {
@ -40,7 +40,7 @@ Index: libvirt-8.3.0/src/libxl/libxl_conf.c
     const char *driver = virDomainDiskGetDriver(l_disk);
     int format = virDomainDiskGetFormat(l_disk);
     int actual_type = virStorageSourceGetActualType(l_disk->src);
-@@ -1099,7 +1114,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
+@@ -1100,7 +1115,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
         if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
             return -1;
     } else {
@ -49,7 +49,7 @@ Index: libvirt-8.3.0/src/libxl/libxl_conf.c
     }
 
     x_disk->vdev = g_strdup(l_disk->dst);
-@@ -1205,6 +1220,8 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
+@@ -1206,6 +1221,8 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
     x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
     libxlDiskSetDiscard(x_disk, l_disk->discard);
     libxlDiskSetCacheMode(x_disk, l_disk->cachemode);
--- a/lxc-wait-after-eth-del.patch
+++ b/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-8.3.0/src/lxc/lxc_controller.c
+Index: libvirt-8.4.0/src/lxc/lxc_controller.c
 ===================================================================
--- libvirt-8.3.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-8.3.0/src/lxc/lxc_controller.c
+--- libvirt-8.4.0.orig/src/lxc/lxc_controller.c
+++ libvirt-8.4.0/src/lxc/lxc_controller.c
@@ -1999,6 +1999,7 @@ static int virLXCControllerDeleteInterfa
         if (virNetDevVethDelete(ctrl->veths[i]) < 0)
             ret = -1;
@ -25,10 +25,10 @@ Index: libvirt-8.3.0/src/lxc/lxc_controller.c
 
     return ret;
 }
-Index: libvirt-8.3.0/src/lxc/lxc_driver.c
+Index: libvirt-8.4.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-8.3.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-8.3.0/src/lxc/lxc_driver.c
+--- libvirt-8.4.0.orig/src/lxc/lxc_driver.c
+++ libvirt-8.4.0/src/lxc/lxc_driver.c
@@ -67,6 +67,7 @@
 #include "virtime.h"
 #include "virtypedparam.h"
@ -53,10 +53,10 @@ Index: libvirt-8.3.0/src/lxc/lxc_driver.c
         break;
 
         /* It'd be nice to support this, but with macvlan
-Index: libvirt-8.3.0/src/lxc/lxc_process.c
+Index: libvirt-8.4.0/src/lxc/lxc_process.c
 ===================================================================
--- libvirt-8.3.0.orig/src/lxc/lxc_process.c
-+++ libvirt-8.3.0/src/lxc/lxc_process.c
+--- libvirt-8.4.0.orig/src/lxc/lxc_process.c
+++ libvirt-8.4.0/src/lxc/lxc_process.c
@@ -51,6 +51,7 @@
 #include "virstring.h"
 #include "virprocess.h"
@ -65,7 +65,7 @@ Index: libvirt-8.3.0/src/lxc/lxc_process.c
 #include "netdev_bandwidth_conf.h"
 #include "virutil.h"
 
-@@ -245,6 +246,7 @@ static void virLXCProcessCleanup(virLXCD
+@@ -243,6 +244,7 @@ static void virLXCProcessCleanup(virLXCD
                 VIR_WARN("Unable to release network device '%s'", NULLSTR(iface->ifname));
         }
     }
--- a/network-don-t-use-dhcp-authoritative-on-static-netwo.patch
+++ b/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-8.3.0/src/network/bridge_driver.c
+Index: libvirt-8.4.0/src/network/bridge_driver.c
 ===================================================================
--- libvirt-8.3.0.orig/src/network/bridge_driver.c
-+++ libvirt-8.3.0/src/network/bridge_driver.c
+--- libvirt-8.4.0.orig/src/network/bridge_driver.c
+++ libvirt-8.4.0/src/network/bridge_driver.c
@@ -1334,7 +1334,14 @@ networkDnsmasqConfContents(virNetworkObj
         if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
             if (ipdef->nranges || ipdef->nhosts) {
@ -37,10 +37,10 @@ Index: libvirt-8.3.0/src/network/bridge_driver.c
             }
 
             if (ipdef->tftproot) {
-Index: libvirt-8.3.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-8.4.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
 ===================================================================
--- libvirt-8.3.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-8.3.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+--- libvirt-8.4.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-8.4.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
@@ -10,7 +10,6 @@ bind-dynamic
 interface=virbr1
 dhcp-range=192.168.122.1,static
--- a/ppc64le-canonical-name.patch
+++ b/ppc64le-canonical-name.patch
@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64

 See bnc#894956

-Index: libvirt-8.3.0/src/util/virarch.c
+Index: libvirt-8.4.0/src/util/virarch.c
 ===================================================================
--- libvirt-8.3.0.orig/src/util/virarch.c
-+++ libvirt-8.3.0/src/util/virarch.c
+--- libvirt-8.4.0.orig/src/util/virarch.c
+++ libvirt-8.4.0/src/util/virarch.c
@@ -222,6 +222,8 @@ virArch virArchFromHost(void)
         arch = VIR_ARCH_X86_64;
     } else if (STREQ(ut.machine, "arm64")) {
--- a/qemu-apparmor-screenshot.patch
+++ b/qemu-apparmor-screenshot.patch
@ -1,7 +1,7 @@
-Index: libvirt-8.3.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-8.4.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-8.3.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-8.3.0/src/security/apparmor/libvirt-qemu
+--- libvirt-8.4.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-8.4.0/src/security/apparmor/libvirt-qemu
@@ -253,3 +253,6 @@
   # required for QEMU accessing UEFI nvram variables
   owner /var/lib/libvirt/qemu/nvram/*_VARS.fd rwk,
--- a/suse-libvirt-guests-service.patch
+++ b/suse-libvirt-guests-service.patch
@ -1,9 +1,9 @@
 Adjust libvirt-guests service to conform to SUSE standards

-Index: libvirt-8.3.0/tools/libvirt-guests.sh.in
+Index: libvirt-8.4.0/tools/libvirt-guests.sh.in
 ===================================================================
--- libvirt-8.3.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-8.3.0/tools/libvirt-guests.sh.in
+--- libvirt-8.4.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-8.4.0/tools/libvirt-guests.sh.in
@@ -20,10 +20,6 @@ sysconfdir="@sysconfdir@"
 localstatedir="@localstatedir@"
 libvirtd="@sbindir@"/libvirtd
--- a/suse-libvirtd-disable-tls.patch
+++ b/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-8.3.0/src/remote/remote_daemon_config.c
+Index: libvirt-8.4.0/src/remote/remote_daemon_config.c
 ===================================================================
--- libvirt-8.3.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-8.3.0/src/remote/remote_daemon_config.c
+--- libvirt-8.4.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-8.4.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-8.3.0/src/remote/remote_daemon_config.c
 # else /* ! LIBVIRTD */
     data->listen_tls = false; /* Always honoured, --listen doesn't exist. */
 # endif /* ! LIBVIRTD */
-Index: libvirt-8.3.0/src/remote/libvirtd.conf.in
+Index: libvirt-8.4.0/src/remote/libvirtd.conf.in
 ===================================================================
--- libvirt-8.3.0.orig/src/remote/libvirtd.conf.in
-+++ libvirt-8.3.0/src/remote/libvirtd.conf.in
+--- libvirt-8.4.0.orig/src/remote/libvirtd.conf.in
+++ libvirt-8.4.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-8.3.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-8.3.0/src/remote/test_libvirtd.aug.in
+Index: libvirt-8.4.0/src/remote/test_libvirtd.aug.in
 ===================================================================
--- libvirt-8.3.0.orig/src/remote/test_libvirtd.aug.in
-+++ libvirt-8.3.0/src/remote/test_libvirtd.aug.in
+--- libvirt-8.4.0.orig/src/remote/test_libvirtd.aug.in
+++ libvirt-8.4.0/src/remote/test_libvirtd.aug.in
@@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ =
 
    test @DAEMON_NAME_UC@.lns get conf =
--- a/suse-libxl-disable-autoballoon.patch
+++ b/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-8.3.0/src/libxl/libxl.conf
+Index: libvirt-8.4.0/src/libxl/libxl.conf
 ===================================================================
--- libvirt-8.3.0.orig/src/libxl/libxl.conf
-+++ libvirt-8.3.0/src/libxl/libxl.conf
+--- libvirt-8.4.0.orig/src/libxl/libxl.conf
+++ libvirt-8.4.0/src/libxl/libxl.conf
@@ -4,12 +4,11 @@
 
 # Enable autoballooning of domain0
@ -27,11 +27,11 @@ Index: libvirt-8.3.0/src/libxl/libxl.conf
 
 
 # In order to prevent accidentally starting two domains that
-Index: libvirt-8.3.0/src/libxl/libxl_conf.c
+Index: libvirt-8.4.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-8.3.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-8.3.0/src/libxl/libxl_conf.c
-@@ -1732,15 +1732,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
+--- libvirt-8.4.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.4.0/src/libxl/libxl_conf.c
+@@ -1734,15 +1734,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
 /*
  * Get domain0 autoballoon configuration.  Honor user-specified
  * setting in libxl.conf first.  If not specified, autoballooning
@ -48,7 +48,7 @@ Index: libvirt-8.3.0/src/libxl/libxl_conf.c
     int res;
 
     res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon);
-@@ -1749,15 +1746,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
+@@ -1751,15 +1748,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
     else if (res == 1)
         return 0;
 
@ -66,10 +66,10 @@ Index: libvirt-8.3.0/src/libxl/libxl_conf.c
     return 0;
 }
 
-Index: libvirt-8.3.0/src/libxl/test_libvirtd_libxl.aug.in
+Index: libvirt-8.4.0/src/libxl/test_libvirtd_libxl.aug.in
 ===================================================================
--- libvirt-8.3.0.orig/src/libxl/test_libvirtd_libxl.aug.in
-+++ libvirt-8.3.0/src/libxl/test_libvirtd_libxl.aug.in
+--- libvirt-8.4.0.orig/src/libxl/test_libvirtd_libxl.aug.in
+++ libvirt-8.4.0/src/libxl/test_libvirtd_libxl.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd_libxl =
   @CONFIG@
 
--- a/suse-qemu-conf.patch
+++ b/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-8.3.0/src/qemu/qemu_conf.c
+Index: libvirt-8.4.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-8.3.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-8.3.0/src/qemu/qemu_conf.c
+--- libvirt-8.4.0.orig/src/qemu/qemu_conf.c
+++ libvirt-8.4.0/src/qemu/qemu_conf.c
@@ -261,7 +261,7 @@ virQEMUDriverConfig *virQEMUDriverConfig
     cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER);
     cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON);
@ -20,10 +20,10 @@ Index: libvirt-8.3.0/src/qemu/qemu_conf.c
     cfg->securityRequireConfined = false;
 
     cfg->keepAliveInterval = 5;
-Index: libvirt-8.3.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-8.4.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
--- libvirt-8.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-8.3.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-8.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-8.4.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" }
@ -32,10 +32,10 @@ Index: libvirt-8.3.0/src/qemu/test_libvirtd_qemu.aug.in
 { "security_default_confined" = "1" }
 { "security_require_confined" = "1" }
 { "user" = "@QEMU_USER@" }
-Index: libvirt-8.3.0/src/qemu/qemu.conf.in
+Index: libvirt-8.4.0/src/qemu/qemu.conf.in
 ===================================================================
--- libvirt-8.3.0.orig/src/qemu/qemu.conf.in
-+++ libvirt-8.3.0/src/qemu/qemu.conf.in
+--- libvirt-8.4.0.orig/src/qemu/qemu.conf.in
+++ libvirt-8.4.0/src/qemu/qemu.conf.in
@@ -491,10 +491,19 @@
 # isolation, but it cannot appear in a list of drivers.
 #
--- a/suse-qemu-ovmf-paths.patch
+++ b/suse-qemu-ovmf-paths.patch
@ -5,10 +5,10 @@ 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-8.3.0/src/qemu/qemu_conf.c
+Index: libvirt-8.4.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-8.3.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-8.3.0/src/qemu/qemu_conf.c
+--- libvirt-8.4.0.orig/src/qemu/qemu_conf.c
+++ libvirt-8.4.0/src/qemu/qemu_conf.c
@@ -87,10 +87,9 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig);
 
 #ifndef DEFAULT_LOADER_NVRAM
@ -23,10 +23,10 @@ Index: libvirt-8.3.0/src/qemu/qemu_conf.c
 #endif
 
 
-Index: libvirt-8.3.0/src/security/virt-aa-helper.c
+Index: libvirt-8.4.0/src/security/virt-aa-helper.c
 ===================================================================
--- libvirt-8.3.0.orig/src/security/virt-aa-helper.c
-+++ libvirt-8.3.0/src/security/virt-aa-helper.c
+--- libvirt-8.4.0.orig/src/security/virt-aa-helper.c
+++ libvirt-8.4.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 */
@ -37,10 +37,10 @@ Index: libvirt-8.3.0/src/security/virt-aa-helper.c
     };
     /* override the above with these */
     const char * const override[] = {
-Index: libvirt-8.3.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-8.4.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
--- libvirt-8.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-8.3.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-8.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-8.4.0/src/qemu/test_libvirtd_qemu.aug.in
@@ -96,10 +96,9 @@ module Test_libvirtd_qemu =
 { "migration_port_max" = "49215" }
 { "log_timestamp" = "0" }
@ -55,10 +55,10 @@ Index: libvirt-8.3.0/src/qemu/test_libvirtd_qemu.aug.in
 }
 { "stdio_handler" = "logd" }
 { "gluster_debug_level" = "9" }
-Index: libvirt-8.3.0/src/qemu/qemu.conf.in
+Index: libvirt-8.4.0/src/qemu/qemu.conf.in
 ===================================================================
--- libvirt-8.3.0.orig/src/qemu/qemu.conf.in
-+++ libvirt-8.3.0/src/qemu/qemu.conf.in
+--- libvirt-8.4.0.orig/src/qemu/qemu.conf.in
+++ libvirt-8.4.0/src/qemu/qemu.conf.in
@@ -857,10 +857,9 @@
 # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
 # follows this scheme.
--- a/suse-xen-ovmf-paths.patch
+++ b/suse-xen-ovmf-paths.patch
@ -5,11 +5,11 @@ 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-8.3.0/src/libxl/libxl_conf.c
+Index: libvirt-8.4.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-8.3.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-8.3.0/src/libxl/libxl_conf.c
-@@ -1783,7 +1783,7 @@ libxlDriverConfigNew(void)
+--- libvirt-8.4.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.4.0/src/libxl/libxl_conf.c
+@@ -1785,7 +1785,7 @@ libxlDriverConfigNew(void)
     cfg->firmwares = g_new0(virFirmware *, 1);
     cfg->nfirmwares = 1;
     cfg->firmwares[0] = g_new0(virFirmware, 1);
--- a/virt-create-rootfs.patch
+++ b/virt-create-rootfs.patch
@ -1,7 +1,7 @@
-Index: libvirt-8.3.0/tools/virt-create-rootfs
+Index: libvirt-8.4.0/tools/virt-create-rootfs
 ===================================================================
 --- /dev/null
-+++ libvirt-8.3.0/tools/virt-create-rootfs
+++ libvirt-8.4.0/tools/virt-create-rootfs
@@ -0,0 +1,236 @@
 +#!/bin/sh
 +set -e
@ -239,10 +239,10 @@ Index: libvirt-8.3.0/tools/virt-create-rootfs
 +    echo "pts/0" >> "$ROOT/etc/securetty"
 +    chroot "$ROOT" /usr/bin/passwd
 +fi
-Index: libvirt-8.3.0/docs/manpages/virt-create-rootfs.rst
+Index: libvirt-8.4.0/docs/manpages/virt-create-rootfs.rst
 ===================================================================
 --- /dev/null
-+++ libvirt-8.3.0/docs/manpages/virt-create-rootfs.rst
+++ libvirt-8.4.0/docs/manpages/virt-create-rootfs.rst
@@ -0,0 +1,88 @@
 +==================
 +virt-create-rootfs
@ -332,10 +332,10 @@ Index: libvirt-8.3.0/docs/manpages/virt-create-rootfs.rst
 +========
 +
 +virsh(1), `https://libvirt.org/ <https://libvirt.org/>`_
-Index: libvirt-8.3.0/docs/manpages/meson.build
+Index: libvirt-8.4.0/docs/manpages/meson.build
 ===================================================================
--- libvirt-8.3.0.orig/docs/manpages/meson.build
-+++ libvirt-8.3.0/docs/manpages/meson.build
+--- libvirt-8.4.0.orig/docs/manpages/meson.build
+++ libvirt-8.4.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') },
@ -344,10 +344,10 @@ Index: libvirt-8.3.0/docs/manpages/meson.build
 
   { 'name': 'libvirt-guests', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') },
   { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') },
-Index: libvirt-8.3.0/tools/meson.build
+Index: libvirt-8.4.0/tools/meson.build
 ===================================================================
--- libvirt-8.3.0.orig/tools/meson.build
-+++ libvirt-8.3.0/tools/meson.build
+--- libvirt-8.4.0.orig/tools/meson.build
+++ libvirt-8.4.0/tools/meson.build
@@ -154,6 +154,8 @@ else
   virsh_icon_res = []
 endif