From patchwork Tue Feb 2 08:18:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 76318 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o128Jmr9030581 for ; Tue, 2 Feb 2010 08:19:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755081Ab0BBITq (ORCPT ); Tue, 2 Feb 2010 03:19:46 -0500 Received: from thoth.sbs.de ([192.35.17.2]:20619 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751300Ab0BBITl (ORCPT ); Tue, 2 Feb 2010 03:19:41 -0500 Received: from mail2.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id o128JBth010270; Tue, 2 Feb 2010 09:19:11 +0100 Received: from localhost.localdomain ([139.25.173.39]) by mail2.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o128J7sM008551; Tue, 2 Feb 2010 09:19:10 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, Anthony Liguori , Alexander Graf , Glauber Costa , qemu-devel@nongnu.org Subject: [PATCH 06/21] qemu-kvm: Use upstream kvm_setup_guest_memory Date: Tue, 2 Feb 2010 09:18:52 +0100 Message-Id: <167f34d89d88dc44ef584170d1aa44af07f00544.1265098707.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 02 Feb 2010 08:19:49 +0000 (UTC) diff --git a/kvm-all.c b/kvm-all.c index 0423fff..e7fa605 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -886,7 +886,6 @@ int kvm_has_vcpu_events(void) return kvm_state->vcpu_events; } -#ifdef KVM_UPSTREAM void kvm_setup_guest_memory(void *start, size_t size) { if (!kvm_has_sync_mmu()) { @@ -905,8 +904,6 @@ void kvm_setup_guest_memory(void *start, size_t size) } } -#endif /* KVM_UPSTREAM */ - #ifdef KVM_CAP_SET_GUEST_DEBUG #ifdef KVM_UPSTREAM diff --git a/kvm.h b/kvm.h index d0f4bbe..05ee540 100644 --- a/kvm.h +++ b/kvm.h @@ -54,10 +54,9 @@ int kvm_has_vcpu_events(void); int kvm_put_vcpu_events(CPUState *env); int kvm_get_vcpu_events(CPUState *env); -#ifdef KVM_UPSTREAM - void kvm_setup_guest_memory(void *start, size_t size); +#ifdef KVM_UPSTREAM int kvm_coalesce_mmio_region(target_phys_addr_t start, ram_addr_t size); int kvm_uncoalesce_mmio_region(target_phys_addr_t start, ram_addr_t size); diff --git a/qemu-kvm.c b/qemu-kvm.c index 97c098c..76f056c 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -2321,21 +2321,6 @@ void kvm_set_phys_mem(target_phys_addr_t start_addr, ram_addr_t size, return; } -int kvm_setup_guest_memory(void *area, unsigned long size) -{ - int ret = 0; - -#ifdef MADV_DONTFORK - if (kvm_enabled() && !kvm_has_sync_mmu()) - ret = madvise(area, size, MADV_DONTFORK); -#endif - - if (ret) - perror("madvise"); - - return ret; -} - #ifdef KVM_CAP_SET_GUEST_DEBUG struct kvm_set_guest_debug_data { diff --git a/qemu-kvm.h b/qemu-kvm.h index d838bca..0664c1d 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -923,7 +923,6 @@ void kvm_cpu_destroy_phys_mem(target_phys_addr_t start_addr, unsigned long size); void kvm_qemu_log_memory(target_phys_addr_t start, target_phys_addr_t size, int log); -int kvm_setup_guest_memory(void *area, unsigned long size); int kvm_qemu_create_memory_alias(uint64_t phys_start, uint64_t len, uint64_t target_phys); int kvm_qemu_destroy_memory_alias(uint64_t phys_start);