mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 08:43:55 -06:00
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
4 changed files with 26 additions and 26 deletions
|
@ -2042,13 +2042,13 @@ void spapr_phb_dma_reset(SpaprPhbState *sphb)
|
|||
static void spapr_phb_reset(DeviceState *qdev)
|
||||
{
|
||||
SpaprPhbState *sphb = SPAPR_PCI_HOST_BRIDGE(qdev);
|
||||
Error *errp = NULL;
|
||||
Error *err = NULL;
|
||||
|
||||
spapr_phb_dma_reset(sphb);
|
||||
spapr_phb_nvgpu_free(sphb);
|
||||
spapr_phb_nvgpu_setup(sphb, &errp);
|
||||
if (errp) {
|
||||
error_report_err(errp);
|
||||
spapr_phb_nvgpu_setup(sphb, &err);
|
||||
if (err) {
|
||||
error_report_err(err);
|
||||
}
|
||||
|
||||
/* Reset the IOMMU state */
|
||||
|
@ -2326,7 +2326,7 @@ int spapr_dt_phb(SpaprMachineState *spapr, SpaprPhbState *phb,
|
|||
cpu_to_be32(phb->numa_node)};
|
||||
SpaprTceTable *tcet;
|
||||
SpaprDrc *drc;
|
||||
Error *errp = NULL;
|
||||
Error *err = NULL;
|
||||
|
||||
/* Start populating the FDT */
|
||||
_FDT(bus_off = fdt_add_subnode(fdt, 0, phb->dtbusname));
|
||||
|
@ -2408,9 +2408,9 @@ int spapr_dt_phb(SpaprMachineState *spapr, SpaprPhbState *phb,
|
|||
return ret;
|
||||
}
|
||||
|
||||
spapr_phb_nvgpu_populate_dt(phb, fdt, bus_off, &errp);
|
||||
if (errp) {
|
||||
error_report_err(errp);
|
||||
spapr_phb_nvgpu_populate_dt(phb, fdt, bus_off, &err);
|
||||
if (err) {
|
||||
error_report_err(err);
|
||||
}
|
||||
spapr_phb_nvgpu_ram_populate_dt(phb, fdt);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue