diff options
| -rw-r--r-- | kvm.c | 34 | ||||
| -rw-r--r-- | kvm.h | 10 |
2 files changed, 18 insertions, 26 deletions
@@ -2375,52 +2375,50 @@ kvm_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv) case KVM_REGISTER_COALESCED_MMIO: { struct kvm *kvmp; - struct kvm_coalesced_mmio_zone_ioc *zone_ioc; - size_t sz = sizeof (struct kvm_coalesced_mmio_zone_ioc); + struct kvm_coalesced_mmio_zone *zone; + size_t sz = sizeof (struct kvm_coalesced_mmio_zone); - zone_ioc = kmem_zalloc(sz, KM_SLEEP); + zone = kmem_zalloc(sz, KM_SLEEP); - if (copyin(argp, zone_ioc, sz) != 0) { - kmem_free(zone_ioc, sz); + if (copyin(argp, zone, sz) != 0) { + kmem_free(zone, sz); rval = EFAULT; break; } if ((kvmp = ksp->kds_kvmp) == NULL) { rval = EINVAL; - kmem_free(zone_ioc, sz); + kmem_free(zone, sz); break; } - rval = kvm_vm_ioctl_register_coalesced_mmio(kvmp, - &zone_ioc->zone); + rval = kvm_vm_ioctl_register_coalesced_mmio(kvmp, zone); - kmem_free(zone_ioc, sz); + kmem_free(zone, sz); break; } case KVM_UNREGISTER_COALESCED_MMIO: { - struct kvm_coalesced_mmio_zone_ioc *zone_ioc; + struct kvm_coalesced_mmio_zone *zone; struct kvm *kvmp; - size_t sz = sizeof (struct kvm_coalesced_mmio_zone_ioc); + size_t sz = sizeof (struct kvm_coalesced_mmio_zone); - zone_ioc = kmem_zalloc(sz, KM_SLEEP); + zone = kmem_zalloc(sz, KM_SLEEP); - if (copyin(argp, zone_ioc, sz) != 0) { - kmem_free(zone_ioc, sz); + if (copyin(argp, zone, sz) != 0) { + kmem_free(zone, sz); break; } if ((kvmp = ksp->kds_kvmp) == NULL) { - kmem_free(zone_ioc, sz); + kmem_free(zone, sz); rval = EINVAL; break; } - rval = kvm_vm_ioctl_unregister_coalesced_mmio(kvmp, - &zone_ioc->zone); + rval = kvm_vm_ioctl_unregister_coalesced_mmio(kvmp, zone); - kmem_free(zone_ioc, sz); + kmem_free(zone, sz); break; } #ifdef KVM_CAP_IRQ_ROUTING @@ -182,12 +182,6 @@ typedef struct kvm_coalesced_mmio_ring { struct kvm_coalesced_mmio coalesced_mmio[1]; } kvm_coalesced_mmio_ring_t; -/* XXX NEEDS TO DIE! */ -typedef struct kvm_coalesced_mmio_zone_ioc { - struct kvm_coalesced_mmio_zone zone; - int kvmid; -} kvm_coalesced_mmio_zone_ioc_t; - #define KVM_COALESCED_MMIO_MAX \ ((PAGESIZE - sizeof (struct kvm_coalesced_mmio_ring)) / \ sizeof (struct kvm_coalesced_mmio)) @@ -430,9 +424,9 @@ typedef struct kvm_clock_data { #define KVM_IRQ_LINE_STATUS _IOWR(KVMIO, 0x67, struct kvm_irq_level) #define KVM_REGISTER_COALESCED_MMIO _IOW(KVMIO, 0x67, \ - struct kvm_coalesced_mmio_zone_ioc) + struct kvm_coalesced_mmio_zone) #define KVM_UNREGISTER_COALESCED_MMIO _IOW(KVMIO, 0x68, \ - struct kvm_coalesced_mmio_zone_ioc) + struct kvm_coalesced_mmio_zone) #define KVM_SET_GSI_ROUTING _IOW(KVMIO, 0x6a, struct kvm_irq_routing) #define KVM_REINJECT_CONTROL _IO(KVMIO, 0x71) #define KVM_CREATE_PIT2 _IOW(KVMIO, 0x77, struct kvm_pit_config) |