ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/i386/amd_iommu: rename Error ** parameter to more common errp 

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20191205174635.18758-12-vsementsov@virtuozzo.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2019-12-05 20:46:25 +03:00 committed by Markus Armbruster
parent e53a578a8b
commit c9b13a51d5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/i386/amd_iommu.c
View File

@ -1533,7 +1533,7 @@ static void amdvi_reset(DeviceState *dev)
amdvi_init(s); amdvi_init(s);
} }
static void amdvi_realize(DeviceState *dev, Error **err) static void amdvi_realize(DeviceState *dev, Error **errp)
{ {
int ret = 0; int ret = 0;
AMDVIState *s = AMD_IOMMU_DEVICE(dev); 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 */ /* This device should take care of IOMMU PCI properties */
x86_iommu->type = TYPE_AMD; x86_iommu->type = TYPE_AMD;
qdev_set_parent_bus(DEVICE(&s->pci), &bus->qbus); 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, ret = pci_add_capability(&s->pci.dev, AMDVI_CAPAB_ID_SEC, 0,
AMDVI_CAPAB_SIZE, err); AMDVI_CAPAB_SIZE, errp);
if (ret < 0) { if (ret < 0) {
return; return;
} }
s->capab_offset = ret; s->capab_offset = ret;
ret = pci_add_capability(&s->pci.dev, PCI_CAP_ID_MSI, 0, 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) { if (ret < 0) {
return; return;
} }
ret = pci_add_capability(&s->pci.dev, PCI_CAP_ID_HT, 0, 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) { if (ret < 0) {
return; return;
} }
@ -1578,8 +1578,8 @@ static void amdvi_realize(DeviceState *dev, Error **err)
sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->mmio); sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->mmio);
sysbus_mmio_map(SYS_BUS_DEVICE(s), 0, AMDVI_BASE_ADDR); sysbus_mmio_map(SYS_BUS_DEVICE(s), 0, AMDVI_BASE_ADDR);
pci_setup_iommu(bus, amdvi_host_dma_iommu, s); pci_setup_iommu(bus, amdvi_host_dma_iommu, s);
s->devid = object_property_get_int(OBJECT(&s->pci), "addr", err); s->devid = object_property_get_int(OBJECT(&s->pci), "addr", errp);
msi_init(&s->pci.dev, 0, 1, true, false, err); msi_init(&s->pci.dev, 0, 1, true, false, errp);
amdvi_init(s); amdvi_init(s);
} }