[KVM PATCH v3 3/3] kvm: do not register i8254 PIO regions until we are initialized

[Gregory Haskins]

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.

Found-by: Avi Kivity <a...@redhat.com>
Signed-off-by: Gregory Haskins <ghask...@novell.com>
---

 arch/x86/kvm/i8254.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index 21301a2..f91b0e3 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -601,15 +601,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;
 
@@ -628,6 +619,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;
 }
 

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html