[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/24] hostmem-file: remove object id from pmem error
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 01/24] hostmem-file: remove object id from pmem error message |
Date: |
Tue, 11 Dec 2018 16:01:06 -0200 |
From: Zhang Yi <address@hidden>
We will never get the canonical path from the object
before object_property_add_child.
Signed-off-by: Zhang Yi <address@hidden>
Message-Id: <address@hidden>
[ehabkost: reword commit message]
Signed-off-by: Eduardo Habkost <address@hidden>
---
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;
}
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL 00/24] Machine queue post-3.1.0 (including 4.0 machine-types), Eduardo Habkost, 2018/12/11
- [Qemu-devel] [PULL 03/24] docs: Document vCPU hotplug procedure, Eduardo Habkost, 2018/12/11
- [Qemu-devel] [PULL 02/24] hw/timer/sun4v-rtc: Fix tracing at sun4v_rtc_write(), Eduardo Habkost, 2018/12/11
- [Qemu-devel] [PULL 04/24] Deprecate QMP `cpu-add`, Eduardo Habkost, 2018/12/11
- [Qemu-devel] [PULL 01/24] hostmem-file: remove object id from pmem error message,
Eduardo Habkost <=
- [Qemu-devel] [PULL 05/24] Deprecate HMP `cpu-add`, Eduardo Habkost, 2018/12/11
- [Qemu-devel] [PULL 07/24] memory-device: use QEMU_IS_ALIGNED, Eduardo Habkost, 2018/12/11
- [Qemu-devel] [PULL 06/24] range: pass const pointer where possible, Eduardo Habkost, 2018/12/11
- [Qemu-devel] [PULL 08/24] memory-device: avoid overflows on very huge devices, Eduardo Habkost, 2018/12/11
- [Qemu-devel] [PULL 09/24] move ObjectClass to typedefs.h, Eduardo Habkost, 2018/12/11
- [Qemu-devel] [PULL 11/24] numa: Match struct to typedef name, Eduardo Habkost, 2018/12/11
- [Qemu-devel] [PULL 10/24] i386: Rename bools in PCMachineState to end in _enabled, Eduardo Habkost, 2018/12/11
- [Qemu-devel] [PULL 12/24] hostmem: Validate host-nodes before setting bitmap, Eduardo Habkost, 2018/12/11
- [Qemu-devel] [PULL 16/24] spapr: Use default_machine_opts to set suppress_vmdesc, Eduardo Habkost, 2018/12/11
- [Qemu-devel] [PULL 18/24] pc: Use default_machine_opts to set suppress_vmdesc, Eduardo Habkost, 2018/12/11