From 87dc3ce60a8a16b47aeb6c5f4dbc14ee975563df Mon Sep 17 00:00:00 2001 From: Zhang Yi Date: Wed, 24 Oct 2018 22:14:56 +0800 Subject: [PATCH] hostmem-file: remove object id from pmem error message We will never get the canonical path from the object before object_property_add_child. Signed-off-by: Zhang Yi Message-Id: [ehabkost: reword commit message] Signed-off-by: Eduardo Habkost --- backends/hostmem-file.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c index 6630021226..78f058dee2 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; } -- GitLab