diff options
author | grehan <grehan@FreeBSD.org> | 2013-08-16 00:35:20 +0000 |
---|---|---|
committer | grehan <grehan@FreeBSD.org> | 2013-08-16 00:35:20 +0000 |
commit | fe073d00ee5f424ed78c27d790357e9a09dc6849 (patch) | |
tree | c02e2c705b0878ea6621495b53dea633395d0352 | |
parent | 5591de079d3f2d8a4854b384d52322fc01bf57ea (diff) | |
download | FreeBSD-src-fe073d00ee5f424ed78c27d790357e9a09dc6849.zip FreeBSD-src-fe073d00ee5f424ed78c27d790357e9a09dc6849.tar.gz |
Fix ordering of legacy IRQ reservations.
Submitted by: Jeremiah Lott jlott at averesystems dot com
-rw-r--r-- | usr.sbin/bhyve/pci_emul.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index 00adf62..005e8b1 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]; @@ -1023,16 +1033,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 * [lowmem, lowmem_limit) memory hole (may be absent) |