|
@@ -604,15 +604,6 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm, u32 flags)
|
|
|
mutex_lock(&pit->pit_state.lock);
|
|
|
spin_lock_init(&pit->pit_state.inject_lock);
|
|
|
|
|
|
- /* Initialize PIO device */
|
|
|
- kvm_iodevice_init(&pit->dev, &pit_dev_ops);
|
|
|
- kvm_io_bus_register_dev(&kvm->pio_bus, &pit->dev);
|
|
|
-
|
|
|
- if (flags & KVM_PIT_SPEAKER_DUMMY) {
|
|
|
- kvm_iodevice_init(&pit->speaker_dev, &speaker_dev_ops);
|
|
|
- kvm_io_bus_register_dev(&kvm->pio_bus, &pit->speaker_dev);
|
|
|
- }
|
|
|
-
|
|
|
kvm->arch.vpit = pit;
|
|
|
pit->kvm = kvm;
|
|
|
|
|
@@ -631,6 +622,14 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm, u32 flags)
|
|
|
pit->mask_notifier.func = pit_mask_notifer;
|
|
|
kvm_register_irq_mask_notifier(kvm, 0, &pit->mask_notifier);
|
|
|
|
|
|
+ kvm_iodevice_init(&pit->dev, &pit_dev_ops);
|
|
|
+ kvm_io_bus_register_dev(&kvm->pio_bus, &pit->dev);
|
|
|
+
|
|
|
+ if (flags & KVM_PIT_SPEAKER_DUMMY) {
|
|
|
+ kvm_iodevice_init(&pit->speaker_dev, &speaker_dev_ops);
|
|
|
+ kvm_io_bus_register_dev(&kvm->pio_bus, &pit->speaker_dev);
|
|
|
+ }
|
|
|
+
|
|
|
return pit;
|
|
|
}
|
|
|
|