This pointer is no longer used, after fields were moved from S390PCIIOMMU
to S390PCIBusDevice.
Signed-off-by: Konstantin Shkolnyy <kshk@linux.ibm.com>
---
hw/s390x/s390-pci-bus.c | 15 +++++++--------
include/hw/s390x/s390-pci-bus.h | 1 -
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 3f3123e62a..83e9ca99f3 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -551,7 +551,7 @@ static IOMMUTLBEntry s390_translate_iommu(IOMMUMemoryRegion *mr, hwaddr addr,
.perm = IOMMU_NONE,
};
- switch (iommu->pbdev->state) {
+ switch (pbdev->state) {
case ZPCI_FS_ENABLED:
case ZPCI_FS_BLOCKED:
if (!iommu->enabled) {
@@ -586,9 +586,9 @@ static IOMMUTLBEntry s390_translate_iommu(IOMMUMemoryRegion *mr, hwaddr addr,
}
err:
if (error) {
- iommu->pbdev->state = ZPCI_FS_ERROR;
- s390_pci_generate_error_event(error, iommu->pbdev->fh,
- iommu->pbdev->fid, addr, 0);
+ pbdev->state = ZPCI_FS_ERROR;
+ s390_pci_generate_error_event(error, pbdev->fh,
+ pbdev->fid, addr, 0);
}
return ret;
}
@@ -767,7 +767,7 @@ void s390_pci_iommu_enable(S390PCIBusDevice *pbdev)
* so the smallest IOMMU region we can define runs from 0 to the end
* of the PCI address space.
*/
- char *name = g_strdup_printf("iommu-s390-%04x", iommu->pbdev->uid);
+ char *name = g_strdup_printf("iommu-s390-%04x", pbdev->uid);
memory_region_init_iommu(&pbdev->iommu_mr, sizeof(pbdev->iommu_mr),
TYPE_S390_IOMMU_MEMORY_REGION, OBJECT(&iommu->mr),
name, iommu->pal + 1);
@@ -788,14 +788,14 @@ void s390_pci_iommu_direct_map_enable(S390PCIBusDevice *pbdev)
* IOVA X + SDMA. VFIO will handle pinning via its memory listener.
*/
g_autofree char *name = g_strdup_printf("iommu-dm-s390-%04x",
- iommu->pbdev->uid);
+ pbdev->uid);
pbdev->dm_mr = g_malloc0(sizeof(*pbdev->dm_mr));
memory_region_init_alias(pbdev->dm_mr, OBJECT(&iommu->mr), name,
get_system_memory(), 0,
s390_get_memory_limit(s390ms));
iommu->enabled = true;
- memory_region_add_subregion(&iommu->mr, iommu->pbdev->zpci_fn.sdma,
+ memory_region_add_subregion(&iommu->mr, pbdev->zpci_fn.sdma,
pbdev->dm_mr);
}
@@ -1187,7 +1187,6 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
pbdev->pdev = pdev;
pbdev->iommu = s390_pci_get_iommu(s, pci_get_bus(pdev), pdev->devfn);
- pbdev->iommu->pbdev = pbdev;
pbdev->state = ZPCI_FS_DISABLED;
set_pbdev_info(pbdev);
diff --git a/include/hw/s390x/s390-pci-bus.h b/include/hw/s390x/s390-pci-bus.h
index d9bafd6859..fcaaf19512 100644
--- a/include/hw/s390x/s390-pci-bus.h
+++ b/include/hw/s390x/s390-pci-bus.h
@@ -273,7 +273,6 @@ typedef struct S390PCIDMACount {
struct S390PCIIOMMU {
Object parent_obj;
- S390PCIBusDevice *pbdev;
AddressSpace as;
MemoryRegion mr;
bool enabled;
--
2.34.1