From patchwork Wed Mar 6 11:07:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1052301 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44DrnD2sdDz9s9N for ; Wed, 6 Mar 2019 22:16:48 +1100 (AEDT) Received: from localhost ([127.0.0.1]:59456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UXW-0003Qy-AV for incoming@patchwork.ozlabs.org; Wed, 06 Mar 2019 06:16:46 -0500 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 Received: from mout.kundenserver.de ([217.72.192.74]:34575) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1UPU-0002Kh-T6; Wed, 06 Mar 2019 06:08:29 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MYNW8-1gWC7j0UWw-00VQsB; Wed, 06 Mar 2019 12:07:41 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2019 12:07:10 +0100 Message-Id: <20190306110711.309-10-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190306110711.309-1-laurent@vivier.eu> References: <20190306110711.309-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:EIQ2MrmTkDMjQDlxKKFoQHKCip2VxS79yw3nG/bZ7V1n5Rr+kLE HTEMToeoh2ik437K2rRTUXpWRZMoMPU5Iww1wszPUi2/lZLJI9rcv8v6VOuK0JC0q5ozGOz f/o3RI9aruUlmKK4zxMCa17jwGNUGLkxdDD1mJPXM/y0IvvcB1fCOmVwZNHdvEX3NeeRWmT 414lPK51Mi7sruoUoY7bA== X-UI-Out-Filterresults: notjunk:1; V03:K0:8SWa3ZNamPQ=:rc0koxLwhQkQA8WoouhueW IseJO9a4QVonALTfNzYmNkrW7BiSMKrlOhp17GI197eUEz/sI4pFnlO+l6T8LhLUZUvAxQX9u 9kaOAX1E23iIsAImBwSBwCtXrrtcFlxp7UvuydGAMFI00/AreFcW8r7DPRnzg0EYYfBFhGIIN 3Gg4I9gfNETKF7AqF8cfYDvCEcufFDRijudLU3w1loaG6NNxp/od8JSHGtaSuycc5AxXcYWJ8 o6Hk/PG3jIjjr7quHJslvianQjewrD6EQmdYCGWSzGxAC0HoTlHFxpYKzppTyBHsUQx+zaf0w gd3PaQhvYb7uIXASbcnS+WyzTgfZH8WBgM1U/KQ9AU1eYAs+NdDLRMPsYdgOwCtpyEfmvL2Oy imku7StHcguVt7ZaQFuvZTSfzjRJ1tPqXX6I18mnz9+zgCY+Tzkn35Puw2U3nXn/dEmIuOTG2 XnaB7cmqpUMoK7gp7e8xQrIdfAuuXnWujq1sEp7qc9qhC9uI/ftJKSAKIyyUWMUxtzoyOVJq8 bS+/NtIJkKbARdEHzH/OSxmjAs/lGK+Pah9vk0uflUDaD0KoK5AxlvhbpF5GZOiBZgxJ2xdAs BQAaY6Qlx+8z2L8KpgrgaFr3J1mA7pgEFvP18NNykHlNms5iphiu19Y9DFkPT9mBvtNefiqqg e7eZAxGvsg8hntb+lVoMC6te5NsKXmTWMwMIycKgP8738UWVLfYJ0bF42j2mVar1Gt7istfwC 9oCUmpMchm1lJvsDjzxIDSnrOW8+mgT81HrO1Q== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 09/10] hostmem-file: simplify ifdef-s in file_backend_memory_alloc() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi , Li Zhijian , "Michael S. Tsirkin" , Michael Tokarev , Paolo Bonzini , zhanghailiang , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Halil Pasic , Christian Borntraeger , Laurent Vivier , Tony Krowiak , Thomas Huth , Eduardo Habkost , Corey Minyard , Riku Voipio , qemu-s390x@nongnu.org, Pavel Dovgalyuk , Zhang Chen , John Snow , Richard Henderson , Kevin Wolf , Pierre Morel , Cornelia Huck , Laurent Vivier , Max Reitz , Wei Yang , Igor Mammedov Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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),