From 6793eb0604269b4f66dea84f9e86a5300ffded27 Mon Sep 17 00:00:00 2001 From: Jason Chen CJ Date: Mon, 8 Oct 2018 13:09:20 +0800 Subject: [PATCH] dm: fix assertion in pci_irq_reserve atkbdc_init will call pci_irq_reserve to reserve irq 1 & 12, which need pci_irq_init be called first. Tracked-On: #1402 Signed-off-by: Jason Chen CJ --- devicemodel/core/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devicemodel/core/main.c b/devicemodel/core/main.c index 0e1588eca..2fe6f1f0e 100644 --- a/devicemodel/core/main.c +++ b/devicemodel/core/main.c @@ -499,12 +499,12 @@ vm_reset_vdevs(struct vmctx *ctx) pci_irq_deinit(ctx); ioapic_deinit(); + pci_irq_init(ctx); atkbdc_init(ctx); vrtc_init(ctx); vpit_init(ctx); ioapic_init(ctx); - pci_irq_init(ctx); init_pci(ctx); if (acpi) {