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

Commit 950712eb authored by Peter Xu's avatar Peter Xu Committed by Paolo Bonzini
Browse files

KVM: x86: check existance before destroy 



Mostly used for split irqchip mode. In that case, these two things are
not inited at all, so no need to release.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent df630b8c

arch/x86/kvm/i8259.c

+3 −0
Original line number Diff line number Diff line
@@ -657,6 +657,9 @@ void kvm_pic_destroy(struct kvm *kvm) 
{

	struct kvm_pic *vpic = kvm->arch.vpic;



	if (!vpic)

		return;



	kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_master);

	kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_slave);

	kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_eclr);

arch/x86/kvm/ioapic.c

+3 −0
Original line number Diff line number Diff line
@@ -635,6 +635,9 @@ void kvm_ioapic_destroy(struct kvm *kvm) 
{

	struct kvm_ioapic *ioapic = kvm->arch.vioapic;



	if (!ioapic)

		return;



	cancel_delayed_work_sync(&ioapic->eoi_inject);

	kvm_io_bus_unregister_dev(kvm, KVM_MMIO_BUS, &ioapic->dev);

	kvm->arch.vioapic = NULL;