pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 852455 from home:jfehlig:branches:Virtualization

Browse Source 
- Update to libvirt 6.10.0
  - jsc#SLE-13688
  - Many incremental improvements and bug fixes, see
    https://libvirt.org/news.html
  - Dropped patches:
    f035f53b-virt-guest-shutdown.patch

OBS-URL: https://build.opensuse.org/request/show/852455
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=861
This commit is contained in:
James Fehlig 2020-12-02 04:12:13 +00:00 committed by Git OBS Bridge
parent 7c4b87951a
commit b2cb9c7395
32 changed files with 270 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
0001-Extract-stats-functions-from-the-qemu-driver.patch
View File

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

10
0001-libxl-add-support-for-BlockResize-API.patch
View File

@ -19,11 +19,11 @@ reworking this patch and submitting it to upstream libvirt.
src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 91 insertions(+) 1 file changed, 91 insertions(+)
Index: libvirt-6.9.0/src/libxl/libxl_driver.c Index: libvirt-6.10.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/libxl/libxl_driver.c --- libvirt-6.10.0.orig/src/libxl/libxl_driver.c
+++ libvirt-6.9.0/src/libxl/libxl_driver.c +++ libvirt-6.10.0/src/libxl/libxl_driver.c
@@ -5327,6 +5327,96 @@ libxlDomainMemoryStats(virDomainPtr dom, @@ -5322,6 +5322,96 @@ libxlDomainMemoryStats(virDomainPtr dom,
#undef LIBXL_SET_MEMSTAT #undef LIBXL_SET_MEMSTAT
@ -120,7 +120,7 @@ Index: libvirt-6.9.0/src/libxl/libxl_driver.c
static int static int
libxlDomainGetJobInfo(virDomainPtr dom, libxlDomainGetJobInfo(virDomainPtr dom,
virDomainJobInfoPtr info) virDomainJobInfoPtr info)
@@ -6799,6 +6889,7 @@ static virHypervisorDriver libxlHypervis @@ -6794,6 +6884,7 @@ static virHypervisorDriver libxlHypervis
#endif #endif
.nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */
.nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */ .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */

10
0002-lxc-implement-connectGetAllDomainStats.patch
View File

@ -9,10 +9,10 @@ them using the existing API.
src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 138 insertions(+) 1 file changed, 138 insertions(+)
Index: libvirt-6.9.0/src/lxc/lxc_driver.c Index: libvirt-6.10.0/src/lxc/lxc_driver.c
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/lxc/lxc_driver.c --- libvirt-6.10.0.orig/src/lxc/lxc_driver.c
+++ libvirt-6.9.0/src/lxc/lxc_driver.c +++ libvirt-6.10.0/src/lxc/lxc_driver.c
@@ -73,6 +73,8 @@ @@ -73,6 +73,8 @@
#include "netdev_bandwidth_conf.h" #include "netdev_bandwidth_conf.h"
#include "virsocket.h" #include "virsocket.h"
@ -22,7 +22,7 @@ Index: libvirt-6.9.0/src/lxc/lxc_driver.c
#define VIR_FROM_THIS VIR_FROM_LXC #define VIR_FROM_THIS VIR_FROM_LXC
@@ -5069,6 +5071,128 @@ lxcDomainHasManagedSaveImage(virDomainPt @@ -5068,6 +5070,128 @@ lxcDomainHasManagedSaveImage(virDomainPt
return ret; return ret;
} }
@ -151,7 +151,7 @@ Index: libvirt-6.9.0/src/lxc/lxc_driver.c
/* Function Tables */ /* Function Tables */
static virHypervisorDriver lxcHypervisorDriver = { static virHypervisorDriver lxcHypervisorDriver = {
@@ -5166,6 +5290,7 @@ static virHypervisorDriver lxcHypervisor @@ -5165,6 +5289,7 @@ static virHypervisorDriver lxcHypervisor
.nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */
.nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */
.domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */

116
f035f53b-virt-guest-shutdown.patch
View File

@ -1,116 +0,0 @@
commit f035f53baa2e5dc00b8e866e594672a90b4cea78
Author: Jim Fehlig <jfehlig@suse.com>
Date: Tue Nov 3 19:14:39 2020 -0700
remote: Add libvirtd dependency to virt-guest-shutdown.target
When restarting libvirt services and sockets *and* libvirt-guests.service
is running, the latter will sometimes hang when trying to connect to
libvirtd. Even though libvirt-guests has 'Wants=libvirtd.service' and
'After=libvirtd.service', we can see via journalctl that it is not
shutdown before libvirtd when executing something like
systemctl try-restart libvirtd.service libvirtd.socket \
libvirtd-ro.socket virtlockd.service virtlockd.socket \
virtlogd.service virtlogd.socket virt-guest-shutdown.target
Oct 28 15:53:31 systemd[1]: Stopping Virtualization daemon...
Oct 28 15:53:31 systemd[1]: libvirtd.service: Succeeded.
Oct 28 15:53:31 systemd[1]: Stopped Virtualization daemon.
Oct 28 15:53:31 systemd[1]: libvirtd-admin.socket: Succeeded.
Oct 28 15:53:31 systemd[1]: Closed Libvirt admin socket.
Oct 28 15:53:31 systemd[1]: Stopping Libvirt admin socket.
Oct 28 15:53:31 systemd[1]: libvirtd-ro.socket: Succeeded.
Oct 28 15:53:31 systemd[1]: Closed Libvirt local read-only socket.
Oct 28 15:53:31 systemd[1]: Stopping Libvirt local read-only socket.
Oct 28 15:53:31 systemd[1]: libvirtd.socket: Succeeded.
Oct 28 15:53:31 systemd[1]: Closed Libvirt local socket.
Oct 28 15:53:31 systemd[1]: Stopping Libvirt local socket.
Oct 28 15:53:31 systemd[1]: Listening on Libvirt local socket.
Oct 28 15:53:31 systemd[1]: Listening on Libvirt admin socket.
Oct 28 15:53:31 systemd[1]: Listening on Libvirt local read-only socket.
Oct 28 15:53:31 systemd[1]: virtlockd.socket: Succeeded.
Oct 28 15:53:31 systemd[1]: Closed Virtual machine lock manager socket.
Oct 28 15:53:31 systemd[1]: Stopping Virtual machine lock manager socket.
Oct 28 15:53:31 systemd[1]: Listening on Virtual machine lock manager socket.
Oct 28 15:53:31 systemd[1]: virtlogd.socket: Succeeded.
Oct 28 15:53:31 systemd[1]: Closed Virtual machine log manager socket.
Oct 28 15:53:31 systemd[1]: Stopping Virtual machine log manager socket.
Oct 28 15:53:31 systemd[1]: Listening on Virtual machine log manager socket.
Oct 28 15:53:31 systemd[1]: Stopping Suspend/Resume Running libvirt Guests...
In this case, the try-restart command hung and libvirt-guests was stuck
trying to connect to libvirtd. In the following case, the try-restart
worked since libvirtd was started again before libvirt-guests was stopped!
Oct 28 15:19:02 systemd[1]: Stopping Virtualization daemon...
Oct 28 15:19:02 systemd[1]: Stopped Virtualization daemon.
Oct 28 15:19:02 systemd[1]: Closed Libvirt admin socket.
Oct 28 15:19:02 systemd[1]: Stopping Libvirt admin socket.
Oct 28 15:19:02 systemd[1]: Closed Virtual machine lock manager socket.
Oct 28 15:19:02 systemd[1]: Stopping Virtual machine lock manager socket.
Oct 28 15:19:02 systemd[1]: Listening on Virtual machine lock manager socket.
Oct 28 15:19:02 systemd[1]: Closed Libvirt local read-only socket.
Oct 28 15:19:02 systemd[1]: Stopping Libvirt local read-only socket.
Oct 28 15:19:02 systemd[1]: Closed Libvirt local socket.
Oct 28 15:19:02 systemd[1]: Stopping Libvirt local socket.
Oct 28 15:19:02 systemd[1]: Listening on Libvirt local socket.
Oct 28 15:19:02 systemd[1]: Listening on Libvirt admin socket.
Oct 28 15:19:02 systemd[1]: Listening on Libvirt local read-only socket.
Oct 28 15:19:02 systemd[1]: Closed Virtual machine log manager socket.
Oct 28 15:19:02 systemd[1]: Stopping Virtual machine log manager socket.
Oct 28 15:19:02 systemd[1]: Listening on Virtual machine log manager socket.
Oct 28 15:19:02 systemd[1]: Starting Virtualization daemon...
Oct 28 15:19:02 systemd[1]: Stopping Suspend/Resume Running libvirt Guests...
Oct 28 15:19:02 systemd[1]: Started Virtualization daemon.
Oct 28 15:19:02 libvirt-guests.sh[4912]: Running guests on default URI: no running guests.
Oct 28 15:19:02 systemd[1]: Stopped Suspend/Resume Running libvirt Guests.
Oct 28 15:19:02 systemd[1]: Stopped target Libvirt guests shutdown.
Oct 28 15:19:02 systemd[1]: Stopping Libvirt guests shutdown.
Oct 28 15:19:02 systemd[1]: Reached target Libvirt guests shutdown.
Oct 28 15:19:02 systemd[1]: Starting Suspend/Resume Running libvirt Guests...
Oct 28 15:19:02 systemd[1]: Started Suspend/Resume Running libvirt Guests.
Adding 'Requires=libvirtd.service' to virt-guest-shutdown.target results
in expected behavior
Oct 28 15:40:00 systemd[1]: Stopping Suspend/Resume Running libvirt Guests...
Oct 28 15:40:00 libvirt-guests.sh[5245]: Running guests on default URI: no running guests.
Oct 28 15:40:00 systemd[1]: Stopped Suspend/Resume Running libvirt Guests.
Oct 28 15:40:00 systemd[1]: Stopped target Libvirt guests shutdown.
Oct 28 15:40:00 systemd[1]: Stopping Libvirt guests shutdown.
Oct 28 15:40:00 systemd[1]: Stopping Virtualization daemon...
Oct 28 15:40:00 systemd[1]: Stopped Virtualization daemon.
Oct 28 15:40:00 systemd[1]: Closed Virtual machine log manager socket.
Oct 28 15:40:00 systemd[1]: Stopping Virtual machine log manager socket.
Oct 28 15:40:00 systemd[1]: Listening on Virtual machine log manager socket.
Oct 28 15:40:00 systemd[1]: Closed Libvirt admin socket.
Oct 28 15:40:00 systemd[1]: Stopping Libvirt admin socket.
Oct 28 15:40:00 systemd[1]: Closed Libvirt local read-only socket.
Oct 28 15:40:00 systemd[1]: Stopping Libvirt local read-only socket.
Oct 28 15:40:00 systemd[1]: Closed Libvirt local socket.
Oct 28 15:40:00 systemd[1]: Stopping Libvirt local socket.
Oct 28 15:40:00 systemd[1]: Listening on Libvirt local socket.
Oct 28 15:40:00 systemd[1]: Listening on Libvirt admin socket.
Oct 28 15:40:00 systemd[1]: Listening on Libvirt local read-only socket.
Oct 28 15:40:00 systemd[1]: Closed Virtual machine lock manager socket.
Oct 28 15:40:00 systemd[1]: Stopping Virtual machine lock manager socket.
Oct 28 15:40:00 systemd[1]: Listening on Virtual machine lock manager socket.
Oct 28 15:40:00 systemd[1]: Starting Virtualization daemon...
Oct 28 15:40:00 systemd[1]: Started Virtualization daemon.
Oct 28 15:40:00 systemd[1]: Reached target Libvirt guests shutdown.
Oct 28 15:40:00 systemd[1]: Starting Suspend/Resume Running libvirt Guests...
Oct 28 15:40:00 systemd[1]: Started Suspend/Resume Running libvirt Guests.
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
Index: libvirt-6.9.0/src/remote/virt-guest-shutdown.target
===================================================================
--- libvirt-6.9.0.orig/src/remote/virt-guest-shutdown.target
+++ libvirt-6.9.0/src/remote/virt-guest-shutdown.target
@@ -1,3 +1,4 @@
[Unit]
Description=Libvirt guests shutdown
+Requires=libvirtd.service
Documentation=https://libvirt.org

3
libvirt-6.10.0.tar.xz Normal file
View File

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

16
libvirt-6.10.0.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAl/GBQ0ACgkQymi+gBAI
TJxI5g/+KwFZ02iJQrC+cgdMvBzYnIGe4ugw1YnFngSXmVtIj0/S5D2AsAN4IaQQ
TdaSl42S2+t/MiOQ7tUg734690P5tNXe2bzUguiXyO3I8cdQy7MNXd6wUOXGCpTj
oSaVXmmxTG9Zyu69G0Gam1SLzBsHTKZa4BA3W/wSBtuoJXaeAT9JJLtWFweRQuQB
G+BigaL5fFkn9lblhc87MI/GdlD2qga5s1ayP5AuS9zZnqFawNHKS5XWrS+OJXKw
ZMx2LH57kxHo3z2n4JP70A0b3WIkmUPfLnvjB2bjn0BS+WdggXOhDqds8FuM56mB
fngBJXhwtIz8McCqhq0mNQbokTLGrzAp58E5b42cbWT1ST2bmpBcIUHgpUpCEX/P
Vns0UYOzsyn6YB+8WfY0Tt1eZYBpkTnFh8O2VaySsx6Gv6qfHBhqdv5kdUvh3j0w
sUudpxM63B6niIMJMtn4NQNsC7uvoU+f2YuobV8Bi0mmSGjJdpSUa5QF+MsKPB7u
kaVmzc8E+CgyYDqf7o24n+rgmkf5FQC83d3hcUJFL0pe9pS5d56FY6CvarMqfD3W
Jds66/LqIrm91PTjPSUvFp78fk17WRb91x6awePSrGiIPXkSGHvPZrZJihFMCZfc
ymJ2m4sddIoydbTBIEioaYPBBKLqP+IPO/c4zs00P5/XbBkAdes=
=t0QA
-----END PGP SIGNATURE-----

3
libvirt-6.9.0.tar.xz
View File

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

16
libvirt-6.9.0.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAl+f3RQACgkQymi+gBAI
TJz/YA/9GcwjRXvtV1JpYweIGsXc3DKEcXRxLjEC9SVMfaNxUMvlLWhJH3xuMpYJ
6zkY/s5UDK5+cR3/uENqPhVVJbgnOk2QsTtKOlv6mqeisopyV3B+QzSYBbPTpYzP
Z5gc2ym7ORbdRgs1FdyKnDhUAvna02MKz8/p2uppfCWnZ9zsrg+SWSloI1Cp+sB4
pcyGNFxYhHC0dm/fvuLexxt/XWywsV6dvhUSwG9Ww9a+JckW+Z07D+Ga19BLYawv
oOZZ/9nx77ojjsqGedYJsbr0jn++qczhTPgOmt1Ii0oKAEjYzXp5noETFl8DWKuN
nx0h6Mo36c+79u9mamiZyK/LIbW4c4W2EfLjD8vWSn6+RyXig5CEU6KEPOKvxi35
5k/PlDyQQtboGxLtZCPcBIjXufKt+j8r5yEmEV5zHNhHRqii8B67l9OhJircUGgv
ZYwgL0fse+PO2mFEQUBXMyv5eI3rCfXPPOAsZXygLgguzLFsapK8tS7pjePUX4K8
ZApbPKIMHacukz8RwS09I8a0e7UquYDbZk4gSMwpMZ6Cqp8CLM38owGBd3p3oatH
CBW1SHbxehYVFiMx9S5EooUDf1+CJt6g85je+ytCn3itUR6AlsMnU83yAOLaDJHM
XvOCSWuXD+JUXFBHOYaj5Kg7D2RNUgbkssXJz8uLGp6vyfxiVuk=
=9w27
-----END PGP SIGNATURE-----

6
libvirt-power8-models.patch
View File

@ -2,10 +2,10 @@ Add POWER8 v2.0 and v2.1 to cpu map XML
From: <ro@suse.de> From: <ro@suse.de>
Index: libvirt-6.9.0/src/cpu_map/ppc64_POWER8.xml Index: libvirt-6.10.0/src/cpu_map/ppc64_POWER8.xml
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/cpu_map/ppc64_POWER8.xml --- libvirt-6.10.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-6.9.0/src/cpu_map/ppc64_POWER8.xml +++ libvirt-6.10.0/src/cpu_map/ppc64_POWER8.xml
@@ -4,5 +4,7 @@ @@ -4,5 +4,7 @@
<pvr value='0x004b0000' mask='0xffff0000'/> <pvr value='0x004b0000' mask='0xffff0000'/>
<pvr value='0x004c0000' mask='0xffff0000'/> <pvr value='0x004c0000' mask='0xffff0000'/>

44
libvirt-suse-netcontrol.patch
View File

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

10
libvirt.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Dec 1 23:55:16 UTC 2020 - James Fehlig <jfehlig@suse.com>
- Update to libvirt 6.10.0
- jsc#SLE-13688
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html
- Dropped patches:
f035f53b-virt-guest-shutdown.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 13 18:06:41 UTC 2020 - James Fehlig <jfehlig@suse.com> Fri Nov 13 18:06:41 UTC 2020 - James Fehlig <jfehlig@suse.com>

77
libvirt.spec
View File

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

8
libxl-dom-reset.patch
View File

@ -8,10 +8,10 @@ Date: Mon Jun 23 15:51:20 2014 -0600
option, but domainReset can be implemented in the libxl driver by option, but domainReset can be implemented in the libxl driver by
forcibly destroying the domain and starting it again. forcibly destroying the domain and starting it again.
Index: libvirt-6.9.0/src/libxl/libxl_driver.c Index: libvirt-6.10.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/libxl/libxl_driver.c --- libvirt-6.10.0.orig/src/libxl/libxl_driver.c
+++ libvirt-6.9.0/src/libxl/libxl_driver.c +++ libvirt-6.10.0/src/libxl/libxl_driver.c
@@ -1374,6 +1374,61 @@ libxlDomainReboot(virDomainPtr dom, unsi @@ -1374,6 +1374,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
} }
@ -74,7 +74,7 @@ Index: libvirt-6.9.0/src/libxl/libxl_driver.c
libxlDomainDestroyFlags(virDomainPtr dom, libxlDomainDestroyFlags(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
@@ -6674,6 +6729,7 @@ static virHypervisorDriver libxlHypervis @@ -6669,6 +6724,7 @@ static virHypervisorDriver libxlHypervis
.domainShutdown = libxlDomainShutdown, /* 0.9.0 */ .domainShutdown = libxlDomainShutdown, /* 0.9.0 */
.domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */ .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */
.domainReboot = libxlDomainReboot, /* 0.9.0 */ .domainReboot = libxlDomainReboot, /* 0.9.0 */

6
libxl-set-cach-mode.patch
View File

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

52
libxl-set-migration-constraints.patch
View File

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

6
libxl-support-block-script.patch
View File

@ -7,10 +7,10 @@ and npiv.
For more details, see bsc#954872 and FATE#319810 For more details, see bsc#954872 and FATE#319810
Index: libvirt-6.9.0/src/libxl/libxl_conf.c Index: libvirt-6.10.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/libxl/libxl_conf.c --- libvirt-6.10.0.orig/src/libxl/libxl_conf.c
+++ libvirt-6.9.0/src/libxl/libxl_conf.c +++ libvirt-6.10.0/src/libxl/libxl_conf.c
@@ -921,6 +921,22 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -921,6 +921,22 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif #endif
} }

24
lxc-wait-after-eth-del.patch
View File

@ -13,11 +13,11 @@ device with the same name that is being created.
src/lxc/lxc_process.c | 1 + src/lxc/lxc_process.c | 1 +
3 files changed, 4 insertions(+) 3 files changed, 4 insertions(+)
Index: libvirt-6.9.0/src/lxc/lxc_controller.c Index: libvirt-6.10.0/src/lxc/lxc_controller.c
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/lxc/lxc_controller.c --- libvirt-6.10.0.orig/src/lxc/lxc_controller.c
+++ libvirt-6.9.0/src/lxc/lxc_controller.c +++ libvirt-6.10.0/src/lxc/lxc_controller.c
@@ -2024,6 +2024,7 @@ static int virLXCControllerDeleteInterfa @@ -2015,6 +2015,7 @@ static int virLXCControllerDeleteInterfa
if (virNetDevVethDelete(ctrl->veths[i]) < 0) if (virNetDevVethDelete(ctrl->veths[i]) < 0)
ret = -1; ret = -1;
} }
@ -25,10 +25,10 @@ Index: libvirt-6.9.0/src/lxc/lxc_controller.c
return ret; return ret;
} }
Index: libvirt-6.9.0/src/lxc/lxc_driver.c Index: libvirt-6.10.0/src/lxc/lxc_driver.c
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/lxc/lxc_driver.c --- libvirt-6.10.0.orig/src/lxc/lxc_driver.c
+++ libvirt-6.9.0/src/lxc/lxc_driver.c +++ libvirt-6.10.0/src/lxc/lxc_driver.c
@@ -66,6 +66,7 @@ @@ -66,6 +66,7 @@
#include "virtime.h" #include "virtime.h"
#include "virtypedparam.h" #include "virtypedparam.h"
@ -37,7 +37,7 @@ Index: libvirt-6.9.0/src/lxc/lxc_driver.c
#include "virstring.h" #include "virstring.h"
#include "viraccessapicheck.h" #include "viraccessapicheck.h"
#include "viraccessapichecklxc.h" #include "viraccessapichecklxc.h"
@@ -3547,6 +3548,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive @@ -3546,6 +3547,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive
case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_NETWORK:
case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_ETHERNET:
ignore_value(virNetDevVethDelete(veth)); ignore_value(virNetDevVethDelete(veth));
@ -45,7 +45,7 @@ Index: libvirt-6.9.0/src/lxc/lxc_driver.c
break; break;
case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_DIRECT:
@@ -3986,6 +3988,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb @@ -3985,6 +3987,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
virDomainAuditNet(vm, detach, NULL, "detach", false); virDomainAuditNet(vm, detach, NULL, "detach", false);
goto cleanup; goto cleanup;
} }
@ -53,10 +53,10 @@ Index: libvirt-6.9.0/src/lxc/lxc_driver.c
break; break;
/* It'd be nice to support this, but with macvlan /* It'd be nice to support this, but with macvlan
Index: libvirt-6.9.0/src/lxc/lxc_process.c Index: libvirt-6.10.0/src/lxc/lxc_process.c
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/lxc/lxc_process.c --- libvirt-6.10.0.orig/src/lxc/lxc_process.c
+++ libvirt-6.9.0/src/lxc/lxc_process.c +++ libvirt-6.10.0/src/lxc/lxc_process.c
@@ -50,6 +50,7 @@ @@ -50,6 +50,7 @@
#include "virstring.h" #include "virstring.h"
#include "virprocess.h" #include "virprocess.h"

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

@ -17,11 +17,11 @@ Signed-off-by: Martin Wilck <mwilck@suse.com>
tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 -
2 files changed, 8 insertions(+), 2 deletions(-) 2 files changed, 8 insertions(+), 2 deletions(-)
Index: libvirt-6.9.0/src/network/bridge_driver.c Index: libvirt-6.10.0/src/network/bridge_driver.c
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/network/bridge_driver.c --- libvirt-6.10.0.orig/src/network/bridge_driver.c
+++ libvirt-6.9.0/src/network/bridge_driver.c +++ libvirt-6.10.0/src/network/bridge_driver.c
@@ -1445,7 +1445,14 @@ networkDnsmasqConfContents(virNetworkObj @@ -1447,7 +1447,14 @@ networkDnsmasqConfContents(virNetworkObj
if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
if (ipdef->nranges || ipdef->nhosts) { if (ipdef->nranges || ipdef->nhosts) {
virBufferAddLit(&configbuf, "dhcp-no-override\n"); virBufferAddLit(&configbuf, "dhcp-no-override\n");
@ -37,10 +37,10 @@ Index: libvirt-6.9.0/src/network/bridge_driver.c
} }
if (ipdef->tftproot) { if (ipdef->tftproot) {
Index: libvirt-6.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf Index: libvirt-6.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf --- libvirt-6.10.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-6.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +++ libvirt-6.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
@@ -10,7 +10,6 @@ bind-dynamic @@ -10,7 +10,6 @@ bind-dynamic
interface=virbr1 interface=virbr1
dhcp-range=192.168.122.1,static dhcp-range=192.168.122.1,static

6
ppc64le-canonical-name.patch
View File

@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64
See bnc#894956 See bnc#894956
Index: libvirt-6.9.0/src/util/virarch.c Index: libvirt-6.10.0/src/util/virarch.c
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/util/virarch.c --- libvirt-6.10.0.orig/src/util/virarch.c
+++ libvirt-6.9.0/src/util/virarch.c +++ libvirt-6.10.0/src/util/virarch.c
@@ -220,6 +220,8 @@ virArch virArchFromHost(void) @@ -220,6 +220,8 @@ virArch virArchFromHost(void)
arch = VIR_ARCH_I686; arch = VIR_ARCH_I686;
} else if (STREQ(ut.machine, "amd64")) { } else if (STREQ(ut.machine, "amd64")) {

8
qemu-apparmor-screenshot.patch
View File

@ -1,8 +1,8 @@
Index: libvirt-6.9.0/src/security/apparmor/libvirt-qemu Index: libvirt-6.10.0/src/security/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/security/apparmor/libvirt-qemu --- libvirt-6.10.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-6.9.0/src/security/apparmor/libvirt-qemu +++ libvirt-6.10.0/src/security/apparmor/libvirt-qemu
@@ -243,3 +243,6 @@ @@ -244,3 +244,6 @@
# /sys/bus/nd/devices # /sys/bus/nd/devices
/ r, # harmless on any lsb compliant system / r, # harmless on any lsb compliant system
/sys/bus/nd/devices/{,**/} r, /sys/bus/nd/devices/{,**/} r,

