mirror of https://gitlab.com/qemu-project/qemu
error: Clean up unusual names of Error * variables
Local Error * variables are conventionally named @err or @local_err, and Error ** parameters @errp. Naming local variables like parameters is confusing. Clean that up. Naming parameters like local variables is also confusing. Left for another day. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20191204093625.14836-17-armbru@redhat.com>
This commit is contained in:
parent
8574c9f1ad
commit
8ca63ba8c2
|
@ -582,10 +582,10 @@ static void kvm_s390_flic_realize(DeviceState *dev, Error **errp)
|
||||||
struct kvm_create_device cd = {0};
|
struct kvm_create_device cd = {0};
|
||||||
struct kvm_device_attr test_attr = {0};
|
struct kvm_device_attr test_attr = {0};
|
||||||
int ret;
|
int ret;
|
||||||
Error *errp_local = NULL;
|
Error *err = NULL;
|
||||||
|
|
||||||
KVM_S390_FLIC_GET_CLASS(dev)->parent_realize(dev, &errp_local);
|
KVM_S390_FLIC_GET_CLASS(dev)->parent_realize(dev, &err);
|
||||||
if (errp_local) {
|
if (err) {
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
flic_state->fd = -1;
|
flic_state->fd = -1;
|
||||||
|
@ -593,7 +593,7 @@ static void kvm_s390_flic_realize(DeviceState *dev, Error **errp)
|
||||||
cd.type = KVM_DEV_TYPE_FLIC;
|
cd.type = KVM_DEV_TYPE_FLIC;
|
||||||
ret = kvm_vm_ioctl(kvm_state, KVM_CREATE_DEVICE, &cd);
|
ret = kvm_vm_ioctl(kvm_state, KVM_CREATE_DEVICE, &cd);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
error_setg_errno(&errp_local, errno, "Creating the KVM device failed");
|
error_setg_errno(&err, errno, "Creating the KVM device failed");
|
||||||
trace_flic_create_device(errno);
|
trace_flic_create_device(errno);
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
@ -605,7 +605,7 @@ static void kvm_s390_flic_realize(DeviceState *dev, Error **errp)
|
||||||
KVM_HAS_DEVICE_ATTR, test_attr);
|
KVM_HAS_DEVICE_ATTR, test_attr);
|
||||||
return;
|
return;
|
||||||
fail:
|
fail:
|
||||||
error_propagate(errp, errp_local);
|
error_propagate(errp, err);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void kvm_s390_flic_reset(DeviceState *dev)
|
static void kvm_s390_flic_reset(DeviceState *dev)
|
||||||
|
|
|
@ -2042,13 +2042,13 @@ void spapr_phb_dma_reset(SpaprPhbState *sphb)
|
||||||
static void spapr_phb_reset(DeviceState *qdev)
|
static void spapr_phb_reset(DeviceState *qdev)
|
||||||
{
|
{
|
||||||
SpaprPhbState *sphb = SPAPR_PCI_HOST_BRIDGE(qdev);
|
SpaprPhbState *sphb = SPAPR_PCI_HOST_BRIDGE(qdev);
|
||||||
Error *errp = NULL;
|
Error *err = NULL;
|
||||||
|
|
||||||
spapr_phb_dma_reset(sphb);
|
spapr_phb_dma_reset(sphb);
|
||||||
spapr_phb_nvgpu_free(sphb);
|
spapr_phb_nvgpu_free(sphb);
|
||||||
spapr_phb_nvgpu_setup(sphb, &errp);
|
spapr_phb_nvgpu_setup(sphb, &err);
|
||||||
if (errp) {
|
if (err) {
|
||||||
error_report_err(errp);
|
error_report_err(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Reset the IOMMU state */
|
/* Reset the IOMMU state */
|
||||||
|
@ -2326,7 +2326,7 @@ int spapr_dt_phb(SpaprMachineState *spapr, SpaprPhbState *phb,
|
||||||
cpu_to_be32(phb->numa_node)};
|
cpu_to_be32(phb->numa_node)};
|
||||||
SpaprTceTable *tcet;
|
SpaprTceTable *tcet;
|
||||||
SpaprDrc *drc;
|
SpaprDrc *drc;
|
||||||
Error *errp = NULL;
|
Error *err = NULL;
|
||||||
|
|
||||||
/* Start populating the FDT */
|
/* Start populating the FDT */
|
||||||
_FDT(bus_off = fdt_add_subnode(fdt, 0, phb->dtbusname));
|
_FDT(bus_off = fdt_add_subnode(fdt, 0, phb->dtbusname));
|
||||||
|
@ -2408,9 +2408,9 @@ int spapr_dt_phb(SpaprMachineState *spapr, SpaprPhbState *phb,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
spapr_phb_nvgpu_populate_dt(phb, fdt, bus_off, &errp);
|
spapr_phb_nvgpu_populate_dt(phb, fdt, bus_off, &err);
|
||||||
if (errp) {
|
if (err) {
|
||||||
error_report_err(errp);
|
error_report_err(err);
|
||||||
}
|
}
|
||||||
spapr_phb_nvgpu_ram_populate_dt(phb, fdt);
|
spapr_phb_nvgpu_ram_populate_dt(phb, fdt);
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ struct SpaprPhbPciNvGpuConfig {
|
||||||
uint64_t nv2_atsd_current;
|
uint64_t nv2_atsd_current;
|
||||||
int num; /* number of non empty (i.e. tgt!=0) entries in slots[] */
|
int num; /* number of non empty (i.e. tgt!=0) entries in slots[] */
|
||||||
SpaprPhbPciNvGpuSlot slots[NVGPU_MAX_NUM];
|
SpaprPhbPciNvGpuSlot slots[NVGPU_MAX_NUM];
|
||||||
Error *errp;
|
Error *err;
|
||||||
};
|
};
|
||||||
|
|
||||||
static SpaprPhbPciNvGpuSlot *
|
static SpaprPhbPciNvGpuSlot *
|
||||||
|
@ -153,7 +153,7 @@ static void spapr_phb_pci_collect_nvgpu(PCIBus *bus, PCIDevice *pdev,
|
||||||
spapr_pci_collect_nvnpu(nvgpus, pdev, tgt, MEMORY_REGION(mr_npu),
|
spapr_pci_collect_nvnpu(nvgpus, pdev, tgt, MEMORY_REGION(mr_npu),
|
||||||
&local_err);
|
&local_err);
|
||||||
}
|
}
|
||||||
error_propagate(&nvgpus->errp, local_err);
|
error_propagate(&nvgpus->err, local_err);
|
||||||
}
|
}
|
||||||
if ((pci_default_read_config(pdev, PCI_HEADER_TYPE, 1) !=
|
if ((pci_default_read_config(pdev, PCI_HEADER_TYPE, 1) !=
|
||||||
PCI_HEADER_TYPE_BRIDGE)) {
|
PCI_HEADER_TYPE_BRIDGE)) {
|
||||||
|
@ -187,9 +187,9 @@ void spapr_phb_nvgpu_setup(SpaprPhbState *sphb, Error **errp)
|
||||||
pci_for_each_device(bus, pci_bus_num(bus),
|
pci_for_each_device(bus, pci_bus_num(bus),
|
||||||
spapr_phb_pci_collect_nvgpu, sphb->nvgpus);
|
spapr_phb_pci_collect_nvgpu, sphb->nvgpus);
|
||||||
|
|
||||||
if (sphb->nvgpus->errp) {
|
if (sphb->nvgpus->err) {
|
||||||
error_propagate(errp, sphb->nvgpus->errp);
|
error_propagate(errp, sphb->nvgpus->err);
|
||||||
sphb->nvgpus->errp = NULL;
|
sphb->nvgpus->err = NULL;
|
||||||
goto cleanup_exit;
|
goto cleanup_exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -34,13 +34,13 @@ static BlockJob *mk_job(BlockBackend *blk, const char *id,
|
||||||
int flags)
|
int flags)
|
||||||
{
|
{
|
||||||
BlockJob *job;
|
BlockJob *job;
|
||||||
Error *errp = NULL;
|
Error *err = NULL;
|
||||||
|
|
||||||
job = block_job_create(id, drv, NULL, blk_bs(blk),
|
job = block_job_create(id, drv, NULL, blk_bs(blk),
|
||||||
0, BLK_PERM_ALL, 0, flags, block_job_cb,
|
0, BLK_PERM_ALL, 0, flags, block_job_cb,
|
||||||
NULL, &errp);
|
NULL, &err);
|
||||||
if (should_succeed) {
|
if (should_succeed) {
|
||||||
g_assert_null(errp);
|
g_assert_null(err);
|
||||||
g_assert_nonnull(job);
|
g_assert_nonnull(job);
|
||||||
if (id) {
|
if (id) {
|
||||||
g_assert_cmpstr(job->job.id, ==, id);
|
g_assert_cmpstr(job->job.id, ==, id);
|
||||||
|
@ -48,9 +48,9 @@ static BlockJob *mk_job(BlockBackend *blk, const char *id,
|
||||||
g_assert_cmpstr(job->job.id, ==, blk_name(blk));
|
g_assert_cmpstr(job->job.id, ==, blk_name(blk));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
g_assert_nonnull(errp);
|
g_assert_nonnull(err);
|
||||||
g_assert_null(job);
|
g_assert_null(job);
|
||||||
error_free(errp);
|
error_free(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
return job;
|
return job;
|
||||||
|
@ -80,9 +80,9 @@ static BlockBackend *create_blk(const char *name)
|
||||||
bdrv_unref(bs);
|
bdrv_unref(bs);
|
||||||
|
|
||||||
if (name) {
|
if (name) {
|
||||||
Error *errp = NULL;
|
Error *err = NULL;
|
||||||
monitor_add_blk(blk, name, &errp);
|
monitor_add_blk(blk, name, &err);
|
||||||
g_assert_null(errp);
|
g_assert_null(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
return blk;
|
return blk;
|
||||||
|
|
Loading…
Reference in New Issue