diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-10 17:49:04 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-06-20 16:32:47 +0200 |
| commit | 24addbc76dcbb1d1c85b3062bbf7a030831cc7a9 (patch) | |
| tree | 043b31d31a78616ed0a11da3e992dd7bc1ad699f /hw | |
| parent | a84bb436696159d460d03db809c27a854cee0863 (diff) | |
| download | qemu-24addbc76dcbb1d1c85b3062bbf7a030831cc7a9.zip qemu-24addbc76dcbb1d1c85b3062bbf7a030831cc7a9.tar.gz qemu-24addbc76dcbb1d1c85b3062bbf7a030831cc7a9.tar.bz2 | |
dma: eliminate old-style IOMMU support
The translate function in the DMAContext is now always NULL.
Remove every reference to it.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/pci/pci.c | 3 | ||||
| -rw-r--r-- | hw/ppc/spapr_iommu.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index a3eb19e..3bcd07d 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -814,8 +814,9 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, memory_region_set_enabled(&pci_dev->bus_master_enable_region, false); address_space_init(&pci_dev->bus_master_as, &pci_dev->bus_master_enable_region); pci_dev->dma = g_new(DMAContext, 1); - dma_context_init(pci_dev->dma, &pci_dev->bus_master_as, NULL, NULL, NULL); + dma_context_init(pci_dev->dma, &pci_dev->bus_master_as); } + pci_dev->devfn = devfn; pstrcpy(pci_dev->name, sizeof(pci_dev->name), name); pci_dev->irq_state = 0; diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index 6e33929..4667e11 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -158,7 +158,7 @@ sPAPRTCETable *spapr_tce_new_table(uint32_t liobn, size_t window_size) memory_region_init_iommu(&tcet->iommu, &spapr_iommu_ops, "iommu-spapr", UINT64_MAX); address_space_init(&tcet->as, &tcet->iommu); - dma_context_init(&tcet->dma, &tcet->as, NULL, NULL, NULL); + dma_context_init(&tcet->dma, &tcet->as); QLIST_INSERT_HEAD(&spapr_tce_tables, tcet, list); |