diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-06 11:58:10 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-06 11:58:10 +0000 |
| commit | 9b748c5e061b1202fba59afd857e16a693743d90 (patch) | |
| tree | 98d795211d01e15820961febb70af5c87576306d /backends | |
| parent | b5b6b2b912bbcd3953407da938a8f969577ad3a1 (diff) | |
| parent | 0e081fde8a3d80383adf2e802fc0c03af44c5436 (diff) | |
| download | qemu-9b748c5e061b1202fba59afd857e16a693743d90.zip qemu-9b748c5e061b1202fba59afd857e16a693743d90.tar.gz qemu-9b748c5e061b1202fba59afd857e16a693743d90.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
trivial patches pull request (20190206)
- acpi: remove unused functions/variables
- tests: remove useless architecture checks
- some typo fixes and documentation update
- flash_cfi02: fix memory leak
# gpg: Signature made Wed 06 Mar 2019 11:05:12 GMT
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-pull-request:
thunk: fix of malloc to g_new
hostmem-file: simplify ifdef-s in file_backend_memory_alloc()
build: Correct explanation of unnest-vars example
bswap: Fix accessors syntax in comment
doc: fix typos for documents in tree
block/pflash_cfi02: Fix memory leak and potential use-after-free
hw/acpi: remove unnecessary variable acpi_table_builtin
hw/acpi: remove unused function acpi_table_add_builtin()
hw/i386/pc.c: remove unused function pc_acpi_init()
tests: Remove (mostly) useless architecture checks
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/hostmem-file.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c index ba601ce..ce54788 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), |