12
suse-apparmor-libnl-paths.patch
View File

@ -8,10 +8,10 @@ It was also noticed that the per-domain profiles need a libnl rule
to squelch a denial when starting confined domains. to squelch a denial when starting confined domains.
Found while investigating bsc#1058847 Found while investigating bsc#1058847
Index: libvirt-6.9.0/src/security/apparmor/libvirt-qemu Index: libvirt-6.10.0/src/security/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/security/apparmor/libvirt-qemu --- libvirt-6.10.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-6.9.0/src/security/apparmor/libvirt-qemu +++ libvirt-6.10.0/src/security/apparmor/libvirt-qemu
@@ -64,6 +64,7 @@ @@ -64,6 +64,7 @@
#/dev/fb* rw, #/dev/fb* rw,
@ -20,10 +20,10 @@ Index: libvirt-6.9.0/src/security/apparmor/libvirt-qemu
@{HOME}/.pulse-cookie rwk, @{HOME}/.pulse-cookie rwk,
owner /root/.pulse-cookie rwk, owner /root/.pulse-cookie rwk,
owner /root/.pulse/ rw, owner /root/.pulse/ rw,
Index: libvirt-6.9.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in Index: libvirt-6.10.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in --- libvirt-6.10.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+++ libvirt-6.9.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +++ libvirt-6.10.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -19,7 +19,7 @@ profile virt-aa-helper @libexecdir@/virt @@ -19,7 +19,7 @@ profile virt-aa-helper @libexecdir@/virt
# Used when internally running another command (namely apparmor_parser) # Used when internally running another command (namely apparmor_parser)
@{PROC}/@{pid}/fd/ r, @{PROC}/@{pid}/fd/ r,

