virDevMapperGetTargets: Don't ignore EBADF

Signed-off-by: imxcc <xingchaochao@huawei.com>

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 <xingchaochao@huawei.com> - 6.2.0-24
+- virDevMapperGetTargets: Don't ignore EBADF
+
 * Tue Sep 14 2021 imxcc <xingchaochao@huawei.com> - 6.2.0-23
 - Modify some different patch files
 

virDevMapperGetTargets-Don-t-ignore-EBADF.patch

@@ -0,0 +1,53 @@
+From e450ebb4c6eab1b7376a5ba873d10936ad563b75 Mon Sep 17 00:00:00 2001
+From: Michal Privoznik <mprivozn@redhat.com>
+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 <mprivozn@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ 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
+