From patchwork Wed Jul 31 13:11:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 263807 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D19492C00AB for ; Thu, 1 Aug 2013 07:32:26 +1000 (EST) Received: from localhost ([::1]:58715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4e0O-0002X4-Qi for incoming@patchwork.ozlabs.org; Wed, 31 Jul 2013 17:32:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4e01-0002Wp-Io for qemu-devel@nongnu.org; Wed, 31 Jul 2013 17:32:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4WBS-0006TM-Cq for qemu-devel@nongnu.org; Wed, 31 Jul 2013 09:11:26 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:60888) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4WBR-0006Sa-Qx for qemu-devel@nongnu.org; Wed, 31 Jul 2013 09:11:18 -0400 Received: from blackfin.pond.sub.org (p5B32B152.dip0.t-ipconnect.de [91.50.177.82]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 95BC3A43D5; Wed, 31 Jul 2013 15:11:13 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AABDE200B9; Wed, 31 Jul 2013 15:11:12 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2013 15:11:07 +0200 Message-Id: <1375276272-15988-4-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1375276272-15988-1-git-send-email-armbru@redhat.com> References: <1375276272-15988-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:4f8:121:10e4::3 Cc: peter.maydell@linaro.org, stefano.stabellini@eu.citrix.com, mtosatti@redhat.com, agraf@suse.de, borntraeger@de.ibm.com, mkletzan@redhat.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net Subject: [Qemu-devel] [PATCH v3 for 1.6 3/8] exec: Reduce ifdeffery around -mem-path X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Instead of spreading its ifdeffery everywhere, confine it to qemu_ram_alloc_from_ptr(). Everywhere else, simply test block->fd, which is non-negative exactly when block uses -mem-path. Signed-off-by: Markus Armbruster --- exec.c | 37 ++++++++++--------------------------- include/exec/cpu-all.h | 2 -- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/exec.c b/exec.c index 957266c..4a825fa 100644 --- a/exec.c +++ b/exec.c @@ -1111,6 +1111,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, size = TARGET_PAGE_ALIGN(size); new_block = g_malloc0(sizeof(*new_block)); + new_block->fd = -1; /* This assumes the iothread lock is taken here too. */ qemu_mutex_lock_ramlist(); @@ -1215,17 +1216,9 @@ void qemu_ram_free(ram_addr_t addr) ; } else if (xen_enabled()) { xen_invalidate_map_cache_entry(block->host); - } else if (mem_path) { -#if defined (__linux__) && !defined(TARGET_S390X) - if (block->fd) { - munmap(block->host, block->length); - close(block->fd); - } else { - qemu_anon_ram_free(block->host, block->length); - } -#else - abort(); -#endif + } else if (block->fd >= 0) { + munmap(block->host, block->length); + close(block->fd); } else { qemu_anon_ram_free(block->host, block->length); } @@ -1256,25 +1249,15 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) } else { flags = MAP_FIXED; munmap(vaddr, length); - if (mem_path) { -#if defined(__linux__) && !defined(TARGET_S390X) - if (block->fd) { + if (block->fd >= 0) { #ifdef MAP_POPULATE - flags |= mem_prealloc ? MAP_POPULATE | MAP_SHARED : - MAP_PRIVATE; + flags |= mem_prealloc ? MAP_POPULATE | MAP_SHARED : + MAP_PRIVATE; #else - flags |= MAP_PRIVATE; -#endif - area = mmap(vaddr, length, PROT_READ | PROT_WRITE, - flags, block->fd, offset); - } else { - flags |= MAP_PRIVATE | MAP_ANONYMOUS; - area = mmap(vaddr, length, PROT_READ | PROT_WRITE, - flags, -1, 0); - } -#else - abort(); + flags |= MAP_PRIVATE; #endif + area = mmap(vaddr, length, PROT_READ | PROT_WRITE, + flags, block->fd, offset); } else { #if defined(TARGET_S390X) && defined(CONFIG_KVM) flags |= MAP_SHARED | MAP_ANONYMOUS; diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index a407b50..b6998f0 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -453,9 +453,7 @@ typedef struct RAMBlock { * Writes must take both locks. */ QTAILQ_ENTRY(RAMBlock) next; -#if defined(__linux__) && !defined(TARGET_S390X) int fd; -#endif } RAMBlock; typedef struct RAMList {