From: Avi Kivity Subject: [PATCH v2 6/8] kvm: allow kvm.h to be included from target independent files Date: Sun, 10 Oct 2010 16:42:05 +0200 Message-ID: <1286721727-31447-7-git-send-email-avi@redhat.com> References: <1286721727-31447-1-git-send-email-avi@redhat.com> To: "Michael S. Tsirkin" , Marcelo Tosatti , kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:2675 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752886Ab0JJOmK (ORCPT ); Sun, 10 Oct 2010 10:42:10 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9AEgAvN025649 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 10 Oct 2010 10:42:10 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9AEg9Cr007639 for ; Sun, 10 Oct 2010 10:42:09 -0400 In-Reply-To: <1286721727-31447-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: - don't include qemu-kvm.h when NEED_CPU_H not defined - move a couple of declarations around Signed-off-by: Avi Kivity --- kvm.h | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/kvm.h b/kvm.h index 2f12851..d484a3f 100644 --- a/kvm.h +++ b/kvm.h @@ -17,7 +17,9 @@ #include #include "config-host.h" #include "qemu-queue.h" +#ifdef NEED_CPU_H #include "qemu-kvm.h" +#endif #ifdef CONFIG_KVM #include @@ -75,7 +77,6 @@ int kvm_set_signal_mask(CPUState *env, const sigset_t *sigset); #endif int kvm_pit_in_kernel(void); -int kvm_irqchip_in_kernel(void); /* internal API */ @@ -181,6 +182,9 @@ static inline void cpu_synchronize_post_init(CPUState *env) } } +int kvm_physical_memory_addr_from_ram(KVMState *s, ram_addr_t ram_addr, + target_phys_addr_t *phys_addr); + #endif int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr, uint32_t val, bool assign); @@ -196,9 +200,6 @@ int kvm_set_irqfd(int gsi, int fd, bool assigned) int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign); -int kvm_physical_memory_addr_from_ram(KVMState *s, ram_addr_t ram_addr, - target_phys_addr_t *phys_addr); - int kvm_has_gsi_routing(void); int kvm_get_irq_route_gsi(void); int kvm_add_msix(uint32_t gsi, uint32_t addr_lo, @@ -211,4 +212,6 @@ int kvm_update_msix(uint32_t old_gsi, uint32_t old_addr_lo, uint32_t new_addr_hi, uint32_t new_data); int kvm_commit_irq_routes(void); +int kvm_irqchip_in_kernel(void); + #endif -- 1.7.3.1