@@ -541,17 +541,17 @@ static int picdev_slave_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,
541
541
addr , len , val );
542
542
}
543
543
544
- static int picdev_eclr_write (struct kvm_vcpu * vcpu , struct kvm_io_device * dev ,
544
+ static int picdev_elcr_write (struct kvm_vcpu * vcpu , struct kvm_io_device * dev ,
545
545
gpa_t addr , int len , const void * val )
546
546
{
547
- return picdev_write (container_of (dev , struct kvm_pic , dev_eclr ),
547
+ return picdev_write (container_of (dev , struct kvm_pic , dev_elcr ),
548
548
addr , len , val );
549
549
}
550
550
551
- static int picdev_eclr_read (struct kvm_vcpu * vcpu , struct kvm_io_device * dev ,
551
+ static int picdev_elcr_read (struct kvm_vcpu * vcpu , struct kvm_io_device * dev ,
552
552
gpa_t addr , int len , void * val )
553
553
{
554
- return picdev_read (container_of (dev , struct kvm_pic , dev_eclr ),
554
+ return picdev_read (container_of (dev , struct kvm_pic , dev_elcr ),
555
555
addr , len , val );
556
556
}
557
557
@@ -577,9 +577,9 @@ static const struct kvm_io_device_ops picdev_slave_ops = {
577
577
.write = picdev_slave_write ,
578
578
};
579
579
580
- static const struct kvm_io_device_ops picdev_eclr_ops = {
581
- .read = picdev_eclr_read ,
582
- .write = picdev_eclr_write ,
580
+ static const struct kvm_io_device_ops picdev_elcr_ops = {
581
+ .read = picdev_elcr_read ,
582
+ .write = picdev_elcr_write ,
583
583
};
584
584
585
585
int kvm_pic_init (struct kvm * kvm )
@@ -602,7 +602,7 @@ int kvm_pic_init(struct kvm *kvm)
602
602
*/
603
603
kvm_iodevice_init (& s -> dev_master , & picdev_master_ops );
604
604
kvm_iodevice_init (& s -> dev_slave , & picdev_slave_ops );
605
- kvm_iodevice_init (& s -> dev_eclr , & picdev_eclr_ops );
605
+ kvm_iodevice_init (& s -> dev_elcr , & picdev_elcr_ops );
606
606
mutex_lock (& kvm -> slots_lock );
607
607
ret = kvm_io_bus_register_dev (kvm , KVM_PIO_BUS , 0x20 , 2 ,
608
608
& s -> dev_master );
@@ -613,7 +613,7 @@ int kvm_pic_init(struct kvm *kvm)
613
613
if (ret < 0 )
614
614
goto fail_unreg_2 ;
615
615
616
- ret = kvm_io_bus_register_dev (kvm , KVM_PIO_BUS , 0x4d0 , 2 , & s -> dev_eclr );
616
+ ret = kvm_io_bus_register_dev (kvm , KVM_PIO_BUS , 0x4d0 , 2 , & s -> dev_elcr );
617
617
if (ret < 0 )
618
618
goto fail_unreg_1 ;
619
619
@@ -647,7 +647,7 @@ void kvm_pic_destroy(struct kvm *kvm)
647
647
mutex_lock (& kvm -> slots_lock );
648
648
kvm_io_bus_unregister_dev (vpic -> kvm , KVM_PIO_BUS , & vpic -> dev_master );
649
649
kvm_io_bus_unregister_dev (vpic -> kvm , KVM_PIO_BUS , & vpic -> dev_slave );
650
- kvm_io_bus_unregister_dev (vpic -> kvm , KVM_PIO_BUS , & vpic -> dev_eclr );
650
+ kvm_io_bus_unregister_dev (vpic -> kvm , KVM_PIO_BUS , & vpic -> dev_elcr );
651
651
mutex_unlock (& kvm -> slots_lock );
652
652
653
653
kvm -> arch .vpic = NULL ;
0 commit comments