[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/34] hw/i386/amd_iommu: rename Error ** parameter to more common
From: |
Markus Armbruster |
Subject: |
[PULL 24/34] hw/i386/amd_iommu: rename Error ** parameter to more common errp |
Date: |
Tue, 17 Dec 2019 07:26:41 +0100 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/i386/amd_iommu.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
index d55dbf07fc..b1175e52c7 100644
--- a/hw/i386/amd_iommu.c
+++ b/hw/i386/amd_iommu.c
@@ -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);
}
--
2.21.0
- [PULL 23/34] block/snapshot: rename Error ** parameter to more common errp, (continued)
- [PULL 23/34] block/snapshot: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/17
- [PULL 32/34] backends/cryptodev: drop local_err from cryptodev_backend_complete(), Markus Armbruster, 2019/12/17
- [PULL 34/34] nbd: assert that Error** is not NULL in nbd_iter_channel_error, Markus Armbruster, 2019/12/17
- [PULL 30/34] hw/usb: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/17
- [PULL 21/34] 9pfs: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/17
- [PULL 17/34] hmp: drop Error pointer indirection in hmp_handle_error, Markus Armbruster, 2019/12/17
- [PULL 27/34] hw/s390x: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/17
- [PULL 31/34] include/qom/object.h: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/17
- [PULL 24/34] hw/i386/amd_iommu: rename Error ** parameter to more common errp,
Markus Armbruster <=
- [PULL 20/34] ppc: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/17
- [PULL 12/34] error: Clean up unusual names of Error * variables, Markus Armbruster, 2019/12/17
- [PULL 22/34] hw/core/qdev: cleanup Error ** variables, Markus Armbruster, 2019/12/17
- [PULL 25/34] qga: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/17
- Re: [PULL 00/34] Error reporting patches for 2019-12-16, Peter Maydell, 2019/12/17