From patchwork Fri Feb 19 18:22:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 45869 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BAFA4B7D09 for ; Sat, 20 Feb 2010 05:34:10 +1100 (EST) Received: from localhost ([127.0.0.1]:37417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NiXYv-0007mi-M2 for incoming@patchwork.ozlabs.org; Fri, 19 Feb 2010 13:26:49 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NiXUs-0006xO-K4 for qemu-devel@nongnu.org; Fri, 19 Feb 2010 13:22:38 -0500 Received: from [199.232.76.173] (port=44321 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NiXUs-0006xC-2M for qemu-devel@nongnu.org; Fri, 19 Feb 2010 13:22:38 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NiXUm-00005g-I2 for qemu-devel@nongnu.org; Fri, 19 Feb 2010 13:22:36 -0500 Received: from david.siemens.de ([192.35.17.14]:15167) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NiXUk-00004z-Jn for qemu-devel@nongnu.org; Fri, 19 Feb 2010 13:22:31 -0500 Received: from mail3.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o1JIMSIV017242; Fri, 19 Feb 2010 19:22:28 +0100 Received: from localhost.localdomain (mchn012c.ww002.siemens.net [139.25.109.167] (may be forged)) by mail3.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o1JIMRG9025400; Fri, 19 Feb 2010 19:22:28 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Fri, 19 Feb 2010 19:22:22 +0100 Message-Id: <2dcac8a5adb7bcb3bbf65185309fee3e0fea48ef.1266603744.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: Anthony Liguori , qemu-devel@nongnu.org, kvm@vger.kernel.org, Gleb Natapov Subject: [Qemu-devel] [PATCH 4/9] qemu-kvm: Use upstream kvm_setup_guest_memory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Nothing missing in upstream kvm_setup_guest_memory, it is even more careful about error handling. Signed-off-by: Jan Kiszka --- kvm-all.c | 3 --- kvm.h | 3 +-- qemu-kvm.c | 15 --------------- qemu-kvm.h | 1 - 4 files changed, 1 insertions(+), 21 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 9f1808f..b9c1553 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -932,7 +932,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()) { @@ -951,8 +950,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 f97efa3..724914d 100644 --- a/kvm.h +++ b/kvm.h @@ -48,10 +48,9 @@ int kvm_get_vcpu_events(CPUState *env); void kvm_cpu_register_phys_memory_client(void); -#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); void kvm_flush_coalesced_mmio_buffer(void); diff --git a/qemu-kvm.c b/qemu-kvm.c index 555d959..17a8080 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -2315,21 +2315,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 069d2c6..f9c797f 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);