On 23/03/2015 16:39, Peter Maydell wrote: > > Not necessarily, for example PCI devices can certainly > > use the short name. > > PCI devices should all be using ld*_pci_dma and st*_pci_dma > so they go through the correct address space for the PCIDevice. > Any PCI device making direct calls to ld*_phys/st*_phys > is broken...
Ok, so most ld*_phys users are already using cs->as. The remaining ones are: hw/alpha/typhoon.c hw/display/sm501_template.h hw/dma/pl080.c hw/dma/sun4m_iommu.c hw/net/vmware_utils.h hw/pci-host/apb.c hw/s390x/css.c hw/s390x/s390-pci-bus.c hw/s390x/s390-virtio-bus.c hw/s390x/virtio-ccw.c hw/scsi/megasas.c hw/scsi/vmw_pvscsi.c So let's keep ld*_phys in cpu-common.h, fix the uses above, and then move it to cpu-all.h (cpu-common.h probably should die). Paolo