From patchwork Wed Jul 31 13:11:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 263694 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 086102C0122 for ; Wed, 31 Jul 2013 23:11:53 +1000 (EST) Received: from localhost ([::1]:38034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4WBy-0004oZ-UI for incoming@patchwork.ozlabs.org; Wed, 31 Jul 2013 09:11:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4WBZ-0004cH-Jq for qemu-devel@nongnu.org; Wed, 31 Jul 2013 09:11:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4WBS-0006Ts-Js for qemu-devel@nongnu.org; Wed, 31 Jul 2013 09:11:25 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:60881) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4WBS-0006SY-7G 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 A3C0AA43D6; Wed, 31 Jul 2013 15:11:13 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8C305200B6; Wed, 31 Jul 2013 15:11:12 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2013 15:11:05 +0200 Message-Id: <1375276272-15988-2-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 1/8] exec: Fix Xen RAM allocation with unusual options 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 Issues: * We try to obey -mem-path even though it can't work with Xen. * To implement -machine mem-merge, we call memory_try_enable_merging(new_block->host, size). But with Xen, new_block->host remains null. Oops. Fix by separating Xen allocation from normal allocation. Acked-by: Stefano Stabellini Signed-off-by: Markus Armbruster --- exec.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/exec.c b/exec.c index c4f2894..5b1be92 100644 --- a/exec.c +++ b/exec.c @@ -1119,6 +1119,12 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, if (host) { new_block->host = host; new_block->flags |= RAM_PREALLOC_MASK; + } else if (xen_enabled()) { + if (mem_path) { + fprintf(stderr, "-mem-path not supported with Xen\n"); + exit(1); + } + xen_ram_alloc(new_block->offset, size, mr); } else { if (mem_path) { #if defined (__linux__) && !defined(TARGET_S390X) @@ -1132,9 +1138,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, exit(1); #endif } else { - if (xen_enabled()) { - xen_ram_alloc(new_block->offset, size, mr); - } else if (kvm_enabled()) { + if (kvm_enabled()) { /* some s390/kvm configurations have special constraints */ new_block->host = kvm_ram_alloc(size); } else { @@ -1212,6 +1216,8 @@ void qemu_ram_free(ram_addr_t addr) ram_list.version++; if (block->flags & RAM_PREALLOC_MASK) { ; + } else if (xen_enabled()) { + xen_invalidate_map_cache_entry(block->host); } else if (mem_path) { #if defined (__linux__) && !defined(TARGET_S390X) if (block->fd) { @@ -1224,11 +1230,7 @@ void qemu_ram_free(ram_addr_t addr) abort(); #endif } else { - if (xen_enabled()) { - xen_invalidate_map_cache_entry(block->host); - } else { - qemu_anon_ram_free(block->host, block->length); - } + qemu_anon_ram_free(block->host, block->length); } g_free(block); break; @@ -1252,6 +1254,8 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) vaddr = block->host + offset; if (block->flags & RAM_PREALLOC_MASK) { ; + } else if (xen_enabled()) { + abort(); } else { flags = MAP_FIXED; munmap(vaddr, length);