From ab0cc413165b8a80d68b30b7e69c611f7087a29b Mon Sep 17 00:00:00 2001

Message-Id: <ab0cc413165b8a80d68b30b7e69c611f7087a29b@dist-git>

From: Michal Privoznik <mprivozn@redhat.com>

Date: Thu, 3 Jan 2019 10:03:43 +0100

Subject: [PATCH] qemuProcessBuildDestroyMemoryPathsImpl: Don't overwrite error

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

The qemuSecurityDomainSetPathLabel() function reports perfect

error itself. Do not overwrite it to something less meaningful.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

(cherry picked from commit 577e68dff90e617a20165dfede0390faa1e24031)

https://bugzilla.redhat.com/show_bug.cgi?id=1658112

Signed-off-by: Erik Skultety <eskultet@redhat.com>

Message-Id: <7ca28756d9a136d67b01df15efe1271266017164.1546506016.git.eskultet@redhat.com>

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

---

 src/qemu/qemu_process.c | 5 +----

 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c

index c220accfaf..34aac69afc 100644

--- a/src/qemu/qemu_process.c

+++ b/src/qemu/qemu_process.c

@@ -3672,11 +3672,8 @@ qemuProcessBuildDestroyMemoryPathsImpl(virQEMUDriverPtr driver,

         }

         if (qemuSecurityDomainSetPathLabel(driver->securityManager,

-                                           def, path, true) < 0) {

-            virReportError(VIR_ERR_INTERNAL_ERROR,

-                            _("Unable to label %s"), path);

+                                           def, path, true) < 0)

             return -1;

-        }

     } else {

         if (virFileDeleteTree(path) < 0)

             return -1;

-- 

2.22.0