[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[qemu-s390x] [PULL 09/10] hostmem-file: simplify ifdef-s in file_backend
From: |
Laurent Vivier |
Subject: |
[qemu-s390x] [PULL 09/10] hostmem-file: simplify ifdef-s in file_backend_memory_alloc() |
Date: |
Wed, 6 Mar 2019 12:07:10 +0100 |
From: Igor Mammedov <address@hidden>
cleanup file_backend_memory_alloc() by using one CONFIG_POSIX ifdef
instead of several ones within the function to make it simpler to follow.
Signed-off-by: Igor Mammedov <address@hidden>
Suggested-by: Wei Yang <address@hidden>
Reviewed-by: Wei Yang <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-Id: <address@hidden>
[lv: s/hostmem/hostmem-file/]
Signed-off-by: Laurent Vivier <address@hidden>
---
backends/hostmem-file.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
index ba601ce94088..ce5478804804 100644
--- a/backends/hostmem-file.c
+++ b/backends/hostmem-file.c
@@ -41,10 +41,12 @@ struct HostMemoryBackendFile {
static void
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)));
+#else
HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(backend);
-#ifdef CONFIG_POSIX
gchar *name;
-#endif
if (!backend->size) {
error_setg(errp, "can't create backend with size 0");
@@ -54,9 +56,6 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error
**errp)
error_setg(errp, "mem-path property not set");
return;
}
-#ifndef CONFIG_POSIX
- error_setg(errp, "-mem-path not supported on this host");
-#else
backend->force_prealloc = mem_prealloc;
name = host_memory_backend_get_name(backend);
memory_region_init_ram_from_file(&backend->mr, OBJECT(backend),
--
2.20.1
- [qemu-s390x] [PULL 00/10] Trivial branch patches, Laurent Vivier, 2019/03/06
- [qemu-s390x] [PULL 05/10] block/pflash_cfi02: Fix memory leak and potential use-after-free, Laurent Vivier, 2019/03/06
- [qemu-s390x] [PULL 07/10] bswap: Fix accessors syntax in comment, Laurent Vivier, 2019/03/06
- [qemu-s390x] [PULL 04/10] hw/acpi: remove unnecessary variable acpi_table_builtin, Laurent Vivier, 2019/03/06
- [qemu-s390x] [PULL 03/10] hw/acpi: remove unused function acpi_table_add_builtin(), Laurent Vivier, 2019/03/06
- [qemu-s390x] [PULL 02/10] hw/i386/pc.c: remove unused function pc_acpi_init(), Laurent Vivier, 2019/03/06
- [qemu-s390x] [PULL 10/10] thunk: fix of malloc to g_new, Laurent Vivier, 2019/03/06
- [qemu-s390x] [PULL 08/10] build: Correct explanation of unnest-vars example, Laurent Vivier, 2019/03/06
- [qemu-s390x] [PULL 09/10] hostmem-file: simplify ifdef-s in file_backend_memory_alloc(),
Laurent Vivier <=
- [qemu-s390x] [PULL 06/10] doc: fix typos for documents in tree, Laurent Vivier, 2019/03/06
- [qemu-s390x] [PULL 01/10] tests: Remove (mostly) useless architecture checks, Laurent Vivier, 2019/03/06
- Re: [qemu-s390x] [Qemu-devel] [PULL 00/10] Trivial branch patches, Peter Maydell, 2019/03/06