From: Cédric Le Goater Date: Mon, 18 Sep 2023 14:58:43 +0000 (+0200) Subject: hw/ppc: Clean up local variable shadowing in _FDT helper routine X-Git-Tag: v8.2.0-rc0~96^2~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90231ce1a355ce07b71f9b82446a40ac866585de;p=thirdparty%2Fqemu.git hw/ppc: Clean up local variable shadowing in _FDT helper routine this fixes numerous warnings of this type : In file included from ../hw/ppc/spapr_pci.c:43: ../hw/ppc/spapr_pci.c: In function ‘spapr_dt_phb’: ../include/hw/ppc/fdt.h:18:13: warning: declaration of ‘ret’ shadows a previous local [-Wshadow=compatible-local] 18 | int ret = (exp); \ | ^~~ ../hw/ppc/spapr_pci.c:2355:5: note: in expansion of macro ‘_FDT’ 2355 | _FDT(bus_off = fdt_add_subnode(fdt, 0, phb->dtbusname)); | ^~~~ ../hw/ppc/spapr_pci.c:2311:24: note: shadowed declaration is here 2311 | int bus_off, i, j, ret; | ^~~ Signed-off-by: Cédric Le Goater Message-ID: <20230918145850.241074-2-clg@kaod.org> Reviewed-by: Harsh Prateek Bora Signed-off-by: Markus Armbruster --- diff --git a/include/hw/ppc/fdt.h b/include/hw/ppc/fdt.h index a8cd85069fe..b56ac2a8cbb 100644 --- a/include/hw/ppc/fdt.h +++ b/include/hw/ppc/fdt.h @@ -15,10 +15,10 @@ #define _FDT(exp) \ do { \ - int ret = (exp); \ - if (ret < 0) { \ - error_report("error creating device tree: %s: %s", \ - #exp, fdt_strerror(ret)); \ + int _ret = (exp); \ + if (_ret < 0) { \ + error_report("error creating device tree: %s: %s", \ + #exp, fdt_strerror(_ret)); \ exit(1); \ } \ } while (0)