Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4820e2d885 | |||
| b5ff942369 | |||
| dafc4559bd | |||
| bfcb9ad2f0 | |||
| acce46f726 |
@@ -0,0 +1,31 @@
|
||||
From 5629ebcb4234fde10fd9468d5fc5dd4947ed8677 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
||||
Date: Tue, 29 Apr 2025 15:49:10 +0100
|
||||
Subject: [PATCH] Fix mocking of virQEMUCapsProbeHVF function
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
From: Daniel P. Berrangé <berrange@redhat.com>
|
||||
|
||||
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
---
|
||||
src/qemu/qemu_capabilities.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
|
||||
index ea7c14daa9..488a1a058e 100644
|
||||
--- a/src/qemu/qemu_capabilities.h
|
||||
+++ b/src/qemu/qemu_capabilities.h
|
||||
@@ -943,7 +943,7 @@ bool
|
||||
virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) G_NO_INLINE;
|
||||
|
||||
bool
|
||||
-virQEMUCapsProbeHVF(virQEMUCaps *qemuCaps) G_NO_INLINE;
|
||||
+virQEMUCapsProbeHVF(virQEMUCaps *qemuCaps) G_NO_INLINE __attribute__((noipa));
|
||||
|
||||
virArch virQEMUCapsArchFromString(const char *arch);
|
||||
const char *virQEMUCapsArchToString(virArch arch);
|
||||
--
|
||||
2.49.0
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
From 63a3d70697dc44ef2f8b40f7c8e9aa869227a7da Mon Sep 17 00:00:00 2001
|
||||
From: Jiang XueQian <jiangxueqian@gmail.com>
|
||||
Date: Sat, 18 Jan 2025 16:32:10 +0800
|
||||
Subject: [PATCH] nss: Skip empty files and avoid use of uninitialized value
|
||||
Content-type: text/plain
|
||||
|
||||
JSON parser isn't called when reading empty files so `jerr` will be used
|
||||
uninitialized in the original code. Empty files appear when a network
|
||||
has no dhcp clients.
|
||||
|
||||
This patch checks for such files and skip them.
|
||||
|
||||
Fixes: a8d828c88bbdaf83ae78dc06cdd84d5667fcc424
|
||||
Signed-off-by: Jiang XueQian <jiangxueqian@gmail.com>
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
---
|
||||
tools/nss/libvirt_nss_leases.c | 9 +++++++--
|
||||
tools/nss/libvirt_nss_macs.c | 9 +++++++--
|
||||
2 files changed, 14 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/tools/nss/libvirt_nss_leases.c b/tools/nss/libvirt_nss_leases.c
|
||||
index aea81bb56e..25ea6b0ce2 100644
|
||||
--- a/tools/nss/libvirt_nss_leases.c
|
||||
+++ b/tools/nss/libvirt_nss_leases.c
|
||||
@@ -263,7 +263,7 @@ findLeases(const char *file,
|
||||
enum json_tokener_error jerr;
|
||||
int jsonflags = JSON_TOKENER_STRICT | JSON_TOKENER_VALIDATE_UTF8;
|
||||
char line[1024];
|
||||
- ssize_t nreadTotal = 0;
|
||||
+ size_t nreadTotal = 0;
|
||||
int rv;
|
||||
|
||||
if ((fd = open(file, O_RDONLY)) < 0) {
|
||||
@@ -290,12 +290,17 @@ findLeases(const char *file,
|
||||
jerr = json_tokener_get_error(tok);
|
||||
} while (jerr == json_tokener_continue);
|
||||
|
||||
+ if (nreadTotal == 0) {
|
||||
+ ret = 0;
|
||||
+ goto cleanup;
|
||||
+ }
|
||||
+
|
||||
if (jerr == json_tokener_continue) {
|
||||
ERROR("Cannot parse %s: incomplete json found", file);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
- if (nreadTotal > 0 && jerr != json_tokener_success) {
|
||||
+ if (jerr != json_tokener_success) {
|
||||
ERROR("Cannot parse %s: %s", file, json_tokener_error_desc(jerr));
|
||||
goto cleanup;
|
||||
}
|
||||
diff --git a/tools/nss/libvirt_nss_macs.c b/tools/nss/libvirt_nss_macs.c
|
||||
index 23229a18f3..bac8c0e1bb 100644
|
||||
--- a/tools/nss/libvirt_nss_macs.c
|
||||
+++ b/tools/nss/libvirt_nss_macs.c
|
||||
@@ -124,7 +124,7 @@ findMACs(const char *file,
|
||||
json_tokener *tok = NULL;
|
||||
enum json_tokener_error jerr;
|
||||
int jsonflags = JSON_TOKENER_STRICT | JSON_TOKENER_VALIDATE_UTF8;
|
||||
- ssize_t nreadTotal = 0;
|
||||
+ size_t nreadTotal = 0;
|
||||
int rv;
|
||||
size_t i;
|
||||
|
||||
@@ -152,12 +152,17 @@ findMACs(const char *file,
|
||||
jerr = json_tokener_get_error(tok);
|
||||
} while (jerr == json_tokener_continue);
|
||||
|
||||
+ if (nreadTotal == 0) {
|
||||
+ ret = 0;
|
||||
+ goto cleanup;
|
||||
+ }
|
||||
+
|
||||
if (jerr == json_tokener_continue) {
|
||||
ERROR("Cannot parse %s: incomplete json found", file);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
- if (nreadTotal > 0 && jerr != json_tokener_success) {
|
||||
+ if (jerr != json_tokener_success) {
|
||||
ERROR("Cannot parse %s: %s", file, json_tokener_error_desc(jerr));
|
||||
goto cleanup;
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
From cd0de70e05475d5f4aa46e578fbb98033d38c06b Mon Sep 17 00:00:00 2001
|
||||
From: Michal Privoznik <mprivozn@redhat.com>
|
||||
Date: Mon, 16 Jun 2025 10:28:37 +0200
|
||||
Subject: [PATCH] qemu: Be more forgiving when acquiring QUERY job when
|
||||
formatting domain XML
|
||||
Content-type: text/plain
|
||||
|
||||
In my previous commit of v11.0.0-rc1~115 I've made QEMU driver
|
||||
implementation for virDomainGetXMLDesc() (qemuDomainGetXMLDesc())
|
||||
acquire QERY job. See its commit message for more info. But this
|
||||
unfortunately broke apps witch fetch domain XML for incoming
|
||||
migration (like virt-manager). The reason is that for incoming
|
||||
migration the VIR_ASYNC_JOB_MIGRATION_IN async job is set, but
|
||||
the mask of allowed synchronous jobs is empty (because QEMU can't
|
||||
talk on monitor really). This makes virDomainObjBeginJob() fail
|
||||
which in turn makes qemuDomainGetXMLDesc() fail too.
|
||||
|
||||
It makes sense for qemuDomainGetXMLDesc() to acquire the job
|
||||
(e.g. so that it's coherent with another thread that might be in
|
||||
the middle of a MODIFY job). But failure to dump XML may be
|
||||
treated as broken daemon (e.g. virt-manager does so).
|
||||
|
||||
Therefore, still try to acquire the QUERY job (if job mask
|
||||
permits it) but, do not treat failure as an error.
|
||||
|
||||
Fixes: 6cc93bf28842526be2fd596a607ebca796b7fb2e
|
||||
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2369243
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
|
||||
---
|
||||
src/qemu/qemu_driver.c | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
||||
index d2eddbd9ae..6bdeede2e8 100644
|
||||
--- a/src/qemu/qemu_driver.c
|
||||
+++ b/src/qemu/qemu_driver.c
|
||||
@@ -6158,6 +6158,7 @@ static char
|
||||
{
|
||||
virQEMUDriver *driver = dom->conn->privateData;
|
||||
virDomainObj *vm;
|
||||
+ bool hasJob = false;
|
||||
char *ret = NULL;
|
||||
|
||||
virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS | VIR_DOMAIN_XML_UPDATE_CPU,
|
||||
@@ -6169,8 +6170,10 @@ static char
|
||||
if (virDomainGetXMLDescEnsureACL(dom->conn, vm->def, flags) < 0)
|
||||
goto cleanup;
|
||||
|
||||
- if (virDomainObjBeginJob(vm, VIR_JOB_QUERY) < 0)
|
||||
- goto cleanup;
|
||||
+ if (virDomainNestedJobAllowed(vm->job, VIR_JOB_QUERY) &&
|
||||
+ virDomainObjBeginJob(vm, VIR_JOB_QUERY) >= 0) {
|
||||
+ hasJob = true;
|
||||
+ }
|
||||
|
||||
qemuDomainUpdateCurrentMemorySize(vm);
|
||||
|
||||
@@ -6186,7 +6189,8 @@ static char
|
||||
|
||||
ret = qemuDomainFormatXML(driver, vm, flags);
|
||||
|
||||
- virDomainObjEndJob(vm);
|
||||
+ if (hasJob)
|
||||
+ virDomainObjEndJob(vm);
|
||||
|
||||
cleanup:
|
||||
virDomainObjEndAPI(&vm);
|
||||
@@ -0,0 +1,94 @@
|
||||
From 63e4cbd109374f44e8bd4f8d1af5e2a2c67611bc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
||||
Date: Mon, 28 Apr 2025 11:42:13 +0100
|
||||
Subject: [PATCH] storage: stop hardcoding paths for mkfs, mount, umount
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
From: Daniel P. Berrangé <berrange@redhat.com>
|
||||
|
||||
This was always undesirable but now causes problems on Fedora 42
|
||||
where at build time we detect a /sbin path but at runtime this
|
||||
will only exist on upgraded machines, not fresh installs.
|
||||
|
||||
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
|
||||
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
---
|
||||
meson.build | 13 -------------
|
||||
src/storage/storage_backend_fs.c | 17 +++--------------
|
||||
2 files changed, 3 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 37b1caa566..14c98b49a1 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1827,23 +1827,10 @@ if conf.has('WITH_LIBVIRTD')
|
||||
endif
|
||||
endif
|
||||
|
||||
- if fs_enable
|
||||
- mount_prog = find_program('mount', required: get_option('storage_fs'), dirs: libvirt_sbin_path)
|
||||
- umount_prog = find_program('umount', required: get_option('storage_fs'), dirs: libvirt_sbin_path)
|
||||
- mkfs_prog = find_program('mkfs', required: get_option('storage_fs'), dirs: libvirt_sbin_path)
|
||||
-
|
||||
- if not mount_prog.found() or not umount_prog.found() or not mkfs_prog.found()
|
||||
- fs_enable = false
|
||||
- endif
|
||||
- endif
|
||||
-
|
||||
if fs_enable
|
||||
use_storage = true
|
||||
|
||||
conf.set('WITH_STORAGE_FS', 1)
|
||||
- conf.set_quoted('MOUNT', mount_prog.full_path())
|
||||
- conf.set_quoted('UMOUNT', umount_prog.full_path())
|
||||
- conf.set_quoted('MKFS', mkfs_prog.full_path())
|
||||
endif
|
||||
endif
|
||||
|
||||
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
|
||||
index fce395d60f..6ec359625a 100644
|
||||
--- a/src/storage/storage_backend_fs.c
|
||||
+++ b/src/storage/storage_backend_fs.c
|
||||
@@ -304,7 +304,7 @@ virStorageBackendFileSystemMount(virStoragePoolObj *pool)
|
||||
if (!(src = virStorageBackendFileSystemGetPoolSource(pool)))
|
||||
return -1;
|
||||
|
||||
- cmd = virStorageBackendFileSystemMountCmd(MOUNT, def, src);
|
||||
+ cmd = virStorageBackendFileSystemMountCmd("mount", def, src);
|
||||
|
||||
/* Mounting a shared FS might take a long time. Don't hold
|
||||
* the pool locked meanwhile. */
|
||||
@@ -362,7 +362,7 @@ virStorageBackendFileSystemStop(virStoragePoolObj *pool)
|
||||
if ((rc = virStorageBackendFileSystemIsMounted(pool)) != 1)
|
||||
return rc;
|
||||
|
||||
- cmd = virCommandNewArgList(UMOUNT, def->target.path, NULL);
|
||||
+ cmd = virCommandNewArgList("umount", def->target.path, NULL);
|
||||
return virCommandRun(cmd, NULL);
|
||||
}
|
||||
#endif /* WITH_STORAGE_FS */
|
||||
@@ -402,18 +402,7 @@ virStorageBackendExecuteMKFS(const char *device,
|
||||
g_autoptr(virCommand) cmd = NULL;
|
||||
g_autofree char *mkfs = NULL;
|
||||
|
||||
-#if WITH_STORAGE_FS
|
||||
- mkfs = virFindFileInPath(MKFS);
|
||||
-#endif /* WITH_STORAGE_FS */
|
||||
-
|
||||
- if (!mkfs) {
|
||||
- virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
- _("mkfs is not available on this platform: Failed to make filesystem of type '%1$s' on device '%2$s'"),
|
||||
- format, device);
|
||||
- return -1;
|
||||
- }
|
||||
-
|
||||
- cmd = virCommandNewArgList(mkfs, "-t", format, NULL);
|
||||
+ cmd = virCommandNewArgList("mkfs", "-t", format, NULL);
|
||||
|
||||
/* use the force, otherwise mkfs.xfs won't overwrite existing fs.
|
||||
* Similarly mkfs.ext2, mkfs.ext3, and mkfs.ext4 require supplying -F
|
||||
--
|
||||
2.49.0
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
||||
To: devel@lists.libvirt.org
|
||||
Subject: [PATCH] util: avoid overflow in hextable buffer
|
||||
Date: Mon, 20 Jan 2025 10:09:24 +0000
|
||||
Message-ID: <20250120100924.3864818-1-berrange@redhat.com>
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The assigned string is 17 chars long once the trailing nul is taken
|
||||
into account. This triggers a warning with GCC 15
|
||||
|
||||
src/util/virsystemd.c: In function ‘virSystemdEscapeName’:
|
||||
src/util/virsystemd.c:59:38: error: initializer-string for array of ‘char’ is too long [-Werror=unterminated-string-initialization]
|
||||
59 | static const char hextable[16] = "0123456789abcdef";
|
||||
| ^~~~~~~~~~~~~~~~~~
|
||||
|
||||
Switch to a dynamically sized array as used in all the other places
|
||||
we have a hextable array.
|
||||
|
||||
See also: https://gcc.gnu.org/PR115185
|
||||
Reported-by: Yaakov Selkowitz <yselkowi@redhat.com>
|
||||
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
---
|
||||
src/util/virsystemd.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c
|
||||
index 5b772e29dd..d46e5f74fc 100644
|
||||
--- a/src/util/virsystemd.c
|
||||
+++ b/src/util/virsystemd.c
|
||||
@@ -56,7 +56,7 @@ struct _virSystemdActivationEntry {
|
||||
static void virSystemdEscapeName(virBuffer *buf,
|
||||
const char *name)
|
||||
{
|
||||
- static const char hextable[16] = "0123456789abcdef";
|
||||
+ static const char hextable[] = "0123456789abcdef";
|
||||
|
||||
#define ESCAPE(c) \
|
||||
do { \
|
||||
--
|
||||
2.47.1
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
From 7ab0f1c2a3fddf46d381f055e49111e3063b4829 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
||||
Date: Mon, 28 Apr 2025 11:47:34 +0100
|
||||
Subject: [PATCH] util: stop hardcoding numad path
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
From: Daniel P. Berrangé <berrange@redhat.com>
|
||||
|
||||
Change the meson rules to always enable numad if on a Linux host, unless
|
||||
the meson options say not to.
|
||||
|
||||
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
|
||||
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
---
|
||||
meson.build | 10 +++-------
|
||||
src/util/virnuma.c | 2 +-
|
||||
2 files changed, 4 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 14c98b49a1..767205f44b 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -2028,14 +2028,10 @@ if not get_option('nss').disabled()
|
||||
endif
|
||||
endif
|
||||
|
||||
-if not get_option('numad').disabled() and numactl_dep.found()
|
||||
- numad_prog = find_program('numad', required: get_option('numad'), dirs: libvirt_sbin_path)
|
||||
- if numad_prog.found()
|
||||
- conf.set('WITH_NUMAD', 1)
|
||||
- conf.set_quoted('NUMAD', numad_prog.full_path())
|
||||
- endif
|
||||
+if not get_option('numad').disabled() and numactl_dep.found() and host_machine.system() == 'linux'
|
||||
+ conf.set('WITH_NUMAD', 1)
|
||||
elif get_option('numad').enabled()
|
||||
- error('You must have numactl enabled for numad support.')
|
||||
+ error('You must have a Linux host with numactl enabled for numad support.')
|
||||
endif
|
||||
|
||||
# nwfilter should only be compiled for linux, and only if the
|
||||
diff --git a/src/util/virnuma.c b/src/util/virnuma.c
|
||||
index 9393c20875..67c51630c7 100644
|
||||
--- a/src/util/virnuma.c
|
||||
+++ b/src/util/virnuma.c
|
||||
@@ -61,7 +61,7 @@ virNumaGetAutoPlacementAdvice(unsigned short vcpus,
|
||||
g_autoptr(virCommand) cmd = NULL;
|
||||
char *output = NULL;
|
||||
|
||||
- cmd = virCommandNewArgList(NUMAD, "-w", NULL);
|
||||
+ cmd = virCommandNewArgList("numad", "-w", NULL);
|
||||
virCommandAddArgFormat(cmd, "%d:%llu", vcpus,
|
||||
VIR_DIV_UP(balloon, 1024));
|
||||
|
||||
--
|
||||
2.49.0
|
||||
|
||||
+68
-93
@@ -3,15 +3,15 @@
|
||||
# This spec file assumes you are building on a Fedora or RHEL version
|
||||
# that's still supported by the vendor. It may work on other distros
|
||||
# or versions, but no effort will be made to ensure that going forward.
|
||||
%define min_rhel 9
|
||||
%define min_fedora 41
|
||||
%define min_rhel 8
|
||||
%define min_fedora 37
|
||||
|
||||
%define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s390x riscv64
|
||||
%if 0%{?rhel}
|
||||
%if 0%{?rhel} >= 10
|
||||
%define arches_qemu_kvm x86_64 aarch64 s390x riscv64
|
||||
%else
|
||||
%if 0%{?rhel} > 8
|
||||
%define arches_qemu_kvm x86_64 aarch64 s390x
|
||||
%else
|
||||
%define arches_qemu_kvm x86_64 %{power64} aarch64 s390x
|
||||
%endif
|
||||
%endif
|
||||
|
||||
@@ -44,12 +44,6 @@
|
||||
%define with_qemu_kvm 0
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} >= 42
|
||||
%define with_account_add 0
|
||||
%else
|
||||
%define with_account_add 1
|
||||
%endif
|
||||
|
||||
%define with_qemu_tcg %{with_qemu}
|
||||
|
||||
# RHEL disables TCG on all architectures
|
||||
@@ -72,13 +66,18 @@
|
||||
|
||||
%define with_storage_gluster 0%{!?_without_storage_gluster:1}
|
||||
%if 0%{?rhel}
|
||||
# Glusterfs has been dropped in RHEL-9.
|
||||
%define with_storage_gluster 0
|
||||
# Glusterfs has been dropped in RHEL-9, and before that
|
||||
# was only enabled on arches where KVM exists
|
||||
%if 0%{?rhel} > 8
|
||||
%define with_storage_gluster 0
|
||||
%else
|
||||
%ifnarch %{arches_qemu_kvm}
|
||||
%define with_storage_gluster 0
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# On Fedora 43, the 'zfs-fuse' package was removed, but is obtainable via
|
||||
# other means. Build the backend, but it's no longer considered to be part
|
||||
# of 'daemon-driver-storage'.
|
||||
# Fedora has zfs-fuse
|
||||
%if 0%{?fedora}
|
||||
%define with_storage_zfs 0%{!?_without_storage_zfs:1}
|
||||
%else
|
||||
@@ -87,7 +86,7 @@
|
||||
|
||||
%define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
|
||||
# libiscsi has been dropped in RHEL-9
|
||||
%if 0%{?rhel}
|
||||
%if 0%{?rhel} > 8
|
||||
%define with_storage_iscsi_direct 0
|
||||
%endif
|
||||
|
||||
@@ -143,6 +142,10 @@
|
||||
|
||||
%define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} < 9
|
||||
%define with_netcf 0%{!?_without_netcf:1}
|
||||
%endif
|
||||
|
||||
# fuse is used to provide virtualized /proc for LXC
|
||||
%if %{with_lxc}
|
||||
%define with_fuse 0%{!?_without_fuse:1}
|
||||
@@ -184,7 +187,8 @@
|
||||
# Right now that's not the case anywhere, but things should be fine by the time
|
||||
# Fedora 40 is released.
|
||||
%if %{with_qemu}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
# rhel-8 lacks pidfd_open
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 9
|
||||
%define with_nbdkit 0%{!?_without_nbdkit:1}
|
||||
|
||||
# setting 'with_nbdkit_config_default' must be done only when compiling
|
||||
@@ -192,7 +196,7 @@
|
||||
#
|
||||
# TODO: add RHEL 9 once a minor release that contains the necessary SELinux
|
||||
# bits exists (we only support the most recent minor release)
|
||||
%if 0%{?fedora}
|
||||
%if 0%{?fedora} >= 40
|
||||
%define with_nbdkit_config_default 0%{!?_without_nbdkit_config_default:1}
|
||||
%endif
|
||||
%endif
|
||||
@@ -203,13 +207,13 @@
|
||||
%endif
|
||||
|
||||
%define with_modular_daemons 0
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 9
|
||||
%define with_modular_daemons 1
|
||||
%endif
|
||||
|
||||
# Prefer nftables for future OS releases but keep using iptables
|
||||
# for existing ones
|
||||
%if 0%{?rhel} >= 10 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 10 || 0%{?fedora} >= 41
|
||||
%define prefer_nftables 1
|
||||
%define firewall_backend_priority nftables,iptables
|
||||
%else
|
||||
@@ -263,7 +267,7 @@
|
||||
|
||||
# Fedora and RHEL-9 are new enough to support /dev/userfaultfd, which
|
||||
# does not require enabling vm.unprivileged_userfaultfd sysctl.
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 9
|
||||
%define with_userfaultfd_sysctl 0
|
||||
%endif
|
||||
|
||||
@@ -290,8 +294,8 @@
|
||||
|
||||
Summary: Library providing a simple virtualization API
|
||||
Name: libvirt
|
||||
Version: 11.6.0
|
||||
Release: 3%{?dist}
|
||||
Version: 11.0.0
|
||||
Release: 5%{?dist}
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1
|
||||
URL: https://libvirt.org/
|
||||
|
||||
@@ -300,6 +304,19 @@ URL: https://libvirt.org/
|
||||
%endif
|
||||
Source: https://download.libvirt.org/%{?mainturl}libvirt-%{version}.tar.xz
|
||||
|
||||
# fix build with GCC 15
|
||||
Patch: 0001-util-avoid-overflow-in-hextable-buffer.patch
|
||||
|
||||
Patch: 0001-storage-stop-hardcoding-paths-for-mkfs-mount-umount.patch
|
||||
Patch: 0001-util-stop-hardcoding-numad-path.patch
|
||||
Patch: 0001-Fix-mocking-of-virQEMUCapsProbeHVF-function.patch
|
||||
|
||||
# Fix dumpxml failures after migration (bz 2369243)
|
||||
Patch: 0001-qemu-Be-more-forgiving-when-acquiring-QUERY-job-when.patch
|
||||
# libvirt-nss stops working after network restarts (bz #2364285)
|
||||
Patch: 0001-nss-Skip-empty-files-and-avoid-use-of-uninitialized-.patch
|
||||
|
||||
# Fix build with wireshark
|
||||
Patch: 0001-wireshark-Drop-needless-declaration-of-proto_registe.patch
|
||||
Patch: 0002-wireshark-Switch-header-files-to-pragma-once.patch
|
||||
Patch: 0003-wireshark-Move-WIRESHARK_VERSION-macro-definition.patch
|
||||
@@ -309,7 +326,6 @@ Patch: 0006-wireshark-Introduce-and-use-vir_val_to_str.patch
|
||||
Patch: 0007-wireshark-Don-t-leak-column-strings.patch
|
||||
Patch: 0008-wireshark-Adapt-to-wireshark-4.6.0.patch
|
||||
|
||||
|
||||
Requires: libvirt-daemon = %{version}-%{release}
|
||||
Requires: libvirt-daemon-config-network = %{version}-%{release}
|
||||
Requires: libvirt-daemon-config-nwfilter = %{version}-%{release}
|
||||
@@ -363,7 +379,7 @@ BuildRequires: gcc
|
||||
%if %{with_libxl}
|
||||
BuildRequires: xen-devel
|
||||
%endif
|
||||
BuildRequires: glib2-devel >= 2.66
|
||||
BuildRequires: glib2-devel >= 2.58
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: pkgconfig(bash-completion) >= 2.0
|
||||
@@ -383,7 +399,12 @@ BuildRequires: sanlock-devel >= 2.4
|
||||
BuildRequires: libpcap-devel >= 1.5.0
|
||||
BuildRequires: libnl3-devel
|
||||
BuildRequires: libselinux-devel
|
||||
# For modprobe
|
||||
BuildRequires: kmod
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: polkit >= 0.112
|
||||
# For mount/umount in FS driver
|
||||
BuildRequires: util-linux
|
||||
%if %{with_qemu}
|
||||
# For managing ACLs
|
||||
BuildRequires: libacl-devel
|
||||
@@ -394,6 +415,10 @@ BuildRequires: /usr/bin/qemu-img
|
||||
%if %{with_nbdkit}
|
||||
BuildRequires: libnbd-devel
|
||||
%endif
|
||||
# For LVM drivers
|
||||
BuildRequires: lvm2
|
||||
# For pool type=iscsi
|
||||
BuildRequires: iscsi-initiator-utils
|
||||
%if %{with_storage_iscsi_direct}
|
||||
# For pool type=iscsi-direct
|
||||
BuildRequires: libiscsi-devel
|
||||
@@ -433,6 +458,11 @@ BuildRequires: libwsman-devel >= 2.6.3
|
||||
BuildRequires: audit-libs-devel
|
||||
BuildRequires: systemtap-sdt-devel
|
||||
BuildRequires: /usr/bin/dtrace
|
||||
# For mount/umount in FS driver
|
||||
BuildRequires: util-linux
|
||||
%if %{with_numad}
|
||||
BuildRequires: numad
|
||||
%endif
|
||||
%if %{with_wireshark}
|
||||
BuildRequires: wireshark-devel
|
||||
%endif
|
||||
@@ -513,8 +543,6 @@ Requires: libvirt-libs = %{version}-%{release}
|
||||
# Recommends here will install libvirt-client by default (if available), but
|
||||
# RPM won't complain if the package is unavailable, masked, or removed later.
|
||||
Recommends: libvirt-client = %{version}-%{release}
|
||||
# For modprobe and rmmod
|
||||
Requires: kmod
|
||||
# for /sbin/ip
|
||||
Requires: iproute
|
||||
# for /sbin/tc
|
||||
@@ -529,10 +557,8 @@ Requires(posttrans): /usr/bin/systemctl
|
||||
Requires(preun): /usr/bin/systemctl
|
||||
# libvirtd depends on 'messagebus' service
|
||||
Requires: dbus
|
||||
%if %{with_account_add}
|
||||
# For uid creation during pre
|
||||
Requires(pre): shadow-utils
|
||||
%endif
|
||||
# Needed by /usr/libexec/libvirt-guests.sh script.
|
||||
%if 0%{?fedora}
|
||||
Requires: gettext-runtime
|
||||
@@ -559,7 +585,6 @@ resources
|
||||
%package daemon-plugin-lockd
|
||||
Summary: lockd client plugin for virtlockd
|
||||
Requires: libvirt-libs = %{version}-%{release}
|
||||
Requires: libvirt-daemon-common = %{version}-%{release}
|
||||
Requires: libvirt-daemon-lock = %{version}-%{release}
|
||||
|
||||
%description daemon-plugin-lockd
|
||||
@@ -674,7 +699,7 @@ Summary: Storage driver plugin including base backends for the libvirtd daemon
|
||||
Requires: libvirt-daemon-common = %{version}-%{release}
|
||||
Requires: libvirt-libs = %{version}-%{release}
|
||||
Recommends: nfs-utils
|
||||
# For mkfs and mount/umount
|
||||
# For mkfs
|
||||
Requires: util-linux
|
||||
# For storage wiping with different algorithms
|
||||
Requires: scrub
|
||||
@@ -786,13 +811,9 @@ volumes using the ceph protocol.
|
||||
Summary: Storage driver plugin for ZFS
|
||||
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
|
||||
Requires: libvirt-libs = %{version}-%{release}
|
||||
# Starting with Fedora 43 the 'zfs-fuse' is no longer shipped but obtainable
|
||||
# externally. The package builds fine without these. Users will have to provide
|
||||
# their own implementation.
|
||||
%if 0%{?fedora} && 0%{?fedora} < 43
|
||||
# Support any conforming implementation of zfs
|
||||
Requires: /sbin/zfs
|
||||
Requires: /sbin/zpool
|
||||
%endif
|
||||
|
||||
%description daemon-driver-storage-zfs
|
||||
The storage driver backend adding implementation of the storage APIs for
|
||||
@@ -816,10 +837,7 @@ Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release}
|
||||
%if %{with_storage_rbd}
|
||||
Requires: libvirt-daemon-driver-storage-rbd = %{version}-%{release}
|
||||
%endif
|
||||
# Starting with Fedora 43 the 'zfs-fuse' is no longer shipped but obtainable
|
||||
# externally. We do not want to install this as part of 'daemon-driver-storage'
|
||||
# any more.
|
||||
%if %{with_storage_zfs} && 0%{?fedora} && 0%{?fedora} < 43
|
||||
%if %{with_storage_zfs}
|
||||
Requires: libvirt-daemon-driver-storage-zfs = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
@@ -846,7 +864,7 @@ Requires: swtpm-tools
|
||||
%if %{with_numad}
|
||||
Requires: numad
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 9
|
||||
Recommends: passt
|
||||
Recommends: passt-selinux
|
||||
%endif
|
||||
@@ -1098,10 +1116,6 @@ Wireshark dissector plugin for better analysis of libvirt RPC traffic.
|
||||
%package login-shell
|
||||
Summary: Login shell for connecting users to an LXC container
|
||||
Requires: libvirt-libs = %{version}-%{release}
|
||||
%if %{with_account_add}
|
||||
# For uid creation during pre
|
||||
Requires(pre): shadow-utils
|
||||
%endif
|
||||
|
||||
%description login-shell
|
||||
Provides the set-uid virt-login-shell binary that is used to
|
||||
@@ -1124,7 +1138,6 @@ Requires: sanlock >= 2.4
|
||||
#for virt-sanlock-cleanup require augeas
|
||||
Requires: augeas
|
||||
Requires: libvirt-libs = %{version}-%{release}
|
||||
Requires: libvirt-daemon-common = %{version}-%{release}
|
||||
Obsoletes: libvirt-lock-sanlock < 9.1.0
|
||||
Provides: libvirt-lock-sanlock = %{version}-%{release}
|
||||
|
||||
@@ -1464,7 +1477,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
|
||||
-Dblkid=disabled \
|
||||
-Dcapng=disabled \
|
||||
-Ddriver_bhyve=disabled \
|
||||
-Ddriver_ch=disabled \
|
||||
-Ddriver_hyperv=disabled \
|
||||
-Ddriver_interface=disabled \
|
||||
-Ddriver_libvirtd=disabled \
|
||||
@@ -1801,12 +1813,10 @@ export VIR_TEST_DEBUG=1
|
||||
%pre daemon-common
|
||||
%libvirt_sysconfig_pre libvirt-guests
|
||||
%libvirt_systemd_oneshot_pre libvirt-guests
|
||||
%if %{with_account_add}
|
||||
# 'libvirt' group is just to allow password-less polkit access to libvirt
|
||||
# daemons. The uid number is irrelevant, so we use dynamic allocation.
|
||||
getent group libvirt >/dev/null || groupadd -r libvirt
|
||||
exit 0
|
||||
%endif
|
||||
|
||||
%posttrans daemon-common
|
||||
%libvirt_sysconfig_posttrans libvirt-guests
|
||||
@@ -1929,7 +1939,6 @@ exit 0
|
||||
%libvirt_sysconfig_pre virtqemud
|
||||
%libvirt_systemd_unix_pre virtqemud
|
||||
|
||||
%if %{with_account_add}
|
||||
# We want soft static allocation of well-known ids, as disk images
|
||||
# are commonly shared across NFS mounts by id rather than name.
|
||||
# See https://docs.fedoraproject.org/en-US/packaging-guidelines/UsersAndGroups/
|
||||
@@ -1945,7 +1954,6 @@ if ! getent passwd 'qemu' >/dev/null; then
|
||||
fi
|
||||
fi
|
||||
exit 0
|
||||
%endif
|
||||
|
||||
%posttrans daemon-driver-qemu
|
||||
%libvirt_sysconfig_posttrans virtqemud
|
||||
@@ -2072,10 +2080,8 @@ done
|
||||
|
||||
%if %{with_lxc}
|
||||
%pre login-shell
|
||||
%if %{with_account_add}
|
||||
getent group virtlogin >/dev/null || groupadd -r virtlogin
|
||||
exit 0
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
@@ -2119,11 +2125,9 @@ exit 0
|
||||
%dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/
|
||||
%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-backend/
|
||||
%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-file/
|
||||
%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
|
||||
%{_datadir}/polkit-1/actions/org.libvirt.unix.policy
|
||||
%{_datadir}/polkit-1/actions/org.libvirt.api.policy
|
||||
%{_datadir}/polkit-1/rules.d/50-libvirt.rules
|
||||
%{_sysusersdir}/libvirt.conf
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
|
||||
%attr(0755, root, root) %{_libexecdir}/libvirt_iohelper
|
||||
%attr(0755, root, root) %{_bindir}/virt-ssh-helper
|
||||
@@ -2151,6 +2155,7 @@ exit 0
|
||||
%{_mandir}/man8/virtlockd.8*
|
||||
|
||||
%files daemon-plugin-lockd
|
||||
%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
|
||||
%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so
|
||||
|
||||
%files daemon-log
|
||||
@@ -2289,6 +2294,7 @@ exit 0
|
||||
%ghost %dir %{_rundir}/libvirt/storage/
|
||||
%{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so
|
||||
%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_fs.so
|
||||
%{_libdir}/libvirt/storage-file/libvirt_storage_file_fs.so
|
||||
%{_mandir}/man8/virtstoraged.8*
|
||||
|
||||
%files daemon-driver-storage-disk
|
||||
@@ -2464,6 +2470,7 @@ exit 0
|
||||
%if %{with_libxl}
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf
|
||||
%endif
|
||||
%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
|
||||
%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so
|
||||
%{_datadir}/augeas/lenses/libvirt_sanlock.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
|
||||
@@ -2546,7 +2553,6 @@ exit 0
|
||||
%attr(4750, root, virtlogin) %{_bindir}/virt-login-shell
|
||||
%{_libexecdir}/virt-login-shell-helper
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf
|
||||
%{_sysusersdir}/libvirt-login-shell.conf
|
||||
%{_mandir}/man1/virt-login-shell.1*
|
||||
%endif
|
||||
|
||||
@@ -2705,51 +2711,20 @@ exit 0
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Feb 16 2026 Daniel P. Berrangé <berrange@redhat.com> - 11.6.0-3
|
||||
- Re-enable ZFS (rhbz#2407005)
|
||||
|
||||
* Fri Oct 31 2025 Cole Robinson <crobinso@redhat.com> - 11.6.0-2
|
||||
* Fri Oct 24 2025 Cole Robinson <crobinso@redhat.com> - 11.0.0-5
|
||||
- Fix build with latest wireshark
|
||||
|
||||
* Tue Aug 05 2025 Cole Robinson <crobinso@redhat.com> - 11.6.0-1
|
||||
- Update to version 11.6.0
|
||||
* Fri Aug 08 2025 Cole Robinson <crobinso@redhat.com> - 11.0.0-4
|
||||
- libvirt-nss stops working after network restarts (bz #2364285)
|
||||
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 11.5.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Wed Jul 16 2025 Richard W.M. Jones <rjones@redhat.com> - 11.5.0-2
|
||||
- Rebuild for updated Xen
|
||||
|
||||
* Wed Jul 09 2025 Cole Robinson <crobinso@redhat.com> - 11.5.0-1
|
||||
- Update to version 11.5.0
|
||||
|
||||
* Fri Jun 20 2025 Cole Robinson <crobinso@redhat.com> - 11.4.0-2
|
||||
* Fri Jun 20 2025 Cole Robinson <crobinso@redhat.com> - 11.0.0-3
|
||||
- Fix dumpxml failures after migration (bz 2369243)
|
||||
|
||||
* Mon Jun 02 2025 Cole Robinson <crobinso@redhat.com> - 11.4.0-1
|
||||
- Update to version 11.4.0
|
||||
|
||||
* Thu May 08 2025 Adam Williamson <awilliam@redhat.com> - 11.3.0-3
|
||||
- Properly obsolete libvirt-daemon-driver-storage-zfs
|
||||
|
||||
* Thu May 08 2025 Cole Robinson <crobinso@redhat.com> - 11.3.0-2
|
||||
- zfs-fuse is gone from rawhide, drop libvirt-daemon-storage-zfs
|
||||
|
||||
* Wed May 07 2025 Cole Robinson <crobinso@redhat.com> - 11.3.0-1
|
||||
- Update to version 11.3.0
|
||||
|
||||
* Tue Apr 29 2025 Daniel P. Berrangé <berrange@redhat.com> - 11.2.0-2
|
||||
- Fix install of Ampere 1 ARM CPU model (rhbz #2361196)
|
||||
* Tue Apr 29 2025 Daniel P. Berrangé <berrange@redhat.com> - 11.0.0-2
|
||||
- Fix location of mount, umount (rhbz #2359196)
|
||||
- Fix location of numad (rhbz #2359736)
|
||||
- Fix tests on rebuild with latest GCC 15
|
||||
|
||||
* Tue Apr 01 2025 Cole Robinson <crobinso@redhat.com> - 11.2.0-1
|
||||
- Update to version 11.2.0
|
||||
|
||||
* Mon Mar 03 2025 Cole Robinson <crobinso@redhat.com> - 11.1.0-1
|
||||
- Update to version 11.1.0
|
||||
|
||||
* Fri Jan 17 2025 Cole Robinson <crobinso@redhat.com> - 11.0.0-1
|
||||
- Update to version 11.0.0
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
SHA512 (libvirt-11.6.0.tar.xz) = b3dcc6628a53e9d8522965c1c47619caf00cbbcfe058298c0162ca196434c96935b1de8e6b8ced8b99737ad12c90e60a969cf83ed6f4ff61e77959ae28e6e6f7
|
||||
SHA512 (libvirt-11.0.0.tar.xz) = ac5fd17d3f488c241017d967364e0441373e9ab0457dab1acfe84fd0b90353dc5d185cc7fcd2b0d7995af4137a3fa18371abb5511686456a9e720f7ec7829da9
|
||||
|
||||
Reference in New Issue
Block a user