From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpZha-0000vr-Gg for qemu-devel@nongnu.org; Thu, 20 Jun 2013 03:54:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UpZhY-000680-0d for qemu-devel@nongnu.org; Thu, 20 Jun 2013 03:54:42 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:39001) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpZhX-00067W-P7 for qemu-devel@nongnu.org; Thu, 20 Jun 2013 03:54:39 -0400 From: Markus Armbruster Date: Thu, 20 Jun 2013 09:54:30 +0200 Message-Id: <1371714876-2317-3-git-send-email-armbru@redhat.com> In-Reply-To: <1371714876-2317-1-git-send-email-armbru@redhat.com> References: <1371714876-2317-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/8] exec: Clean up fall back when -mem-path allocation fails 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 With -mem-path, qemu_ram_alloc_from_ptr() first tries to allocate accordingly, but when it fails, it falls back to normal allocation. The fall back allocation code used to be effectively identical to the "-mem-path not given" code, until it started to diverge in commit 432d268. I believe the code still works, but clean it up anyway: drop the special fall back allocation code, and fall back to the ordinary "-mem-path not given" code instead. Reviewed-by: Paolo Bonzini Signed-off-by: Markus Armbruster --- exec.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/exec.c b/exec.c index b424e12..56c31a9 100644 --- a/exec.c +++ b/exec.c @@ -1091,15 +1091,12 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, if (mem_path) { #if defined (__linux__) && !defined(TARGET_S390X) new_block->host = file_ram_alloc(new_block, size, mem_path); - if (!new_block->host) { - new_block->host = qemu_anon_ram_alloc(size); - memory_try_enable_merging(new_block->host, size); - } #else fprintf(stderr, "-mem-path option unsupported\n"); exit(1); #endif - } else { + } + if (!new_block->host) { if (kvm_enabled()) { /* some s390/kvm configurations have special constraints */ new_block->host = kvm_ram_alloc(size); -- 1.7.11.7