From 50dc0db3f02fb9160be1e7f1bd33de2fc12e170f Mon Sep 17 00:00:00 2001 From: Peter Grehan Date: Fri, 16 Aug 2013 00:35:20 +0000 Subject: [PATCH] Fix ordering of legacy IRQ reservations. Submitted by: Jeremiah Lott jlott at averesystems dot com --- usr.sbin/bhyve/pci_emul.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index 00adf622b091..005e8b139f30 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -1008,6 +1008,16 @@ init_pci(struct vmctx *ctx) pci_emul_membase32 = vm_get_lowmem_limit(ctx); pci_emul_membase64 = PCI_EMUL_MEMBASE64; + /* + * Allow ISA IRQs 5,10,11,12, and 15 to be available for + * generic use + */ + lirq[5].li_generic = 1; + lirq[10].li_generic = 1; + lirq[11].li_generic = 1; + lirq[12].li_generic = 1; + lirq[15].li_generic = 1; + for (slot = 0; slot < MAXSLOTS; slot++) { for (func = 0; func < MAXFUNCS; func++) { si = &pci_slotinfo[slot][func]; @@ -1022,16 +1032,6 @@ init_pci(struct vmctx *ctx) } } - /* - * Allow ISA IRQs 5,10,11,12, and 15 to be available for - * generic use - */ - lirq[5].li_generic = 1; - lirq[10].li_generic = 1; - lirq[11].li_generic = 1; - lirq[12].li_generic = 1; - lirq[15].li_generic = 1; - /* * The guest physical memory map looks like the following: * [0, lowmem) guest system memory