yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-hostmem-file-remove-object-id-from-pmem-error-messag.patch

b38b0f
From 2968c04bb24aaca2d9b8b46a5f67fe7ee3abe7fa Mon Sep 17 00:00:00 2001
b38b0f
From: "plai@redhat.com" <plai@redhat.com>
b38b0f
Date: Thu, 11 Apr 2019 18:48:03 +0100
b38b0f
Subject: [PATCH 09/11] hostmem-file: remove object id from pmem error message
b38b0f
b38b0f
RH-Author: plai@redhat.com
b38b0f
Message-id: <1555008483-17720-1-git-send-email-plai@redhat.com>
b38b0f
Patchwork-id: 85563
b38b0f
O-Subject: [RHEL8.1 qemu-kvm PATCH ] hostmem-file: remove object id from pmem error message
b38b0f
Bugzilla: 1687596
b38b0f
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
b38b0f
RH-Acked-by: Pankaj Gupta <pagupta@redhat.com>
b38b0f
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
b38b0f
b38b0f
From: Zhang Yi <yi.z.zhang@linux.intel.com>
b38b0f
b38b0f
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1687596
b38b0f
Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=21121663
b38b0f
Branch: rhel-8.1.0
b38b0f
b38b0f
---
b38b0f
b38b0f
We will never get the canonical path from the object
b38b0f
before object_property_add_child.
b38b0f
b38b0f
Signed-off-by: Zhang Yi <yi.z.zhang@linux.intel.com>
b38b0f
Message-Id: <a6491f996827f4039c1a52198ed5dcc7727cb0f9.1540389255.git.yi.z.zhang@linux.intel.com>
b38b0f
[ehabkost: reword commit message]
b38b0f
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
b38b0f
b38b0f
(cherry picked from commit 87dc3ce60a8a16b47aeb6c5f4dbc14ee975563df)
b38b0f
Signed-off-by: Paul Lai <plai@redhat.com>
b38b0f
b38b0f
Resovled Conflicts:
b38b0f
	backends/hostmem-file.c
b38b0f
b38b0f
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
b38b0f
---
b38b0f
 backends/hostmem-file.c | 10 ++++------
b38b0f
 1 file changed, 4 insertions(+), 6 deletions(-)
b38b0f
b38b0f
diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
b38b0f
index 2476dcb..4b667b7 100644
b38b0f
--- a/backends/hostmem-file.c
b38b0f
+++ b/backends/hostmem-file.c
b38b0f
@@ -145,9 +145,8 @@ static void file_memory_backend_set_pmem(Object *o, bool value, Error **errp)
b38b0f
     HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);
b38b0f
 
b38b0f
     if (host_memory_backend_mr_inited(backend)) {
b38b0f
-        error_setg(errp, "cannot change property 'pmem' of %s '%s'",
b38b0f
-                   object_get_typename(o),
b38b0f
-                   object_get_canonical_path_component(o));
b38b0f
+        error_setg(errp, "cannot change property 'pmem' of %s.",
b38b0f
+                   object_get_typename(o));
b38b0f
         return;
b38b0f
     }
b38b0f
 
b38b0f
@@ -156,9 +155,8 @@ static void file_memory_backend_set_pmem(Object *o, bool value, Error **errp)
b38b0f
         Error *local_err = NULL;
b38b0f
         error_setg(&local_err,
b38b0f
                    "Lack of libpmem support while setting the 'pmem=on'"
b38b0f
-                   " of %s '%s'. We can't ensure data persistence.",
b38b0f
-                   object_get_typename(o),
b38b0f
-                   object_get_canonical_path_component(o));
b38b0f
+                   " of %s. We can't ensure data persistence.",
b38b0f
+                   object_get_typename(o));
b38b0f
         error_propagate(errp, local_err);
b38b0f
         return;
b38b0f
     }
b38b0f
-- 
b38b0f
1.8.3.1
b38b0f