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