|
 |
ad1c90 |
From 16b2178f23f82688b988c12bf7ee6caa97974669 Mon Sep 17 00:00:00 2001
|
|
|
ad1c90 |
Message-Id: <16b2178f23f82688b988c12bf7ee6caa97974669@dist-git>
|
|
|
ad1c90 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
ad1c90 |
Date: Mon, 27 Jul 2020 12:36:53 +0200
|
|
|
ad1c90 |
Subject: [PATCH] virDevMapperGetTargets: Don't ignore EBADF
|
|
|
ad1c90 |
MIME-Version: 1.0
|
|
|
ad1c90 |
Content-Type: text/plain; charset=UTF-8
|
|
|
ad1c90 |
Content-Transfer-Encoding: 8bit
|
|
|
ad1c90 |
|
|
|
ad1c90 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
ad1c90 |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
ad1c90 |
(cherry picked from commit e450ebb4c6eab1b7376a5ba873d10936ad563b75)
|
|
|
ad1c90 |
|
|
|
ad1c90 |
https://bugzilla.redhat.com/show_bug.cgi?id=1860421
|
|
|
ad1c90 |
|
|
|
ad1c90 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
ad1c90 |
Message-Id: <6dc32e8797122ad9ecd44a60aaff8e70d060b3b9.1595846084.git.mprivozn@redhat.com>
|
|
|
ad1c90 |
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
ad1c90 |
---
|
|
|
ad1c90 |
src/qemu/qemu_cgroup.c | 2 +-
|
|
|
ad1c90 |
src/qemu/qemu_domain.c | 4 ++--
|
|
|
ad1c90 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
ad1c90 |
|
|
|
ad1c90 |
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
|
|
|
ad1c90 |
index 57a1231855..3a62b4ac15 100644
|
|
|
ad1c90 |
--- a/src/qemu/qemu_cgroup.c
|
|
|
ad1c90 |
+++ b/src/qemu/qemu_cgroup.c
|
|
|
ad1c90 |
@@ -89,7 +89,7 @@ qemuSetupImagePathCgroup(virDomainObjPtr vm,
|
|
|
ad1c90 |
}
|
|
|
ad1c90 |
|
|
|
ad1c90 |
if (virDevMapperGetTargets(path, &targetPaths) < 0 &&
|
|
|
ad1c90 |
- errno != ENOSYS && errno != EBADF) {
|
|
|
ad1c90 |
+ errno != ENOSYS) {
|
|
|
ad1c90 |
virReportSystemError(errno,
|
|
|
ad1c90 |
_("Unable to get devmapper targets for %s"),
|
|
|
ad1c90 |
path);
|
|
|
ad1c90 |
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
|
|
ad1c90 |
index ffe88ff027..35b536868a 100644
|
|
|
ad1c90 |
--- a/src/qemu/qemu_domain.c
|
|
|
ad1c90 |
+++ b/src/qemu/qemu_domain.c
|
|
|
ad1c90 |
@@ -14924,7 +14924,7 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
|
|
|
ad1c90 |
goto cleanup;
|
|
|
ad1c90 |
|
|
|
ad1c90 |
if (virDevMapperGetTargets(next->path, &targetPaths) < 0 &&
|
|
|
ad1c90 |
- errno != ENOSYS && errno != EBADF) {
|
|
|
ad1c90 |
+ errno != ENOSYS) {
|
|
|
ad1c90 |
virReportSystemError(errno,
|
|
|
ad1c90 |
_("Unable to get devmapper targets for %s"),
|
|
|
ad1c90 |
next->path);
|
|
|
ad1c90 |
@@ -15985,7 +15985,7 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm,
|
|
|
ad1c90 |
tmpPath = g_strdup(next->path);
|
|
|
ad1c90 |
|
|
|
ad1c90 |
if (virDevMapperGetTargets(next->path, &targetPaths) < 0 &&
|
|
|
ad1c90 |
- errno != ENOSYS && errno != EBADF) {
|
|
|
ad1c90 |
+ errno != ENOSYS) {
|
|
|
ad1c90 |
virReportSystemError(errno,
|
|
|
ad1c90 |
_("Unable to get devmapper targets for %s"),
|
|
|
ad1c90 |
next->path);
|
|
|
ad1c90 |
--
|
|
|
ad1c90 |
2.28.0
|
|
|
ad1c90 |
|