|
@@ -12,6 +12,7 @@
|
|
|
#include "qemu/osdep.h"
|
|
|
#include "qapi/error.h"
|
|
|
#include "qemu-common.h"
|
|
|
+#include "qemu/error-report.h"
|
|
|
#include "sysemu/hostmem.h"
|
|
|
#include "sysemu/sysemu.h"
|
|
|
#include "qom/object_interfaces.h"
|
|
@@ -31,9 +32,10 @@ typedef struct HostMemoryBackendFile HostMemoryBackendFile;
|
|
|
struct HostMemoryBackendFile {
|
|
|
HostMemoryBackend parent_obj;
|
|
|
|
|
|
- bool discard_data;
|
|
|
char *mem_path;
|
|
|
uint64_t align;
|
|
|
+ bool discard_data;
|
|
|
+ bool is_pmem;
|
|
|
};
|
|
|
|
|
|
static void
|
|
@@ -59,7 +61,8 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
|
|
|
memory_region_init_ram_from_file(&backend->mr, OBJECT(backend),
|
|
|
path,
|
|
|
backend->size, fb->align,
|
|
|
- backend->share ? RAM_SHARED : 0,
|
|
|
+ (backend->share ? RAM_SHARED : 0) |
|
|
|
+ (fb->is_pmem ? RAM_PMEM : 0),
|
|
|
fb->mem_path, errp);
|
|
|
g_free(path);
|
|
|
}
|
|
@@ -131,6 +134,39 @@ static void file_memory_backend_set_align(Object *o, Visitor *v,
|
|
|
error_propagate(errp, local_err);
|
|
|
}
|
|
|
|
|
|
+static bool file_memory_backend_get_pmem(Object *o, Error **errp)
|
|
|
+{
|
|
|
+ return MEMORY_BACKEND_FILE(o)->is_pmem;
|
|
|
+}
|
|
|
+
|
|
|
+static void file_memory_backend_set_pmem(Object *o, bool value, Error **errp)
|
|
|
+{
|
|
|
+ HostMemoryBackend *backend = MEMORY_BACKEND(o);
|
|
|
+ HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);
|
|
|
+
|
|
|
+ if (host_memory_backend_mr_inited(backend)) {
|
|
|
+ error_setg(errp, "cannot change property 'pmem' of %s '%s'",
|
|
|
+ object_get_typename(o),
|
|
|
+ object_get_canonical_path_component(o));
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+#ifndef CONFIG_LIBPMEM
|
|
|
+ if (value) {
|
|
|
+ Error *local_err = NULL;
|
|
|
+ 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),
|
|
|
+ object_get_canonical_path_component(o));
|
|
|
+ error_propagate(errp, local_err);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+#endif
|
|
|
+
|
|
|
+ fb->is_pmem = value;
|
|
|
+}
|
|
|
+
|
|
|
static void file_backend_unparent(Object *obj)
|
|
|
{
|
|
|
HostMemoryBackend *backend = MEMORY_BACKEND(obj);
|
|
@@ -162,6 +198,9 @@ file_backend_class_init(ObjectClass *oc, void *data)
|
|
|
file_memory_backend_get_align,
|
|
|
file_memory_backend_set_align,
|
|
|
NULL, NULL, &error_abort);
|
|
|
+ object_class_property_add_bool(oc, "pmem",
|
|
|
+ file_memory_backend_get_pmem, file_memory_backend_set_pmem,
|
|
|
+ &error_abort);
|
|
|
}
|
|
|
|
|
|
static void file_backend_instance_finalize(Object *o)
|