From: Peter Xu Date: Mon, 9 Jan 2017 08:55:53 +0000 (+0800) Subject: x86: ioapic: fix fail migration when irqchip=split X-Git-Tag: v2.9.0-rc0~139^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f254b1ae04b36e2ab2d91528297ed60d40c8c08;p=thirdparty%2Fqemu.git x86: ioapic: fix fail migration when irqchip=split Split irqchip works based on the fact that we kept the first 24 gsi routing entries inside KVM for userspace ioapic's use. When system boot, we'll reserve these MSI routing entries before hand. However, after migration, we forgot to re-configure it up in the destination side. The result is, we'll get invalid gsi routing entries after migration (all empty), and we get interrupts with vector=0, then strange things happen, like keyboard hang. The solution is simple - we update them after migration, which is a one line fix. Signed-off-by: Peter Xu Message-Id: <1483952153-7221-4-git-send-email-peterx@redhat.com> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index d1254f860e7..9047b8950a3 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -439,6 +439,11 @@ static void ioapic_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); k->realize = ioapic_realize; + /* + * If APIC is in kernel, we need to update the kernel cache after + * migration, otherwise first 24 gsi routes will be invalid. + */ + k->post_load = ioapic_update_kvm_routes; dc->reset = ioapic_reset_common; dc->props = ioapic_properties; }