Following the example documented since commit e3fe3988d7 ("error:
Document Error API usage rules"), have cpu_exec_realizefn()
return a boolean indicating whether an error is set or not.
Signed-off-by: Philippe Mathieu-Daudé
---
include/sysemu/hostmem.h | 10 +-
backends/hostmem-epc.c | 11 +--
backends/hostmem-file.c | 19 ++-
backends/hostmem-memfd.c | 10 +-
backends/hostmem-ram.c | 9 +
backends/hostmem.c | 5 ++---
6 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h
index 39326f1d4f..0e411aaa29 100644
--- a/include/sysemu/hostmem.h
+++ b/include/sysemu/hostmem.h
@@ -47,7 +47,15 @@ OBJECT_DECLARE_TYPE(HostMemoryBackend,
HostMemoryBackendClass,
struct HostMemoryBackendClass {
ObjectClass parent_class;
-void (*alloc)(HostMemoryBackend *backend, Error **errp);
+/**
+ * alloc: Allocate memory from backend.
+ *
+ * @backend: the #HostMemoryBackend.
+ * @errp: pointer to Error*, to store an error if it happens.
+ *
+ * Return: true on success, else false setting @errp with error.
+ */
+bool (*alloc)(HostMemoryBackend *backend, Error **errp);
};
/**
diff --git a/backends/hostmem-epc.c b/backends/hostmem-epc.c
index 3ceb079f9e..735e2e1cf8 100644
--- a/backends/hostmem-epc.c
+++ b/backends/hostmem-epc.c
@@ -17,7 +17,7 @@
#include "sysemu/hostmem.h"
#include "hw/i386/hostmem-epc.h"
-static void
+static bool
sgx_epc_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
{
g_autofree char *name = NULL;
@@ -26,21 +26,20 @@ sgx_epc_backend_memory_alloc(HostMemoryBackend *backend,
Error **errp)
if (!backend->size) {
error_setg(errp, "can't create backend with size 0");
-return;
+return false;
}
fd = qemu_open_old("/dev/sgx_vepc", O_RDWR);
if (fd < 0) {
error_setg_errno(errp, errno,
"failed to open /dev/sgx_vepc to alloc SGX EPC");
-return;
+return false;
}
name = object_get_canonical_path(OBJECT(backend));
ram_flags = (backend->share ? RAM_SHARED : 0) | RAM_PROTECTED;
-memory_region_init_ram_from_fd(>mr, OBJECT(backend),
- name, backend->size, ram_flags,
- fd, 0, errp);
+return memory_region_init_ram_from_fd(>mr, OBJECT(backend), name,
+ backend->size, ram_flags, fd, 0,
errp);
}
static void sgx_epc_backend_instance_init(Object *obj)
diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
index fe8c481f8f..ac3e433cbd 100644
--- a/backends/hostmem-file.c
+++ b/backends/hostmem-file.c
@@ -36,12 +36,13 @@ struct HostMemoryBackendFile {
OnOffAuto rom;
};
-static void
+static bool
file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
{
#ifndef CONFIG_POSIX
error_setg(errp, "backend '%s' not supported on this host",
object_get_typename(OBJECT(backend)));
+return false;
#else
HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(backend);
g_autofree gchar *name = NULL;
@@ -49,11 +50,11 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error
**errp)
if (!backend->size) {
error_setg(errp, "can't create backend with size 0");
-return;
+return false;
}
if (!fb->mem_path) {
error_setg(errp, "mem-path property not set");
-return;
+return false;
}
switch (fb->rom) {
@@ -65,18 +66,18 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error
**errp)
if (!fb->readonly) {
error_setg(errp, "property 'rom' = 'on' is not supported with"
" 'readonly' = 'off'");
-return;
+return false;
}
break;
case ON_OFF_AUTO_OFF:
if (fb->readonly && backend->share) {
error_setg(errp, "property 'rom' = 'off' is incompatible with"
" 'readonly' = 'on' and 'share' = 'on'");
-return;
+return false;
}
break;
default:
-assert(false);
+g_assert_not_reached();
}
name = host_memory_backend_get_name(backend);
@@ -86,9 +87,9 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error
**errp)
ram_flags |= backend->reserve ? 0 : RAM_NORESERVE;
ram_flags |= fb->is_pmem ? RAM_PMEM : 0;
ram_flags |= RAM_NAMED_FILE;
-memory_region_init_ram_from_file(>mr, OBJECT(backend), name,
- backend->size, fb->align, ram_flags,
- fb->mem_path, fb->offset, errp);
+return memory_region_init_ram_from_file(>mr, OBJECT(backend),
name,
+backend->size, fb->align,
ram_flags,
+fb->mem_path, fb->offset, errp);
