|
 |
7711c0 |
From 111769e4a152fdb52f2b10fb957cdfec2fe7d4d2 Mon Sep 17 00:00:00 2001
|
|
|
7711c0 |
From: "plai@redhat.com" <plai@redhat.com>
|
|
|
7711c0 |
Date: Tue, 8 Jan 2019 21:33:09 +0100
|
|
|
7711c0 |
Subject: [PATCH 3/8] hostmem-file: remove object id from pmem error message
|
|
|
7711c0 |
|
|
|
7711c0 |
RH-Author: plai@redhat.com
|
|
|
7711c0 |
Message-id: <1546983189-26340-1-git-send-email-plai@redhat.com>
|
|
|
7711c0 |
Patchwork-id: 83911
|
|
|
7711c0 |
O-Subject: [RHEL7.7 qemu-kvm-rhev PATCH v2] hostmem-file: remove object id from pmem error message
|
|
|
7711c0 |
Bugzilla: 1628098
|
|
|
7711c0 |
RH-Acked-by: Pankaj Gupta <pagupta@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
From: Zhang Yi <yi.z.zhang@linux.intel.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1628098
|
|
|
7711c0 |
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=19688087
|
|
|
7711c0 |
Branch: rhv7/master-2.12.0
|
|
|
7711c0 |
|
|
|
7711c0 |
Tested by Intel OTC virtualization.
|
|
|
7711c0 |
|
|
|
7711c0 |
---
|
|
|
7711c0 |
v2
|
|
|
7711c0 |
fixing subject line to use qemu-kvm-rhev instead of qemu-kvm
|
|
|
7711c0 |
---
|
|
|
7711c0 |
We will never get the canonical path from the object
|
|
|
7711c0 |
before object_property_add_child.
|
|
|
7711c0 |
|
|
|
7711c0 |
Signed-off-by: Zhang Yi <yi.z.zhang@linux.intel.com>
|
|
|
7711c0 |
Message-Id: <a6491f996827f4039c1a52198ed5dcc7727cb0f9.1540389255.git.yi.z.zhang@linux.intel.com>
|
|
|
7711c0 |
[ehabkost: reword commit message]
|
|
|
7711c0 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
(cherry picked from commit 87dc3ce60a8a16b47aeb6c5f4dbc14ee975563df)
|
|
|
7711c0 |
Signed-off-by: Paul Lai <plai@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
Resolved Conflicts:
|
|
|
7711c0 |
backends/hostmem-file.c
|
|
|
7711c0 |
|
|
|
7711c0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
---
|
|
|
7711c0 |
backends/hostmem-file.c | 11 +++++------
|
|
|
7711c0 |
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
|
7711c0 |
|
|
|
7711c0 |
diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
|
|
|
7711c0 |
index 2476dcb..5b519c2 100644
|
|
|
7711c0 |
--- a/backends/hostmem-file.c
|
|
|
7711c0 |
+++ b/backends/hostmem-file.c
|
|
|
7711c0 |
@@ -145,20 +145,19 @@ static void file_memory_backend_set_pmem(Object *o, bool value, Error **errp)
|
|
|
7711c0 |
HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);
|
|
|
7711c0 |
|
|
|
7711c0 |
if (host_memory_backend_mr_inited(backend)) {
|
|
|
7711c0 |
- error_setg(errp, "cannot change property 'pmem' of %s '%s'",
|
|
|
7711c0 |
- object_get_typename(o),
|
|
|
7711c0 |
- object_get_canonical_path_component(o));
|
|
|
7711c0 |
+ error_setg(errp, "cannot change property 'pmem' of %s.",
|
|
|
7711c0 |
+ object_get_typename(o));
|
|
|
7711c0 |
return;
|
|
|
7711c0 |
}
|
|
|
7711c0 |
|
|
|
7711c0 |
#ifndef CONFIG_LIBPMEM
|
|
|
7711c0 |
if (value) {
|
|
|
7711c0 |
Error *local_err = NULL;
|
|
|
7711c0 |
+
|
|
|
7711c0 |
error_setg(&local_err,
|
|
|
7711c0 |
"Lack of libpmem support while setting the 'pmem=on'"
|
|
|
7711c0 |
- " of %s '%s'. We can't ensure data persistence.",
|
|
|
7711c0 |
- object_get_typename(o),
|
|
|
7711c0 |
- object_get_canonical_path_component(o));
|
|
|
7711c0 |
+ " of %s. We can't ensure data persistence.",
|
|
|
7711c0 |
+ object_get_typename(o));
|
|
|
7711c0 |
error_propagate(errp, local_err);
|
|
|
7711c0 |
return;
|
|
|
7711c0 |
}
|
|
|
7711c0 |
--
|
|
|
7711c0 |
1.8.3.1
|
|
|
7711c0 |
|