[1/1] hostmem-file: remove the invalid pmem object id.

Commit Message

Zhang, Yi Oct. 24, 2018, 2:14 p.m. UTC

We will never get the canonical path from the object
before object_property_add_child.

Signed-off-by: Zhang Yi <[e-mail]>
---
 backends/hostmem-file.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

Comments

Eduardo Habkost Oct. 26, 2018, 3:40 p.m. UTC | #1

On Wed, Oct 24, 2018 at 10:14:56PM +0800, Zhang Yi wrote:
> We will never get the canonical path from the object
> before object_property_add_child.
> 
> Signed-off-by: Zhang Yi <[e-mail]>

Thanks.  I'm queueing it on machine-next, after rewriting the
subject line as:

  hostmem-file: remove object id from pmem error message

Patch

diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
index 639c8d4..9691c48 100644
--- a/backends/hostmem-file.c
+++ b/backends/hostmem-file.c
@@ -145,26 +145,20 @@  static void file_memory_backend_set_pmem(Object *o, bool value, Error **errp)
     HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);
 
     if (host_memory_backend_mr_inited(backend)) {
-        char *path = object_get_canonical_path_component(o);
 
-        error_setg(errp, "cannot change property 'pmem' of %s '%s'",
-                   object_get_typename(o),
-                   path);
-        g_free(path);
+        error_setg(errp, "cannot change property 'pmem' of %s.",
+                   object_get_typename(o));
         return;
     }
 
 #ifndef CONFIG_LIBPMEM
     if (value) {
         Error *local_err = NULL;
-        char *path = object_get_canonical_path_component(o);
 
         error_setg(&local_err,
                    "Lack of libpmem support while setting the 'pmem=on'"
-                   " of %s '%s'. We can't ensure data persistence.",
-                   object_get_typename(o),
-                   path);
-        g_free(path);
+                   " of %s. We can't ensure data persistence.",
+                   object_get_typename(o));
         error_propagate(errp, local_err);
         return;
     }