From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpGoS-0008Sd-Vi for qemu-devel@nongnu.org; Wed, 19 Jun 2013 07:44:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UpGoP-0001N8-9G for qemu-devel@nongnu.org; Wed, 19 Jun 2013 07:44:32 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:35639) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpGoO-0001MF-TF for qemu-devel@nongnu.org; Wed, 19 Jun 2013 07:44:29 -0400 From: Markus Armbruster Date: Wed, 19 Jun 2013 13:44:19 +0200 Message-Id: <1371642264-17704-4-git-send-email-armbru@redhat.com> In-Reply-To: <1371642264-17704-1-git-send-email-armbru@redhat.com> References: <1371642264-17704-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 3/8] exec: Reduce ifdeffery around -mem-path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, stefano.stabellini@eu.citrix.com, mtosatti@redhat.com, agraf@suse.de, borntraeger@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net 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 56c31a9..4dbb0f1 100644 --- a/exec.c +++ b/exec.c @@ -1073,6 +1073,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(); @@ -1177,17 +1178,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); } @@ -1218,25 +1211,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 e9c3717..c369b25 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -476,9 +476,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 { -- 1.7.11.7