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

Accepting request 966486 from home:jfehlig:branches:Virtualization

Browse Source 
- Update to libvirt 8.2.0
  - CVE-2022-0897
  - Many incremental improvements and bug fixes, see
    https://libvirt.org/news.html#v8-2-0-2022-04-01
  - Dropped patches:
    823a62ec-qemu-fix-undefine-crash.patch

OBS-URL: https://build.opensuse.org/request/show/966486
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=927
This commit is contained in:
James Fehlig 2022-04-01 22:35:43 +00:00 committed by Git OBS Bridge
parent 061a75b436
commit 1c1fa4f3a7
28 changed files with 210 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
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-8.1.0/src/conf/domain_stats.c Index: libvirt-8.2.0/src/conf/domain_stats.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-8.1.0/src/conf/domain_stats.c +++ libvirt-8.2.0/src/conf/domain_stats.c
@@ -0,0 +1,117 @@ @@ -0,0 +1,117 @@
+/* +/*
+ * domain_stats.c: domain stats extraction helpers + * domain_stats.c: domain stats extraction helpers
@ -140,10 +140,10 @@ Index: libvirt-8.1.0/src/conf/domain_stats.c
+} +}
+ +
+#undef STATS_ADD_NET_PARAM +#undef STATS_ADD_NET_PARAM
Index: libvirt-8.1.0/src/conf/domain_stats.h Index: libvirt-8.2.0/src/conf/domain_stats.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-8.1.0/src/conf/domain_stats.h +++ libvirt-8.2.0/src/conf/domain_stats.h
@@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
+/* +/*
+ * domain_stats.h: domain stats extraction helpers + * domain_stats.h: domain stats extraction helpers
@ -205,11 +205,11 @@ Index: libvirt-8.1.0/src/conf/domain_stats.h
+ virTypedParamList *params); + virTypedParamList *params);
+ +
+#endif /* __DOMAIN_STATS_H */ +#endif /* __DOMAIN_STATS_H */
Index: libvirt-8.1.0/src/libvirt_private.syms Index: libvirt-8.2.0/src/libvirt_private.syms
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/libvirt_private.syms --- libvirt-8.2.0.orig/src/libvirt_private.syms
+++ libvirt-8.1.0/src/libvirt_private.syms +++ libvirt-8.2.0/src/libvirt_private.syms
@@ -772,6 +772,11 @@ virDomainConfNWFilterTeardown; @@ -774,6 +774,11 @@ virDomainConfNWFilterTeardown;
virDomainConfVMNWFilterTeardown; virDomainConfVMNWFilterTeardown;
@ -221,7 +221,7 @@ Index: libvirt-8.1.0/src/libvirt_private.syms
# conf/domain_validate.h # conf/domain_validate.h
virDomainActualNetDefValidate; virDomainActualNetDefValidate;
virDomainDefValidate; virDomainDefValidate;
@@ -1963,6 +1968,7 @@ virCgroupGetMemoryUsage; @@ -1966,6 +1971,7 @@ virCgroupGetMemoryUsage;
virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapHardLimit;
virCgroupGetMemSwapUsage; virCgroupGetMemSwapUsage;
virCgroupGetPercpuStats; virCgroupGetPercpuStats;
@ -229,10 +229,10 @@ Index: libvirt-8.1.0/src/libvirt_private.syms
virCgroupHasController; virCgroupHasController;
virCgroupHasEmptyTasks; virCgroupHasEmptyTasks;
virCgroupKillPainfully; virCgroupKillPainfully;
Index: libvirt-8.1.0/src/qemu/qemu_driver.c Index: libvirt-8.2.0/src/qemu/qemu_driver.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/qemu/qemu_driver.c --- libvirt-8.2.0.orig/src/qemu/qemu_driver.c
+++ libvirt-8.1.0/src/qemu/qemu_driver.c +++ libvirt-8.2.0/src/qemu/qemu_driver.c
@@ -68,6 +68,7 @@ @@ -68,6 +68,7 @@
#include "virarptable.h" #include "virarptable.h"
#include "viruuid.h" #include "viruuid.h"
@ -241,7 +241,7 @@ Index: libvirt-8.1.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"
@@ -17422,13 +17423,7 @@ qemuDomainGetStatsState(virQEMUDriver *d @@ -17444,13 +17445,7 @@ qemuDomainGetStatsState(virQEMUDriver *d
virTypedParamList *params, virTypedParamList *params,
unsigned int privflags G_GNUC_UNUSED) unsigned int privflags G_GNUC_UNUSED)
{ {
@ -256,7 +256,7 @@ Index: libvirt-8.1.0/src/qemu/qemu_driver.c
} }
@@ -17720,25 +17715,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj @@ -17742,25 +17737,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
virTypedParamList *params) virTypedParamList *params)
{ {
qemuDomainObjPrivate *priv = dom->privateData; qemuDomainObjPrivate *priv = dom->privateData;
@ -283,7 +283,7 @@ Index: libvirt-8.1.0/src/qemu/qemu_driver.c
} }
static int static int
@@ -17931,76 +17912,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr @@ -17953,76 +17934,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr
return ret; return ret;
} }
@ -361,10 +361,10 @@ Index: libvirt-8.1.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-8.1.0/src/util/vircgroup.c Index: libvirt-8.2.0/src/util/vircgroup.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/util/vircgroup.c --- libvirt-8.2.0.orig/src/util/vircgroup.c
+++ libvirt-8.1.0/src/util/vircgroup.c +++ libvirt-8.2.0/src/util/vircgroup.c
@@ -3022,6 +3022,31 @@ virCgroupGetInode(virCgroup *cgroup) @@ -3022,6 +3022,31 @@ virCgroupGetInode(virCgroup *cgroup)
return st.st_ino; return st.st_ino;
} }
@ -412,10 +412,10 @@ Index: libvirt-8.1.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-8.1.0/src/util/vircgroup.h Index: libvirt-8.2.0/src/util/vircgroup.h
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/util/vircgroup.h --- libvirt-8.2.0.orig/src/util/vircgroup.h
+++ libvirt-8.1.0/src/util/vircgroup.h +++ libvirt-8.2.0/src/util/vircgroup.h
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
#include "virbitmap.h" #include "virbitmap.h"
@ -432,10 +432,10 @@ Index: libvirt-8.1.0/src/util/vircgroup.h
+ virTypedParamList *params); + virTypedParamList *params);
+ +
int virCgroupGetInode(virCgroup *cgroup); int virCgroupGetInode(virCgroup *cgroup);
Index: libvirt-8.1.0/src/conf/meson.build Index: libvirt-8.2.0/src/conf/meson.build
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/conf/meson.build --- libvirt-8.2.0.orig/src/conf/meson.build
+++ libvirt-8.1.0/src/conf/meson.build +++ libvirt-8.2.0/src/conf/meson.build
@@ -15,6 +15,7 @@ domain_conf_sources = [ @@ -15,6 +15,7 @@ domain_conf_sources = [
'domain_conf.c', 'domain_conf.c',
'domain_nwfilter.c', 'domain_nwfilter.c',

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

@ -19,10 +19,10 @@ 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-8.1.0/src/libxl/libxl_driver.c Index: libvirt-8.2.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/libxl/libxl_driver.c --- libvirt-8.2.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.1.0/src/libxl/libxl_driver.c +++ libvirt-8.2.0/src/libxl/libxl_driver.c
@@ -5264,6 +5264,95 @@ libxlDomainMemoryStats(virDomainPtr dom, @@ -5264,6 +5264,95 @@ libxlDomainMemoryStats(virDomainPtr dom,
#undef LIBXL_SET_MEMSTAT #undef LIBXL_SET_MEMSTAT
@ -73,7 +73,7 @@ Index: libvirt-8.1.0/src/libxl/libxl_driver.c
+ if (virDomainBlockResizeEnsureACL(dom->conn, vm->def) < 0) + if (virDomainBlockResizeEnsureACL(dom->conn, vm->def) < 0)
+ goto cleanup; + goto cleanup;
+ +
+ if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0)
+ goto cleanup; + goto cleanup;
+ +
+ if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm)) {
@ -127,10 +127,10 @@ Index: libvirt-8.1.0/src/libxl/libxl_driver.c
.domainGetJobInfo = libxlDomainGetJobInfo, /* 1.3.1 */ .domainGetJobInfo = libxlDomainGetJobInfo, /* 1.3.1 */
.domainGetJobStats = libxlDomainGetJobStats, /* 1.3.1 */ .domainGetJobStats = libxlDomainGetJobStats, /* 1.3.1 */
.domainMemoryStats = libxlDomainMemoryStats, /* 1.3.0 */ .domainMemoryStats = libxlDomainMemoryStats, /* 1.3.0 */
Index: libvirt-8.1.0/src/libxl/libxl_api_wrapper.h Index: libvirt-8.2.0/src/libxl/libxl_api_wrapper.h
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/libxl/libxl_api_wrapper.h --- libvirt-8.2.0.orig/src/libxl/libxl_api_wrapper.h
+++ libvirt-8.1.0/src/libxl/libxl_api_wrapper.h +++ libvirt-8.2.0/src/libxl/libxl_api_wrapper.h
@@ -215,3 +215,18 @@ libxlSetMemoryTargetWrapper(libxl_ctx *c @@ -215,3 +215,18 @@ libxlSetMemoryTargetWrapper(libxl_ctx *c
return ret; return ret;

6
0001-util-Don-t-spawn-pkttyagent-when-stdin-is-not-a-tty.patch
View File

@ -18,10 +18,10 @@ Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
src/util/virpolkit.c | 3 +++ src/util/virpolkit.c | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
Index: libvirt-8.1.0/src/util/virpolkit.c Index: libvirt-8.2.0/src/util/virpolkit.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/util/virpolkit.c --- libvirt-8.2.0.orig/src/util/virpolkit.c
+++ libvirt-8.1.0/src/util/virpolkit.c +++ libvirt-8.2.0/src/util/virpolkit.c
@@ -237,6 +237,9 @@ virPolkitAgentAvailable(void) @@ -237,6 +237,9 @@ virPolkitAgentAvailable(void)
const char *termid = ctermid(NULL); const char *termid = ctermid(NULL);
VIR_AUTOCLOSE fd = -1; VIR_AUTOCLOSE fd = -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-8.1.0/src/lxc/lxc_driver.c Index: libvirt-8.2.0/src/lxc/lxc_driver.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/lxc/lxc_driver.c --- libvirt-8.2.0.orig/src/lxc/lxc_driver.c
+++ libvirt-8.1.0/src/lxc/lxc_driver.c +++ libvirt-8.2.0/src/lxc/lxc_driver.c
@@ -74,6 +74,8 @@ @@ -74,6 +74,8 @@
#include "netdev_bandwidth_conf.h" #include "netdev_bandwidth_conf.h"
#include "virsocket.h" #include "virsocket.h"
@ -22,7 +22,7 @@ Index: libvirt-8.1.0/src/lxc/lxc_driver.c
#define VIR_FROM_THIS VIR_FROM_LXC #define VIR_FROM_THIS VIR_FROM_LXC
@@ -5039,6 +5041,128 @@ lxcDomainHasManagedSaveImage(virDomainPt @@ -5033,6 +5035,128 @@ lxcDomainHasManagedSaveImage(virDomainPt
return ret; return ret;
} }
@ -151,7 +151,7 @@ Index: libvirt-8.1.0/src/lxc/lxc_driver.c
/* Function Tables */ /* Function Tables */
static virHypervisorDriver lxcHypervisorDriver = { static virHypervisorDriver lxcHypervisorDriver = {
@@ -5136,6 +5260,7 @@ static virHypervisorDriver lxcHypervisor @@ -5130,6 +5254,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 */

42
823a62ec-qemu-fix-undefine-crash.patch
View File

@ -1,42 +0,0 @@
commit 823a62ec8aac4fb75e6e281164f3eb56ae47597c
Author: Boris Fiuczynski <fiuczy@linux.ibm.com>
Date: Tue Mar 1 18:47:59 2022 +0100
qemu: segmentation fault in virtqemud executing qemuDomainUndefineFlags
Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault.
Stack trace of thread 664419:
#0 0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618
#1 0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at ../src/libvirt-domain.c:6519
#2 0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, rerr=0x3ff8287b950, client=<optimized out>)
at src/remote/remote_daemon_dispatch_stubs.h:13080
#3 remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized out>, ret=0x0)
at src/remote/remote_daemon_dispatch_stubs.h:13059
#4 0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010)
at ../src/rpc/virnetserverprogram.c:428
#5 virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302
#6 0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140
#7 virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160
#8 0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164
#9 0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256
#10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6
#11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6
Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Index: libvirt-8.1.0/src/qemu/qemu_driver.c
===================================================================
--- libvirt-8.1.0.orig/src/qemu/qemu_driver.c
+++ libvirt-8.1.0/src/qemu/qemu_driver.c
@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom
}
}
- if (vm->def->os.loader->nvram) {
+ if (vm->def->os.loader && vm->def->os.loader->nvram) {
nvram_path = g_strdup(vm->def->os.loader->nvram);
} else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path);

3
libvirt-8.1.0.tar.xz
View File

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmId5HcACgkQymi+gBAI
TJyDjw//Z6xV7+IFYQBsWqYNztVyxbIUtLHkWBy43N8O32S552d0qiHxjinSWcQf
1rgWPeC4Gs7WDHThUnuSw1BPSXNYkMo9gLJqZsnl0dkP0dw6fBhyKV7X18AV9fPg
q8cmMy1gN9k70nbkJID234ysNJQWfCYtCHBJydgvlFZ4awupk61vnhM4bBxTpVcY
nUK4lPhObGXMtO0J6hB0DJJq0JpMs6Pr4e89b+dxh8YYdexroedAD4+WeVBoSmb/
bMZlsJNGDhu6ixmGKqY+ZyQ+zldiiontejREHVpA9brp3ERc1durkV33XnE/hVYb
yDQIrnyz6ldlqBdGRjCfq+yBNJEMITvp6uqRPF19N0DS7RkvnJQVjulMY55y4Oic
7ozv03Dp0yQBLznxO7nowG1Z+zIdyG6cPh8+FIadTlU5IFxqa2wjYC9oKrwTEtCm
coU0qWVglObdOsyo9uauIlhPqNdcei8lEbVwgWR53MLVKwqcheGq3TJH74Uw/QM4
xjDhCWAyE1duS4iK5GB3AxO7kl+RPkPXZ9erFjBVemofuSsPFdSZx6mQJrp/GrDX
/VMPCOLgLtGENyqRkWh+xjWJWuZ8+Qa3ZpTzfe6IANelsdMfzjSpOyygv20GMWsO
s35XeB+za1nzwPA1cVHpR8dURdTMZKxkz3aXtE9/6B8Fkcc7bSo=
=KtlB
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmJG1GIACgkQymi+gBAI
TJyn3A//RQHdXAtLuJhier+x9lPsIJyNuo9/crnG4r/OfCvJgryygyKc0iYg0QwF
Mfx7RV+LhjW0BgOSeNcg4Zm0kSDEpqeLAilUmAGrArT+E/TdHDgCMHAXEEf8ZQKB
Sa3uGyAzHTwi/QP3Yn7ACOMjO7Nc5TaoK1UiEJaz5H0CI3byCDOsDN2t9vmVuf2K
Qm1htqIBnIbdDow8C+VgcXeyTGnHmRzO1xDTNgRLmllMFvuitg99pqhRxYQbS4s3
ed6dm9ps7yTi0wuGy3z/TLacHLakVeadUjwVRWQL10SUTgXXwJDuIzWXDxejG7iz
sKgA9A8WkHAWOqiloIwMcQnlw5fzUdoc1k97xX9UPyH6vsYd66VnYC2ywa5Ugdlf
lw/vQ+wnAQ0UMRz386GYviYEgsIvkGOKo92IbkL5eXalZJ4Tk3wAworF7F2kVodc
ngCEzxncQhEh1k1OSeJG8pvK9c8Wi9b6FL3+6/1P1m7tZhkpSWJMWQTJGbtHZSRd
r6Lsl/3Bcb7MYShu0AwUr/pnliHVwAj+N7YyL5C29kGACu4DD9EFLEbEuY4vCDvS
QXzi3IrDWzoLvTXjxMAKvPimOf7Mu902NFRh5cqvPdXtAWjh0DOg9cenoyEZBE3P
SgqhJWoBHRXRGJFO/sl1WdHHd+bcqAT5zizjhKOzqRWkQ2eHWfY=
=J0Ij
-----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-8.1.0/src/cpu_map/ppc64_POWER8.xml Index: libvirt-8.2.0/src/cpu_map/ppc64_POWER8.xml
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/cpu_map/ppc64_POWER8.xml --- libvirt-8.2.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-8.1.0/src/cpu_map/ppc64_POWER8.xml +++ libvirt-8.2.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-8.1.0/tools/virsh.c Index: libvirt-8.2.0/tools/virsh.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/tools/virsh.c --- libvirt-8.2.0.orig/tools/virsh.c
+++ libvirt-8.1.0/tools/virsh.c +++ libvirt-8.2.0/tools/virsh.c
@@ -551,6 +551,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ @@ -552,6 +552,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-8.1.0/tools/virsh.c
# elif defined(WITH_UDEV) # elif defined(WITH_UDEV)
vshPrint(ctl, " udev"); vshPrint(ctl, " udev");
# endif # endif
Index: libvirt-8.1.0/src/interface/interface_backend_netcf.c Index: libvirt-8.2.0/src/interface/interface_backend_netcf.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/interface/interface_backend_netcf.c --- libvirt-8.2.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-8.1.0/src/interface/interface_backend_netcf.c +++ libvirt-8.2.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-8.1.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-8.1.0/src/interface/interface_driver.c Index: libvirt-8.2.0/src/interface/interface_driver.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/interface/interface_driver.c --- libvirt-8.2.0.orig/src/interface/interface_driver.c
+++ libvirt-8.1.0/src/interface/interface_driver.c +++ libvirt-8.2.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-8.1.0/src/interface/interface_driver.c
if (udevIfaceRegister() == 0) if (udevIfaceRegister() == 0)
return 0; return 0;
#endif /* WITH_UDEV */ #endif /* WITH_UDEV */
Index: libvirt-8.1.0/meson.build Index: libvirt-8.2.0/meson.build
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/meson.build --- libvirt-8.2.0.orig/meson.build
+++ libvirt-8.1.0/meson.build +++ libvirt-8.2.0/meson.build
@@ -1067,6 +1067,12 @@ else @@ -1073,6 +1073,12 @@ else
netcf_dep = dependency('', required: false) netcf_dep = dependency('', required: false)
endif endif
@ -164,7 +164,7 @@ Index: libvirt-8.1.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')
@@ -1474,10 +1480,10 @@ elif get_option('driver_hyperv').enabled @@ -1480,10 +1486,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-8.1.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')
@@ -2307,6 +2313,7 @@ libs_summary = { @@ -2293,6 +2299,7 @@ libs_summary = {
'libssh2': libssh2_dep.found(), 'libssh2': libssh2_dep.found(),
'libutil': libutil_dep.found(), 'libutil': libutil_dep.found(),
'netcf': conf.has('WITH_NETCF'), 'netcf': conf.has('WITH_NETCF'),
@ -185,10 +185,10 @@ Index: libvirt-8.1.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-8.1.0/src/interface/meson.build Index: libvirt-8.2.0/src/interface/meson.build
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/interface/meson.build --- libvirt-8.2.0.orig/src/interface/meson.build
+++ libvirt-8.1.0/src/interface/meson.build +++ libvirt-8.2.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-8.1.0/src/interface/meson.build
udev_dep, udev_dep,
], ],
'link_args': [ 'link_args': [
Index: libvirt-8.1.0/meson_options.txt Index: libvirt-8.2.0/meson_options.txt
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/meson_options.txt --- libvirt-8.2.0.orig/meson_options.txt
+++ libvirt-8.1.0/meson_options.txt +++ libvirt-8.2.0/meson_options.txt
@@ -29,6 +29,7 @@ option('libpcap', type: 'feature', value @@ -29,6 +29,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 @@
-------------------------------------------------------------------
Fri Apr 1 17:30:25 UTC 2022 - James Fehlig <jfehlig@suse.com>
- Update to libvirt 8.2.0
- CVE-2022-0897
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html#v8-2-0-2022-04-01
- Dropped patches:
823a62ec-qemu-fix-undefine-crash.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 3 15:25:50 UTC 2022 - James Fehlig <jfehlig@suse.com> Thu Mar 3 15:25:50 UTC 2022 - James Fehlig <jfehlig@suse.com>

5
libvirt.spec
View File

@ -158,7 +158,7 @@
Name: libvirt Name: libvirt
URL: http://libvirt.org/ URL: http://libvirt.org/
Version: 8.1.0 Version: 8.2.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
@ -300,7 +300,6 @@ Source6: libvirtd-relocation-server.xml
Source99: baselibs.conf Source99: baselibs.conf
Source100: %{name}-rpmlintrc Source100: %{name}-rpmlintrc
# Upstream patches # Upstream patches
Patch0: 823a62ec-qemu-fix-undefine-crash.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
@ -1393,7 +1392,6 @@ fi
%doc %{_mandir}/man8/virtlogd.8* %doc %{_mandir}/man8/virtlogd.8*
%doc %{_mandir}/man8/virtlockd.8* %doc %{_mandir}/man8/virtlockd.8*
%doc %{_mandir}/man8/virtproxyd.8* %doc %{_mandir}/man8/virtproxyd.8*
%doc %{_mandir}/man7/virkey*.7*
%if %{with_apparmor} %if %{with_apparmor}
%dir %{_sysconfdir}/apparmor.d %dir %{_sysconfdir}/apparmor.d
%dir %{_sysconfdir}/apparmor.d/abstractions %dir %{_sysconfdir}/apparmor.d/abstractions
@ -1701,6 +1699,7 @@ fi
%doc %{_mandir}/man1/virt-xml-validate.1* %doc %{_mandir}/man1/virt-xml-validate.1*
%doc %{_mandir}/man1/virt-pki-query-dn.1* %doc %{_mandir}/man1/virt-pki-query-dn.1*
%doc %{_mandir}/man1/virt-pki-validate.1* %doc %{_mandir}/man1/virt-pki-validate.1*
%doc %{_mandir}/man7/virkey*.7*
%{_bindir}/virsh %{_bindir}/virsh
%{_bindir}/virt-xml-validate %{_bindir}/virt-xml-validate
%{_bindir}/virt-pki-query-dn %{_bindir}/virt-pki-query-dn

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-8.1.0/src/libxl/libxl_driver.c Index: libvirt-8.2.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/libxl/libxl_driver.c --- libvirt-8.2.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.1.0/src/libxl/libxl_driver.c +++ libvirt-8.2.0/src/libxl/libxl_driver.c
@@ -1361,6 +1361,63 @@ libxlDomainReboot(virDomainPtr dom, unsi @@ -1361,6 +1361,63 @@ libxlDomainReboot(virDomainPtr dom, unsi
} }
@ -33,7 +33,7 @@ Index: libvirt-8.1.0/src/libxl/libxl_driver.c
+ if (virDomainResetEnsureACL(dom->conn, vm->def) < 0) + if (virDomainResetEnsureACL(dom->conn, vm->def) < 0)
+ goto cleanup; + goto cleanup;
+ +
+ if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0)
+ goto cleanup; + goto cleanup;
+ +
+ if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm)) {

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-8.1.0/src/libxl/libxl_conf.c Index: libvirt-8.2.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/libxl/libxl_conf.c --- libvirt-8.2.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.1.0/src/libxl/libxl_conf.c +++ libvirt-8.2.0/src/libxl/libxl_conf.c
@@ -943,6 +943,28 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -943,6 +943,28 @@ libxlDiskSetDiscard(libxl_device_disk *x
} }
} }

42
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-8.1.0/docs/manpages/virsh.rst Index: libvirt-8.2.0/docs/manpages/virsh.rst
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/docs/manpages/virsh.rst --- libvirt-8.2.0.orig/docs/manpages/virsh.rst
+++ libvirt-8.1.0/docs/manpages/virsh.rst +++ libvirt-8.2.0/docs/manpages/virsh.rst
@@ -3246,6 +3246,7 @@ migrate @@ -3246,6 +3246,7 @@ migrate
[--parallel [--parallel-connections connections]] [--parallel [--parallel-connections connections]]
[--bandwidth bandwidth] [--tls-destination hostname] [--bandwidth bandwidth] [--tls-destination hostname]
@ -41,10 +41,10 @@ Index: libvirt-8.1.0/docs/manpages/virsh.rst
Running migration can be canceled by interrupting virsh (usually using Running migration can be canceled by interrupting virsh (usually using
``Ctrl-C``) or by ``domjobabort`` command sent from another virsh instance. ``Ctrl-C``) or by ``domjobabort`` command sent from another virsh instance.
Index: libvirt-8.1.0/include/libvirt/libvirt-domain.h Index: libvirt-8.2.0/include/libvirt/libvirt-domain.h
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/include/libvirt/libvirt-domain.h --- libvirt-8.2.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-8.1.0/include/libvirt/libvirt-domain.h +++ libvirt-8.2.0/include/libvirt/libvirt-domain.h
@@ -1090,6 +1090,25 @@ typedef enum { @@ -1090,6 +1090,25 @@ typedef enum {
*/ */
# define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination" # define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination"
@ -71,10 +71,10 @@ Index: libvirt-8.1.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-8.1.0/src/libxl/libxl_driver.c Index: libvirt-8.2.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/libxl/libxl_driver.c --- libvirt-8.2.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.1.0/src/libxl/libxl_driver.c +++ libvirt-8.2.0/src/libxl/libxl_driver.c
@@ -6005,6 +6005,9 @@ libxlDomainMigratePerform3Params(virDoma @@ -6005,6 +6005,9 @@ libxlDomainMigratePerform3Params(virDoma
const char *dname = NULL; const char *dname = NULL;
const char *uri = NULL; const char *uri = NULL;
@ -115,10 +115,10 @@ Index: libvirt-8.1.0/src/libxl/libxl_driver.c
goto cleanup; goto cleanup;
} }
Index: libvirt-8.1.0/src/libxl/libxl_migration.c Index: libvirt-8.2.0/src/libxl/libxl_migration.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/libxl/libxl_migration.c --- libvirt-8.2.0.orig/src/libxl/libxl_migration.c
+++ libvirt-8.1.0/src/libxl/libxl_migration.c +++ libvirt-8.2.0/src/libxl/libxl_migration.c
@@ -332,18 +332,38 @@ libxlMigrateDstReceive(virNetSocket *soc @@ -332,18 +332,38 @@ libxlMigrateDstReceive(virNetSocket *soc
static int static int
libxlDoMigrateSrcSend(libxlDriverPrivate *driver, libxlDoMigrateSrcSend(libxlDriverPrivate *driver,
@ -279,10 +279,10 @@ Index: libvirt-8.1.0/src/libxl/libxl_migration.c
virObjectLock(vm); virObjectLock(vm);
if (ret == 0) { if (ret == 0) {
Index: libvirt-8.1.0/src/libxl/libxl_migration.h Index: libvirt-8.2.0/src/libxl/libxl_migration.h
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/libxl/libxl_migration.h --- libvirt-8.2.0.orig/src/libxl/libxl_migration.h
+++ libvirt-8.1.0/src/libxl/libxl_migration.h +++ libvirt-8.2.0/src/libxl/libxl_migration.h
@@ -35,6 +35,9 @@ @@ -35,6 +35,9 @@
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, \
@ -325,11 +325,11 @@ Index: libvirt-8.1.0/src/libxl/libxl_migration.h
virDomainPtr virDomainPtr
libxlDomainMigrationDstFinish(virConnectPtr dconn, libxlDomainMigrationDstFinish(virConnectPtr dconn,
Index: libvirt-8.1.0/tools/virsh-domain.c Index: libvirt-8.2.0/tools/virsh-domain.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/tools/virsh-domain.c --- libvirt-8.2.0.orig/tools/virsh-domain.c
+++ libvirt-8.1.0/tools/virsh-domain.c +++ libvirt-8.2.0/tools/virsh-domain.c
@@ -10863,6 +10863,18 @@ static const vshCmdOptDef opts_migrate[] @@ -10902,6 +10902,18 @@ static const vshCmdOptDef opts_migrate[]
.completer = virshCompleteEmpty, .completer = virshCompleteEmpty,
.help = N_("override the destination host name used for TLS verification") .help = N_("override the destination host name used for TLS verification")
}, },
@ -348,7 +348,7 @@ Index: libvirt-8.1.0/tools/virsh-domain.c
{.name = NULL} {.name = NULL}
}; };
@@ -10883,6 +10895,7 @@ doMigrate(void *opaque) @@ -10922,6 +10934,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;
@ -356,7 +356,7 @@ Index: libvirt-8.1.0/tools/virsh-domain.c
#ifndef WIN32 #ifndef WIN32
sigset_t sigmask, oldsigmask; sigset_t sigmask, oldsigmask;
@@ -11013,6 +11026,22 @@ doMigrate(void *opaque) @@ -11052,6 +11065,22 @@ doMigrate(void *opaque)
goto save_error; goto save_error;
} }

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-8.1.0/src/libxl/libxl_conf.c Index: libvirt-8.2.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/libxl/libxl_conf.c --- libvirt-8.2.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.1.0/src/libxl/libxl_conf.c +++ libvirt-8.2.0/src/libxl/libxl_conf.c
@@ -944,6 +944,20 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -944,6 +944,20 @@ libxlDiskSetDiscard(libxl_device_disk *x
} }

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

@ -13,10 +13,10 @@ 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-8.1.0/src/lxc/lxc_controller.c Index: libvirt-8.2.0/src/lxc/lxc_controller.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/lxc/lxc_controller.c --- libvirt-8.2.0.orig/src/lxc/lxc_controller.c
+++ libvirt-8.1.0/src/lxc/lxc_controller.c +++ libvirt-8.2.0/src/lxc/lxc_controller.c
@@ -1998,6 +1998,7 @@ static int virLXCControllerDeleteInterfa @@ -1998,6 +1998,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-8.1.0/src/lxc/lxc_controller.c
return ret; return ret;
} }
Index: libvirt-8.1.0/src/lxc/lxc_driver.c Index: libvirt-8.2.0/src/lxc/lxc_driver.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/lxc/lxc_driver.c --- libvirt-8.2.0.orig/src/lxc/lxc_driver.c
+++ libvirt-8.1.0/src/lxc/lxc_driver.c +++ libvirt-8.2.0/src/lxc/lxc_driver.c
@@ -67,6 +67,7 @@ @@ -67,6 +67,7 @@
#include "virtime.h" #include "virtime.h"
#include "virtypedparam.h" #include "virtypedparam.h"
@ -37,7 +37,7 @@ Index: libvirt-8.1.0/src/lxc/lxc_driver.c
#include "virstring.h" #include "virstring.h"
#include "viraccessapicheck.h" #include "viraccessapicheck.h"
#include "viraccessapichecklxc.h" #include "viraccessapichecklxc.h"
@@ -3511,6 +3512,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive @@ -3505,6 +3506,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-8.1.0/src/lxc/lxc_driver.c
break; break;
case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_DIRECT:
@@ -3950,6 +3952,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb @@ -3944,6 +3946,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-8.1.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-8.1.0/src/lxc/lxc_process.c Index: libvirt-8.2.0/src/lxc/lxc_process.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/lxc/lxc_process.c --- libvirt-8.2.0.orig/src/lxc/lxc_process.c
+++ libvirt-8.1.0/src/lxc/lxc_process.c +++ libvirt-8.2.0/src/lxc/lxc_process.c
@@ -51,6 +51,7 @@ @@ -51,6 +51,7 @@
#include "virstring.h" #include "virstring.h"
#include "virprocess.h" #include "virprocess.h"

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

@ -17,10 +17,10 @@ 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-8.1.0/src/network/bridge_driver.c Index: libvirt-8.2.0/src/network/bridge_driver.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/network/bridge_driver.c --- libvirt-8.2.0.orig/src/network/bridge_driver.c
+++ libvirt-8.1.0/src/network/bridge_driver.c +++ libvirt-8.2.0/src/network/bridge_driver.c
@@ -1336,7 +1336,14 @@ networkDnsmasqConfContents(virNetworkObj @@ -1336,7 +1336,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) {
@ -37,10 +37,10 @@ Index: libvirt-8.1.0/src/network/bridge_driver.c
} }
if (ipdef->tftproot) { if (ipdef->tftproot) {
Index: libvirt-8.1.0/tests/networkxml2confdata/dhcp6host-routed-network.conf Index: libvirt-8.2.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf --- libvirt-8.2.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-8.1.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +++ libvirt-8.2.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-8.1.0/src/util/virarch.c Index: libvirt-8.2.0/src/util/virarch.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/util/virarch.c --- libvirt-8.2.0.orig/src/util/virarch.c
+++ libvirt-8.1.0/src/util/virarch.c +++ libvirt-8.2.0/src/util/virarch.c
@@ -222,6 +222,8 @@ virArch virArchFromHost(void) @@ -222,6 +222,8 @@ virArch virArchFromHost(void)
arch = VIR_ARCH_X86_64; arch = VIR_ARCH_X86_64;
} else if (STREQ(ut.machine, "arm64")) { } else if (STREQ(ut.machine, "arm64")) {

14
qemu-apparmor-screenshot.patch
View File

@ -1,11 +1,11 @@
Index: libvirt-8.1.0/src/security/apparmor/libvirt-qemu Index: libvirt-8.2.0/src/security/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/security/apparmor/libvirt-qemu --- libvirt-8.2.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-8.1.0/src/security/apparmor/libvirt-qemu +++ libvirt-8.2.0/src/security/apparmor/libvirt-qemu
@@ -248,3 +248,6 @@ @@ -252,3 +252,6 @@
# /sys/bus/nd/devices # required for QEMU accessing UEFI nvram variables
/ r, # harmless on any lsb compliant system owner /var/lib/libvirt/qemu/nvram/*_VARS.fd rwk,
/sys/bus/nd/devices/{,**/} r, owner /var/lib/libvirt/qemu/nvram/*_VARS.ms.fd rwk,
+ +
+ # Temporary screendump rule -- See bsc#904426 + # Temporary screendump rule -- See bsc#904426
+ /var/cache/libvirt/qemu/qemu.screendump.* rw, + /var/cache/libvirt/qemu/qemu.screendump.* rw,

6
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-8.1.0/tools/libvirt-guests.sh.in Index: libvirt-8.2.0/tools/libvirt-guests.sh.in
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/tools/libvirt-guests.sh.in --- libvirt-8.2.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-8.1.0/tools/libvirt-guests.sh.in +++ libvirt-8.2.0/tools/libvirt-guests.sh.in
@@ -20,10 +20,6 @@ sysconfdir="@sysconfdir@" @@ -20,10 +20,6 @@ sysconfdir="@sysconfdir@"
localstatedir="@localstatedir@" localstatedir="@localstatedir@"
libvirtd="@sbindir@"/libvirtd libvirtd="@sbindir@"/libvirtd

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-8.1.0/src/remote/remote_daemon_config.c Index: libvirt-8.2.0/src/remote/remote_daemon_config.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/remote/remote_daemon_config.c --- libvirt-8.2.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-8.1.0/src/remote/remote_daemon_config.c +++ libvirt-8.2.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-8.1.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-8.1.0/src/remote/libvirtd.conf.in Index: libvirt-8.2.0/src/remote/libvirtd.conf.in
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/remote/libvirtd.conf.in --- libvirt-8.2.0.orig/src/remote/libvirtd.conf.in
+++ libvirt-8.1.0/src/remote/libvirtd.conf.in +++ libvirt-8.2.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-8.1.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-8.1.0/src/remote/test_libvirtd.aug.in Index: libvirt-8.2.0/src/remote/test_libvirtd.aug.in
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/remote/test_libvirtd.aug.in --- libvirt-8.2.0.orig/src/remote/test_libvirtd.aug.in
+++ libvirt-8.1.0/src/remote/test_libvirtd.aug.in +++ libvirt-8.2.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 =

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-8.1.0/src/libxl/libxl.conf Index: libvirt-8.2.0/src/libxl/libxl.conf
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/libxl/libxl.conf --- libvirt-8.2.0.orig/src/libxl/libxl.conf
+++ libvirt-8.1.0/src/libxl/libxl.conf +++ libvirt-8.2.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-8.1.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-8.1.0/src/libxl/libxl_conf.c Index: libvirt-8.2.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/libxl/libxl_conf.c --- libvirt-8.2.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.1.0/src/libxl/libxl_conf.c +++ libvirt-8.2.0/src/libxl/libxl_conf.c
@@ -1732,15 +1732,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa @@ -1732,15 +1732,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
/* /*
* Get domain0 autoballoon configuration. Honor user-specified * Get domain0 autoballoon configuration. Honor user-specified
@ -66,10 +66,10 @@ Index: libvirt-8.1.0/src/libxl/libxl_conf.c
return 0; return 0;
} }
Index: libvirt-8.1.0/src/libxl/test_libvirtd_libxl.aug.in Index: libvirt-8.2.0/src/libxl/test_libvirtd_libxl.aug.in
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/libxl/test_libvirtd_libxl.aug.in --- libvirt-8.2.0.orig/src/libxl/test_libvirtd_libxl.aug.in
+++ libvirt-8.1.0/src/libxl/test_libvirtd_libxl.aug.in +++ libvirt-8.2.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@

20
suse-qemu-conf.patch
View File

@ -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 etc.), but for now they are all lumped together in this
single patch. single patch.
Index: libvirt-8.1.0/src/qemu/qemu.conf Index: libvirt-8.2.0/src/qemu/qemu.conf
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/qemu/qemu.conf --- libvirt-8.2.0.orig/src/qemu/qemu.conf
+++ libvirt-8.1.0/src/qemu/qemu.conf +++ libvirt-8.2.0/src/qemu/qemu.conf
@@ -491,10 +491,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.
# #
@ -60,11 +60,11 @@ Index: libvirt-8.1.0/src/qemu/qemu.conf
# #
#lock_manager = "lockd" #lock_manager = "lockd"
Index: libvirt-8.1.0/src/qemu/qemu_conf.c Index: libvirt-8.2.0/src/qemu/qemu_conf.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/qemu/qemu_conf.c --- libvirt-8.2.0.orig/src/qemu/qemu_conf.c
+++ libvirt-8.1.0/src/qemu/qemu_conf.c +++ libvirt-8.2.0/src/qemu/qemu_conf.c
@@ -272,7 +272,7 @@ virQEMUDriverConfig *virQEMUDriverConfig @@ -261,7 +261,7 @@ virQEMUDriverConfig *virQEMUDriverConfig
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,10 +73,10 @@ Index: libvirt-8.1.0/src/qemu/qemu_conf.c
cfg->securityRequireConfined = false; cfg->securityRequireConfined = false;
cfg->keepAliveInterval = 5; cfg->keepAliveInterval = 5;
Index: libvirt-8.1.0/src/qemu/test_libvirtd_qemu.aug.in Index: libvirt-8.2.0/src/qemu/test_libvirtd_qemu.aug.in
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in --- libvirt-8.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-8.1.0/src/qemu/test_libvirtd_qemu.aug.in +++ libvirt-8.2.0/src/qemu/test_libvirtd_qemu.aug.in
@@ -45,6 +45,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" }

26
suse-qemu-ovmf-paths.patch
View File

@ -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 removes the old DEFAULT_LOADER_NVRAM approach and associated code, this
patch will stay. patch will stay.
Index: libvirt-8.1.0/src/qemu/qemu.conf Index: libvirt-8.2.0/src/qemu/qemu.conf
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/qemu/qemu.conf --- libvirt-8.2.0.orig/src/qemu/qemu.conf
+++ libvirt-8.1.0/src/qemu/qemu.conf +++ libvirt-8.2.0/src/qemu/qemu.conf
@@ -857,10 +857,9 @@ @@ -857,10 +857,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.
@ -23,11 +23,11 @@ Index: libvirt-8.1.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-8.1.0/src/qemu/qemu_conf.c Index: libvirt-8.2.0/src/qemu/qemu_conf.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/qemu/qemu_conf.c --- libvirt-8.2.0.orig/src/qemu/qemu_conf.c
+++ libvirt-8.1.0/src/qemu/qemu_conf.c +++ libvirt-8.2.0/src/qemu/qemu_conf.c
@@ -98,10 +98,9 @@ qemuDriverUnlock(virQEMUDriver *driver) @@ -87,10 +87,9 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig);
#ifndef DEFAULT_LOADER_NVRAM #ifndef DEFAULT_LOADER_NVRAM
# define DEFAULT_LOADER_NVRAM \ # define DEFAULT_LOADER_NVRAM \
@ -41,10 +41,10 @@ Index: libvirt-8.1.0/src/qemu/qemu_conf.c
#endif #endif
Index: libvirt-8.1.0/src/security/virt-aa-helper.c Index: libvirt-8.2.0/src/security/virt-aa-helper.c
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/security/virt-aa-helper.c --- libvirt-8.2.0.orig/src/security/virt-aa-helper.c
+++ libvirt-8.1.0/src/security/virt-aa-helper.c +++ libvirt-8.2.0/src/security/virt-aa-helper.c
@@ -480,7 +480,8 @@ valid_path(const char *path, const bool @@ -480,7 +480,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 */
@ -55,10 +55,10 @@ Index: libvirt-8.1.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-8.1.0/src/qemu/test_libvirtd_qemu.aug.in Index: libvirt-8.2.0/src/qemu/test_libvirtd_qemu.aug.in
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in --- libvirt-8.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-8.1.0/src/qemu/test_libvirtd_qemu.aug.in +++ libvirt-8.2.0/src/qemu/test_libvirtd_qemu.aug.in
@@ -96,10 +96,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" }

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

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

20
virt-create-rootfs.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-8.1.0/tools/virt-create-rootfs Index: libvirt-8.2.0/tools/virt-create-rootfs
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-8.1.0/tools/virt-create-rootfs +++ libvirt-8.2.0/tools/virt-create-rootfs
@@ -0,0 +1,236 @@ @@ -0,0 +1,236 @@
+#!/bin/sh +#!/bin/sh
+set -e +set -e
@ -239,10 +239,10 @@ Index: libvirt-8.1.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-8.1.0/docs/manpages/virt-create-rootfs.rst Index: libvirt-8.2.0/docs/manpages/virt-create-rootfs.rst
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-8.1.0/docs/manpages/virt-create-rootfs.rst +++ libvirt-8.2.0/docs/manpages/virt-create-rootfs.rst
@@ -0,0 +1,88 @@ @@ -0,0 +1,88 @@
+================== +==================
+virt-create-rootfs +virt-create-rootfs
@ -332,10 +332,10 @@ Index: libvirt-8.1.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-8.1.0/docs/manpages/meson.build Index: libvirt-8.2.0/docs/manpages/meson.build
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/docs/manpages/meson.build --- libvirt-8.2.0.orig/docs/manpages/meson.build
+++ libvirt-8.1.0/docs/manpages/meson.build +++ libvirt-8.2.0/docs/manpages/meson.build
@@ -20,6 +20,7 @@ docs_man_files = [ @@ -20,6 +20,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') },
@ -344,10 +344,10 @@ Index: libvirt-8.1.0/docs/manpages/meson.build
{ 'name': 'libvirt-guests', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'libvirt-guests', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') },
{ 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') },
Index: libvirt-8.1.0/tools/meson.build Index: libvirt-8.2.0/tools/meson.build
=================================================================== ===================================================================
--- libvirt-8.1.0.orig/tools/meson.build --- libvirt-8.2.0.orig/tools/meson.build
+++ libvirt-8.1.0/tools/meson.build +++ libvirt-8.2.0/tools/meson.build
@@ -154,6 +154,8 @@ else @@ -154,6 +154,8 @@ else
virsh_icon_res = [] virsh_icon_res = []
endif endif