From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:35806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UPr-0005Ve-Qb for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1UPr-0002ZK-33 for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:51 -0500 From: Laurent Vivier Date: Wed, 6 Mar 2019 12:07:10 +0100 Message-Id: <20190306110711.309-10-laurent@vivier.eu> In-Reply-To: <20190306110711.309-1-laurent@vivier.eu> References: <20190306110711.309-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 09/10] hostmem-file: simplify ifdef-s in file_backend_memory_alloc() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Riku Voipio , Zhang Chen , zhanghailiang , Christian Borntraeger , Cornelia Huck , Kevin Wolf , Richard Henderson , Thomas Huth , Igor Mammedov , Li Zhijian , John Snow , Halil Pasic , Pavel Dovgalyuk , Laurent Vivier , Eduardo Habkost , qemu-block@nongnu.org, Marcel Apfelbaum , Tony Krowiak , Max Reitz , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Laurent Vivier , Michael Tokarev , qemu-s390x@nongnu.org, Corey Minyard , Pierre Morel , Wei Yang , Stefan Hajnoczi From: Igor Mammedov 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 Suggested-by: Wei Yang Reviewed-by: Wei Yang Message-Id: <20190213123858.24620-1-imammedo@redhat.com> Signed-off-by: Stefan Hajnoczi Message-Id: <20190214031004.32522-2-stefanha@redhat.com> [lv: s/hostmem/hostmem-file/] Signed-off-by: Laurent Vivier --- 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