diff options
| author | Alexey Kardashevskiy | 2014-05-27 07:36:35 +0200 |
|---|---|---|
| committer | Alexander Graf | 2014-06-16 13:24:39 +0200 |
| commit | 523e7b8ab818ec3fab14cfd7a20d51cb3aa33a9d (patch) | |
| tree | b7d72322305d1dbc097846b9374dc034d6a04a74 /include | |
| parent | spapr_iommu: Convert old qdev_init_nofail() to object_property_set_bool (diff) | |
| download | qemu-523e7b8ab818ec3fab14cfd7a20d51cb3aa33a9d.tar.gz qemu-523e7b8ab818ec3fab14cfd7a20d51cb3aa33a9d.tar.xz qemu-523e7b8ab818ec3fab14cfd7a20d51cb3aa33a9d.zip | |
spapr_iommu: Get rid of window_size in sPAPRTCETable
This removes window_size as it is basically a copy of nb_table
shifted by SPAPR_TCE_PAGE_SHIFT. As new dynamic DMA windows are
going to support windows as big as the entire RAM and this number
will be bigger that 32 capacity, we will have to do something
about @window_size anyway and removal seems to be the right way to go.
This removes dma_window_start/dma_window_size from sPAPRPHBState as
they are no longer used.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/pci-host/spapr.h | 2 | ||||
| -rw-r--r-- | include/hw/ppc/spapr.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h index 9ce83ea1aa..0934518bbd 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -60,8 +60,6 @@ struct sPAPRPHBState { MemoryRegion memwindow, iowindow; uint32_t dma_liobn; - uint64_t dma_window_start; - uint64_t dma_window_size; AddressSpace iommu_as; MemoryRegion iommu_root; diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index b8c2ba4a4d..7a0bcc53ff 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -397,7 +397,6 @@ typedef struct sPAPRTCETable sPAPRTCETable; struct sPAPRTCETable { DeviceState parent; uint32_t liobn; - uint32_t window_size; uint32_t nb_table; uint64_t *table; bool bypass; @@ -410,7 +409,7 @@ void spapr_events_init(sPAPREnvironment *spapr); void spapr_events_fdt_skel(void *fdt, uint32_t epow_irq); int spapr_h_cas_compose_response(target_ulong addr, target_ulong size); sPAPRTCETable *spapr_tce_new_table(DeviceState *owner, uint32_t liobn, - size_t window_size); + uint32_t nb_table); MemoryRegion *spapr_tce_get_iommu(sPAPRTCETable *tcet); void spapr_tce_set_bypass(sPAPRTCETable *tcet, bool bypass); int spapr_dma_dt(void *fdt, int node_off, const char *propname, |