libvirt-7.7.0-1.el9

- Rebased to libvirt-7.7.0 (rhbz#2001507)
- The rebase also fixes the following bugs:
    rhbz#2001326, rhbz#2001391, rhbz#2001322, rhbz#2001389, rhbz#1967187
    rhbz#2001327, rhbz#1977155, rhbz#2001997, rhbz#2001323
- RHEL: spec: Do not enable modular daemons yet (rhbz#2001507)

Resolves: rhbz#1967187, rhbz#1977155, rhbz#2001322, rhbz#2001323, rhbz#2001326
Resolves: rhbz#2001327, rhbz#2001389, rhbz#2001391, rhbz#2001507, rhbz#2001997
This commit is contained in:
Jiri Denemark 2021-09-10 10:06:18 +02:00
parent 3dd0facde5
commit a44d9229e4
5 changed files with 248 additions and 71 deletions

View File

@ -1,5 +1,5 @@
From 8eaad4cc89e78c25ccca3481741cded0538046b0 Mon Sep 17 00:00:00 2001 From 7d27eb2ca9d5a3a9add7bf2bc2850aa72b97a806 Mon Sep 17 00:00:00 2001
Message-Id: <8eaad4cc89e78c25ccca3481741cded0538046b0@dist-git> Message-Id: <7d27eb2ca9d5a3a9add7bf2bc2850aa72b97a806@dist-git>
From: Peter Krempa <pkrempa@redhat.com> From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 28 Jul 2021 17:37:21 +0200 Date: Wed, 28 Jul 2021 17:37:21 +0200
Subject: [PATCH] RHEL: Enable usage of x-blockdev-reopen Subject: [PATCH] RHEL: Enable usage of x-blockdev-reopen
@ -39,10 +39,10 @@ Reviewed-by: Ján Tomko <jtomko@redhat.com>
9 files changed, 46 insertions(+), 18 deletions(-) 9 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 4691dff4f7..1f731fff3d 100644 index 0bc92f6a23..3af064614e 100644
--- a/src/qemu/qemu_block.c --- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c
@@ -3289,7 +3289,8 @@ qemuBlockBitmapsHandleCommitFinish(virStorageSource *topsrc, @@ -3287,7 +3287,8 @@ qemuBlockBitmapsHandleCommitFinish(virStorageSource *topsrc,
int int
qemuBlockReopenFormatMon(qemuMonitor *mon, qemuBlockReopenFormatMon(qemuMonitor *mon,
@ -52,7 +52,7 @@ index 4691dff4f7..1f731fff3d 100644
{ {
g_autoptr(virJSONValue) reopenprops = NULL; g_autoptr(virJSONValue) reopenprops = NULL;
g_autoptr(virJSONValue) srcprops = NULL; g_autoptr(virJSONValue) srcprops = NULL;
@@ -3298,15 +3299,19 @@ qemuBlockReopenFormatMon(qemuMonitor *mon, @@ -3296,15 +3297,19 @@ qemuBlockReopenFormatMon(qemuMonitor *mon,
if (!(srcprops = qemuBlockStorageSourceGetBlockdevProps(src, src->backingStore))) if (!(srcprops = qemuBlockStorageSourceGetBlockdevProps(src, src->backingStore)))
return -1; return -1;
@ -79,7 +79,7 @@ index 4691dff4f7..1f731fff3d 100644
return -1; return -1;
return 0; return 0;
@@ -3330,6 +3335,7 @@ qemuBlockReopenFormat(virDomainObj *vm, @@ -3328,6 +3333,7 @@ qemuBlockReopenFormat(virDomainObj *vm,
{ {
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
virQEMUDriver *driver = priv->driver; virQEMUDriver *driver = priv->driver;
@ -87,7 +87,7 @@ index 4691dff4f7..1f731fff3d 100644
int rc; int rc;
/* If we are lacking the object here, qemu might have opened an image with /* If we are lacking the object here, qemu might have opened an image with
@@ -3343,7 +3349,7 @@ qemuBlockReopenFormat(virDomainObj *vm, @@ -3341,7 +3347,7 @@ qemuBlockReopenFormat(virDomainObj *vm,
if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
return -1; return -1;
@ -111,26 +111,26 @@ index 54601a48a9..88fc9974c4 100644
int int
qemuBlockReopenReadWrite(virDomainObj *vm, qemuBlockReopenReadWrite(virDomainObj *vm,
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 9558938866..6734ed213d 100644 index 70c3ec2f0c..99e9eb485e 100644
--- a/src/qemu/qemu_capabilities.c --- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c
@@ -637,6 +637,7 @@ VIR_ENUM_IMPL(virQEMUCaps, @@ -638,6 +638,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"confidential-guest-support", "query-display-options", /* QEMU_CAPS_QUERY_DISPLAY_OPTIONS */
"query-display-options", "s390-pv-guest", /* QEMU_CAPS_S390_PV_GUEST */
"s390-pv-guest", "set-action", /* QEMU_CAPS_SET_ACTION */
+ "blockdev-reopen.__com.redhat_rhel-av-8_2_0-api", + "blockdev-reopen.__com.redhat_rhel-av-8_2_0-api",
); );
@@ -1551,6 +1552,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVhostUserFS[] = @@ -1551,6 +1552,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVhostUserFS[] =
/* see documentation for virQEMUQAPISchemaPathGet for the query format */ /* see documentation for virQEMUQAPISchemaPathGet for the query format */
static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
{ "block-commit/arg-type/*top", QEMU_CAPS_ACTIVE_COMMIT },
+ { "x-blockdev-reopen/$__com.redhat_rhel-av-8_2_0-api", QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API }, + { "x-blockdev-reopen/$__com.redhat_rhel-av-8_2_0-api", QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API },
{ "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL}, { "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
{ "blockdev-add/arg-type/+gluster/debug", QEMU_CAPS_GLUSTER_DEBUG_LEVEL}, { "blockdev-add/arg-type/+gluster/debug", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
{ "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS}, { "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS},
@@ -5204,6 +5206,15 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) @@ -5155,6 +5157,15 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps)
qemuCaps->arch == VIR_ARCH_MIPS) qemuCaps->arch == VIR_ARCH_MIPS)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SCSI_NCR53C90); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SCSI_NCR53C90);
@ -147,22 +147,22 @@ index 9558938866..6734ed213d 100644
} }
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 2b1bb57a49..def0dd2030 100644 index bc762d1916..658176c12b 100644
--- a/src/qemu/qemu_capabilities.h --- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h
@@ -617,6 +617,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ @@ -618,6 +618,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT, /* -machine confidential-guest-support */
QEMU_CAPS_QUERY_DISPLAY_OPTIONS, /* 'query-display-options' qmp command present */ QEMU_CAPS_QUERY_DISPLAY_OPTIONS, /* 'query-display-options' qmp command present */
QEMU_CAPS_S390_PV_GUEST, /* -object s390-pv-guest,... */ QEMU_CAPS_S390_PV_GUEST, /* -object s390-pv-guest,... */
QEMU_CAPS_SET_ACTION, /* 'set-action' QMP command */
+ QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API, /* downstream support for blockdev reopen in rhel-av-8.2.0 */ + QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API, /* downstream support for blockdev reopen in rhel-av-8.2.0 */
QEMU_CAPS_LAST /* this must always be the last item */ QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags; } virQEMUCapsFlags;
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 6e2d8010c5..7ebaa7b099 100644 index 42846349c4..065ed59336 100644
--- a/src/qemu/qemu_monitor.c --- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c
@@ -4339,14 +4339,15 @@ qemuMonitorBlockdevAdd(qemuMonitor *mon, @@ -4331,14 +4331,15 @@ qemuMonitorBlockdevAdd(qemuMonitor *mon,
int int
qemuMonitorBlockdevReopen(qemuMonitor *mon, qemuMonitorBlockdevReopen(qemuMonitor *mon,
@ -181,10 +181,10 @@ index 6e2d8010c5..7ebaa7b099 100644
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 1491c1297c..5a93447e23 100644 index 2f08357c0c..d1eb8f1b26 100644
--- a/src/qemu/qemu_monitor.h --- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h
@@ -1366,7 +1366,8 @@ int qemuMonitorBlockdevAdd(qemuMonitor *mon, @@ -1405,7 +1405,8 @@ int qemuMonitorBlockdevAdd(qemuMonitor *mon,
virJSONValue **props); virJSONValue **props);
int qemuMonitorBlockdevReopen(qemuMonitor *mon, int qemuMonitorBlockdevReopen(qemuMonitor *mon,
@ -195,10 +195,10 @@ index 1491c1297c..5a93447e23 100644
int qemuMonitorBlockdevDel(qemuMonitor *mon, int qemuMonitorBlockdevDel(qemuMonitor *mon,
const char *nodename); const char *nodename);
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index ca2c3bb6cf..8ecd5f3bbd 100644 index 8d3c4031a6..88bc1485e3 100644
--- a/src/qemu/qemu_monitor_json.c --- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c
@@ -8687,13 +8687,19 @@ qemuMonitorJSONBlockdevAdd(qemuMonitor *mon, @@ -8626,13 +8626,19 @@ qemuMonitorJSONBlockdevAdd(qemuMonitor *mon,
int int
qemuMonitorJSONBlockdevReopen(qemuMonitor *mon, qemuMonitorJSONBlockdevReopen(qemuMonitor *mon,
@ -222,10 +222,10 @@ index ca2c3bb6cf..8ecd5f3bbd 100644
if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
return -1; return -1;
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 01a3ba25f1..90792c9939 100644 index c8cf734a1c..1c93645fda 100644
--- a/src/qemu/qemu_monitor_json.h --- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h
@@ -601,7 +601,8 @@ int qemuMonitorJSONBlockdevAdd(qemuMonitor *mon, @@ -598,7 +598,8 @@ int qemuMonitorJSONBlockdevAdd(qemuMonitor *mon,
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int qemuMonitorJSONBlockdevReopen(qemuMonitor *mon, int qemuMonitorJSONBlockdevReopen(qemuMonitor *mon,
@ -236,10 +236,10 @@ index 01a3ba25f1..90792c9939 100644
int qemuMonitorJSONBlockdevDel(qemuMonitor *mon, int qemuMonitorJSONBlockdevDel(qemuMonitor *mon,
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 2122d9d999..c20287afee 100644 index 9ec5f06981..38388efe0d 100644
--- a/tests/qemumonitorjsontest.c --- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c
@@ -2820,7 +2820,7 @@ testQemuMonitorJSONBlockdevReopen(const void *opaque) @@ -2824,7 +2824,7 @@ testQemuMonitorJSONBlockdevReopen(const void *opaque)
if (qemuMonitorTestAddItem(test, "blockdev-reopen", "{\"return\":{}}") < 0) if (qemuMonitorTestAddItem(test, "blockdev-reopen", "{\"return\":{}}") < 0)
return -1; return -1;
@ -249,5 +249,5 @@ index 2122d9d999..c20287afee 100644
return 0; return 0;
-- --
2.32.0 2.33.0

View File

@ -1,5 +1,5 @@
From 8232ba78dea7336282f65e94d575beb9b27d03f4 Mon Sep 17 00:00:00 2001 From 27750c7d5c43ddc3aaf8a544a370e23a4cae2ac6 Mon Sep 17 00:00:00 2001
Message-Id: <8232ba78dea7336282f65e94d575beb9b27d03f4@dist-git> Message-Id: <27750c7d5c43ddc3aaf8a544a370e23a4cae2ac6@dist-git>
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com> From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Mon, 27 Aug 2018 13:09:38 +0200 Date: Mon, 27 Aug 2018 13:09:38 +0200
Subject: [PATCH] RHEL: Fix virConnectGetMaxVcpus output Subject: [PATCH] RHEL: Fix virConnectGetMaxVcpus output
@ -26,7 +26,7 @@ Reviewed-by: Andrea Bolognani <abologna@redhat.com>
1 file changed, 5 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 7aa92ad11d..337f03b41b 100644 index 5dd2baf2df..6811c498f9 100644
--- a/src/util/virhostcpu.c --- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c
@@ -1192,6 +1192,11 @@ virHostCPUGetKVMMaxVCPUs(void) @@ -1192,6 +1192,11 @@ virHostCPUGetKVMMaxVCPUs(void)
@ -42,5 +42,5 @@ index 7aa92ad11d..337f03b41b 100644
/* at first try KVM_CAP_MAX_VCPUS to determine the maximum count */ /* at first try KVM_CAP_MAX_VCPUS to determine the maximum count */
if ((ret = ioctl(fd, KVM_CHECK_EXTENSION, KVM_CAP_MAX_VCPUS)) > 0) if ((ret = ioctl(fd, KVM_CHECK_EXTENSION, KVM_CAP_MAX_VCPUS)) > 0)
-- --
2.32.0 2.33.0

View File

@ -24,7 +24,7 @@
%define arches_vbox %{arches_x86} %define arches_vbox %{arches_x86}
%define arches_ceph %{arches_64bit} %define arches_ceph %{arches_64bit}
%define arches_zfs %{arches_x86} %{power64} %{arm} %define arches_zfs %{arches_x86} %{power64} %{arm}
%define arches_numactl %{arches_x86} %{power64} aarch64 %define arches_numactl %{arches_x86} %{power64} aarch64 s390x
%define arches_numad %{arches_x86} %{power64} aarch64 %define arches_numad %{arches_x86} %{power64} aarch64
# The hypervisor drivers that run in libvirtd # The hypervisor drivers that run in libvirtd
@ -181,6 +181,11 @@
%define with_dmidecode 0%{!?_without_dmidecode:1} %define with_dmidecode 0%{!?_without_dmidecode:1}
%endif %endif
%define with_modular_daemons 0
%if 0%{?fedora} >= 35
%define with_modular_daemons 1
%endif
# Force QEMU to run as non-root # Force QEMU to run as non-root
%define qemu_user qemu %define qemu_user qemu
%define qemu_group qemu %define qemu_group qemu
@ -200,8 +205,8 @@
Summary: Library providing a simple virtualization API Summary: Library providing a simple virtualization API
Name: libvirt Name: libvirt
Version: 7.6.0 Version: 7.7.0
Release: 2%{?dist}%{?extra_release} Release: 1%{?dist}%{?extra_release}
License: LGPLv2+ License: LGPLv2+
URL: https://libvirt.org/ URL: https://libvirt.org/
@ -1097,6 +1102,12 @@ exit 1
%define arg_libssh2 -Dlibssh2=disabled %define arg_libssh2 -Dlibssh2=disabled
%endif %endif
%if %{with_modular_daemons}
%define arg_remote_mode -Dremote_default_mode=direct
%else
%define arg_remote_mode -Dremote_default_mode=legacy
%endif
%define when %(date +"%%F-%%T") %define when %(date +"%%F-%%T")
%define where %(hostname) %define where %(hostname)
%define who %{?packager}%{!?packager:Unknown} %define who %{?packager}%{!?packager:Unknown}
@ -1127,7 +1138,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
-Ddriver_vz=disabled \ -Ddriver_vz=disabled \
-Ddriver_bhyve=disabled \ -Ddriver_bhyve=disabled \
-Ddriver_ch=disabled \ -Ddriver_ch=disabled \
-Dremote_default_mode=legacy \ %{?arg_remote_mode} \
-Ddriver_interface=enabled \ -Ddriver_interface=enabled \
-Ddriver_network=enabled \ -Ddriver_network=enabled \
-Dstorage_fs=enabled \ -Dstorage_fs=enabled \
@ -1269,6 +1280,29 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
# raising the test timeout # raising the test timeout
VIR_TEST_DEBUG=1 %meson_test --no-suite syntax-check --timeout-multiplier 10 VIR_TEST_DEBUG=1 %meson_test --no-suite syntax-check --timeout-multiplier 10
%global libvirt_daemon_schedule_restart() mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : \
/bin/systemctl is-active %1.service 1>/dev/null 2>&1 && \
touch %{_localstatedir}/lib/rpm-state/libvirt/restart-%1 || :
%global libvirt_daemon_finish_restart() rm -f %{_localstatedir}/lib/rpm-state/libvirt/restart-%1 \
rmdir %{_localstatedir}/lib/rpm-state/libvirt 2>/dev/null || :
%global libvirt_daemon_needs_restart() -f %{_localstatedir}/lib/rpm-state/libvirt/restart-%1
%global libvirt_daemon_perform_restart() if test %libvirt_daemon_needs_restart %1 \
then \
/bin/systemctl try-restart %1.service >/dev/null 2>&1 || : \
fi \
%libvirt_daemon_finish_restart %1
%global libvirt_daemon_systemd_post() %systemd_post %1.socket %1-ro.socket %1-admin.socket %1.service
%global libvirt_daemon_systemd_post_inet() %systemd_post %1.socket %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket %1.service
%global libvirt_daemon_systemd_preun() %systemd_preun %1.service %1-ro.socket %1-admin.socket %1.socket
%global libvirt_daemon_systemd_preun_inet() %systemd_preun %1.service %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket %1.socket
%pre daemon %pre daemon
# 'libvirt' group is just to allow password-less polkit access to # 'libvirt' group is just to allow password-less polkit access to
# libvirtd. The uid number is irrelevant, so we use dynamic allocation # libvirtd. The uid number is irrelevant, so we use dynamic allocation
@ -1278,30 +1312,25 @@ getent group libvirt >/dev/null || groupadd -r libvirt
exit 0 exit 0
%post daemon %post daemon
%global post_units \\\ %libvirt_daemon_systemd_post virtlogd
virtlockd.socket virtlockd-admin.socket \\\ %libvirt_daemon_systemd_post virtlockdd
virtlogd.socket virtlogd-admin.socket \\\ %if %{with_modular_daemons}
libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket \\\ %libvirt_daemon_systemd_post_inet virtproxyd
libvirtd-tcp.socket libvirtd-tls.socket \\\ %else
libvirtd.service \\\ %libvirt_daemon_systemd_post_inet libvirtd
libvirt-guests.service %endif
%systemd_post %post_units %systemd_post libvirt-guests.service
# request daemon restart in posttrans %libvirt_daemon_schedule_restart libvirtd
mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
%preun daemon %preun daemon
%global preun_units \\\ %systemd_preun libvirt-guests.service
libvirtd.service \\\
libvirtd-tcp.socket libvirtd-tls.socket \\\
libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket \\\
virtlogd.socket virtlogd-admin.socket virtlogd.service \\\
virtlockd.socket virtlockd-admin.socket virtlockd.service \\\
libvirt-guests.service
%systemd_preun %preun_units %libvirt_daemon_systemd_preun_inet libvirtd
%libvirt_daemon_systemd_preun_inet virtproxyd
%libvirt_daemon_systemd_preun virtlogd
%libvirt_daemon_systemd_preun virtlockdd
%postun daemon %postun daemon
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1 || :
@ -1323,7 +1352,8 @@ if [ $1 -ge 1 ] ; then
fi fi
%posttrans daemon %posttrans daemon
if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then if test %libvirt_daemon_needs_restart libvirtd
then
# See if user has previously modified their install to # See if user has previously modified their install to
# tell libvirtd to use --listen # tell libvirtd to use --listen
grep -E '^LIBVIRTD_ARGS=.*--listen' /etc/sysconfig/libvirtd 1>/dev/null 2>&1 grep -E '^LIBVIRTD_ARGS=.*--listen' /etc/sysconfig/libvirtd 1>/dev/null 2>&1
@ -1359,18 +1389,156 @@ if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
fi fi
fi fi
fi fi
rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
%libvirt_daemon_finish_restart libvirtd
%post daemon-driver-network %post daemon-driver-network
%if %{with_firewalld_zone} %if %{with_firewalld_zone}
%firewalld_reload %firewalld_reload
%endif %endif
%if %{with_modular_daemons}
%libvirt_daemon_systemd_post virtnetworkd
%endif
%libvirt_daemon_schedule_restart virtnetworkd
%preun
%libvirt_daemon_systemd_preun virtnetworkd
%postun daemon-driver-network %postun daemon-driver-network
%if %{with_firewalld_zone} %if %{with_firewalld_zone}
%firewalld_reload %firewalld_reload
%endif %endif
%posttrans daemon-driver-network
%libvirt_daemon_perform_restart virtnetworkd
%post daemon-driver-nwfilter
%if %{with_modular_daemons}
%libvirt_daemon_systemd_post virtnwfilterd
%endif
%libvirt_daemon_schedule_restart virtnwfilterd
%preun daemon-driver-nwfilter
%libvirt_daemon_systemd_preun virtnwfilterd
%posttrans daemon-driver-nwfilter
%libvirt_daemon_perform_restart virtnwfilterd
%post daemon-driver-nodedev
%if %{with_modular_daemons}
%libvirt_daemon_systemd_post virtnodedevd
%endif
%libvirt_daemon_schedule_restart virtnodedevd
%preun daemon-driver-nodedev
%libvirt_daemon_systemd_preun virtnodedevd
%posttrans daemon-driver-nodedev
%libvirt_daemon_perform_restart virtnodedevd
%post daemon-driver-interface
%if %{with_modular_daemons}
%libvirt_daemon_systemd_post virtinterfaced
%endif
%libvirt_daemon_schedule_restart virtinterfaced
%preun daemon-driver-interface
%libvirt_daemon_systemd_preun virtinterfaced
%posttrans daemon-driver-interface
%libvirt_daemon_perform_restart virtinterfaced
%post daemon-driver-secret
%if %{with_modular_daemons}
%libvirt_daemon_systemd_post virtsecretd
%endif
%libvirt_daemon_schedule_restart virtsecretd
%preun daemon-driver-secret
%libvirt_daemon_systemd_preun virtsecretd
%posttrans daemon-driver-secret
%libvirt_daemon_perform_restart virtsecretd
%post daemon-driver-storage
%if %{with_modular_daemons}
%libvirt_daemon_systemd_post virtstoraged
%endif
%libvirt_daemon_schedule_restart virtstoraged
%preun daemon-driver-storage
%libvirt_daemon_systemd_preun virtstoraged
%posttrans daemon-driver-storage
%libvirt_daemon_perform_restart virtstoraged
%if %{with_qemu}
%post daemon-driver-qemu
%if %{with_modular_daemons}
%libvirt_daemon_systemd_post virtqemud
%endif
%libvirt_daemon_schedule_restart virtqemud
%preun daemon-driver-qemu
%libvirt_daemon_systemd_preun virtqemud
%posttrans daemon-driver-qemu
%libvirt_daemon_perform_restart virtqemud
%endif
%if %{with_lxc}
%post daemon-driver-lxc
%if %{with_modular_daemons}
%libvirt_daemon_systemd_post virtlxcd
%endif
%libvirt_daemon_schedule_restart virtlxcd
%preun daemon-driver-lxc
%libvirt_daemon_systemd_preun virtlxcd
%posttrans daemon-driver-lxc
%libvirt_daemon_perform_restart virtlxcd
%endif
%if %{with_vbox}
%post daemon-driver-vbox
%if %{with_modular_daemons}
%libvirt_daemon_systemd_post virtvboxd
%endif
%libvirt_daemon_schedule_restart virtvboxd
%preun daemon-driver-vbox
%libvirt_daemon_systemd_preun virtvboxd
%posttrans daemon-driver-vbox
%libvirt_daemon_perform_restart virtvboxd
%endif
%if %{with_libxl}
%post daemon-driver-libxl
%if %{with_modular_daemons}
%libvirt_daemon_systemd_post virtxend
%endif
%libvirt_daemon_schedule_restart virtxend
%preun daemon-driver-libxl
%libvirt_daemon_systemd_preun virtxend
%posttrans daemon-driver-libxl
%libvirt_daemon_perform_restart virtxend
%endif
%post daemon-config-network %post daemon-config-network
if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; then 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, # see if the network used by default network creates a conflict,
@ -1409,15 +1577,13 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ;
chmod 0600 %{_sysconfdir}/libvirt/qemu/networks/default.xml chmod 0600 %{_sysconfdir}/libvirt/qemu/networks/default.xml
# Make sure libvirt picks up the new network defininiton # Make sure libvirt picks up the new network defininiton
mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : %libvirt_daemon_schedule_restart libvirtd
touch %{_localstatedir}/lib/rpm-state/libvirt/restart || : %libvirt_daemon_schedule_restart virtnetworkd
fi fi
%posttrans daemon-config-network %posttrans daemon-config-network
if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then %libvirt_daemon_perform_restart libvirtd
/bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : %libvirt_daemon_perform_restart virtnetworkd
fi
rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
%post daemon-config-nwfilter %post daemon-config-nwfilter
for datadir_file in %{_datadir}/libvirt/nwfilter/*.xml; do for datadir_file in %{_datadir}/libvirt/nwfilter/*.xml; do
@ -1428,15 +1594,12 @@ for datadir_file in %{_datadir}/libvirt/nwfilter/*.xml; do
fi fi
done done
# Make sure libvirt picks up the new nwfilter defininitons # Make sure libvirt picks up the new nwfilter defininitons
mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : %libvirt_daemon_schedule_restart libvirtd
touch %{_localstatedir}/lib/rpm-state/libvirt/restart || : %libvirt_daemon_schedule_restart virtnwfilterd
%posttrans daemon-config-nwfilter %posttrans daemon-config-nwfilter
if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then %libvirt_daemon_perform_restart libvirtd
/bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : %libvirt_daemon_perform_restart virtnwfilterd
fi
rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
%if %{with_qemu} %if %{with_qemu}
%pre daemon-driver-qemu %pre daemon-driver-qemu
@ -1923,6 +2086,13 @@ exit 0
%changelog %changelog
* Fri Sep 10 2021 Jiri Denemark <jdenemar@redhat.com> - 7.7.0-1
- Rebased to libvirt-7.7.0 (rhbz#2001507)
- The rebase also fixes the following bugs:
rhbz#2001326, rhbz#2001391, rhbz#2001322, rhbz#2001389, rhbz#1967187
rhbz#2001327, rhbz#1977155, rhbz#2001997, rhbz#2001323
- RHEL: spec: Do not enable modular daemons yet (rhbz#2001507)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 7.6.0-2 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 7.6.0-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688

View File

@ -1 +1 @@
SHA512 (libvirt-7.6.0.tar.xz) = bad6cc02af071ca909bbbe3c07165e91cad863c9a759b26d9cff6aed6ea5643bc723d2f3c61ad41436dffd4fd50389333d74b131e37eaa54a5071a3ae26df627 SHA512 (libvirt-7.7.0.tar.xz) = a0d585c9ac46be08d2865d66456d681b7233291d17f6e0ed2564d0f29dc38ea7afc846ab382f58a193d3cd9acaf25fcc526feb3c98e12a6b4b8ae5aa4aec2f3e

View File

@ -49,6 +49,7 @@ tests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0.xml ../nodedevschemadata/
tests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0_if0.xml ../nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0_if0.xml tests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0_if0.xml ../nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0_if0.xml
tests/qemublocktestdata/imagecreate/qcow2-backing-luks.xml qcow2.xml tests/qemublocktestdata/imagecreate/qcow2-backing-luks.xml qcow2.xml
tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.xml qcow2.xml tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.xml qcow2.xml
tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2luks.xml qcow2.xml
tests/qemublocktestdata/imagecreate/qcow2-backing-raw-nbd.xml qcow2.xml tests/qemublocktestdata/imagecreate/qcow2-backing-raw-nbd.xml qcow2.xml
tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.xml qcow2.xml tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.xml qcow2.xml
tests/qemublocktestdata/imagecreate/qcow2-backing-raw.xml qcow2.xml tests/qemublocktestdata/imagecreate/qcow2-backing-raw.xml qcow2.xml
@ -1096,3 +1097,9 @@ tests/virhostcpudata/linux-with-die/node/node0/cpu6 ../../cpu/cpu6
tests/virhostcpudata/linux-with-die/node/node0/cpu7 ../../cpu/cpu7 tests/virhostcpudata/linux-with-die/node/node0/cpu7 ../../cpu/cpu7
tests/virhostcpudata/linux-with-die/node/node0/cpu8 ../../cpu/cpu8 tests/virhostcpudata/linux-with-die/node/node0/cpu8 ../../cpu/cpu8
tests/virhostcpudata/linux-with-die/node/node0/cpu9 ../../cpu/cpu9 tests/virhostcpudata/linux-with-die/node/node0/cpu9 ../../cpu/cpu9
tests/vmx2xmldata/cdrom-ide-file-missing-datastore.xml cdrom-ide-empty.xml
tests/vmx2xmldata/cdrom-ide-file-missing-file.xml cdrom-ide-empty.xml
tests/vmx2xmldata/serial-pipe-client-app.xml serial-pipe.xml
tests/vmx2xmldata/serial-pipe-client-vm.xml serial-pipe.xml
tests/vmx2xmldata/serial-pipe-server-app.xml serial-pipe.xml
tests/vmx2xmldata/serial-pipe-server-vm.xml serial-pipe.xml