svn commit: r254395 - head/usr.sbin/bhyve

[Peter Grehan]

Author: grehan
Date: Fri Aug 16 00:35:20 2013
New Revision: 254395
URL: http://svnweb.freebsd.org/changeset/base/254395

Log:
  Fix ordering of legacy IRQ reservations.
  
  Submitted by:	Jeremiah Lott   jlott at averesystems dot com

Modified:
  head/usr.sbin/bhyve/pci_emul.c

Modified: head/usr.sbin/bhyve/pci_emul.c
==============================================================================
--- head/usr.sbin/bhyve/pci_emul.c	Fri Aug 16 00:24:34 2013	(r254394)
+++ head/usr.sbin/bhyve/pci_emul.c	Fri Aug 16 00:35:20 2013	(r254395)
@@ -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)