32
suse-bump-xen-version.patch
View File

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

12
suse-libvirt-guests-service.patch
View File

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

18
suse-libvirtd-disable-tls.patch
View File

@ -3,10 +3,10 @@ Disable TLS by default
On SUSE distros, the default is for libvirtd to listen only on the On SUSE distros, the default is for libvirtd to listen only on the
Unix Domain Socket. The libvirt client still provides remote access Unix Domain Socket. The libvirt client still provides remote access
via a SSH tunnel. via a SSH tunnel.
Index: libvirt-6.9.0/src/remote/remote_daemon_config.c Index: libvirt-6.10.0/src/remote/remote_daemon_config.c
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/remote/remote_daemon_config.c --- libvirt-6.10.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-6.9.0/src/remote/remote_daemon_config.c +++ libvirt-6.10.0/src/remote/remote_daemon_config.c
@@ -98,7 +98,7 @@ daemonConfigNew(bool privileged G_GNUC_U @@ -98,7 +98,7 @@ daemonConfigNew(bool privileged G_GNUC_U
#ifdef WITH_IP #ifdef WITH_IP
@ -16,10 +16,10 @@ Index: libvirt-6.9.0/src/remote/remote_daemon_config.c
# else /* ! LIBVIRTD */ # else /* ! LIBVIRTD */
data->listen_tls = false; /* Always honoured, --listen doesn't exist. */ data->listen_tls = false; /* Always honoured, --listen doesn't exist. */
# endif /* ! LIBVIRTD */ # endif /* ! LIBVIRTD */
Index: libvirt-6.9.0/src/remote/libvirtd.conf.in Index: libvirt-6.10.0/src/remote/libvirtd.conf.in
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/remote/libvirtd.conf.in --- libvirt-6.10.0.orig/src/remote/libvirtd.conf.in
+++ libvirt-6.9.0/src/remote/libvirtd.conf.in +++ libvirt-6.10.0/src/remote/libvirtd.conf.in
@@ -17,8 +17,8 @@ @@ -17,8 +17,8 @@
# It is necessary to setup a CA and issue server certificates before # It is necessary to setup a CA and issue server certificates before
# using this capability. # using this capability.
@ -31,10 +31,10 @@ Index: libvirt-6.9.0/src/remote/libvirtd.conf.in
# Listen for unencrypted TCP connections on the public TCP/IP port. # 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 # NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to
Index: libvirt-6.9.0/src/remote/test_libvirtd.aug.in Index: libvirt-6.10.0/src/remote/test_libvirtd.aug.in
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/remote/test_libvirtd.aug.in --- libvirt-6.10.0.orig/src/remote/test_libvirtd.aug.in
+++ libvirt-6.9.0/src/remote/test_libvirtd.aug.in +++ libvirt-6.10.0/src/remote/test_libvirtd.aug.in
@@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ = @@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ =
test @DAEMON_NAME_UC@.lns get conf = test @DAEMON_NAME_UC@.lns get conf =

6
suse-libvirtd-sysconfig-settings.patch
View File

@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards Adjust libvirtd sysconfig file to conform to SUSE standards
Index: libvirt-6.9.0/src/remote/libvirtd.sysconf Index: libvirt-6.10.0/src/remote/libvirtd.sysconf
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/remote/libvirtd.sysconf --- libvirt-6.10.0.orig/src/remote/libvirtd.sysconf
+++ libvirt-6.9.0/src/remote/libvirtd.sysconf +++ libvirt-6.10.0/src/remote/libvirtd.sysconf
@@ -1,5 +1,9 @@ @@ -1,5 +1,9 @@
+## Path: System/Virtualization/libvirt +## Path: System/Virtualization/libvirt
# Customizations for the libvirtd.service systemd unit # Customizations for the libvirtd.service systemd unit

18
suse-libxl-disable-autoballoon.patch
View File

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

30
suse-ovmf-paths.patch
View File

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

26
suse-qemu-conf.patch
View File

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

6
suse-virtlockd-sysconfig-settings.patch
View File

@ -1,9 +1,9 @@
Adjust virtlockd sysconfig file to conform to SUSE standards Adjust virtlockd sysconfig file to conform to SUSE standards
Index: libvirt-6.9.0/src/locking/virtlockd.sysconf Index: libvirt-6.10.0/src/locking/virtlockd.sysconf
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/locking/virtlockd.sysconf --- libvirt-6.10.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-6.9.0/src/locking/virtlockd.sysconf +++ libvirt-6.10.0/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlockd +## Path: System/Virtualization/virtlockd
+ +

6
suse-virtlogd-sysconfig-settings.patch
View File

@ -1,9 +1,9 @@
Adjust virtlogd sysconfig file to conform to SUSE standards Adjust virtlogd sysconfig file to conform to SUSE standards
Index: libvirt-6.9.0/src/logging/virtlogd.sysconf Index: libvirt-6.10.0/src/logging/virtlogd.sysconf
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/logging/virtlogd.sysconf --- libvirt-6.10.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-6.9.0/src/logging/virtlogd.sysconf +++ libvirt-6.10.0/src/logging/virtlogd.sysconf
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlogd +## Path: System/Virtualization/virtlogd
+ +

6
suse-xen-ovmf-loaders.patch
View File

@ -5,10 +5,10 @@ upstream support for firmware autoselection in the xen driver. Sadly, the
upstream efforts to improve firmware handling in the qemu driver broke upstream efforts to improve firmware handling in the qemu driver broke
the firmware handling in the xen driver. the firmware handling in the xen driver.
Index: libvirt-6.9.0/src/libxl/libxl_conf.c Index: libvirt-6.10.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-6.9.0.orig/src/libxl/libxl_conf.c --- libvirt-6.10.0.orig/src/libxl/libxl_conf.c
+++ libvirt-6.9.0/src/libxl/libxl_conf.c +++ libvirt-6.10.0/src/libxl/libxl_conf.c
@@ -1783,6 +1783,15 @@ libxlDriverConfigNew(void) @@ -1783,6 +1783,15 @@ libxlDriverConfigNew(void)
cfg->autoDumpDir = g_strdup(LIBXL_DUMP_DIR); cfg->autoDumpDir = g_strdup(LIBXL_DUMP_DIR);
cfg->channelDir = g_strdup(LIBXL_CHANNEL_DIR); cfg->channelDir = g_strdup(LIBXL_CHANNEL_DIR);

20
virt-create-rootfs.patch
View File

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