commit ff403da6a76ac4879da101768e5a956c9582b8db
author blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> Tue Jan 01 17:04:45 2008 +0000
committer blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> Tue Jan 01 17:04:45 2008 +0000
tree fe9b9b9cd7c7452d47f1fa9ade361957940b0b56
parent 4254fab8f96ecffebf204ff34c8e7eac7a3e0aed

 DVMA translation errors raise a module error irq (NMI)


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3880 c046a42c-6fe2-441c-8c8c-71466251a162

hw/sun4m.c

diff --git a/hw/sun4m.c b/hw/sun4m.c
index 96515f2..6f6f705 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -436,7 +436,6 @@
     prom_offset += (ret + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
 
     /* set up devices */
-    iommu = iommu_init(hwdef->iommu_base, hwdef->iommu_version);
     slavio_intctl = slavio_intctl_init(hwdef->intctl_base,
                                        hwdef->intctl_base + 0x10000ULL,
                                        &hwdef->intbit_to_level[0],
@@ -451,6 +450,9 @@
                                      prom_offset | IO_MEM_ROM);
     }
 
+    iommu = iommu_init(hwdef->iommu_base, hwdef->iommu_version,
+                       slavio_irq[hwdef->me_irq]);
+
     espdma = sparc32_dma_init(hwdef->dma_base, slavio_irq[hwdef->esp_irq],
                               iommu, &espdma_irq, &esp_reset);
 
@@ -597,7 +599,8 @@
     slavio_intctl = sun4c_intctl_init(hwdef->sun4c_intctl_base,
                                       &slavio_irq, cpu_irqs);
 
-    iommu = iommu_init(hwdef->iommu_base, hwdef->iommu_version);
+    iommu = iommu_init(hwdef->iommu_base, hwdef->iommu_version,
+                       slavio_irq[hwdef->me_irq]);
 
     espdma = sparc32_dma_init(hwdef->dma_base, slavio_irq[hwdef->esp_irq],
                               iommu, &espdma_irq, &esp_reset);
@@ -1091,7 +1094,9 @@
 
     for (i = 0; i < MAX_IOUNITS; i++)
         if (hwdef->iounit_bases[i] != (target_phys_addr_t)-1)
-            iounits[i] = iommu_init(hwdef->iounit_bases[i], hwdef->iounit_version);
+            iounits[i] = iommu_init(hwdef->iounit_bases[i],
+                                    hwdef->iounit_version,
+                                    sbi_irq[hwdef->me_irq]);
 
     espdma = sparc32_dma_init(hwdef->espdma_base, sbi_irq[hwdef->esp_irq],
                               iounits[0], &espdma_irq, &esp_reset);