From patchwork Thu Jun 13 07:02:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 250988 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 242BD2C0099 for ; Thu, 13 Jun 2013 17:03:11 +1000 (EST) Received: from localhost ([::1]:35575 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un1Yr-00036u-0T for incoming@patchwork.ozlabs.org; Thu, 13 Jun 2013 03:03:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un1YE-00031x-9E for qemu-devel@nongnu.org; Thu, 13 Jun 2013 03:02:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Un1Y7-00032W-Rb for qemu-devel@nongnu.org; Thu, 13 Jun 2013 03:02:30 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:39440) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un1Y7-00031a-Hl for qemu-devel@nongnu.org; Thu, 13 Jun 2013 03:02:23 -0400 Received: from blackfin.pond.sub.org (p5B32AA2B.dip0.t-ipconnect.de [91.50.170.43]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 15FBA9FE59; Thu, 13 Jun 2013 09:02:20 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7FB10200B6; Thu, 13 Jun 2013 09:02:19 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 13 Jun 2013 09:02:15 +0200 Message-Id: <1371106939-6968-5-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1371106939-6968-1-git-send-email-armbru@redhat.com> References: <1371106939-6968-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: mtosatti@redhat.com, borntraeger@de.ibm.com, pbonzini@redhat.com, agraf@suse.de, stefano.stabellini@eu.citrix.com Subject: [Qemu-devel] [PATCH RFC 4/8] s390: Simplify the RAM allocation hook 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 Less code and ifdeffery. Signed-off-by: Markus Armbruster Reviewed-by: Andreas Färber --- exec.c | 4 ++-- include/sysemu/kvm.h | 3 +-- kvm-all.c | 15 ++------------- target-s390x/kvm.c | 17 ++++++----------- 4 files changed, 11 insertions(+), 28 deletions(-) diff --git a/exec.c b/exec.c index 4dbb0f1..7552e3c 100644 --- a/exec.c +++ b/exec.c @@ -1098,9 +1098,9 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, #endif } if (!new_block->host) { - if (kvm_enabled()) { + if (kvm_enabled() && kvm_arch_ram_alloc) { /* some s390/kvm configurations have special constraints */ - new_block->host = kvm_ram_alloc(size); + new_block->host = kvm_arch_ram_alloc(size); } else { new_block->host = qemu_anon_ram_alloc(size); } diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 8b19322..dd79914 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -152,8 +152,7 @@ int kvm_init_vcpu(CPUState *cpu); int kvm_cpu_exec(CPUArchState *env); #if !defined(CONFIG_USER_ONLY) -void *kvm_ram_alloc(ram_addr_t size); -void *kvm_arch_ram_alloc(ram_addr_t size); +extern void *(*kvm_arch_ram_alloc)(ram_addr_t size); #endif void kvm_setup_guest_memory(void *start, size_t size); diff --git a/kvm-all.c b/kvm-all.c index 405480e..5e0cc9b 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -119,6 +119,8 @@ static const KVMCapabilityInfo kvm_required_capabilites[] = { KVM_CAP_LAST_INFO }; +void *(*kvm_arch_ram_alloc)(ram_addr_t size); + static KVMSlot *kvm_alloc_slot(KVMState *s) { int i; @@ -1816,19 +1818,6 @@ int kvm_has_intx_set_mask(void) return kvm_state->intx_set_mask; } -void *kvm_ram_alloc(ram_addr_t size) -{ -#ifdef TARGET_S390X - void *mem; - - mem = kvm_arch_ram_alloc(size); - if (mem) { - return mem; - } -#endif - return qemu_anon_ram_alloc(size); -} - void kvm_setup_guest_memory(void *start, size_t size) { #ifdef CONFIG_VALGRIND_H diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 862fb12..be802ab 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -92,9 +92,15 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = { static int cap_sync_regs; +static void *legacy_s390_alloc(ram_addr_t size); + int kvm_arch_init(KVMState *s) { cap_sync_regs = kvm_check_extension(s, KVM_CAP_SYNC_REGS); + if (!kvm_check_extension(s, KVM_CAP_S390_GMAP) + || !kvm_check_extension(s, KVM_CAP_S390_COW)) { + kvm_arch_ram_alloc = legacy_s390_alloc; + } return 0; } @@ -332,17 +338,6 @@ static void *legacy_s390_alloc(ram_addr_t size) return mem; } -void *kvm_arch_ram_alloc(ram_addr_t size) -{ - /* Can we use the standard allocation ? */ - if (kvm_check_extension(kvm_state, KVM_CAP_S390_GMAP) && - kvm_check_extension(kvm_state, KVM_CAP_S390_COW)) { - return NULL; - } else { - return legacy_s390_alloc(size); - } -} - int kvm_arch_insert_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *bp) { S390CPU *cpu = S390_CPU(cs);