hw/i386/amd_iommu: rename Error ** parameter to more common errp
PATCH v6 1/1 hw/i386/amd_iommu: rename Error ** parameter to more common errp
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
--- hw/i386/amd_iommu.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
hw/i386/amd_iommu.c +7 -7
@@ -1533,7 +1533,7 @@ static void amdvi_reset(DeviceState *dev)amdvi_init (s); } -static void amdvi_realize (DeviceState *dev,Error **err) +static void amdvi_realize (DeviceState *dev,Error **errp) {int ret =0 ;AMDVIState *s =AMD_IOMMU_DEVICE (dev);
@@ -1549,21 +1549,21 @@ static void amdvi_realize(DeviceState *dev, Error **err)/* This device should take care of IOMMU PCI properties */ x86_iommu->type =TYPE_AMD ;qdev_set_parent_bus (DEVICE (&s->pci), &bus->qbus); -object_property_set_bool (OBJECT (&s->pci), true,"realized" , err); +object_property_set_bool (OBJECT (&s->pci), true,"realized" , errp); ret =pci_add_capability (&s->pci.dev,AMDVI_CAPAB_ID_SEC ,0 , -AMDVI_CAPAB_SIZE , err); +AMDVI_CAPAB_SIZE , errp);if (ret <0 ) {return ; } s->capab_offset = ret; ret =pci_add_capability (&s->pci.dev,PCI_CAP_ID_MSI ,0 , -AMDVI_CAPAB_REG_SIZE , err); +AMDVI_CAPAB_REG_SIZE , errp);if (ret <0 ) {return ; } ret =pci_add_capability (&s->pci.dev,PCI_CAP_ID_HT ,0 , -AMDVI_CAPAB_REG_SIZE , err); +AMDVI_CAPAB_REG_SIZE , errp);if (ret <0 ) {return ; }
@@ -1578,8 +1578,8 @@ static void amdvi_realize(DeviceState *dev, Error **err)sysbus_init_mmio (SYS_BUS_DEVICE (s), &s->mmio);sysbus_mmio_map (SYS_BUS_DEVICE (s),0 ,AMDVI_BASE_ADDR );pci_setup_iommu (bus, amdvi_host_dma_iommu, s); - s->devid =object_property_get_int (OBJECT (&s->pci),"addr" , err); -msi_init (&s->pci.dev,0 ,1 , true, false, err); + s->devid =object_property_get_int (OBJECT (&s->pci),"addr" , errp); +msi_init (&s->pci.dev,0 ,1 , true, false, errp);amdvi_init (s); }
Signature · 1 line
2.21.0