From patchwork Wed Jul 31 13:11:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 263706 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 4A2C22C00BE for ; Wed, 31 Jul 2013 23:37:28 +1000 (EST) Received: from localhost ([::1]:46007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4Waj-0002PM-Ax for incoming@patchwork.ozlabs.org; Wed, 31 Jul 2013 09:37:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4WaP-0002P2-45 for qemu-devel@nongnu.org; Wed, 31 Jul 2013 09:37:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4WBT-0006UP-1X for qemu-devel@nongnu.org; Wed, 31 Jul 2013 09:11:28 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:60934) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4WBS-0006Tm-OG 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 7E9D0A5C62; Wed, 31 Jul 2013 15:11:16 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D40FA200BD; Wed, 31 Jul 2013 15:11:12 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2013 15:11:10 +0200 Message-Id: <1375276272-15988-7-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 6/8] exec: Clean up unnecessary S390 ifdeffery 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 Another issue missed in commit fdec991 is -mem-path: it needs to be rejected only for old S390 KVM, not for any S390. Not that I personally care, but the ifdeffery in qemu_ram_alloc_from_ptr() annoys me. Note that this doesn't actually make -mem-path work, as the kernel doesn't (yet?) support large pages in the host for KVM guests. Clean it up anyway. Thanks to Christian Borntraeger for pointing out the S390 kernel limitations. Signed-off-by: Markus Armbruster --- exec.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/exec.c b/exec.c index dea4b1a..231d04e 100644 --- a/exec.c +++ b/exec.c @@ -904,7 +904,7 @@ void qemu_mutex_unlock_ramlist(void) qemu_mutex_unlock(&ram_list.mutex); } -#if defined(__linux__) && !defined(TARGET_S390X) +#ifdef __linux__ #include @@ -1007,6 +1007,14 @@ static void *file_ram_alloc(RAMBlock *block, block->fd = fd; return area; } +#else +static void *file_ram_alloc(RAMBlock *block, + ram_addr_t memory, + const char *path) +{ + fprintf(stderr, "-mem-path not supported on this host\n"); + exit(1); +} #endif static ram_addr_t find_ram_offset(ram_addr_t size) @@ -1140,12 +1148,17 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, xen_ram_alloc(new_block->offset, size, mr); } else { if (mem_path) { -#if defined (__linux__) && !defined(TARGET_S390X) + if (phys_mem_alloc != qemu_anon_ram_alloc) { + /* + * file_ram_alloc() needs to allocate just like + * phys_mem_alloc, but we haven't bothered to provide + * a hook there. + */ + fprintf(stderr, + "-mem-path not supported with this accelerator\n"); + exit(1); + } new_block->host = file_ram_alloc(new_block, size, mem_path); -#else - fprintf(stderr, "-mem-path option unsupported\n"); - exit(1); -#endif } if (!new_block->host) { new_block->host = phys_mem_alloc(size);