Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b66ac1a authored by Gregory Haskins's avatar Gregory Haskins Committed by Avi Kivity
Browse files

KVM: do not register i8254 PIO regions until we are initialized 



We currently publish the i8254 resources to the pio_bus before the devices
are fully initialized.  Since we hold the pit_lock, its probably not
a real issue.  But lets clean this up anyway.

Reported-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarGregory Haskins <ghaskins@novell.com>
Acked-by: default avatarChris Wright <chrisw@sous-sol.org>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent d76685c4

arch/x86/kvm/i8254.c

+8 −9
Original line number Diff line number Diff line
@@ -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;

}