From f166061c73f070ce98a9003bdaeedd39ab034eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Sat, 31 Oct 2020 16:23:40 +0100 Subject: [PATCH 1/2] MAINTAINERS: Demote Renesas target & hardware to 'Odd Fixes' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To be fair with other subsystems listed as 'Odd Fixes' but having maintainers more present, demote the Renesas sections from being 'Maintained' to 'Odd Fixes' (has a maintainer but they don't have time to do much other than throw the odd patch in.) This matches Magnus's possibilities so far: https://www.mail-archive.com/qemu-devel@nongnu.org/msg710319.html Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20201102104001.2062572-1-f4bug@amsat.org> --- MAINTAINERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 63223e1183..f6da5990aa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -289,7 +289,7 @@ F: linux-user/host/riscv64/ RENESAS RX CPUs M: Yoshinori Sato -S: Maintained +S: Odd Fixes F: target/rx/ S390 TCG CPUs @@ -1334,7 +1334,7 @@ RX Machines ----------- rx-gdbsim M: Yoshinori Sato -S: Maintained +S: Odd Fixes F: docs/system/target-rx.rst F: hw/rx/rx-gdbsim.c F: tests/acceptance/machine_rx_gdbsim.py @@ -1344,7 +1344,7 @@ SH4 Machines R2D M: Yoshinori Sato R: Magnus Damm -S: Maintained +S: Odd Fixes F: hw/sh4/r2d.c F: hw/intc/sh_intc.c F: include/hw/sh4/sh_intc.h @@ -2077,7 +2077,7 @@ F: docs/*/*xive* Renesas peripherals M: Yoshinori Sato R: Magnus Damm -S: Maintained +S: Odd Fixes F: hw/char/renesas_sci.c F: hw/char/sh_serial.c F: hw/timer/renesas_*.c @@ -2088,7 +2088,7 @@ F: include/hw/timer/renesas_*.h Renesas RX peripherals M: Yoshinori Sato -S: Maintained +S: Odd Fixes F: hw/intc/rx_icu.c F: hw/rx/ F: include/hw/intc/rx_icu.h From 60f6de8fbafa5dc57af63792e3ba1a910239d195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Wed, 28 Oct 2020 16:08:10 +0100 Subject: [PATCH 2/2] hw/rx/rx-gdbsim: Fix memory leak (CID 1432307) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As load_device_tree() returns allocated memory, we need to free it. Cc: Yoshinori Sato Fixes: bda19d7bb56 ("hw/rx: Add RX GDB simulator") Reported-by: Coverity (CID 1432307: RESOURCE_LEAK) Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20201102104542.2064745-1-f4bug@amsat.org> --- hw/rx/rx-gdbsim.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c index 417ec0564b..285549c79b 100644 --- a/hw/rx/rx-gdbsim.c +++ b/hw/rx/rx-gdbsim.c @@ -122,9 +122,8 @@ static void rx_gdbsim_init(MachineState *machine) if (dtb_filename) { ram_addr_t dtb_offset; int dtb_size; - void *dtb; + g_autofree void *dtb = load_device_tree(dtb_filename, &dtb_size); - dtb = load_device_tree(dtb_filename, &dtb_size); if (dtb == NULL) { error_report("Couldn't open dtb file %s", dtb_filename); exit(1);