diff options
| author | Wei Yongjun | 2010-02-09 03:33:03 +0100 |
|---|---|---|
| committer | Marcelo Tosatti | 2010-03-01 16:36:10 +0100 |
| commit | 72bb2fcd23afe8db53b47e8f9edd736c517ba532 (patch) | |
| tree | b79884bcb50077fec7cb5615178cacbbf9e6ce04 /virt/kvm/ioapic.c | |
| parent | KVM: kvm->arch.vioapic should be NULL if kvm_ioapic_init() failure (diff) | |
| download | kernel-qcow2-linux-72bb2fcd23afe8db53b47e8f9edd736c517ba532.tar.gz kernel-qcow2-linux-72bb2fcd23afe8db53b47e8f9edd736c517ba532.tar.xz kernel-qcow2-linux-72bb2fcd23afe8db53b47e8f9edd736c517ba532.zip | |
KVM: cleanup the failure path of KVM_CREATE_IRQCHIP ioctrl
If we fail to init ioapic device or the fail to setup the default irq
routing, the device register by kvm_create_pic() and kvm_ioapic_init()
remain unregister. This patch fixed to do this.
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt/kvm/ioapic.c')
| -rw-r--r-- | virt/kvm/ioapic.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index f3d06934ae6d..3db15a807f80 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -401,6 +401,17 @@ int kvm_ioapic_init(struct kvm *kvm) return ret; } +void kvm_ioapic_destroy(struct kvm *kvm) +{ + struct kvm_ioapic *ioapic = kvm->arch.vioapic; + + if (ioapic) { + kvm_io_bus_unregister_dev(kvm, KVM_MMIO_BUS, &ioapic->dev); + kvm->arch.vioapic = NULL; + kfree(ioapic); + } +} + int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state) { struct kvm_ioapic *ioapic = ioapic_irqchip(kvm); |