From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Riku Voipio <riku.voipio@iki.fi>,
Zhang Chen <zhangckid@gmail.com>,
zhanghailiang <zhang.zhanghailiang@huawei.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Cornelia Huck <cohuck@redhat.com>, Kevin Wolf <kwolf@redhat.com>,
Richard Henderson <rth@twiddle.net>,
Thomas Huth <thuth@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Li Zhijian <lizhijian@cn.fujitsu.com>,
John Snow <jsnow@redhat.com>, Halil Pasic <pasic@linux.ibm.com>,
Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>,
Laurent Vivier <laurent@vivier.eu>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-block@nongnu.org,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Tony Krowiak <akrowiak@linux.ibm.com>,
Max Reitz <mreitz@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
qemu-trivial@nongnu.org, Laurent Vivier <lvivier@redhat.com>,
Michael Tokarev <mjt@tls.msk.ru>,
qemu-s390x@nongnu.org, Corey Minyard <minyard@acm.org>,
Pierre Morel <pmorel@linux.ibm.com>,
Wei Yang <richardw.yang@linux.intel.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL 09/10] hostmem-file: simplify ifdef-s in file_backend_memory_alloc()
Date: Wed, 6 Mar 2019 12:07:10 +0100 [thread overview]
Message-ID: <20190306110711.309-10-laurent@vivier.eu> (raw)
In-Reply-To: <20190306110711.309-1-laurent@vivier.eu>
From: Igor Mammedov <imammedo@redhat.com>
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 <imammedo@redhat.com>
Suggested-by: Wei Yang <richardw.yang@linux.intel.com>
Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
Message-Id: <20190213123858.24620-1-imammedo@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20190214031004.32522-2-stefanha@redhat.com>
[lv: s/hostmem/hostmem-file/]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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
next prev parent reply other threads:[~2019-03-06 11:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-06 11:07 [Qemu-devel] [PULL 00/10] Trivial branch patches Laurent Vivier
2019-03-06 11:07 ` [Qemu-devel] [PULL 01/10] tests: Remove (mostly) useless architecture checks Laurent Vivier
2019-03-06 11:07 ` [Qemu-devel] [PULL 02/10] hw/i386/pc.c: remove unused function pc_acpi_init() Laurent Vivier
2019-03-06 11:07 ` [Qemu-devel] [PULL 03/10] hw/acpi: remove unused function acpi_table_add_builtin() Laurent Vivier
2019-03-06 11:07 ` [Qemu-devel] [PULL 04/10] hw/acpi: remove unnecessary variable acpi_table_builtin Laurent Vivier
2019-03-06 11:07 ` [Qemu-devel] [PULL 05/10] block/pflash_cfi02: Fix memory leak and potential use-after-free Laurent Vivier
2019-03-06 11:07 ` [Qemu-devel] [PULL 06/10] doc: fix typos for documents in tree Laurent Vivier
2019-03-06 11:07 ` [Qemu-devel] [PULL 07/10] bswap: Fix accessors syntax in comment Laurent Vivier
2019-03-06 11:07 ` [Qemu-devel] [PULL 08/10] build: Correct explanation of unnest-vars example Laurent Vivier
2019-03-06 11:07 ` Laurent Vivier [this message]
2019-03-06 11:07 ` [Qemu-devel] [PULL 10/10] thunk: fix of malloc to g_new Laurent Vivier
2019-03-06 14:50 ` [Qemu-devel] [PULL 00/10] Trivial branch patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190306110711.309-10-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=akrowiak@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=lvivier@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=minyard@acm.org \
--cc=mjt@tls.msk.ru \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pavel.dovgaluk@ispras.ru \
--cc=pbonzini@redhat.com \
--cc=pmorel@linux.ibm.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=richardw.yang@linux.intel.com \
--cc=riku.voipio@iki.fi \
--cc=rth@twiddle.net \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
--cc=zhang.zhanghailiang@huawei.com \
--cc=zhangckid@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).