|
 |
c480ed |
From ab0cc413165b8a80d68b30b7e69c611f7087a29b Mon Sep 17 00:00:00 2001
|
|
|
c480ed |
Message-Id: <ab0cc413165b8a80d68b30b7e69c611f7087a29b@dist-git>
|
|
|
c480ed |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
c480ed |
Date: Thu, 3 Jan 2019 10:03:43 +0100
|
|
|
c480ed |
Subject: [PATCH] qemuProcessBuildDestroyMemoryPathsImpl: Don't overwrite error
|
|
|
c480ed |
MIME-Version: 1.0
|
|
|
c480ed |
Content-Type: text/plain; charset=UTF-8
|
|
|
c480ed |
Content-Transfer-Encoding: 8bit
|
|
|
c480ed |
|
|
|
c480ed |
The qemuSecurityDomainSetPathLabel() function reports perfect
|
|
|
c480ed |
error itself. Do not overwrite it to something less meaningful.
|
|
|
c480ed |
|
|
|
c480ed |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
c480ed |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c480ed |
(cherry picked from commit 577e68dff90e617a20165dfede0390faa1e24031)
|
|
|
c480ed |
|
|
|
c480ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1658112
|
|
|
c480ed |
|
|
|
c480ed |
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
|
c480ed |
Message-Id: <7ca28756d9a136d67b01df15efe1271266017164.1546506016.git.eskultet@redhat.com>
|
|
|
c480ed |
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c480ed |
---
|
|
|
c480ed |
src/qemu/qemu_process.c | 5 +----
|
|
|
c480ed |
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
c480ed |
|
|
|
c480ed |
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
|
c480ed |
index c220accfaf..34aac69afc 100644
|
|
|
c480ed |
--- a/src/qemu/qemu_process.c
|
|
|
c480ed |
+++ b/src/qemu/qemu_process.c
|
|
|
c480ed |
@@ -3672,11 +3672,8 @@ qemuProcessBuildDestroyMemoryPathsImpl(virQEMUDriverPtr driver,
|
|
|
c480ed |
}
|
|
|
c480ed |
|
|
|
c480ed |
if (qemuSecurityDomainSetPathLabel(driver->securityManager,
|
|
|
c480ed |
- def, path, true) < 0) {
|
|
|
c480ed |
- virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
c480ed |
- _("Unable to label %s"), path);
|
|
|
c480ed |
+ def, path, true) < 0)
|
|
|
c480ed |
return -1;
|
|
|
c480ed |
- }
|
|
|
c480ed |
} else {
|
|
|
c480ed |
if (virFileDeleteTree(path) < 0)
|
|
|
c480ed |
return -1;
|
|
|
c480ed |
--
|
|
|
c480ed |
2.22.0
|
|
|
c480ed |
|