vfio-pci: Re-order map/unmap
This cleans up the next patch that calls unmap from map. Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
parent
ea486926b0
commit
af6bc27e39
|
@ -786,6 +786,24 @@ static void vfio_pci_write_config(PCIDevice *pdev, uint32_t addr,
|
|||
/*
|
||||
* DMA - Mapping and unmapping for the "type1" IOMMU interface used on x86
|
||||
*/
|
||||
static int vfio_dma_unmap(VFIOContainer *container,
|
||||
target_phys_addr_t iova, ram_addr_t size)
|
||||
{
|
||||
struct vfio_iommu_type1_dma_unmap unmap = {
|
||||
.argsz = sizeof(unmap),
|
||||
.flags = 0,
|
||||
.iova = iova,
|
||||
.size = size,
|
||||
};
|
||||
|
||||
if (ioctl(container->fd, VFIO_IOMMU_UNMAP_DMA, &unmap)) {
|
||||
DPRINTF("VFIO_UNMAP_DMA: %d\n", -errno);
|
||||
return -errno;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vfio_dma_map(VFIOContainer *container, target_phys_addr_t iova,
|
||||
ram_addr_t size, void *vaddr, bool readonly)
|
||||
{
|
||||
|
@ -809,24 +827,6 @@ static int vfio_dma_map(VFIOContainer *container, target_phys_addr_t iova,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int vfio_dma_unmap(VFIOContainer *container,
|
||||
target_phys_addr_t iova, ram_addr_t size)
|
||||
{
|
||||
struct vfio_iommu_type1_dma_unmap unmap = {
|
||||
.argsz = sizeof(unmap),
|
||||
.flags = 0,
|
||||
.iova = iova,
|
||||
.size = size,
|
||||
};
|
||||
|
||||
if (ioctl(container->fd, VFIO_IOMMU_UNMAP_DMA, &unmap)) {
|
||||
DPRINTF("VFIO_UNMAP_DMA: %d\n", -errno);
|
||||
return -errno;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void vfio_listener_dummy1(MemoryListener *listener)
|
||||
{
|
||||
/* We don't do batching (begin/commit) or care about logging */
|
||||
|
|
Loading…
Reference in a new issue