From patchwork Fri Jul 10 20:17:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 35104 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6AKIEO4020557 for ; Fri, 10 Jul 2009 20:18:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756493AbZGJUSK (ORCPT ); Fri, 10 Jul 2009 16:18:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756426AbZGJUSK (ORCPT ); Fri, 10 Jul 2009 16:18:10 -0400 Received: from mx2.redhat.com ([66.187.237.31]:53916 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756065AbZGJUSD (ORCPT ); Fri, 10 Jul 2009 16:18:03 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6AKI3DY018125 for ; Fri, 10 Jul 2009 16:18:03 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n6AKI2w4007794; Fri, 10 Jul 2009 16:18:02 -0400 Received: from localhost.localdomain (virtlab1.virt.bos.redhat.com [10.16.72.21]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n6AKI0uQ026979; Fri, 10 Jul 2009 16:18:01 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: avi@redhat.com Subject: [PATCH v2 4/9] remove leftover: Date: Fri, 10 Jul 2009 16:17:55 -0400 Message-Id: <1247257080-18549-5-git-send-email-glommer@redhat.com> In-Reply-To: <1247257080-18549-4-git-send-email-glommer@redhat.com> References: <1247257080-18549-1-git-send-email-glommer@redhat.com> <1247257080-18549-2-git-send-email-glommer@redhat.com> <1247257080-18549-3-git-send-email-glommer@redhat.com> <1247257080-18549-4-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org get rid of kvm_callbacks structure definition Signed-off-by: Glauber Costa --- libkvm-all.h | 57 --------------------------------------------------------- 1 files changed, 0 insertions(+), 57 deletions(-) diff --git a/libkvm-all.h b/libkvm-all.h index 3e3e1b4..01c0486 100644 --- a/libkvm-all.h +++ b/libkvm-all.h @@ -105,7 +105,6 @@ int handle_io_window(kvm_context_t kvm); int handle_debug(kvm_vcpu_context_t vcpu, void *env); int try_push_interrupts(kvm_context_t kvm); - #if defined(__x86_64__) || defined(__i386__) struct kvm_msr_list *kvm_get_msr_list(kvm_context_t); int kvm_get_msrs(kvm_vcpu_context_t, struct kvm_msr_entry *msrs, int n); @@ -113,62 +112,6 @@ int kvm_set_msrs(kvm_vcpu_context_t, struct kvm_msr_entry *msrs, int n); #endif /*! - * \brief KVM callbacks structure - * - * This structure holds pointers to various functions that KVM will call - * when it encounters something that cannot be virtualized, such as - * accessing hardware devices via MMIO or regular IO. - */ -struct kvm_callbacks { - /// For 8bit IO reads from the guest (Usually when executing 'inb') - int (*inb)(void *opaque, uint16_t addr, uint8_t *data); - /// For 16bit IO reads from the guest (Usually when executing 'inw') - int (*inw)(void *opaque, uint16_t addr, uint16_t *data); - /// For 32bit IO reads from the guest (Usually when executing 'inl') - int (*inl)(void *opaque, uint16_t addr, uint32_t *data); - /// For 8bit IO writes from the guest (Usually when executing 'outb') - int (*outb)(void *opaque, uint16_t addr, uint8_t data); - /// For 16bit IO writes from the guest (Usually when executing 'outw') - int (*outw)(void *opaque, uint16_t addr, uint16_t data); - /// For 32bit IO writes from the guest (Usually when executing 'outl') - int (*outl)(void *opaque, uint16_t addr, uint32_t data); - /// generic memory reads to unmapped memory (For MMIO devices) - int (*mmio_read)(void *opaque, uint64_t addr, uint8_t *data, - int len); - /// generic memory writes to unmapped memory (For MMIO devices) - int (*mmio_write)(void *opaque, uint64_t addr, uint8_t *data, - int len); -#ifdef KVM_CAP_SET_GUEST_DEBUG - int (*debug)(void *opaque, void *env, - struct kvm_debug_exit_arch *arch_info); -#endif - /*! - * \brief Called when the VCPU issues an 'hlt' instruction. - * - * Typically, you should yeild here to prevent 100% CPU utilization - * on the host CPU. - */ - int (*halt)(void *opaque, kvm_vcpu_context_t vcpu); - int (*shutdown)(void *opaque, void *env); - int (*io_window)(void *opaque); - int (*try_push_interrupts)(void *opaque); -#ifdef KVM_CAP_USER_NMI - void (*push_nmi)(void *opaque); -#endif - void (*post_kvm_run)(void *opaque, void *env); - int (*pre_kvm_run)(void *opaque, void *env); - int (*tpr_access)(void *opaque, kvm_vcpu_context_t vcpu, uint64_t rip, int is_write); -#if defined(__s390__) - int (*s390_handle_intercept)(kvm_context_t context, kvm_vcpu_context_t vcpu, - struct kvm_run *run); - int (*s390_handle_reset)(kvm_context_t context, kvm_vcpu_context_t vcpu, - struct kvm_run *run); -#endif - int (*unhandled)(kvm_context_t context, kvm_vcpu_context_t vcpu, - uint64_t hw_reason); -}; - -/*! * \brief Create new KVM context * * This creates a new kvm_context. A KVM context is a small area of data that