diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-11 12:38:50 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-06-20 16:32:48 +0200 |
| commit | 96478592a93f93322ecc20d0a6eccb4d4ef33c7a (patch) | |
| tree | fb82480c4492f6d617494b5b4a88d19128dcd195 /hw | |
| parent | e00387d58243d4ae24ac68008a2aea76313ab997 (diff) | |
| download | qemu-96478592a93f93322ecc20d0a6eccb4d4ef33c7a.tar.gz | |
spapr_vio: take care of creating our own AddressSpace/DMAContext
Fetch the root region from the sPAPRTCETable, and use it to build
an AddressSpace and DMAContext.
Now, everywhere we have a DMAContext we also have access to the
corresponding AddressSpace (either because we create it just before
the DMAContext, or because dma_context_memory's AddressSpace is
trivially address_space_memory).
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ppc/spapr_iommu.c | 11 | ||||
| -rw-r--r-- | hw/ppc/spapr_vio.c | 3 |
2 files changed, 2 insertions, 12 deletions
diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index 4667e117a2..91bc8e488e 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -37,10 +37,6 @@ enum sPAPRTCEAccess { }; struct sPAPRTCETable { - /* temporary until everyone has its own AddressSpace */ - DMAContext dma; - AddressSpace as; - uint32_t liobn; uint32_t window_size; sPAPRTCE *table; @@ -157,8 +153,6 @@ 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); QLIST_INSERT_HEAD(&spapr_tce_tables, tcet, list); @@ -178,11 +172,6 @@ void spapr_tce_free(sPAPRTCETable *tcet) g_free(tcet); } -DMAContext *spapr_tce_get_dma(sPAPRTCETable *tcet) -{ - return &tcet->dma; -} - MemoryRegion *spapr_tce_get_iommu(sPAPRTCETable *tcet) { return &tcet->iommu; diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index ae906a74a6..09cda646b0 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -454,7 +454,8 @@ static int spapr_vio_busdev_init(DeviceState *qdev) if (pc->rtce_window_size) { uint32_t liobn = SPAPR_VIO_BASE_LIOBN | dev->reg; dev->tcet = spapr_tce_new_table(liobn, pc->rtce_window_size); - dev->dma = spapr_tce_get_dma(dev->tcet); + address_space_init(&dev->as, spapr_tce_get_iommu(dev->tcet)); + dma_context_init(&dev->dma, &dev->as); } return pc->init(dev); |