diff options
| -rw-r--r-- | kvm.c | 7 | ||||
| -rw-r--r-- | kvm_host.h | 10 |
2 files changed, 1 insertions, 16 deletions
@@ -379,13 +379,12 @@ kvm_destroy_vm(struct kvm *kvmp) kmem_free(kvmp->buses[ii], sizeof (struct kvm_io_bus)); rw_destroy(&kvmp->kvm_rwlock); -#ifdef CONFIG_HAVE_KVM_IRQCHIP + /* * These lists are contained by the pic. However, the pic isn't */ list_destroy(&kvmp->irq_ack_notifier_list); list_destroy(&kvmp->mask_notifier_list); -#endif kvm_arch_destroy_vm(kvmp); } @@ -399,14 +398,12 @@ kvm_create_vm(void) if (kvmp == NULL) return (NULL); -#ifdef CONFIG_HAVE_KVM_IRQCHIP list_create(&kvmp->mask_notifier_list, sizeof (struct kvm_irq_mask_notifier), offsetof(struct kvm_irq_mask_notifier, link)); list_create(&kvmp->irq_ack_notifier_list, sizeof (struct kvm_irq_ack_notifier), offsetof(struct kvm_irq_ack_notifier, link)); -#endif kvmp->memslots = kmem_zalloc(sizeof (struct kvm_memslots), KM_SLEEP); @@ -1355,11 +1352,9 @@ kvm_dev_ioctl_check_extension_generic(long arg, int *rv) case KVM_CAP_INTERNAL_ERROR_DATA: *rv = 1; return (DDI_SUCCESS); -#ifdef CONFIG_HAVE_KVM_IRQCHIP case KVM_CAP_IRQ_ROUTING: *rv = KVM_MAX_IRQ_ROUTES; return (DDI_SUCCESS); -#endif default: break; } @@ -223,11 +223,9 @@ typedef struct kvm { #endif kmutex_t irq_lock; -#ifdef CONFIG_HAVE_KVM_IRQCHIP struct kvm_irq_routing_table *irq_routing; list_t mask_notifier_list; list_t irq_ack_notifier_list; -#endif #if defined(KVM_ARCH_WANT_MMU_NOTIFIER) && defined(CONFIG_MMU_NOTIFIER) struct mmu_notifier mmu_notifier; @@ -498,8 +496,6 @@ void kvm_migrate_timers(struct kvm_vcpu *vcpu); #define unalias_gfn_instantiation unalias_gfn #endif -#ifdef CONFIG_HAVE_KVM_IRQCHIP - int kvm_setup_default_irq_routing(struct kvm *kvm); int kvm_set_irq_routing(struct kvm *kvm, const struct kvm_irq_routing_entry *entries, @@ -507,12 +503,6 @@ int kvm_set_irq_routing(struct kvm *kvm, unsigned flags); void kvm_free_irq_routing(struct kvm *kvm); -#else - -static void kvm_free_irq_routing(struct kvm *kvm) {} - -#endif /*CONFIG_HAVE_KVM_IRQCHIP*/ - #ifdef CONFIG_KVM_APIC_ARCHITECTURE extern int kvm_vcpu_is_bsp(struct kvm_vcpu *); #endif |