diff options
| -rw-r--r-- | kvm_coalesced_mmio.c | 9 | ||||
| -rw-r--r-- | kvm_ioapic.c | 4 | ||||
| -rw-r--r-- | kvm_irq_comm.c | 20 |
3 files changed, 4 insertions, 29 deletions
diff --git a/kvm_coalesced_mmio.c b/kvm_coalesced_mmio.c index d231c2e..50c5b4d 100644 --- a/kvm_coalesced_mmio.c +++ b/kvm_coalesced_mmio.c @@ -106,8 +106,7 @@ kvm_coalesced_mmio_init(struct kvm *kvm) ret = -ENOMEM; dev = kmem_zalloc(sizeof (struct kvm_coalesced_mmio_dev), KM_SLEEP); - if (!dev) - goto out_free_page; + mutex_init(&dev->lock, NULL, MUTEX_DRIVER, 0); kvm_iodevice_init(&dev->dev, &coalesced_mmio_ops); dev->kvm = kvm; @@ -123,12 +122,6 @@ kvm_coalesced_mmio_init(struct kvm *kvm) out_free_dev: kmem_free(dev, sizeof (struct kvm_coalesced_mmio_dev)); -out_free_page: -#ifdef XXX - kmem_free(page, PAGESIZE); -#else - XXX_KVM_PROBE; -#endif ddi_umem_free(kvm->mmio_cookie); return (ret); } diff --git a/kvm_ioapic.c b/kvm_ioapic.c index b8fe29a..10b89a9 100644 --- a/kvm_ioapic.c +++ b/kvm_ioapic.c @@ -100,11 +100,7 @@ ioapic_service(struct kvm_ioapic *ioapic, unsigned int idx) static void update_handled_vectors(struct kvm_ioapic *ioapic) { -#ifdef XXX_KVM_DECLARATION - BITMAP_VECTORS(handled_vectors, 256); -#else unsigned long handled_vectors[4]; -#endif int i; memset(handled_vectors, 0, sizeof (handled_vectors)); diff --git a/kvm_irq_comm.c b/kvm_irq_comm.c index 250cbd3..e632a4d 100644 --- a/kvm_irq_comm.c +++ b/kvm_irq_comm.c @@ -242,15 +242,10 @@ kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id) ASSERT(irq_source_id != KVM_USERSPACE_IRQ_SOURCE_ID); mutex_enter(&kvm->irq_lock); - if (irq_source_id < 0 || - irq_source_id >= BITS_PER_LONG) { -#ifdef XXX - printk(KERN_ERR "kvm: IRQ source ID out of range!\n"); -#else - XXX_KVM_PROBE; -#endif + + if (irq_source_id < 0 || irq_source_id >= BITS_PER_LONG) goto unlock; - } + clear_bit(irq_source_id, &kvm->arch.irq_sources_bitmap); if (!irqchip_in_kernel(kvm)) goto unlock; @@ -395,13 +390,6 @@ kvm_set_irq_routing(struct kvm *kvm, const struct kvm_irq_routing_entry *ue, nr_rt_entries += 1; -#ifdef XXX - new = kmem_zalloc(sizeof (*new) + (nr_rt_entries * sizeof (list_t)) + - (nr * sz), KM_SLEEP); - - new->rt_entries = (void *)&new->map[nr_rt_entries]; -#else - XXX_KVM_PROBE; new = kmem_zalloc(sizeof (*new), KM_SLEEP); for (i = 0; i < KVM_MAX_IRQ_ROUTES; i++) { @@ -412,8 +400,6 @@ kvm_set_irq_routing(struct kvm *kvm, const struct kvm_irq_routing_entry *ue, new->rt_entries = kmem_zalloc(sz * nr, KM_SLEEP); newsz = sz * nr; -#endif - new->nr_rt_entries = nr_rt_entries; for (i = 0; i < 3; i++) for (j = 0; j < KVM_IOAPIC_NUM_PINS; j++) |