From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZnrJK-0006zj-4x for qemu-devel@nongnu.org; Sun, 18 Oct 2015 12:59:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZnrJJ-0000BV-Af for qemu-devel@nongnu.org; Sun, 18 Oct 2015 12:59:54 -0400 Received: from mga09.intel.com ([134.134.136.24]:16793) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZnrJJ-00008u-5g for qemu-devel@nongnu.org; Sun, 18 Oct 2015 12:59:53 -0400 From: Xiao Guangrong Date: Mon, 19 Oct 2015 08:53:56 +0800 Message-Id: <1445216059-88521-11-git-send-email-guangrong.xiao@linux.intel.com> In-Reply-To: <1445216059-88521-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1445216059-88521-1-git-send-email-guangrong.xiao@linux.intel.com> Subject: [Qemu-devel] [PATCH v4 10/33] hostmem-file: clean up memory allocation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: pbonzini@redhat.com, imammedo@redhat.com Cc: Xiao Guangrong , ehabkost@redhat.com, kvm@vger.kernel.org, mst@redhat.com, gleb@kernel.org, mtosatti@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, dan.j.williams@intel.com, rth@twiddle.net - hostmem-file.c is compiled only if CONFIG_LINUX is enabled so that is unnecessary to do the same check in the source file - the interface, HostMemoryBackendClass->alloc(), is not called many times, do not need to check if the memory-region is initialized Signed-off-by: Xiao Guangrong --- backends/hostmem-file.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c index e9b6d21..9097a57 100644 --- a/backends/hostmem-file.c +++ b/backends/hostmem-file.c @@ -46,17 +46,12 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) error_setg(errp, "mem-path property not set"); return; } -#ifndef CONFIG_LINUX - error_setg(errp, "-mem-path not supported on this host"); -#else - if (!memory_region_size(&backend->mr)) { - backend->force_prealloc = mem_prealloc; - memory_region_init_ram_from_file(&backend->mr, OBJECT(backend), + + backend->force_prealloc = mem_prealloc; + memory_region_init_ram_from_file(&backend->mr, OBJECT(backend), object_get_canonical_path(OBJECT(backend)), backend->size, fb->share, fb->mem_path, errp); - } -#endif } static void -- 1.8.3.1