forked from rpms/libvirt
libvirt-9.0.0-1.el9
- Rebased to libvirt-9.0.0 (rhbz#2124466)
- The rebase also fixes the following bugs:
rhbz#2151064, rhbz#1874163, rhbz#2130192, rhbz#2111948, rhbz#1824722
rhbz#2150455, rhbz#2063723, rhbz#1717611, rhbz#2160448, rhbz#2151869
rhbz#2040272, rhbz#2144738, rhbz#2159851, rhbz#2156289, rhbz#2033879
rhbz#1820437, rhbz#2151202
Resolves: rhbz#1717611, rhbz#1820437, rhbz#1824722, rhbz#1874163, rhbz#2033879
Resolves: rhbz#2040272, rhbz#2063723, rhbz#2111948, rhbz#2124466, rhbz#2130192
Resolves: rhbz#2144738, rhbz#2150455, rhbz#2151064, rhbz#2151202, rhbz#2151869
Resolves: rhbz#2156289, rhbz#2159851, rhbz#2160448
This commit is contained in:
Jiri Denemark
parent
6a12fe27ae
commit
04a142d808
@ -1,41 +0,0 @@
|
||||
From aeb0e68bdfee244d14bdd5177b1f559bff76f473 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <aeb0e68bdfee244d14bdd5177b1f559bff76f473@dist-git>
|
||||
From: Michal Privoznik <mprivozn@redhat.com>
|
||||
Date: Mon, 5 Dec 2022 13:08:39 +0100
|
||||
Subject: [PATCH] qemu: Init ext devices paths on reconnect
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Paths for external devices (well, so far only vTPM) are not
|
||||
stored in the status XML. Therefore, we need to regenerate them
|
||||
after we've been restarted and reconnecting to a running domain.
|
||||
Otherwise these will remain NULL which may later lead to a NULL
|
||||
dereference.
|
||||
|
||||
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2150760
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||||
(cherry picked from commit 7a2034127010598b91fa576f72f330baf50c1085)
|
||||
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||||
---
|
||||
src/qemu/qemu_process.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
||||
index 19b9242623..c542be5036 100644
|
||||
--- a/src/qemu/qemu_process.c
|
||||
+++ b/src/qemu/qemu_process.c
|
||||
@@ -8896,6 +8896,9 @@ qemuProcessReconnect(void *opaque)
|
||||
if (qemuDomainMasterKeyReadFile(priv) < 0)
|
||||
goto error;
|
||||
|
||||
+ if (qemuExtDevicesInitPaths(driver, obj->def) < 0)
|
||||
+ goto error;
|
||||
+
|
||||
/* If we are connecting to a guest started by old libvirt there is no
|
||||
* allowReboot in status XML and we need to initialize it. */
|
||||
qemuProcessPrepareAllowReboot(obj);
|
||||
--
|
||||
2.38.1
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
From 32fd470a01fc0e9890a2c5e5a347322254c90b0d Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <32fd470a01fc0e9890a2c5e5a347322254c90b0d@dist-git>
|
||||
From: Michal Privoznik <mprivozn@redhat.com>
|
||||
Date: Mon, 5 Dec 2022 13:08:25 +0100
|
||||
Subject: [PATCH] qemu_extdevice: Expose qemuExtDevicesInitPaths()
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This function is going to be called outside of qemu_extdevice.c.
|
||||
Expose it to the rest of the driver.
|
||||
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||||
(cherry picked from commit 3458c3ff8c2c5fa071243b85aa5f3d48b31b1b28)
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=2150760
|
||||
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||||
---
|
||||
src/qemu/qemu_extdevice.c | 2 +-
|
||||
src/qemu/qemu_extdevice.h | 5 +++++
|
||||
2 files changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
|
||||
index 34454891f6..d5c3e8ed71 100644
|
||||
--- a/src/qemu/qemu_extdevice.c
|
||||
+++ b/src/qemu/qemu_extdevice.c
|
||||
@@ -64,7 +64,7 @@ qemuExtDeviceLogCommand(virQEMUDriver *driver,
|
||||
* stored and we can remove directories and files in case of domain XML
|
||||
* changes.
|
||||
*/
|
||||
-static int
|
||||
+int
|
||||
qemuExtDevicesInitPaths(virQEMUDriver *driver,
|
||||
virDomainDef *def)
|
||||
{
|
||||
diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h
|
||||
index 86e7133a2a..d4ac9f395c 100644
|
||||
--- a/src/qemu/qemu_extdevice.h
|
||||
+++ b/src/qemu/qemu_extdevice.h
|
||||
@@ -30,6 +30,11 @@ int qemuExtDeviceLogCommand(virQEMUDriver *driver,
|
||||
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4)
|
||||
G_GNUC_WARN_UNUSED_RESULT;
|
||||
|
||||
+int
|
||||
+qemuExtDevicesInitPaths(virQEMUDriver *driver,
|
||||
+ virDomainDef *def)
|
||||
+ ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
|
||||
+
|
||||
int qemuExtDevicesPrepareDomain(virQEMUDriver *driver,
|
||||
virDomainObj *vm)
|
||||
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
|
||||
--
|
||||
2.38.1
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
From 1d90c111815d3c96446b83f2f389363f44592a7a Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <1d90c111815d3c96446b83f2f389363f44592a7a@dist-git>
|
||||
From: Michal Privoznik <mprivozn@redhat.com>
|
||||
Date: Mon, 5 Dec 2022 12:27:24 +0100
|
||||
Subject: [PATCH] qemu_extdevice: Init paths in qemuExtDevicesPrepareDomain()
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The path generation phase belongs conceptually into domain
|
||||
preparation phase and not host preparation. Move
|
||||
qemuExtDevicesInitPaths() call from qemuExtDevicesPrepareHost()
|
||||
into qemuExtDevicesPrepareDomain().
|
||||
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||||
(cherry picked from commit f1958a3e5e465c389ce3c8cae2a26c5b00775440)
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=2150760
|
||||
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||||
---
|
||||
src/qemu/qemu_extdevice.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
|
||||
index 3eaf6571a2..34454891f6 100644
|
||||
--- a/src/qemu/qemu_extdevice.c
|
||||
+++ b/src/qemu/qemu_extdevice.c
|
||||
@@ -97,6 +97,9 @@ qemuExtDevicesPrepareDomain(virQEMUDriver *driver,
|
||||
int ret = 0;
|
||||
size_t i;
|
||||
|
||||
+ if (qemuExtDevicesInitPaths(driver, vm->def) < 0)
|
||||
+ return -1;
|
||||
+
|
||||
for (i = 0; i < vm->def->nvideos; i++) {
|
||||
virDomainVideoDef *video = vm->def->videos[i];
|
||||
|
||||
@@ -134,9 +137,6 @@ qemuExtDevicesPrepareHost(virQEMUDriver *driver,
|
||||
virDomainDef *def = vm->def;
|
||||
size_t i;
|
||||
|
||||
- if (qemuExtDevicesInitPaths(driver, def) < 0)
|
||||
- return -1;
|
||||
-
|
||||
for (i = 0; i < def->ntpms; i++) {
|
||||
virDomainTPMDef *tpm = def->tpms[i];
|
||||
|
||||
--
|
||||
2.38.1
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
From e7f2bfc6db3b35dc9b76ce56abec636ed9c7f85a Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <e7f2bfc6db3b35dc9b76ce56abec636ed9c7f85a@dist-git>
|
||||
From: Michal Privoznik <mprivozn@redhat.com>
|
||||
Date: Mon, 5 Dec 2022 12:18:50 +0100
|
||||
Subject: [PATCH] qemu_process: Document qemuProcessPrepare{Domain,Host}()
|
||||
order
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The domain startup process is split into multiple phases. One of
|
||||
them is preparing the domain (at that point live) XML, private
|
||||
data, various paths, etc - see qemuProcessPrepareDomain(); the
|
||||
other prepares the host - see qemuProcessPrepareHost(). It's
|
||||
obvious that the domain XML preparation function must be called
|
||||
before the host preparation function (e.g. the host preparation
|
||||
might try to create a file which path is generated in the domain
|
||||
preparation phase). Nevertheless, let's document this
|
||||
expectation.
|
||||
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||||
(cherry picked from commit 107ebe62f4d9cf620608b2a58ba874a5fc83d41a)
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=2150760
|
||||
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||||
---
|
||||
src/qemu/qemu_process.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
||||
index e1c18dde90..19b9242623 100644
|
||||
--- a/src/qemu/qemu_process.c
|
||||
+++ b/src/qemu/qemu_process.c
|
||||
@@ -6634,6 +6634,8 @@ qemuProcessPrepareChardevSource(virDomainDef *def,
|
||||
* start the domain but create a valid qemu command. If some code shouldn't be
|
||||
* executed in this case, make sure to check this flag.
|
||||
*
|
||||
+ * This function MUST be called before qemuProcessPrepareHost().
|
||||
+ *
|
||||
* TODO: move all XML modification from qemuBuildCommandLine into this function
|
||||
*/
|
||||
int
|
||||
@@ -7151,6 +7153,8 @@ qemuProcessPrepareHostBackendChardevHotplug(virDomainObj *vm,
|
||||
* update live XML) to prepare environment for a domain which is about to start
|
||||
* and it's the only place to do those modifications.
|
||||
*
|
||||
+ * This function MUST be called only after qemuProcessPrepareDomain().
|
||||
+ *
|
||||
* TODO: move all host modification from qemuBuildCommandLine into this function
|
||||
*/
|
||||
int
|
||||
--
|
||||
2.38.1
|
||||
|
||||
208
libvirt.spec
208
libvirt.spec
@ -138,7 +138,6 @@
|
||||
%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}
|
||||
@ -229,8 +228,8 @@
|
||||
|
||||
Summary: Library providing a simple virtualization API
|
||||
Name: libvirt
|
||||
Version: 8.10.0
|
||||
Release: 2%{?dist}%{?extra_release}
|
||||
Version: 9.0.0
|
||||
Release: 1%{?dist}%{?extra_release}
|
||||
License: LGPLv2+
|
||||
URL: https://libvirt.org/
|
||||
|
||||
@ -239,11 +238,6 @@ URL: https://libvirt.org/
|
||||
%endif
|
||||
Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz
|
||||
Source1: symlinks
|
||||
Patch1: libvirt-qemu_process-Document-qemuProcessPrepare-Domain-Host-order.patch
|
||||
Patch2: libvirt-qemu_extdevice-Init-paths-in-qemuExtDevicesPrepareDomain.patch
|
||||
Patch3: libvirt-qemu_extdevice-Expose-qemuExtDevicesInitPaths.patch
|
||||
Patch4: libvirt-qemu-Init-ext-devices-paths-on-reconnect.patch
|
||||
|
||||
|
||||
Requires: libvirt-daemon = %{version}-%{release}
|
||||
Requires: libvirt-daemon-config-network = %{version}-%{release}
|
||||
@ -264,7 +258,6 @@ Obsoletes: libvirt-daemon-uml <= 5.0.0
|
||||
Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
|
||||
%endif
|
||||
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
|
||||
|
||||
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
|
||||
Requires: libvirt-daemon-driver-secret = %{version}-%{release}
|
||||
Requires: libvirt-daemon-driver-storage = %{version}-%{release}
|
||||
@ -355,6 +348,9 @@ BuildRequires: libssh2-devel >= 1.3.0
|
||||
%if %{with_netcf}
|
||||
BuildRequires: netcf-devel >= 0.2.2
|
||||
%endif
|
||||
%if (0%{?fedora} >= 36) || (0%{?rhel} >= 9)
|
||||
BuildRequires: passt
|
||||
%endif
|
||||
%if %{with_esx}
|
||||
BuildRequires: libcurl-devel
|
||||
%endif
|
||||
@ -364,33 +360,25 @@ BuildRequires: libwsman-devel >= 2.6.3
|
||||
BuildRequires: audit-libs-devel
|
||||
# we need /usr/sbin/dtrace
|
||||
BuildRequires: systemtap-sdt-devel
|
||||
|
||||
# For mount/umount in FS driver
|
||||
BuildRequires: util-linux
|
||||
# For showmount in FS driver (netfs discovery)
|
||||
BuildRequires: nfs-utils
|
||||
|
||||
# Fedora build root suckage
|
||||
BuildRequires: gawk
|
||||
|
||||
# For storage wiping with different algorithms
|
||||
BuildRequires: scrub
|
||||
|
||||
%if %{with_numad}
|
||||
BuildRequires: numad
|
||||
%endif
|
||||
|
||||
%if %{with_wireshark}
|
||||
BuildRequires: wireshark-devel
|
||||
%endif
|
||||
|
||||
%if %{with_libssh}
|
||||
BuildRequires: libssh-devel >= 0.8.1
|
||||
%endif
|
||||
|
||||
BuildRequires: rpcgen
|
||||
BuildRequires: libtirpc-devel
|
||||
|
||||
# Needed for the firewalld_reload macro
|
||||
%if %{with_firewalld_zone}
|
||||
BuildRequires: firewalld-filesystem
|
||||
@ -410,7 +398,6 @@ BuildRequires: mingw32-portablexdr
|
||||
BuildRequires: mingw32-dlfcn
|
||||
BuildRequires: mingw32-libssh2
|
||||
BuildRequires: mingw32-curl
|
||||
|
||||
BuildRequires: mingw64-filesystem
|
||||
BuildRequires: mingw64-gcc
|
||||
BuildRequires: mingw64-binutils
|
||||
@ -445,29 +432,24 @@ Summary: Server side daemon and supporting files for libvirt library
|
||||
# for subpackages are listed later in those subpackages)
|
||||
|
||||
# The client side, i.e. shared libs are in a subpackage
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
|
||||
Requires: libvirt-libs = %{version}-%{release}
|
||||
# The libvirt-guests.sh script requires virsh from libvirt-client subpackage,
|
||||
# but not every deployment wants to use libvirt-guests service. Using
|
||||
# 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: %{name}-client = %{version}-%{release}
|
||||
|
||||
Recommends: libvirt-client = %{version}-%{release}
|
||||
# netcat is needed on the server side so that clients that have
|
||||
# libvirt < 6.9.0 can connect, but newer versions will prefer
|
||||
# virt-ssh-helper. Making this a Recommends means that it gets
|
||||
# installed by default, but can still be removed if compatibility
|
||||
# with old clients is not required
|
||||
Recommends: /usr/bin/nc
|
||||
|
||||
# for modprobe of pci devices
|
||||
Requires: module-init-tools
|
||||
|
||||
# for /sbin/ip
|
||||
Requires: iproute
|
||||
# for /sbin/tc
|
||||
Requires: iproute-tc
|
||||
|
||||
Requires: polkit >= 0.112
|
||||
%if %{with_dmidecode}
|
||||
# For virConnectGetSysinfo
|
||||
@ -529,7 +511,6 @@ The network driver plugin for the libvirtd daemon, providing
|
||||
an implementation of the virtual network APIs using the Linux
|
||||
bridge capabilities.
|
||||
|
||||
|
||||
%package daemon-driver-nwfilter
|
||||
Summary: Nwfilter driver plugin for the libvirtd daemon
|
||||
Requires: libvirt-daemon = %{version}-%{release}
|
||||
@ -542,7 +523,6 @@ The nwfilter driver plugin for the libvirtd daemon, providing
|
||||
an implementation of the firewall APIs using the ebtables,
|
||||
iptables and ip6tables capabilities
|
||||
|
||||
|
||||
%package daemon-driver-nodedev
|
||||
Summary: Nodedev driver plugin for the libvirtd daemon
|
||||
Requires: libvirt-daemon = %{version}-%{release}
|
||||
@ -557,7 +537,6 @@ The nodedev driver plugin for the libvirtd daemon, providing
|
||||
an implementation of the node device APIs using the udev
|
||||
capabilities.
|
||||
|
||||
|
||||
%package daemon-driver-interface
|
||||
Summary: Interface driver plugin for the libvirtd daemon
|
||||
Requires: libvirt-daemon = %{version}-%{release}
|
||||
@ -610,7 +589,6 @@ Requires: lvm2
|
||||
The storage driver backend adding implementation of the storage APIs for block
|
||||
volumes using lvm.
|
||||
|
||||
|
||||
%package daemon-driver-storage-disk
|
||||
Summary: Storage driver plugin for disk
|
||||
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
|
||||
@ -622,7 +600,6 @@ Requires: device-mapper
|
||||
The storage driver backend adding implementation of the storage APIs for block
|
||||
volumes using the host disks.
|
||||
|
||||
|
||||
%package daemon-driver-storage-scsi
|
||||
Summary: Storage driver plugin for local scsi devices
|
||||
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
|
||||
@ -632,7 +609,6 @@ Requires: libvirt-libs = %{version}-%{release}
|
||||
The storage driver backend adding implementation of the storage APIs for scsi
|
||||
host devices.
|
||||
|
||||
|
||||
%package daemon-driver-storage-iscsi
|
||||
Summary: Storage driver plugin for iscsi
|
||||
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
|
||||
@ -643,7 +619,6 @@ Requires: iscsi-initiator-utils
|
||||
The storage driver backend adding implementation of the storage APIs for iscsi
|
||||
volumes using the host iscsi stack.
|
||||
|
||||
|
||||
%if %{with_storage_iscsi_direct}
|
||||
%package daemon-driver-storage-iscsi-direct
|
||||
Summary: Storage driver plugin for iscsi-direct
|
||||
@ -655,7 +630,6 @@ The storage driver backend adding implementation of the storage APIs for iscsi
|
||||
volumes using libiscsi direct connection.
|
||||
%endif
|
||||
|
||||
|
||||
%package daemon-driver-storage-mpath
|
||||
Summary: Storage driver plugin for multipath volumes
|
||||
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
|
||||
@ -666,7 +640,6 @@ Requires: device-mapper
|
||||
The storage driver backend adding implementation of the storage APIs for
|
||||
multipath storage using device mapper.
|
||||
|
||||
|
||||
%if %{with_storage_gluster}
|
||||
%package daemon-driver-storage-gluster
|
||||
Summary: Storage driver plugin for gluster
|
||||
@ -684,7 +657,6 @@ The storage driver backend adding implementation of the storage APIs for gluster
|
||||
volumes using libgfapi.
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with_storage_rbd}
|
||||
%package daemon-driver-storage-rbd
|
||||
Summary: Storage driver plugin for rbd
|
||||
@ -696,7 +668,6 @@ The storage driver backend adding implementation of the storage APIs for rbd
|
||||
volumes using the ceph protocol.
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with_storage_zfs}
|
||||
%package daemon-driver-storage-zfs
|
||||
Summary: Storage driver plugin for ZFS
|
||||
@ -711,7 +682,6 @@ The storage driver backend adding implementation of the storage APIs for
|
||||
ZFS volumes.
|
||||
%endif
|
||||
|
||||
|
||||
%package daemon-driver-storage
|
||||
Summary: Storage driver plugin including all backends for the libvirtd daemon
|
||||
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
|
||||
@ -738,7 +708,6 @@ The storage driver plugin for the libvirtd daemon, providing
|
||||
an implementation of the storage APIs using LVM, iSCSI,
|
||||
parted and more.
|
||||
|
||||
|
||||
%if %{with_qemu}
|
||||
%package daemon-driver-qemu
|
||||
Summary: QEMU driver plugin for the libvirtd daemon
|
||||
@ -752,6 +721,9 @@ Requires: lzop
|
||||
Requires: xz
|
||||
Requires: systemd-container
|
||||
Requires: swtpm-tools
|
||||
%if (0%{?fedora} >= 36) || (0%{?rhel} >= 9)
|
||||
Recommends: passt
|
||||
%endif
|
||||
|
||||
%description daemon-driver-qemu
|
||||
The qemu driver plugin for the libvirtd daemon, providing
|
||||
@ -759,7 +731,6 @@ an implementation of the hypervisor driver APIs using
|
||||
QEMU
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with_lxc}
|
||||
%package daemon-driver-lxc
|
||||
Summary: LXC driver plugin for the libvirtd daemon
|
||||
@ -775,7 +746,6 @@ an implementation of the hypervisor driver APIs using
|
||||
the Linux kernel
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with_vbox}
|
||||
%package daemon-driver-vbox
|
||||
Summary: VirtualBox driver plugin for the libvirtd daemon
|
||||
@ -788,7 +758,6 @@ an implementation of the hypervisor driver APIs using
|
||||
VirtualBox
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with_libxl}
|
||||
%package daemon-driver-libxl
|
||||
Summary: Libxl driver plugin for the libvirtd daemon
|
||||
@ -802,8 +771,6 @@ an implementation of the hypervisor driver APIs using
|
||||
Libxl
|
||||
%endif
|
||||
|
||||
|
||||
|
||||
%if %{with_qemu_tcg}
|
||||
%package daemon-qemu
|
||||
Summary: Server side daemon & driver required to run QEMU guests
|
||||
@ -823,7 +790,6 @@ Server side daemon and driver required to manage the virtualization
|
||||
capabilities of the QEMU TCG emulators
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with_qemu_kvm}
|
||||
%package daemon-kvm
|
||||
Summary: Server side daemon & driver required to run KVM guests
|
||||
@ -843,7 +809,6 @@ Server side daemon and driver required to manage the virtualization
|
||||
capabilities of the KVM hypervisor
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with_lxc}
|
||||
%package daemon-lxc
|
||||
Summary: Server side daemon & driver required to run LXC guests
|
||||
@ -862,15 +827,12 @@ Server side daemon and driver required to manage the virtualization
|
||||
capabilities of LXC
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with_libxl}
|
||||
%package daemon-xen
|
||||
Summary: Server side daemon & driver required to run XEN guests
|
||||
|
||||
Requires: libvirt-daemon = %{version}-%{release}
|
||||
%if %{with_libxl}
|
||||
Requires: libvirt-daemon-driver-libxl = %{version}-%{release}
|
||||
%endif
|
||||
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
|
||||
Requires: libvirt-daemon-driver-network = %{version}-%{release}
|
||||
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
|
||||
@ -904,7 +866,7 @@ capabilities of VirtualBox
|
||||
|
||||
%package client
|
||||
Summary: Client side utilities of the libvirt library
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Requires: libvirt-libs = %{version}-%{release}
|
||||
# Needed by virt-pki-validate script.
|
||||
Requires: gnutls-utils
|
||||
|
||||
@ -917,7 +879,7 @@ capabilities of recent versions of Linux (and other OSes).
|
||||
|
||||
%package client-qemu
|
||||
Summary: Additional client side utilities for QEMU
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Requires: libvirt-libs = %{version}-%{release}
|
||||
Requires: python3-libvirt >= 3.7.0
|
||||
|
||||
%description client-qemu
|
||||
@ -939,7 +901,7 @@ Shared libraries for accessing the libvirt daemon.
|
||||
%package wireshark
|
||||
Summary: Wireshark dissector plugin for libvirt RPC transactions
|
||||
Requires: wireshark
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Requires: libvirt-libs = %{version}-%{release}
|
||||
|
||||
%description wireshark
|
||||
Wireshark dissector plugin for better analysis of libvirt RPC traffic.
|
||||
@ -948,7 +910,7 @@ Wireshark dissector plugin for better analysis of libvirt RPC traffic.
|
||||
%if %{with_lxc}
|
||||
%package login-shell
|
||||
Summary: Login shell for connecting users to an LXC container
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Requires: libvirt-libs = %{version}-%{release}
|
||||
|
||||
%description login-shell
|
||||
Provides the set-uid virt-login-shell binary that is used to
|
||||
@ -958,7 +920,7 @@ namespaces.
|
||||
|
||||
%package devel
|
||||
Summary: Libraries, includes, etc. to compile with the libvirt library
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Requires: libvirt-libs = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
|
||||
%description devel
|
||||
@ -970,8 +932,8 @@ Summary: Sanlock lock manager plugin for QEMU driver
|
||||
Requires: sanlock >= 2.4
|
||||
#for virt-sanlock-cleanup require augeas
|
||||
Requires: augeas
|
||||
Requires: %{name}-daemon = %{version}-%{release}
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Requires: libvirt-daemon = %{version}-%{release}
|
||||
Requires: libvirt-libs = %{version}-%{release}
|
||||
|
||||
%description lock-sanlock
|
||||
Includes the Sanlock lock manager plugin for the QEMU
|
||||
@ -1006,7 +968,6 @@ MinGW Windows libvirt virtualization library.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
|
||||
%autosetup -S git_am -N
|
||||
|
||||
# "make dist" replaces all symlinks with a copy of the linked files;
|
||||
@ -1177,12 +1138,11 @@ exit 1
|
||||
%define who %{?packager}%{!?packager:Unknown}
|
||||
%define arg_packager -Dpackager="%{who}, %{when}, %{where}"
|
||||
%define arg_packager_version -Dpackager_version="%{release}"
|
||||
|
||||
%define arg_selinux_mount -Dselinux_mount="/sys/fs/selinux"
|
||||
|
||||
# place macros above and build commands below this comment
|
||||
|
||||
export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
|
||||
export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
|
||||
|
||||
%meson \
|
||||
-Drunstatedir=%{_rundir} \
|
||||
@ -1337,7 +1297,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
|
||||
%install
|
||||
rm -fr %{buildroot}
|
||||
|
||||
export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
|
||||
export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
|
||||
|
||||
%meson_install
|
||||
|
||||
@ -1419,8 +1379,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
|
||||
|
||||
%mingw_debug_install_post
|
||||
|
||||
%endif
|
||||
%mingw_find_lang %{name}
|
||||
|
||||
%endif
|
||||
|
||||
%check
|
||||
# Building on slow archs, like emulated s390x in Fedora copr, requires
|
||||
@ -1460,7 +1421,6 @@ fi \
|
||||
# libvirtd. The uid number is irrelevant, so we use dynamic allocation
|
||||
# described at the above link.
|
||||
getent group libvirt >/dev/null || groupadd -r libvirt
|
||||
|
||||
exit 0
|
||||
|
||||
%post daemon
|
||||
@ -1471,14 +1431,11 @@ exit 0
|
||||
%else
|
||||
%libvirt_daemon_systemd_post_inet libvirtd
|
||||
%endif
|
||||
|
||||
%systemd_post libvirt-guests.service
|
||||
|
||||
%libvirt_daemon_schedule_restart libvirtd
|
||||
|
||||
%preun daemon
|
||||
%systemd_preun libvirt-guests.service
|
||||
|
||||
%libvirt_daemon_systemd_preun_inet libvirtd
|
||||
%libvirt_daemon_systemd_preun_inet virtproxyd
|
||||
%libvirt_daemon_systemd_preun_priv virtlogd
|
||||
@ -1491,18 +1448,6 @@ if [ $1 -ge 1 ] ; then
|
||||
fi
|
||||
%systemd_postun libvirt-guests.service
|
||||
|
||||
# In upgrade scenario we must explicitly enable virtlockd/virtlogd
|
||||
# sockets, if libvirtd is already enabled and start them if
|
||||
# libvirtd is running, otherwise you'll get failures to start
|
||||
# guests
|
||||
%triggerpostun daemon -- libvirt-daemon < 1.3.0
|
||||
if [ $1 -ge 1 ] ; then
|
||||
/bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 &&
|
||||
/bin/systemctl enable virtlogd.socket virtlogd-admin.socket || :
|
||||
/bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 &&
|
||||
/bin/systemctl start virtlogd.socket virtlogd-admin.socket || :
|
||||
fi
|
||||
|
||||
%posttrans daemon
|
||||
%libvirt_sysconfig_posttrans libvirtd virtproxyd virtlogd virtlockd libvirt-guests
|
||||
if test %libvirt_daemon_needs_restart libvirtd
|
||||
@ -1522,6 +1467,7 @@ then
|
||||
libvirtd-admin.socket \
|
||||
libvirtd-tls.socket \
|
||||
libvirtd-tcp.socket >/dev/null 2>&1 || :
|
||||
/bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
|
||||
else
|
||||
# Old libvirtd owns the sockets and will delete them on
|
||||
# shutdown. Can't use a try-restart as libvirtd will simply
|
||||
@ -1536,7 +1482,6 @@ then
|
||||
/bin/systemctl start libvirtd.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
fi
|
||||
|
||||
%libvirt_daemon_finish_restart libvirtd
|
||||
|
||||
%pre daemon-driver-network
|
||||
@ -1628,7 +1573,6 @@ fi
|
||||
%libvirt_sysconfig_posttrans virtsecretd
|
||||
%libvirt_daemon_perform_restart virtsecretd
|
||||
|
||||
|
||||
%pre daemon-driver-storage-core
|
||||
%libvirt_sysconfig_pre virtstoraged
|
||||
|
||||
@ -1645,7 +1589,6 @@ fi
|
||||
%libvirt_sysconfig_posttrans virtstoraged
|
||||
%libvirt_daemon_perform_restart virtstoraged
|
||||
|
||||
|
||||
%if %{with_qemu}
|
||||
%pre daemon-driver-qemu
|
||||
%libvirt_sysconfig_pre virtqemud
|
||||
@ -1677,7 +1620,6 @@ exit 0
|
||||
%libvirt_daemon_perform_restart virtqemud
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with_lxc}
|
||||
%pre daemon-driver-lxc
|
||||
%libvirt_sysconfig_pre virtlxcd
|
||||
@ -1696,7 +1638,6 @@ exit 0
|
||||
%libvirt_daemon_perform_restart virtlxcd
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with_vbox}
|
||||
%post daemon-driver-vbox
|
||||
%if %{with_modular_daemons}
|
||||
@ -1715,7 +1656,6 @@ exit 0
|
||||
%libvirt_daemon_perform_restart virtvboxd
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with_libxl}
|
||||
%post daemon-driver-libxl
|
||||
%if %{with_modular_daemons}
|
||||
@ -1734,7 +1674,6 @@ exit 0
|
||||
%libvirt_daemon_perform_restart virtxend
|
||||
%endif
|
||||
|
||||
|
||||
%post daemon-config-network
|
||||
if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; then
|
||||
# see if the network used by default network creates a conflict,
|
||||
@ -1810,7 +1749,6 @@ exit 0
|
||||
%doc libvirt-docs/*
|
||||
|
||||
%files daemon
|
||||
|
||||
%{_unitdir}/libvirtd.service
|
||||
%{_unitdir}/libvirtd.socket
|
||||
%{_unitdir}/libvirtd-ro.socket
|
||||
@ -1837,25 +1775,21 @@ exit 0
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
|
||||
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
|
||||
%config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf
|
||||
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
|
||||
%dir %{_datadir}/libvirt/
|
||||
|
||||
%ghost %dir %{_rundir}/libvirt/
|
||||
%ghost %dir %{_rundir}/libvirt/common/
|
||||
|
||||
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
|
||||
%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/
|
||||
%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/
|
||||
%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/
|
||||
%dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/
|
||||
|
||||
|
||||
%dir %attr(0755, root, root) %{_libdir}/libvirt/
|
||||
%dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/
|
||||
%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver
|
||||
%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
|
||||
%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-backend/
|
||||
%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-file/
|
||||
%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so
|
||||
|
||||
%{_datadir}/augeas/lenses/libvirtd.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
|
||||
%{_datadir}/augeas/lenses/virtlogd.aug
|
||||
@ -1868,23 +1802,17 @@ exit 0
|
||||
%if %{with_qemu}
|
||||
%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
|
||||
%endif
|
||||
|
||||
%{_datadir}/polkit-1/actions/org.libvirt.unix.policy
|
||||
%{_datadir}/polkit-1/actions/org.libvirt.api.policy
|
||||
%{_datadir}/polkit-1/rules.d/50-libvirt.rules
|
||||
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
|
||||
|
||||
%attr(0755, root, root) %{_libexecdir}/libvirt_iohelper
|
||||
|
||||
%attr(0755, root, root) %{_bindir}/virt-ssh-helper
|
||||
|
||||
%attr(0755, root, root) %{_sbindir}/libvirtd
|
||||
%attr(0755, root, root) %{_sbindir}/virtproxyd
|
||||
%attr(0755, root, root) %{_sbindir}/virtlogd
|
||||
%attr(0755, root, root) %{_sbindir}/virtlockd
|
||||
%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
|
||||
|
||||
%{_mandir}/man1/virt-admin.1*
|
||||
%{_mandir}/man1/virt-host-validate.1*
|
||||
%{_mandir}/man8/virt-ssh-helper.8*
|
||||
@ -1893,7 +1821,6 @@ exit 0
|
||||
%{_mandir}/man8/virtlogd.8*
|
||||
%{_mandir}/man8/virtlockd.8*
|
||||
%{_mandir}/man8/virtproxyd.8*
|
||||
|
||||
%{_bindir}/virt-host-validate
|
||||
%{_bindir}/virt-admin
|
||||
%{_datadir}/bash-completion/completions/virt-admin
|
||||
@ -1919,7 +1846,7 @@ exit 0
|
||||
%{_unitdir}/virtinterfaced-admin.socket
|
||||
%attr(0755, root, root) %{_sbindir}/virtinterfaced
|
||||
%ghost %dir %{_rundir}/libvirt/interface/
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
|
||||
%{_libdir}/libvirt/connection-driver/libvirt_driver_interface.so
|
||||
%{_mandir}/man8/virtinterfaced.8*
|
||||
|
||||
%files daemon-driver-network
|
||||
@ -1938,9 +1865,8 @@ exit 0
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
|
||||
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
|
||||
%attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_network.so
|
||||
%{_libdir}/libvirt/connection-driver/libvirt_driver_network.so
|
||||
%{_mandir}/man8/virtnetworkd.8*
|
||||
|
||||
%if %{with_firewalld_zone}
|
||||
%{_prefix}/lib/firewalld/zones/libvirt.xml
|
||||
%{_prefix}/lib/firewalld/zones/libvirt-routed.xml
|
||||
@ -1959,7 +1885,7 @@ exit 0
|
||||
%{_unitdir}/virtnodedevd-admin.socket
|
||||
%attr(0755, root, root) %{_sbindir}/virtnodedevd
|
||||
%ghost %dir %{_rundir}/libvirt/nodedev/
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
|
||||
%{_libdir}/libvirt/connection-driver/libvirt_driver_nodedev.so
|
||||
%{_mandir}/man8/virtnodedevd.8*
|
||||
|
||||
%files daemon-driver-nwfilter
|
||||
@ -1975,7 +1901,7 @@ exit 0
|
||||
%ghost %dir %{_rundir}/libvirt/network/
|
||||
%ghost %dir %{_rundir}/libvirt/nwfilter-binding/
|
||||
%ghost %dir %{_rundir}/libvirt/nwfilter/
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so
|
||||
%{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so
|
||||
%{_mandir}/man8/virtnwfilterd.8*
|
||||
|
||||
%files daemon-driver-secret
|
||||
@ -1989,7 +1915,7 @@ exit 0
|
||||
%attr(0755, root, root) %{_sbindir}/virtsecretd
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/secrets/
|
||||
%ghost %dir %{_rundir}/libvirt/secrets/
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so
|
||||
%{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so
|
||||
%{_mandir}/man8/virtsecretd.8*
|
||||
|
||||
%files daemon-driver-storage
|
||||
@ -2007,45 +1933,45 @@ exit 0
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/autostart/
|
||||
%ghost %dir %{_rundir}/libvirt/storage/
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so
|
||||
%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so
|
||||
%{_libdir}/%{name}/storage-file/libvirt_storage_file_fs.so
|
||||
%{_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
|
||||
%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_disk.so
|
||||
%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_disk.so
|
||||
|
||||
%files daemon-driver-storage-logical
|
||||
%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_logical.so
|
||||
%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_logical.so
|
||||
|
||||
%files daemon-driver-storage-scsi
|
||||
%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_scsi.so
|
||||
%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.so
|
||||
|
||||
%files daemon-driver-storage-iscsi
|
||||
%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so
|
||||
%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi.so
|
||||
|
||||
%if %{with_storage_iscsi_direct}
|
||||
%files daemon-driver-storage-iscsi-direct
|
||||
%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so
|
||||
%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so
|
||||
%endif
|
||||
|
||||
%files daemon-driver-storage-mpath
|
||||
%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so
|
||||
%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_mpath.so
|
||||
|
||||
%if %{with_storage_gluster}
|
||||
%files daemon-driver-storage-gluster
|
||||
%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_gluster.so
|
||||
%{_libdir}/%{name}/storage-file/libvirt_storage_file_gluster.so
|
||||
%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_gluster.so
|
||||
%{_libdir}/libvirt/storage-file/libvirt_storage_file_gluster.so
|
||||
%endif
|
||||
|
||||
%if %{with_storage_rbd}
|
||||
%files daemon-driver-storage-rbd
|
||||
%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_rbd.so
|
||||
%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_rbd.so
|
||||
%endif
|
||||
|
||||
%if %{with_storage_zfs}
|
||||
%files daemon-driver-storage-zfs
|
||||
%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_zfs.so
|
||||
%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so
|
||||
%endif
|
||||
|
||||
%if %{with_qemu}
|
||||
@ -2067,6 +1993,7 @@ exit 0
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
|
||||
%ghost %dir %{_rundir}/libvirt/qemu/
|
||||
%ghost %dir %{_rundir}/libvirt/qemu/dbus/
|
||||
%ghost %dir %{_rundir}/libvirt/qemu/passt/
|
||||
%ghost %dir %{_rundir}/libvirt/qemu/slirp/
|
||||
%ghost %dir %{_rundir}/libvirt/qemu/swtpm/
|
||||
%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
|
||||
@ -2081,7 +2008,7 @@ exit 0
|
||||
%dir %attr(0750, root, root) %{_localstatedir}/cache/libvirt/qemu/
|
||||
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so
|
||||
%{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
|
||||
%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/swtpm/
|
||||
%dir %attr(0730, tss, tss) %{_localstatedir}/log/swtpm/libvirt/qemu/
|
||||
%{_bindir}/virt-qemu-run
|
||||
@ -2109,7 +2036,7 @@ exit 0
|
||||
%{_datadir}/augeas/lenses/libvirtd_lxc.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
|
||||
%attr(0755, root, root) %{_libexecdir}/libvirt_lxc
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so
|
||||
%{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so
|
||||
%{_mandir}/man8/virtlxcd.8*
|
||||
%endif
|
||||
|
||||
@ -2137,7 +2064,7 @@ exit 0
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/channel/target/
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/dump/
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/save/
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so
|
||||
%{_libdir}/libvirt/connection-driver/libvirt_driver_libxl.so
|
||||
%{_mandir}/man8/virtxend.8*
|
||||
%endif
|
||||
|
||||
@ -2151,7 +2078,7 @@ exit 0
|
||||
%{_unitdir}/virtvboxd-ro.socket
|
||||
%{_unitdir}/virtvboxd-admin.socket
|
||||
%attr(0755, root, root) %{_sbindir}/virtvboxd
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so
|
||||
%{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so
|
||||
%{_mandir}/man8/virtvboxd.8*
|
||||
%endif
|
||||
|
||||
@ -2202,7 +2129,6 @@ exit 0
|
||||
%{_bindir}/virt-xml-validate
|
||||
%{_bindir}/virt-pki-query-dn
|
||||
%{_bindir}/virt-pki-validate
|
||||
|
||||
%{_datadir}/bash-completion/completions/virsh
|
||||
|
||||
%if %{with_qemu}
|
||||
@ -2224,17 +2150,13 @@ exit 0
|
||||
%{_libdir}/libvirt-admin.so.*
|
||||
%dir %{_datadir}/libvirt/
|
||||
%dir %{_datadir}/libvirt/schemas/
|
||||
|
||||
%{_datadir}/systemtap/tapset/libvirt_probes*.stp
|
||||
%{_datadir}/systemtap/tapset/libvirt_functions.stp
|
||||
%if %{with_qemu}
|
||||
%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
|
||||
%endif
|
||||
|
||||
%{_datadir}/libvirt/schemas/*.rng
|
||||
|
||||
%{_datadir}/libvirt/cpu_map/*.xml
|
||||
|
||||
%{_datadir}/libvirt/test-screenshot.png
|
||||
|
||||
%if %{with_wireshark}
|
||||
@ -2282,7 +2204,6 @@ exit 0
|
||||
%{_libdir}/pkgconfig/libvirt-admin.pc
|
||||
%{_libdir}/pkgconfig/libvirt-qemu.pc
|
||||
%{_libdir}/pkgconfig/libvirt-lxc.pc
|
||||
|
||||
%dir %{_datadir}/libvirt/api/
|
||||
%{_datadir}/libvirt/api/libvirt-api.xml
|
||||
%{_datadir}/libvirt/api/libvirt-admin-api.xml
|
||||
@ -2290,11 +2211,10 @@ exit 0
|
||||
%{_datadir}/libvirt/api/libvirt-lxc-api.xml
|
||||
|
||||
%if %{with_mingw}
|
||||
%files -n mingw32-libvirt
|
||||
%files -n mingw32-libvirt -f mingw32-libvirt.lang
|
||||
%dir %{mingw32_sysconfdir}/libvirt/
|
||||
%config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt.conf
|
||||
%config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt-admin.conf
|
||||
|
||||
%{mingw32_bindir}/libvirt-0.dll
|
||||
%{mingw32_bindir}/virsh.exe
|
||||
%{mingw32_bindir}/virt-admin.exe
|
||||
@ -2304,7 +2224,6 @@ exit 0
|
||||
%{mingw32_bindir}/libvirt-lxc-0.dll
|
||||
%{mingw32_bindir}/libvirt-qemu-0.dll
|
||||
%{mingw32_bindir}/libvirt-admin-0.dll
|
||||
|
||||
%{mingw32_libdir}/libvirt.dll.a
|
||||
%{mingw32_libdir}/pkgconfig/libvirt.pc
|
||||
%{mingw32_libdir}/pkgconfig/libvirt-qemu.pc
|
||||
@ -2313,23 +2232,16 @@ exit 0
|
||||
%{mingw32_libdir}/libvirt-lxc.dll.a
|
||||
%{mingw32_libdir}/libvirt-qemu.dll.a
|
||||
%{mingw32_libdir}/libvirt-admin.dll.a
|
||||
|
||||
%dir %{mingw32_datadir}/libvirt/
|
||||
%dir %{mingw32_datadir}/libvirt/schemas/
|
||||
%{mingw32_datadir}/libvirt/schemas/*.rng
|
||||
|
||||
%dir %{mingw32_datadir}/libvirt/api/
|
||||
%{mingw32_datadir}/libvirt/api/libvirt-api.xml
|
||||
%{mingw32_datadir}/libvirt/api/libvirt-lxc-api.xml
|
||||
%{mingw32_datadir}/libvirt/api/libvirt-qemu-api.xml
|
||||
%{mingw32_datadir}/libvirt/api/libvirt-admin-api.xml
|
||||
|
||||
%{mingw32_datadir}/libvirt/cpu_map/*.xml
|
||||
|
||||
%{mingw32_datadir}/libvirt/test-screenshot.png
|
||||
|
||||
%{mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo
|
||||
|
||||
%dir %{mingw32_includedir}/libvirt
|
||||
%{mingw32_includedir}/libvirt/libvirt.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-common.h
|
||||
@ -2349,7 +2261,6 @@ exit 0
|
||||
%{mingw32_includedir}/libvirt/libvirt-lxc.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-qemu.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-admin.h
|
||||
|
||||
%{mingw32_mandir}/man1/virsh.1*
|
||||
%{mingw32_mandir}/man1/virt-admin.1*
|
||||
%{mingw32_mandir}/man1/virt-xml-validate.1*
|
||||
@ -2357,12 +2268,10 @@ exit 0
|
||||
%{mingw32_mandir}/man1/virt-pki-validate.1*
|
||||
%{mingw32_mandir}/man7/virkey*.7*
|
||||
|
||||
|
||||
%files -n mingw64-libvirt
|
||||
%files -n mingw64-libvirt -f mingw64-libvirt.lang
|
||||
%dir %{mingw64_sysconfdir}/libvirt/
|
||||
%config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt.conf
|
||||
%config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt-admin.conf
|
||||
|
||||
%{mingw64_bindir}/libvirt-0.dll
|
||||
%{mingw64_bindir}/virsh.exe
|
||||
%{mingw64_bindir}/virt-admin.exe
|
||||
@ -2372,7 +2281,6 @@ exit 0
|
||||
%{mingw64_bindir}/libvirt-lxc-0.dll
|
||||
%{mingw64_bindir}/libvirt-qemu-0.dll
|
||||
%{mingw64_bindir}/libvirt-admin-0.dll
|
||||
|
||||
%{mingw64_libdir}/libvirt.dll.a
|
||||
%{mingw64_libdir}/pkgconfig/libvirt.pc
|
||||
%{mingw64_libdir}/pkgconfig/libvirt-qemu.pc
|
||||
@ -2381,23 +2289,16 @@ exit 0
|
||||
%{mingw64_libdir}/libvirt-lxc.dll.a
|
||||
%{mingw64_libdir}/libvirt-qemu.dll.a
|
||||
%{mingw64_libdir}/libvirt-admin.dll.a
|
||||
|
||||
%dir %{mingw64_datadir}/libvirt/
|
||||
%dir %{mingw64_datadir}/libvirt/schemas/
|
||||
%{mingw64_datadir}/libvirt/schemas/*.rng
|
||||
|
||||
%dir %{mingw64_datadir}/libvirt/api/
|
||||
%{mingw64_datadir}/libvirt/api/libvirt-api.xml
|
||||
%{mingw64_datadir}/libvirt/api/libvirt-lxc-api.xml
|
||||
%{mingw64_datadir}/libvirt/api/libvirt-qemu-api.xml
|
||||
%{mingw64_datadir}/libvirt/api/libvirt-admin-api.xml
|
||||
|
||||
%{mingw64_datadir}/libvirt/cpu_map/*.xml
|
||||
|
||||
%{mingw64_datadir}/libvirt/test-screenshot.png
|
||||
|
||||
%{mingw64_datadir}/locale/*/LC_MESSAGES/libvirt.mo
|
||||
|
||||
%dir %{mingw64_includedir}/libvirt
|
||||
%{mingw64_includedir}/libvirt/libvirt.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-common.h
|
||||
@ -2417,7 +2318,6 @@ exit 0
|
||||
%{mingw64_includedir}/libvirt/libvirt-lxc.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-qemu.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-admin.h
|
||||
|
||||
%{mingw64_mandir}/man1/virsh.1*
|
||||
%{mingw64_mandir}/man1/virt-admin.1*
|
||||
%{mingw64_mandir}/man1/virt-xml-validate.1*
|
||||
@ -2427,6 +2327,14 @@ exit 0
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jan 16 2023 Jiri Denemark <jdenemar@redhat.com> - 9.0.0-1
|
||||
- Rebased to libvirt-9.0.0 (rhbz#2124466)
|
||||
- The rebase also fixes the following bugs:
|
||||
rhbz#2151064, rhbz#1874163, rhbz#2130192, rhbz#2111948, rhbz#1824722
|
||||
rhbz#2150455, rhbz#2063723, rhbz#1717611, rhbz#2160448, rhbz#2151869
|
||||
rhbz#2040272, rhbz#2144738, rhbz#2159851, rhbz#2156289, rhbz#2033879
|
||||
rhbz#1820437, rhbz#2151202
|
||||
|
||||
* Tue Dec 6 2022 Jiri Denemark <jdenemar@redhat.com> - 8.10.0-2
|
||||
- qemu_process: Document qemuProcessPrepare{Domain,Host}() order (rhbz#2150760)
|
||||
- qemu_extdevice: Init paths in qemuExtDevicesPrepareDomain() (rhbz#2150760)
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
inspections:
|
||||
abidiff: off
|
||||
|
||||
emptyrpm:
|
||||
expected_empty:
|
||||
- libvirt
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (libvirt-8.10.0.tar.xz) = 1d4006e909e185a89f9163e6d2309841f4086da65b9165c42eb512e2f6ae964749eeb72f74e86476768a09061e2e311cfcc31f4024b4ecbaba04cd3f5f5d849d
|
||||
SHA512 (libvirt-9.0.0.tar.xz) = 135f690f9fe722161c22579166f10a54d52941a371439165fd0e3d391ca7835049a3bcbff33fc81c50153046230db8a5a318d707383bad3141d489d2faa09ecb
|
||||
|
||||
2
symlinks
2
symlinks
@ -201,6 +201,7 @@ tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml ../qemuxml2argvdata/mem
|
||||
tests/qemuxml2xmloutdata/memory-hotplug-virtio-mem.x86_64-latest.xml ../qemuxml2argvdata/memory-hotplug-virtio-mem.xml
|
||||
tests/qemuxml2xmloutdata/memory-hotplug-virtio-pmem.x86_64-latest.xml ../qemuxml2argvdata/memory-hotplug-virtio-pmem.xml
|
||||
tests/qemuxml2xmloutdata/net-user-addr.xml ../qemuxml2argvdata/net-user-addr.xml
|
||||
tests/qemuxml2xmloutdata/net-user-passt.xml ../qemuxml2argvdata/net-user-passt.xml
|
||||
tests/qemuxml2xmloutdata/net-virtio-rss.x86_64-latest.xml ../qemuxml2argvdata/net-virtio-rss.xml
|
||||
tests/qemuxml2xmloutdata/net-virtio-teaming-hostdev.xml ../qemuxml2argvdata/net-virtio-teaming-hostdev.xml
|
||||
tests/qemuxml2xmloutdata/numatune-hmat.xml ../qemuxml2argvdata/numatune-hmat.xml
|
||||
@ -222,6 +223,7 @@ tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml ../qemuxml2argv
|
||||
tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml ../qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml
|
||||
tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml ../qemuxml2argvdata/tpm-emulator-tpm2.xml
|
||||
tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml ../qemuxml2argvdata/tpm-emulator.xml
|
||||
tests/qemuxml2xmloutdata/tpm-external.x86_64-latest.xml ../qemuxml2argvdata/tpm-external.xml
|
||||
tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml ../qemuxml2argvdata/tpm-passthrough-crb.xml
|
||||
tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml ../qemuxml2argvdata/tpm-passthrough.xml
|
||||
tests/qemuxml2xmloutdata/user-aliases.x86_64-latest.xml ../qemuxml2argvdata/user-aliases.xml
|
||||
|
||||
Loading…
Reference in New Issue
Block a user