From e4337e3bb0e5877eff36ca9a7461b279bc0bb69f Mon Sep 17 00:00:00 2001 From: imxcc Date: Tue, 14 Sep 2021 22:17:12 +0800 Subject: [PATCH 1/2] Modify some different patch files Signed-off-by: imxcc --- ...-major.patch => Don-t-cache-device-mapper-major.patch | 0 ... => Handle-kernel-without-device-mapper-support.patch | 0 libvirt.spec | 9 ++++++--- 3 files changed, 6 insertions(+), 3 deletions(-) rename 0001-Don-t-cache-device-mapper-major.patch => Don-t-cache-device-mapper-major.patch (100%) rename 0001-Handle-kernel-without-device-mapper-support.patch => Handle-kernel-without-device-mapper-support.patch (100%) diff --git a/0001-Don-t-cache-device-mapper-major.patch b/Don-t-cache-device-mapper-major.patch similarity index 100% rename from 0001-Don-t-cache-device-mapper-major.patch rename to Don-t-cache-device-mapper-major.patch diff --git a/0001-Handle-kernel-without-device-mapper-support.patch b/Handle-kernel-without-device-mapper-support.patch similarity index 100% rename from 0001-Handle-kernel-without-device-mapper-support.patch rename to Handle-kernel-without-device-mapper-support.patch diff --git a/libvirt.spec b/libvirt.spec index 70cb8ab..77b5722 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -105,7 +105,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 6.2.0 -Release: 22 +Release: 23 License: LGPLv2+ URL: https://libvirt.org/ @@ -184,8 +184,8 @@ Patch0067: tests-fix-stat-mocking-with-Fedora-rawhide.patch Patch0068: cpu_map-Add-Cooperlake-x86-CPU-model.patch Patch0069: cpu_map-Add-pschange-mc-no-bit-in-IA32_ARCH_CAPABILI.patch Patch0070: cpu_map-Distribute-x86_Cooperlake.xml.patch -Patch0071: 0001-Don-t-cache-device-mapper-major.patch -Patch0072: 0001-Handle-kernel-without-device-mapper-support.patch +Patch0071: Don-t-cache-device-mapper-major.patch +Patch0072: Handle-kernel-without-device-mapper-support.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -1919,6 +1919,9 @@ exit 0 %changelog +* Tue Sep 14 2021 imxcc - 6.2.0-23 +- Modify some different patch files + * Thu Sep 2 2021 heyitao - 6.2.0-22 - Don't cache device-mapper major - Handle kernel without device-mapper support -- Gitee From 8ac929cbee35f73d164ad915171c633a6a18db62 Mon Sep 17 00:00:00 2001 From: imxcc Date: Tue, 14 Sep 2021 22:22:33 +0800 Subject: [PATCH 2/2] virDevMapperGetTargets: Don't ignore EBADF Signed-off-by: imxcc --- libvirt.spec | 6 ++- ...vMapperGetTargets-Don-t-ignore-EBADF.patch | 53 +++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 virDevMapperGetTargets-Don-t-ignore-EBADF.patch diff --git a/libvirt.spec b/libvirt.spec index 77b5722..4dbf518 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -105,7 +105,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 6.2.0 -Release: 23 +Release: 24 License: LGPLv2+ URL: https://libvirt.org/ @@ -186,6 +186,7 @@ Patch0069: cpu_map-Add-pschange-mc-no-bit-in-IA32_ARCH_CAPABILI.patch Patch0070: cpu_map-Distribute-x86_Cooperlake.xml.patch Patch0071: Don-t-cache-device-mapper-major.patch Patch0072: Handle-kernel-without-device-mapper-support.patch +Patch0073: virDevMapperGetTargets-Don-t-ignore-EBADF.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -1919,6 +1920,9 @@ exit 0 %changelog +* Tue Sep 14 2021 imxcc - 6.2.0-24 +- virDevMapperGetTargets: Don't ignore EBADF + * Tue Sep 14 2021 imxcc - 6.2.0-23 - Modify some different patch files diff --git a/virDevMapperGetTargets-Don-t-ignore-EBADF.patch b/virDevMapperGetTargets-Don-t-ignore-EBADF.patch new file mode 100644 index 0000000..03c250a --- /dev/null +++ b/virDevMapperGetTargets-Don-t-ignore-EBADF.patch @@ -0,0 +1,53 @@ +From e450ebb4c6eab1b7376a5ba873d10936ad563b75 Mon Sep 17 00:00:00 2001 +From: Michal Privoznik +Date: Thu, 23 Jul 2020 17:08:46 +0200 +Subject: [PATCH] virDevMapperGetTargets: Don't ignore EBADF +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Michal Privoznik +Reviewed-by: Daniel P. Berrangé +--- + src/qemu/qemu_cgroup.c | 2 +- + src/qemu/qemu_domain.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c +index 914bf640ca..e88da02341 100644 +--- a/src/qemu/qemu_cgroup.c ++++ b/src/qemu/qemu_cgroup.c +@@ -87,7 +87,7 @@ qemuSetupImagePathCgroup(virDomainObjPtr vm, + } + + if (virDevMapperGetTargets(path, &targetPaths) < 0 && +- errno != ENOSYS && errno != EBADF) { ++ errno != ENOSYS) { + virReportSystemError(errno, + _("Unable to get devmapper targets for %s"), + path); +diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c +index 5b22eb2eaa..2058290870 100644 +--- a/src/qemu/qemu_domain.c ++++ b/src/qemu/qemu_domain.c +@@ -10264,7 +10264,7 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, + return -1; + + if (virDevMapperGetTargets(next->path, &targetPaths) < 0 && +- errno != ENOSYS && errno != EBADF) { ++ errno != ENOSYS) { + virReportSystemError(errno, + _("Unable to get devmapper targets for %s"), + next->path); +@@ -11328,7 +11328,7 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm, + tmpPath = g_strdup(next->path); + + if (virDevMapperGetTargets(next->path, &targetPaths) < 0 && +- errno != ENOSYS && errno != EBADF) { ++ errno != ENOSYS) { + virReportSystemError(errno, + _("Unable to get devmapper targets for %s"), + next->path); +-- +2.27.0 + -- Gitee