Merge remote-tracking branch 'up/main' into main-riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
commit
dc5fb57483
GPG Key ID:
8B7F1DA0E2C9FDBB
|
|
@ -1,34 +0,0 @@
|
|||
From: Pavel Hrdina <phrdina@redhat.com>
|
||||
Date: Fri, 3 Nov 2023 14:03:55 +0100
|
||||
Subject: [PATCH] qemu_process: fix crash in qemuSaveImageDecompressionStart
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Content-type: text/plain
|
||||
|
||||
Commit changing the code to allow passing NULL as @data into
|
||||
qemuSaveImageDecompressionStart() was not correct as it left the
|
||||
original call into the function as well.
|
||||
|
||||
Introduced-by: 2f3e582a1ac1008eba8d43c751cdba8712dd1614
|
||||
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2247754
|
||||
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
||||
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||||
---
|
||||
src/qemu/qemu_process.c | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
||||
index 1ef032dbd2..b9267d8699 100644
|
||||
--- a/src/qemu/qemu_process.c
|
||||
+++ b/src/qemu/qemu_process.c
|
||||
@@ -8208,9 +8208,6 @@ qemuProcessStartWithMemoryState(virConnectPtr conn,
|
||||
}
|
||||
}
|
||||
|
||||
- if (qemuSaveImageDecompressionStart(data, fd, &intermediatefd, &errbuf, &cmd) < 0)
|
||||
- return -1;
|
||||
-
|
||||
/* No cookie means libvirt which saved the domain was too old to mess up
|
||||
* the CPU definitions.
|
||||
*/
|
||||
117
libvirt.spec
117
libvirt.spec
|
|
@ -203,9 +203,29 @@
|
|||
%define qemu_moddir %{_libdir}/qemu
|
||||
%define qemu_datadir %{_datadir}/qemu
|
||||
|
||||
%define with_mingw 0
|
||||
# Native / MinGW builds
|
||||
%define with_native 0%{!?_without_native:1}
|
||||
|
||||
%define with_mingw32 0
|
||||
%define with_mingw64 0
|
||||
|
||||
%if 0%{?fedora}
|
||||
%define with_mingw 0%{!?_without_mingw:1}
|
||||
%if 0%{!?_without_mingw:1}
|
||||
%define with_mingw32 0%{!?_without_mingw32:1}
|
||||
%define with_mingw64 0%{!?_without_mingw64:1}
|
||||
%endif
|
||||
|
||||
# These tell the other mingw macros whether to perform or
|
||||
# skip the 32-bit and 64-bit specific steps respectively
|
||||
%define mingw_build_win32 %{with_mingw32}
|
||||
%define mingw_build_win64 %{with_mingw64}
|
||||
%endif
|
||||
|
||||
%if !%{with_native}
|
||||
# Building the debugsource package apparently only works if the
|
||||
# native build is enabled. debuginfo packages don't have this
|
||||
# problem and setting this doesn't disable them
|
||||
%global debug_package %{nil}
|
||||
%endif
|
||||
|
||||
# RHEL releases provide stable tool chains and so it is safe to turn
|
||||
|
|
@ -240,8 +260,8 @@
|
|||
|
||||
Summary: Library providing a simple virtualization API
|
||||
Name: libvirt
|
||||
Version: 9.9.0
|
||||
Release: 2.0.riscv64%{?dist}
|
||||
Version: 9.10.0
|
||||
Release: 1.0.riscv64%{?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/
|
||||
|
||||
|
|
@ -250,9 +270,6 @@ URL: https://libvirt.org/
|
|||
%endif
|
||||
Source: https://download.libvirt.org/%{?mainturl}libvirt-%{version}.tar.xz
|
||||
|
||||
# Fix crash with snapshot restore (bz #2247754)
|
||||
Patch0001: 0001-qemu_process-fix-crash-in-qemuSaveImageDecompression.patch
|
||||
|
||||
Requires: libvirt-daemon = %{version}-%{release}
|
||||
Requires: libvirt-daemon-config-network = %{version}-%{release}
|
||||
Requires: libvirt-daemon-config-nwfilter = %{version}-%{release}
|
||||
|
|
@ -284,21 +301,29 @@ Requires: libvirt-libs = %{version}-%{release}
|
|||
# All build-time requirements. Run-time requirements are
|
||||
# listed against each sub-RPM
|
||||
BuildRequires: python3-docutils
|
||||
BuildRequires: gcc
|
||||
BuildRequires: meson >= 0.56.0
|
||||
BuildRequires: ninja-build
|
||||
BuildRequires: git
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: python3
|
||||
BuildRequires: python3-pytest
|
||||
# For xmllint
|
||||
BuildRequires: libxml2
|
||||
# For xsltproc
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: gettext
|
||||
BuildRequires: systemd-rpm-macros
|
||||
# Fedora build root suckage
|
||||
BuildRequires: gawk
|
||||
%if %{with_native}
|
||||
BuildRequires: gcc
|
||||
%if %{with_libxl}
|
||||
BuildRequires: xen-devel
|
||||
%endif
|
||||
BuildRequires: glib2-devel >= 2.56
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: bash-completion >= 2.0
|
||||
BuildRequires: gettext
|
||||
BuildRequires: libtasn1-devel
|
||||
BuildRequires: gnutls-devel
|
||||
BuildRequires: libattr-devel
|
||||
|
|
@ -307,7 +332,6 @@ BuildRequires: libblkid-devel >= 2.17
|
|||
# for augparse, optionally used in testing
|
||||
BuildRequires: augeas
|
||||
BuildRequires: systemd-devel >= 185
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: libpciaccess-devel >= 0.10.9
|
||||
BuildRequires: yajl-devel
|
||||
%if %{with_sanlock}
|
||||
|
|
@ -318,7 +342,8 @@ BuildRequires: libnl3-devel
|
|||
BuildRequires: libselinux-devel
|
||||
BuildRequires: iptables
|
||||
BuildRequires: ebtables
|
||||
BuildRequires: module-init-tools
|
||||
# For modprobe
|
||||
BuildRequires: kmod
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: polkit >= 0.112
|
||||
# For mount/umount in FS driver
|
||||
|
|
@ -383,8 +408,6 @@ BuildRequires: systemtap-sdt-devel
|
|||
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}
|
||||
|
|
@ -396,14 +419,14 @@ BuildRequires: wireshark-devel
|
|||
%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}
|
||||
# Needed for the firewalld_reload macro
|
||||
BuildRequires: firewalld-filesystem
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with_mingw}
|
||||
%if %{with_mingw32}
|
||||
BuildRequires: mingw32-filesystem
|
||||
BuildRequires: mingw32-gcc
|
||||
BuildRequires: mingw32-binutils
|
||||
|
|
@ -417,6 +440,8 @@ BuildRequires: mingw32-portablexdr
|
|||
BuildRequires: mingw32-dlfcn
|
||||
BuildRequires: mingw32-libssh2
|
||||
BuildRequires: mingw32-curl
|
||||
%endif
|
||||
%if %{with_mingw64}
|
||||
BuildRequires: mingw64-filesystem
|
||||
BuildRequires: mingw64-gcc
|
||||
BuildRequires: mingw64-binutils
|
||||
|
|
@ -437,6 +462,7 @@ Libvirt is a C toolkit to interact with the virtualization capabilities
|
|||
of recent versions of Linux (and other OSes). The main package includes
|
||||
the libvirtd server exporting the virtualization support.
|
||||
|
||||
%if %{with_native}
|
||||
%package docs
|
||||
Summary: API reference and website documentation
|
||||
|
||||
|
|
@ -1061,8 +1087,9 @@ Requires: libvirt-daemon-driver-network = %{version}-%{release}
|
|||
|
||||
%description nss
|
||||
Libvirt plugin for NSS for translating domain names into IP addresses.
|
||||
%endif
|
||||
|
||||
%if %{with_mingw}
|
||||
%if %{with_mingw32}
|
||||
%package -n mingw32-libvirt
|
||||
Summary: %{summary}
|
||||
Obsoletes: mingw32-libvirt-static < 7.0.0
|
||||
|
|
@ -1071,6 +1098,10 @@ BuildArch: noarch
|
|||
%description -n mingw32-libvirt
|
||||
MinGW Windows libvirt virtualization library.
|
||||
|
||||
%{?mingw32_debug_package}
|
||||
%endif
|
||||
|
||||
%if %{with_mingw64}
|
||||
%package -n mingw64-libvirt
|
||||
Summary: %{summary}
|
||||
Obsoletes: mingw64-libvirt-static < 7.0.0
|
||||
|
|
@ -1079,7 +1110,7 @@ BuildArch: noarch
|
|||
%description -n mingw64-libvirt
|
||||
MinGW Windows libvirt virtualization library.
|
||||
|
||||
%{?mingw_debug_package}
|
||||
%{?mingw64_debug_package}
|
||||
%endif
|
||||
|
||||
%prep
|
||||
|
|
@ -1248,6 +1279,7 @@ exit 1
|
|||
|
||||
export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
|
||||
|
||||
%if %{with_native}
|
||||
%meson \
|
||||
-Drunstatedir=%{_rundir} \
|
||||
-Dinitconfdir=%{_sysconfdir}/sysconfig \
|
||||
|
|
@ -1286,6 +1318,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
|
|||
-Dcapng=enabled \
|
||||
%{?arg_fuse} \
|
||||
%{?arg_netcf} \
|
||||
-Dnls=enabled \
|
||||
-Dselinux=enabled \
|
||||
%{?arg_selinux_mount} \
|
||||
-Dapparmor=disabled \
|
||||
|
|
@ -1322,8 +1355,9 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
|
|||
%{?arg_login_shell}
|
||||
|
||||
%meson_build
|
||||
%endif
|
||||
|
||||
%if %{with_mingw}
|
||||
%if %{with_mingw32} || %{with_mingw64}
|
||||
%mingw_meson \
|
||||
--auto-features=enabled \
|
||||
-Ddriver_remote=enabled \
|
||||
|
|
@ -1366,7 +1400,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
|
|||
-Dlibssh=disabled \
|
||||
-Dlogin_shell=disabled \
|
||||
-Dnetcf=disabled \
|
||||
-Dnls=disabled \
|
||||
-Dnls=enabled \
|
||||
-Dnss=disabled \
|
||||
-Dnumactl=disabled \
|
||||
-Dnumad=disabled \
|
||||
|
|
@ -1406,6 +1440,7 @@ rm -fr %{buildroot}
|
|||
|
||||
export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
|
||||
|
||||
%if %{with_native}
|
||||
%meson_install
|
||||
|
||||
# We don't want to install /etc/libvirt/qemu/networks in the main %%files list
|
||||
|
|
@ -1468,22 +1503,29 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
|
|||
$RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with_mingw}
|
||||
%if %{with_mingw32} || %{with_mingw64}
|
||||
%mingw_ninja_install
|
||||
%endif
|
||||
|
||||
%if %{with_mingw32}
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw32_sysconfdir}/libvirt/nwfilter
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_sysconfdir}/libvirt/nwfilter
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc/*
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc/*
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc/*
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc/*
|
||||
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt_iohelper.exe
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt_iohelper.exe
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt-guests.sh
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
|
||||
%endif
|
||||
|
||||
%if %{with_mingw64}
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_sysconfdir}/libvirt/nwfilter
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc/*
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc/*
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt_iohelper.exe
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
|
||||
%endif
|
||||
|
||||
%if %{with_mingw32} || %{with_mingw64}
|
||||
%mingw_debug_install_post
|
||||
|
||||
%mingw_find_lang %{name}
|
||||
|
|
@ -1491,9 +1533,12 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
|
|||
%endif
|
||||
|
||||
%check
|
||||
|
||||
%if %{with_native}
|
||||
# Building on slow archs, like emulated s390x in Fedora copr, requires
|
||||
# raising the test timeout
|
||||
VIR_TEST_DEBUG=1 %meson_test --no-suite syntax-check --timeout-multiplier 10
|
||||
%endif
|
||||
|
||||
%define libvirt_rpmstatedir %{_localstatedir}/lib/rpm-state/libvirt
|
||||
|
||||
|
|
@ -1639,6 +1684,7 @@ VIR_TEST_DEBUG=1 %meson_test --no-suite syntax-check --timeout-multiplier 10
|
|||
%define libvirt_systemd_config_pre() %libvirt_systemd_schedule_restart %1.service
|
||||
%define libvirt_systemd_config_posttrans() %libvirt_systemd_perform_restart %1.service
|
||||
|
||||
%if %{with_native}
|
||||
%pre daemon
|
||||
%libvirt_sysconfig_pre libvirtd
|
||||
%libvirt_systemd_inet_pre libvirtd
|
||||
|
|
@ -1907,7 +1953,9 @@ done
|
|||
getent group virtlogin >/dev/null || groupadd -r virtlogin
|
||||
exit 0
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with_native}
|
||||
%files
|
||||
|
||||
%files docs
|
||||
|
|
@ -2384,8 +2432,9 @@ exit 0
|
|||
%{_datadir}/libvirt/api/libvirt-admin-api.xml
|
||||
%{_datadir}/libvirt/api/libvirt-qemu-api.xml
|
||||
%{_datadir}/libvirt/api/libvirt-lxc-api.xml
|
||||
%endif
|
||||
|
||||
%if %{with_mingw}
|
||||
%if %{with_mingw32}
|
||||
%files -n mingw32-libvirt -f mingw32-libvirt.lang
|
||||
%dir %{mingw32_sysconfdir}/libvirt/
|
||||
%config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt.conf
|
||||
|
|
@ -2442,7 +2491,9 @@ exit 0
|
|||
%{mingw32_mandir}/man1/virt-pki-query-dn.1*
|
||||
%{mingw32_mandir}/man1/virt-pki-validate.1*
|
||||
%{mingw32_mandir}/man7/virkey*.7*
|
||||
%endif
|
||||
|
||||
%if %{with_mingw64}
|
||||
%files -n mingw64-libvirt -f mingw64-libvirt.lang
|
||||
%dir %{mingw64_sysconfdir}/libvirt/
|
||||
%config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt.conf
|
||||
|
|
@ -2503,9 +2554,15 @@ exit 0
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Nov 13 2023 David Abdurachmanov <davidlt@rivosinc.com> - 9.9.0-2.0.riscv64
|
||||
* Mon Dec 04 2023 David Abdurachmanov <davidlt@rivosinc.com> - 9.10.0-1.0.riscv64
|
||||
- Add riscv64 to arches_qemu_kvm
|
||||
|
||||
* Sat Dec 02 2023 Cole Robinson <crobinso@redhat.com> - 9.10.0-1
|
||||
- Update to version 9.10.0
|
||||
|
||||
* Thu Nov 30 2023 Richard W.M. Jones <rjones@redhat.com> - 9.9.0-3
|
||||
- Bump and rebuild for xen 4.18.0
|
||||
|
||||
* Mon Nov 06 2023 Cole Robinson <crobinso@redhat.com> - 9.9.0-2
|
||||
- Fix crash with snapshot restore (bz #2247754)
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (libvirt-9.9.0.tar.xz) = 77cea28acf4f3e8c92fbd5bd72ad084be183c07f14e3a9ce35d6d9d62d36ee97a30cef55fb204b3e43f282890ecd7d5827a784a517e7f4ed8b22ee502c3f09d7
|
||||
SHA512 (libvirt-9.10.0.tar.xz) = d35d14810a29aef9319d894e60d493c9011930e0b45d832861c8f8669ee66c0539cdd49f8e0a94801b510ae0f1ed150e4d6a03ea03cc23e8cb2e5456edd76f68
|
||||
|
|
|
|||
Loading…
Reference in New Issue